diff options
| author | Michael Wilson | 2014-08-25 13:58:26 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-08-25 13:58:26 +0200 |
| commit | 294618f76a03315529b5b8cd546305ac6a667bd4 (patch) | |
| tree | e55030cfe5a6994c2766bcf9520313911e71eb95 | |
| parent | Konfigdatei wird beim ändern des Logins zurückgesetzt (diff) | |
| download | tutor-module-294618f76a03315529b5b8cd546305ac6a667bd4.tar.gz tutor-module-294618f76a03315529b5b8cd546305ac6a667bd4.tar.xz tutor-module-294618f76a03315529b5b8cd546305ac6a667bd4.zip | |
fenster nun auch schließbar :)
| -rw-r--r-- | Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class | bin | 13712 -> 13712 bytes | |||
| -rw-r--r-- | Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class | bin | 13256 -> 13256 bytes | |||
| -rw-r--r-- | Dozentenmodul/bin/gui/intro/Login_GUI.class | bin | 10961 -> 10957 bytes | |||
| -rw-r--r-- | Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java | 5 | ||||
| -rw-r--r-- | Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java | 4 | ||||
| -rw-r--r-- | Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java | 3 | ||||
| -rw-r--r-- | Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java | 3 |
7 files changed, 14 insertions, 1 deletions
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Binary files differindex b34abb62..57bcddec 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class Binary files differindex bafbc05d..38955b90 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class Binary files differindex 8ccd10e0..f5e5a335 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index ba442928..7901369c 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -95,7 +95,7 @@ public class FTPCreateUploader_GUI extends JFrame implements @Override public void windowClosing(WindowEvent arg0) { - + if (taskrun == true) { // check if user wants to quit. int choice = JOptionPane @@ -121,6 +121,9 @@ public class FTPCreateUploader_GUI extends JFrame implements con.closeThriftConnection(); System.exit(0); }//end if choice + } else { + //no upload running, close window + System.exit(0); }//end if taskrun }// end window closing }); diff --git a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java index e03d07a3..a944be46 100644 --- a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java @@ -117,6 +117,10 @@ public class FTPEditDownloader_GUI extends JFrame implements task.cancel(true); System.exit(0); }// end if coice + + }else { + //no download running, close window + System.exit(0); }// end if taskrun }// end window closing }); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 7826e979..de1f6ffe 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -119,6 +119,9 @@ public class FTPEditUploader_GUI extends JFrame implements con.closeThriftConnection(); System.exit(0); }// end if choice + }else { + //no upload running, close window + System.exit(0); }// end if taskrun }// end window closing }); diff --git a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java index 41176f05..8c372983 100644 --- a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java @@ -118,6 +118,9 @@ public class FTPSearchDownloader_GUI extends JFrame implements System.exit(0); }// end if choice + }else { + //no download running, close window + System.exit(0); }// end if taskrun }// end window closing }); |