diff options
| author | Nino Breuer | 2014-12-11 12:26:08 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-12-11 12:26:08 +0100 |
| commit | c2bfef0cd3cc94f3207ab9aa6cb53199b0460589 (patch) | |
| tree | 9086894909812bb087a0ce5a7a2ada5fce5f4bc1 /dozentenmodul/src/main/java | |
| parent | [client] improved error handling of ShibboECP. (diff) | |
| download | tutor-module-c2bfef0cd3cc94f3207ab9aa6cb53199b0460589.tar.gz tutor-module-c2bfef0cd3cc94f3207ab9aa6cb53199b0460589.tar.xz tutor-module-c2bfef0cd3cc94f3207ab9aa6cb53199b0460589.zip | |
d
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java | 9 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/thrift/MasterThriftConnection.java | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 2e5e4d66..2f94f55f 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -391,6 +391,14 @@ public class FTPEditUploader_GUI extends JFrame implements btnUploadStoppen.setEnabled(false); btnUploadStoppen.setBounds(307, 238, 173, 23); contentPanel.add(btnUploadStoppen); + + JLabel lblNewLabel = new JLabel(" (opt.)"); + lblNewLabel.setBounds(20, 179, 46, 14); + contentPanel.add(lblNewLabel); + + JLabel lblopt = new JLabel(" (opt.)"); + lblopt.setBounds(20, 257, 46, 14); + contentPanel.add(lblopt); { JPanel buttonPane = new JPanel(); buttonPane.setBackground(UIManager.getColor("Button.background")); @@ -835,5 +843,4 @@ public class FTPEditUploader_GUI extends JFrame implements btnUploadStoppen.setEnabled(false); }// end resetButtons - }// end class
\ No newline at end of file diff --git a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java index a5df03c2..686d0944 100644 --- a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java +++ b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java @@ -15,7 +15,7 @@ public class MasterThriftConnection { public static final String MASTERSERVER_IP = "132.230.4.16"; public static final int MASTERSERVER_PORT = 9090; - public static final int MASTERSERVER_TIMEOUT_MS = 6000; + public static final int MASTERSERVER_TIMEOUT_MS = 30000; final TTransport transport = new TFramedTransport(new TSocket( MASTERSERVER_IP, MASTERSERVER_PORT, MASTERSERVER_TIMEOUT_MS)); |