1 files changed, 29 insertions, 16 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java
index b2201239..1cb861ee 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java
@@ -30,9 +30,8 @@ public class ContainerPanel extends JPanel {
 	public static final String IMAGE_CONTEXT = "IMAGE";
 	public static final String CONTAINER_CONTEXT = "CONTAINER";
 
-	private final Logger LOGGER = Logger.getLogger(ContainerBindMountConfigurator.class);
+	private final Logger LOGGER = Logger.getLogger(ContainerPanel.class);
 
-	// TODO ContainerImageType should be set in MetaData
 	private final QLabel lblContainerImageType;
 	private final ComboBox<ContainerMeta.ContainerImageType> cboContainerImageType;
 
@@ -65,6 +64,8 @@ public class ContainerPanel extends JPanel {
 
 		QLabel lblContainerRunCommand = new QLabel(
 				I18n.PANEL.getString("ContainerPanel.ContainerRunCommand.label"));
+		lblContainerRunCommand.setToolTipText(
+				I18n.PANEL.getString("ContainerPanel.ContainerRunCommand.tooltip"));
 		txtContainerRunCommand = new JTextField();
 		grdContainerMeta.add(lblContainerRunCommand);
 		grdContainerMeta.add(txtContainerRunCommand, 2).fill(true, false).expand(true, false);
@@ -89,20 +90,9 @@ public class ContainerPanel extends JPanel {
 		scrollableTextArea.setPreferredSize(Gui.getScaledDimension(0, 200));
 		grdContainer.add(scrollableTextArea, 2).fill(true, true).expand(true, true);
 
-		// TODO copy-paste in ImageMetaDataPageLayout for this ContainerImageType component
-		lblContainerImageType = new QLabel("Container Image Type");
-		cboContainerImageType = new ComboBox<>(
-				new ComboBox.ComboBoxRenderer<ContainerMeta.ContainerImageType>() {
-					@Override public String renderItem(ContainerMeta.ContainerImageType item) {
-						if (item == null)
-							return "null";
-						return item.toString(); // shows the provided label
-					}
-				}, ContainerMeta.ContainerImageType.class);
-		for (ContainerMeta.ContainerImageType type : ContainerMeta.ContainerImageType.values()) {
-			cboContainerImageType.addItem(type);
-		}
-		cboContainerImageType.setSelectedItem(ContainerMeta.ContainerImageType.LECTURE);
+		lblContainerImageType = new QLabel(
+				I18n.PANEL.getString("ContainerPanel.Label.ContainerImageType.text"));
+		cboContainerImageType = ContainerPanel.createContainerImageTypeCBO();
 		grdContainer.add(lblContainerImageType);
 		grdContainer.add(cboContainerImageType).fill(true, false).expand(true, false);
 
@@ -236,5 +226,28 @@ public class ContainerPanel extends JPanel {
 		}
 		return true;
 	}
+
+	public static ComboBox<ContainerMeta.ContainerImageType> createContainerImageTypeCBO (){
+		ComboBox<ContainerMeta.ContainerImageType> cbo = new ComboBox<>(
+				new ComboBox.ComboBoxRenderer<ContainerMeta.ContainerImageType>() {
+					@Override public String renderItem(ContainerMeta.ContainerImageType item) {
+						switch (item){
+						case LECTURE:
+							return "Pool";
+						case BATCH:
+							return "Pool/Cluster";
+						case DATA:
+							return "Daten";
+						default:
+							return "";
+						}
+					}
+				}, ContainerMeta.ContainerImageType.class);
+		for (ContainerMeta.ContainerImageType type : ContainerMeta.ContainerImageType.values()) {
+			cbo.addItem(type);
+		}
+		cbo.setSelectedItem(ContainerMeta.ContainerImageType.LECTURE);
+		return cbo;
+	}
 }