summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
diff options
context:
space:
mode:
authorSimon Rettberg2014-09-13 17:08:38 +0200
committerSimon Rettberg2014-09-13 17:08:38 +0200
commit6a5dcc7a296d2eb9c3278d74ce31d751cf7f042b (patch)
treeaece01286494db00433b3678272846829f119260 /dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
parent[client] Add resource loader that will take care of error handling (diff)
downloadtutor-module-6a5dcc7a296d2eb9c3278d74ce31d751cf7f042b.tar.gz
tutor-module-6a5dcc7a296d2eb9c3278d74ce31d751cf7f042b.tar.xz
tutor-module-6a5dcc7a296d2eb9c3278d74ce31d751cf7f042b.zip
Fix server.thrift file (make future-proof by using field ids), move generated thrift classes to own package
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 8a7fda3f..9b026a59 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -47,7 +47,7 @@ import org.apache.thrift.TException;
import org.ini4j.InvalidFileFormatException;
import org.ini4j.Wini;
-import server.Server.Client;
+import server.generated.Server.Client;
import thrift.ThriftConnection;
import util.GuiOrganizer;
import util.OpenLinks;
@@ -67,7 +67,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
JProgressBar progressBar;
String host = SessionData.session.getServerAdress();
int port = 21;
- server.User user;
+ server.generated.User user;
String filename = "";
File uploadFile;
static String arg = "";