diff options
| author | Jonathan Bauer | 2015-09-17 18:41:19 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-09-17 18:41:19 +0200 |
| commit | 803d9ca9989c78ebedab8f3c7d1a685329b46a5e (patch) | |
| tree | 8d35f3478786ce95c24696b943ae9c8129c6914f | |
| parent | [client] async login (diff) | |
| parent | [client] TransferPanel germanized (diff) | |
| download | tutor-module-803d9ca9989c78ebedab8f3c7d1a685329b46a5e.tar.gz tutor-module-803d9ca9989c78ebedab8f3c7d1a685329b46a5e.tar.xz tutor-module-803d9ca9989c78ebedab8f3c7d1a685329b46a5e.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into1.1
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java | 17 |
1 files changed, 15 insertions, 2 deletions
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 fcc2159b..f48d7ee9 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 @@ -10,6 +10,7 @@ import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JPanel; +import org.apache.log4j.Logger; import org.openslx.dozmod.filetransfer.TransferEvent; import org.openslx.dozmod.filetransfer.TransferEventListener; import org.openslx.dozmod.filetransfer.TransferTask; @@ -42,13 +43,15 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve private int errorCountdown = 0; + private final static Logger LOGGER = Logger.getLogger(TransferPanel.class); + public TransferPanel(TransferTask transfer, String displayName, String fileName) { setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS)); setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); // Header: [status] VM-Name ---- fileName [Button] header = new JPanel(); header.setLayout(new BoxLayout(header, BoxLayout.LINE_AXIS)); - lblStatus = new QLabel("[init]"); + lblStatus = new QLabel("Initialisiere"); header.add(lblStatus); header.add(Box.createHorizontalStrut(10)); QLabel vmName = new QLabel(displayName); @@ -111,19 +114,29 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve } // Status? if (event.state != null) { + String status; switch (event.state) { case ERROR: errorCountdown = 20; + status = "Fehler"; break; case FINISHED: btnClose.setText("Schließen"); lblRemaining.setText("-"); transfer.removeListener(panel); + status = "Beendet"; + break; + case IDLE: + status = "Inaktiv"; + break; + case WORKING: + status = "Überträgt"; break; default: + status = event.state.toString(); break; } - lblStatus.setText(event.state.toString()); + lblStatus.setText(status); } // Remaining + Speed if (event.remainingRaw != 0) { |