[*] Display sat->master progress in client

3 files changed, 42 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java
new file mode 100644
index 00000000..a889e7b6
--- /dev/null
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/PassiveUploadPanel.java
@@ -0,0 +1,33 @@
+package org.openslx.dozmod.gui.activity;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import org.apache.log4j.Logger;
+import org.openslx.dozmod.filetransfer.TransferEventEmitter;
+
+@SuppressWarnings("serial")
+public class PassiveUploadPanel extends TransferPanel {
+
+	private static final Logger LOGGER = Logger.getLogger(PassiveUploadPanel.class);
+
+	private final TransferEventEmitter state;
+
+	private final PassiveUploadPanel panel = this;
+
+	public PassiveUploadPanel(TransferEventEmitter state, String name) {
+		super(state, name, "");
+		btnClose.addActionListener(new ButtonAction());
+		this.state = state;
+		state.addListener(this);
+		btnClose.setText("Ausblenden");
+	}
+
+	private class ButtonAction implements ActionListener {
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			state.removeListener(panel);
+			close();
+		}
+	}
+}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
index 6e2e38ec..7a3582df 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java
@@ -5,17 +5,15 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.GridLayout;
 
-import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JPanel;
-import javax.swing.JSeparator;
 
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.filetransfer.TransferEvent;
+import org.openslx.dozmod.filetransfer.TransferEventEmitter;
 import org.openslx.dozmod.filetransfer.TransferEventListener;
-import org.openslx.dozmod.filetransfer.TransferTask;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.BlockProgressBar;
 import org.openslx.dozmod.gui.control.QLabel;
@@ -37,7 +35,7 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
 
 	protected final BlockProgressBar progress;
 
-	private final TransferTask transfer;
+	private final TransferEventEmitter transfer;
 
 	private final TransferPanel panel = this;
 
@@ -53,7 +51,7 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
 
 	private JPanel footer;
 
-	public TransferPanel(TransferTask transfer, String displayName, String fileName) {
+	public TransferPanel(TransferEventEmitter transfer, String displayName, String fileName) {
 		setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
 		// Header: [status] VM-Name ---- fileName [Button]
 		header = new JPanel();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
index e8313120..d71a4a1c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
@@ -7,6 +7,7 @@ import org.apache.log4j.Logger;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.state.UploadWizardState;
+import org.openslx.dozmod.thrift.UploadInitiator;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
@@ -15,32 +16,32 @@ public class UploadPanel extends TransferPanel {
 
 	private static final Logger LOGGER = Logger.getLogger(UploadPanel.class);
 
-	private final UploadWizardState state;
+	private final UploadInitiator state;
 
 	private final UploadPanel panel = this;
 
 	public UploadPanel(UploadWizardState state) {
 		super(state.upload.getUploadTask(), state.name, state.diskFile.getName());
 		btnClose.addActionListener(new ButtonAction());
-		this.state = state;
+		this.state = state.upload;
 		state.upload.getUploadTask().addListener(this);
 	}
 
 	private class ButtonAction implements ActionListener {
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			if (!state.upload.getUploadTask().isCanceled()) {
+			if (!state.getUploadTask().isCanceled()) {
 				if (!Gui.showMessageBox(panel, "Wollen Sie diesen Transfer wirklich abbrechen?",
 						MessageType.QUESTION_YESNO, null, null))
 					return;
 				QuickTimer.scheduleOnce(new Task() {
 					@Override
 					public void fire() {
-						state.upload.cancelError();
+						state.cancelError();
 					}
 				});
 			}
-			state.upload.getUploadTask().removeListener(panel);
+			state.getUploadTask().removeListener(panel);
 			close();
 		}
 	}