[client] started one-page UploadWizard [WIP]

4 files changed, 35 insertions, 20 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 8a46b4dd..a870e300 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -14,6 +14,7 @@ import java.util.Map;
 
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
@@ -36,10 +37,11 @@ import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback;
 import org.openslx.dozmod.gui.window.layout.ImageDetailsWindowLayout;
 import org.openslx.dozmod.gui.wizard.LectureWizard;
+import org.openslx.dozmod.gui.wizard.UpdateWizard;
 import org.openslx.dozmod.permissions.ImagePerms;
 import org.openslx.dozmod.thrift.Session;
-import org.openslx.dozmod.thrift.ThriftError;
 import org.openslx.dozmod.thrift.ThriftActions;
+import org.openslx.dozmod.thrift.ThriftError;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.dozmod.thrift.cache.UserCache;
 import org.openslx.dozmod.util.FormatHelper;
@@ -110,7 +112,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		btnUpdateImage.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				// TODO image version up
+				new UpdateWizard(SwingUtilities.getWindowAncestor(me), image).setVisible(true);
+				refresh(true);
 			}
 		});
 		btnChangeOwner.addActionListener(new ActionListener() {
@@ -270,11 +273,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 				Gui.showMessageBox(me, "Besitzrechte übertragen an " + FormatHelper.userName(user),
 						MessageType.INFO, null, null);
 				makeEditable(false);
-				String baseId = image.getImageBaseId();
-				synchronized (me) {
-					image = null;
-				}
-				setImage(baseId);
+				refresh(true);
 			}
 		});
 	}
@@ -306,11 +305,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 				}
 				// no success message I'd say...
 				btnSaveChanges.setEnabled(false);
-				String baseId = image.getImageBaseId();
-				synchronized (me) {
-					image = null;
-				}
-				setImage(baseId);
+				refresh(true);
 				callback.updated();
 			}
 		});
@@ -353,10 +348,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 				Gui.asyncExec(new Runnable() {
 					@Override
 					public void run() {
-						// "manual" refresh
-						String baseId = image.getImageBaseId();
-						image = null;
-						setImage(baseId);
+						refresh(true);
 					}
 				});
 			}
@@ -369,6 +361,16 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	 *
 	 ********************************************************************************/
 	/**
+	 * @param forceRefresh
+	 */
+	private void refresh(boolean forceRefresh) {
+		String baseId = image.getImageBaseId();
+		synchronized (me) {
+			image = null;
+		}
+		setImage(baseId);
+	}
+	/**
 	 * callback function when we received the image's details from the server
 	 */
 	private void fill() {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
index eced8813..73235920 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java
@@ -33,7 +33,7 @@ public class ImageWizard extends Wizard implements UiFeedback {
 	 */
 	public ImageWizard(Window parent) {
 		super(parent);
-		imageUploadPage = new ImageUploadPage(this, uploadWizardState);
+		imageUploadPage = new ImageUploadPage(this, uploadWizardState, false);
 		imageMetaDataPage = new ImageMetaDataPage(this, uploadWizardState);
 		imageCustomPermissionPage = new ImageCustomPermissionPage(this, uploadWizardState);
 		addPage(imageUploadPage);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
index ff1e3f1d..32b127a6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
@@ -2,7 +2,9 @@ package org.openslx.dozmod.gui.wizard.layout;
 
 import java.awt.event.KeyEvent;
 
+import javax.swing.Box;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
 
@@ -16,6 +18,7 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 	protected JTextField imageNameTextField;
 	protected JButton imageFileBrowseButton;
 	protected JTextField imageFileTextField;
+	protected JCheckBox softwareLicenseBox;
 
 	/**
 	 * Page for uploading an imagefile
@@ -43,7 +46,12 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 		grid.add(imageNameTextField, 2, 1).fill(true, false).expand(true, false);
 		grid.nextRow();
 		
+		// -- Software license changed - shown only in UploadWizard --
+		softwareLicenseBox = new JCheckBox("Lizensierte Software enthalten");
+		grid.skip();
+		grid.add(softwareLicenseBox, 2, 1).fill(false, false).expand(true, false);
+		grid.nextRow();
+		
 		grid.finish(true);
-
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
index 2e4ce13e..2d88464c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
@@ -19,8 +19,8 @@ import org.openslx.dozmod.Config;
 import org.openslx.dozmod.filetransfer.UploadTask;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
-import org.openslx.dozmod.gui.helper.QFileChooser;
 import org.openslx.dozmod.gui.helper.MessageType;
+import org.openslx.dozmod.gui.helper.QFileChooser;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.ImageUploadPageLayout;
 import org.openslx.dozmod.state.UploadWizardState;
@@ -38,12 +38,17 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 
 	private UploadWizardState state;
 	private String lastDetectedName = null;
+	private boolean updateExisting = false;
 
-	public ImageUploadPage(Wizard wizard, UploadWizardState uploadWizardState) {
+	public ImageUploadPage(Wizard wizard, UploadWizardState uploadWizardState, boolean updateExisting) {
 		super(wizard);
 		setPageComplete(false);
 		this.canComeBack = false;
 		this.state = uploadWizardState;
+		this.updateExisting = updateExisting;
+
+		// hide software license checkbox if we are only uploading an image version
+		softwareLicenseBox.setVisible(updateExisting);
 
 		// Browse for *.vmx
 		imageFileBrowseButton.addActionListener(new ActionListener() {