diff options
| author | unknown | 2014-04-17 08:49:41 +0200 |
|---|---|---|
| committer | unknown | 2014-04-17 08:49:41 +0200 |
| commit | 9a0146ebd3e43334b261d1014ce221900a520bef (patch) | |
| tree | 8be75f30cffde5319441f642383c8caa34dc1d89 /Dozentenmodul/src/ftp/UploadTask.java | |
| parent | g (diff) | |
| parent | Debugging: Jeder Fehler poppt auf in einem Textfenster und kann analysiert we... (diff) | |
| download | tutor-module-9a0146ebd3e43334b261d1014ce221900a520bef.tar.gz tutor-module-9a0146ebd3e43334b261d1014ce221900a520bef.tar.xz tutor-module-9a0146ebd3e43334b261d1014ce221900a520bef.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Conflicts:
Dozentenmodulserver/bin/server/ServerHandler.class
Dozentenmodulserver/src/server/ServerHandler.java
Diffstat (limited to 'Dozentenmodul/src/ftp/UploadTask.java')
| -rw-r--r-- | Dozentenmodul/src/ftp/UploadTask.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java index 67706169..788acad6 100644 --- a/Dozentenmodul/src/ftp/UploadTask.java +++ b/Dozentenmodul/src/ftp/UploadTask.java @@ -69,7 +69,7 @@ public class UploadTask extends SwingWorker<Void, Void> { util.finish(); } catch (FTPException ex) { JOptionPane.showMessageDialog(null, "Error uploading file: " + ex.getMessage(), - "Error", JOptionPane.ERROR_MESSAGE); + "Error", JOptionPane.ERROR_MESSAGE); ex.printStackTrace(); setProgress(0); cancel(true); |