diff options
| author | Tobias Spitzer | 2014-08-27 10:51:39 +0200 |
|---|---|---|
| committer | Tobias Spitzer | 2014-08-27 10:51:39 +0200 |
| commit | 64e3144ad2964d763c7a25a694fb294c7c45ebdf (patch) | |
| tree | 264343d2cd2fd767a3aa2eb134c9111605e71afa | |
| parent | popo (diff) | |
| download | tutor-module-64e3144ad2964d763c7a25a694fb294c7c45ebdf.tar.gz tutor-module-64e3144ad2964d763c7a25a694fb294c7c45ebdf.tar.xz tutor-module-64e3144ad2964d763c7a25a694fb294c7c45ebdf.zip | |
Ticket 1153 behoben
| -rw-r--r-- | Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class | bin | 14213 -> 14286 bytes | |||
| -rw-r--r-- | Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java | 13 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class Binary files differindex f15b74e6..43defd4a 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index a58001a8..4954f81d 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -80,6 +80,7 @@ public class FTPEditUploader_GUI extends JFrame implements long filesize; double speed; long bytesread; + boolean fileupload=false; boolean taskrun = false; int progress = 0; ThriftConnection con = new ThriftConnection(); @@ -510,7 +511,7 @@ public class FTPEditUploader_GUI extends JFrame implements } private void buttonUploadActionPerformed(ActionEvent event) { - + fileupload=true; progressBar.setValue(0); btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick btnUploadStarten.setText("Bitte warten"); @@ -610,7 +611,10 @@ public class FTPEditUploader_GUI extends JFrame implements Image.image.getVersion(), Image.image.isVorlage(), Image.image.getFilesize(), Image.image.getShareMode(), Image.image.getOS()); - client.startFileCopy(Image.image.getNewName()); + if(fileupload==true){ + client.startFileCopy(Image.image.getNewName()); + } + } else { client.updateImageData(Image.image.getImagename(), @@ -621,7 +625,10 @@ public class FTPEditUploader_GUI extends JFrame implements Image.image.getImageId(), Image.image.getVersion(), Image.image.isVorlage(), Image.image.getFilesize(), Image.image.getShareMode(), Image.image.getOS()); - client.startFileCopy(Image.image.getNewName()); + + if(fileupload==true){ + client.startFileCopy(Image.image.getNewName()); + } } } catch (TException e) { // TODO Auto-generated catch block |
