[client] refactoring

1 files changed, 12 insertions, 13 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/DockerfileUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/DockerfileUploadPage.java
index a90329a1..b4ea3e71 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/DockerfileUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/DockerfileUploadPage.java
@@ -54,11 +54,12 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout {
 		init();
 	}
 
-	public DockerfileUploadPage(Wizard wizard, UploadWizardState state_, ImageDetailsRead image) {
+	public DockerfileUploadPage(Wizard wizard, UploadWizardState uploadWizardState,
+			ImageDetailsRead imageDetailsRead) {
 		super(wizard);
 
-		state = state_;
-		existingImage = image;
+		state = uploadWizardState;
+		existingImage = imageDetailsRead;
 		// TODO Restore ContainerMeta to show Configuration (and Dockerfile) in ImageDetailsWindow,
 		// Cannot be done, because vmx not downloaded!
 		containerMeta = new ContainerMeta();
@@ -67,17 +68,15 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout {
 		txtImageName.setEnabled(existingImage == null);
 		txtInfoText.setVisible(existingImage == null);
 
-		state.name = image.imageName;
-
-		state.defaultPermissions = image.getDefaultPermissions();
-		//		state.permissionMap // TODO do i need that ?
-		state.description = image.getDescription();
-		state.detectedOs = MetaDataCache.getOsById(image.getOsId());
-		state.selectedOs = MetaDataCache.getOsById(image.getOsId());
-		state.tags = image.getTags();
-		state.defaultPermissions = image.getUserPermissions();
+		state.name = imageDetailsRead.imageName;
+		state.defaultPermissions = imageDetailsRead.getDefaultPermissions();
+		state.description = imageDetailsRead.getDescription();
+		state.detectedOs = MetaDataCache.getOsById(imageDetailsRead.getOsId());
+		state.selectedOs = MetaDataCache.getOsById(imageDetailsRead.getOsId());
+		state.tags = imageDetailsRead.getTags();
+		state.defaultPermissions = imageDetailsRead.getUserPermissions();
 
-		state.uuid = image.getImageBaseId();
+		state.uuid = imageDetailsRead.getImageBaseId();
 		init();
 	}