[client] refactoring

- rename DockerfileUploadPage to ContainerUploadPage
- use now ContainerBindMountConfigurator in ContainerUploadPage and -Layout

1 files changed, 16 insertions, 37 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/ContainerUploadPage.java
index 9eaf5cf6..9004a957 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/ContainerUploadPage.java
@@ -5,16 +5,19 @@ import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.Gui;
-import org.openslx.dozmod.gui.helper.*;
-import org.openslx.dozmod.gui.window.ContainerBindMountWindow;
+import org.openslx.dozmod.gui.helper.MessageType;
+import org.openslx.dozmod.gui.helper.QFileChooser;
+import org.openslx.dozmod.gui.helper.TextChangeListener;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.ContainerUploadPageLayout;
-import org.openslx.dozmod.model.ContainerBindMount;
 import org.openslx.dozmod.model.ContainerBuildContextMethod;
 import org.openslx.dozmod.model.ContainerDefinition;
 import org.openslx.dozmod.model.ContainerMeta;
 import org.openslx.dozmod.state.UploadWizardState;
-import org.openslx.dozmod.thrift.*;
+import org.openslx.dozmod.thrift.ThriftActions;
+import org.openslx.dozmod.thrift.ThriftError;
+import org.openslx.dozmod.thrift.UploadInitiator;
+import org.openslx.dozmod.thrift.WrappedException;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.util.vm.DockerMetaDataDummy;
 
@@ -22,14 +25,14 @@ import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.filechooser.FileFilter;
-import java.awt.event.*;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.IOException;
 
-public class DockerfileUploadPage extends ContainerUploadPageLayout {
+public class ContainerUploadPage extends ContainerUploadPageLayout {
 
-	private final Logger LOGGER = Logger.getLogger(DockerfileUploadPage.class);
+	private final Logger LOGGER = Logger.getLogger(ContainerUploadPage.class);
 
 	/**
 	 * Page for uploading an imagefile
@@ -39,7 +42,7 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout {
 	private final UploadWizardState state;
 	private final ImageDetailsRead existingImage;
 
-	public DockerfileUploadPage(Wizard wizard, final UploadWizardState state_) {
+	public ContainerUploadPage(Wizard wizard, final UploadWizardState state_) {
 		super(wizard);
 
 		canComeBack = false;
@@ -52,7 +55,7 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout {
 		init();
 	}
 
-	public DockerfileUploadPage(Wizard wizard, UploadWizardState uploadWizardState,
+	public ContainerUploadPage(Wizard wizard, UploadWizardState uploadWizardState,
 			ImageDetailsRead imageDetailsRead) {
 		super(wizard);
 
@@ -110,34 +113,10 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout {
 			}
 		});
 
-		btnAddBindMount.addActionListener(new ActionListener() {
-			@Override public void actionPerformed(ActionEvent e) {
-				addBindMount();
-			}
-		});
-		btnDelBindMount.addActionListener(new ActionListener() {
-			@Override public void actionPerformed(ActionEvent e) {
-				btnDelBindMount();
-			}
-		});
-
 		btnBrowseForImage.requestFocus();
 		txtInfoText.setText("Many Text");
 	}
 
-	private void addBindMount() {
-		ContainerBindMountWindow.open(wizard, bindMountTable);
-	}
-
-	private void btnDelBindMount() {
-		if (null == bindMountTable.getSelectedItem())
-			return;
-		List<ContainerBindMount> data = new ArrayList<>(bindMountTable.getData());
-		if (data.remove(bindMountTable.getSelectedItem()))
-			LOGGER.info("Bind Mount Entry Deleted");
-		bindMountTable.setData(data, true);
-	}
-
 	private void browseFile() {
 
 		QFileChooser fc = new QFileChooser(Config.getUploadPath(), false);
@@ -237,7 +216,7 @@ public class DockerfileUploadPage extends ContainerUploadPageLayout {
 		containerMeta.setBuildContextMethod(getBuildContextMethod().ordinal());
 		containerMeta.setImageName(txtImageName.getText());
 		containerMeta.setRunOptions(txtContainerRun.getText());
-		containerMeta.setBindMountConfig(bindMountTable.getData());
+		containerMeta.setBindMountConfig(bindMountConfigurator.getData());
 		switch (getBuildContextMethod()) {
 		case FILE:
 			cd = new ContainerDefinition(state.descriptionFile, containerMeta);