[Client] minor changes in DockerfileUpdatePage; use DockerMetaDataDummy (VmMetaData) from master-sync-shared

2 files changed, 17 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
index 845957ff..349f555a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java
@@ -20,8 +20,6 @@ import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftError;
 import org.openslx.dozmod.thrift.UploadInitiator.GotUploadTokenCallback;
-import org.openslx.dozmod.thrift.cache.MetaDataCache;
-import org.openslx.dozmod.util.VmMetaDataDummy;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
@@ -68,7 +66,6 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif
 	public void doDockerCreation() {
 		cleanCurrent();
 
-		state.meta = new VmMetaDataDummy(MetaDataCache.getOperatingSystems());
 		currentPages.add(new DockerfileUploadPage(this,state));
 		currentPages.add(new ImageMetaDataPage(this,state));
 		currentPages.add(new ImageCustomPermissionPage(this, state));
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 12c15ffe..b78ffd6e 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
@@ -1,22 +1,19 @@
 package org.openslx.dozmod.gui.wizard.page;
 
 import org.apache.log4j.Logger;
-import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.Gui;
-import org.openslx.dozmod.gui.helper.MessageType;
-import org.openslx.dozmod.gui.helper.QFileChooser;
+import org.openslx.dozmod.gui.helper.*;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.ImageUploadPageLayout;
 import org.openslx.dozmod.state.UploadWizardState;
 import org.openslx.dozmod.thrift.*;
+import org.openslx.dozmod.thrift.cache.MetaDataCache;
+import org.openslx.util.vm.DockerMetaDataDummy;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
+import java.awt.event.*;
 import java.io.File;
 import java.io.IOException;
 
@@ -32,14 +29,16 @@ public class DockerfileUploadPage extends ImageUploadPageLayout {
 	private final UploadWizardState state;
 
 
-
-	public DockerfileUploadPage(Wizard wizard,UploadWizardState state) {
+	public DockerfileUploadPage(Wizard wizard, final UploadWizardState state) {
 		super(wizard);
 
 		this.canComeBack = false;
 		this.state = state;
 
 
+		state.meta = new DockerMetaDataDummy(MetaDataCache.getOperatingSystems());
+		//state.meta = new VmMetaDataDummy(MetaDataCache.getOperatingSystems());
+
 		this.txtImageFile.addActionListener(new ActionListener() {
 			@Override public void actionPerformed(ActionEvent e) {
 				browseFile();
@@ -51,9 +50,14 @@ public class DockerfileUploadPage extends ImageUploadPageLayout {
 			}
 		});
 
-		txtImageName.addPropertyChangeListener(new PropertyChangeListener() {
-			@Override public void propertyChange(PropertyChangeEvent evt) {
-
+		txtImageName.getDocument().addDocumentListener(new TextChangeListener() {
+			@Override public void changed() {
+				String imageName = txtImageName.getText();
+				if (imageName.equals(""))
+					setPageComplete(false);
+				else
+					setPageComplete(true);
+				state.name = imageName;
 			}
 		});
 		btnBrowseForImage.requestFocus();
@@ -82,6 +86,7 @@ public class DockerfileUploadPage extends ImageUploadPageLayout {
 		state.diskFile = file; // TODO no disk file in docker context (DUMMY SET)
 		state.name = file.getParentFile().getName();
 
+		Config.setUploadPath(file.getParent());
 		setPageComplete(true);
 	}