[client] Start upload only when finishing wizard, add final summary page to wizard

1 files changed, 16 insertions, 12 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 33c51111..e5bd99ad 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
@@ -19,11 +19,11 @@ import java.util.Map.Entry;
 import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
-import javax.swing.RowFilter;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import org.apache.log4j.Logger;
+import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.ImageBaseWrite;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
@@ -36,7 +36,6 @@ import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
-import org.openslx.dozmod.gui.control.table.ListTable.ListModel;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.helper.PopupMenu;
 import org.openslx.dozmod.gui.helper.UiFeedback;
@@ -49,6 +48,7 @@ import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftActions.DeleteCallback;
 import org.openslx.dozmod.thrift.ThriftActions.ImageMetaCallback;
+import org.openslx.dozmod.thrift.ThriftError;
 import org.openslx.dozmod.thrift.cache.LectureCache;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.dozmod.thrift.cache.UserCache;
@@ -393,22 +393,26 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 				cboShareMode.getItemAt(cboShareMode.getSelectedIndex()));
 		// now trigger the actual action
 		if (metadataChanged) {
-			if (ThriftActions.updateImageBase(JOptionPane.getFrameForComponent(me), image.getImageBaseId(),
-					ibw)) {
-				LOGGER.info("Successfully saved new metadata");
-				metadataChanged = false;
-			} else {
+			try {
+				ThriftActions.updateImageBase(image.getImageBaseId(), ibw);
+			} catch (TException e) {
+				ThriftError.showMessage(me, LOGGER, e,
+						"Konnte aktualisierte Metadaten nicht an den Server übermitteln");
 				return false;
 			}
+			LOGGER.info("Successfully saved new metadata");
+			metadataChanged = false;
 		}
 		if (permissionsChanged) {
-			if (ThriftActions.writeImagePermissions(JOptionPane.getFrameForComponent(me),
-					image.getImageBaseId(), customPermissions)) {
-				LOGGER.info("Successfully saved new permissions");
-				permissionsChanged = false;
-			} else {
+			try {
+				ThriftActions.writeImagePermissions(image.getImageBaseId(), customPermissions);
+			} catch (TException e) {
+				ThriftError.showMessage(me, LOGGER, e,
+						"Konnte geänderte Berechtigungen nicht an den Server übermitteln");
 				return false;
 			}
+			LOGGER.info("Successfully saved new permissions");
+			permissionsChanged = false;
 		}
 		return true;
 	}