[client] Refactoring

- rewrite visible text for usage, fix typos
- hide gui controls, which are not used in container context.

2 files changed, 16 insertions, 20 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
index 3ce75f37..be96f283 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java
@@ -26,6 +26,9 @@ import java.io.IOException;
 
 public class ContainerUploadPage extends ContainerUploadPageLayout {
 
+	// TODO: Add a Instruction for the new Container-Feature in bwLehrpool.
+	// TODO: Add link to instructions for Docker-Intetragtion at https://www.bwlehrpool.de/doku.php
+
 	private final Logger LOGGER = Logger.getLogger(ContainerUploadPage.class);
 
 	/**
@@ -124,8 +127,6 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
 		fc.setAcceptAllFileFilterUsed(false);
 		fc.addChoosableFileFilter(new DockerfileFilter());
 
-		// TODO add Feature for MULTIPLE_HYPERVISORS
-
 		int action = fc.showOpenDialog(getDialog());
 		File file = fc.getSelectedFile();
 
@@ -230,9 +231,6 @@ public class ContainerUploadPage extends ContainerUploadPageLayout {
 	}
 
 	@Override protected boolean wantNextOrFinish() {
-		// are we creating a new image? then either:
-		// get the image name either auto filled by VmwareMetaData or by user
-		// get the image name from the image we are uploading a new version of
 		state.name = existingImage != null ? existingImage.getImageName() : txtImageName.getText();
 		state.meta = createVmMeta();
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index 7b9dcd10..47408fd9 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -25,15 +25,15 @@ import java.util.List;
 /**
  * Page for setting the details of an image.
  */
-@SuppressWarnings("serial")
-public class ImageMetaDataPage extends ImageMetaDataPageLayout {
+@SuppressWarnings("serial") public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 
 	private final static Logger LOGGER = Logger.getLogger(ImageMetaDataPage.class);
 
 	private UploadWizardState state;
 	private final ContainerDefinition containerDefinition;
 
-	public ImageMetaDataPage(Wizard wizard, UploadWizardState uploadWizardState, ContainerDefinition containerDefinition) {
+	public ImageMetaDataPage(Wizard wizard, UploadWizardState uploadWizardState,
+			ContainerDefinition containerDefinition) {
 		super(wizard);
 		this.state = uploadWizardState;
 		this.containerDefinition = containerDefinition;
@@ -45,14 +45,12 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		QuickTimer.scheduleOnce(new Task() {
 			List<OperatingSystem> osList = null;
 
-			@Override
-			public void fire() {
+			@Override public void fire() {
 				osList = MetaDataCache.getOperatingSystems();
 				// now send the organizations back to the LoginWindow
 				// through populateIdpCombo()
 				Gui.asyncExec(new Runnable() {
-					@Override
-					public void run() {
+					@Override public void run() {
 						fillOsCombo(osList);
 					}
 				});
@@ -60,8 +58,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		});
 
 		cboOperatingSystem.addItemListener(new ItemListener() {
-			@Override
-			public void itemStateChanged(ItemEvent e) {
+			@Override public void itemStateChanged(ItemEvent e) {
 				if (e.getStateChange() == ItemEvent.SELECTED) {
 					reactToUserInput();
 				}
@@ -69,15 +66,13 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		});
 
 		txtDescription.getDocument().addDocumentListener(new TextChangeListener() {
-			@Override
-			public void changed() {
+			@Override public void changed() {
 				reactToUserInput();
 			}
 		});
 	}
 
-	@Override
-	protected void onPageEnter() {
+	@Override protected void onPageEnter() {
 		// Preselect OS if possible
 		if (state.detectedOs != null) {
 			cboOperatingSystem.setSelectedItem(state.detectedOs);
@@ -91,8 +86,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		reactToUserInput();
 	}
 
-	@Override
-	protected boolean wantNextOrFinish() {
+	@Override protected boolean wantNextOrFinish() {
 		state.selectedOs = (OperatingSystem) cboOperatingSystem.getSelectedItem();
 		state.isTemplate = chkIsTemplate.isSelected();
 		state.isRestricted = chkLicenseRestricted.isSelected();
@@ -135,6 +129,10 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		if (state.meta instanceof DockerMetaDataDummy) {
 			bindMountConfigurator.setVisible(true);
 
+			// TODO we need Information about a OS in Container? Currently use "Other (32 Bit)" as default
+			lblOperatingSystem.setVisible(false);
+			cboOperatingSystem.setVisible(false);
+
 			// TODO do we need to check license restrictions in container?
 			chkLicenseRestricted.setVisible(false);
 			// TODO currently no Container Template!