summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java')
-rw-r--r--Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 3c17a3e5..99fc034b 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -36,6 +36,7 @@ import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import models.Image;
import models.Links;
+import models.SessionData;
import models.person;
import org.apache.thrift.TException;
import server.Server.Client;
@@ -55,7 +56,7 @@ public class FTPEditUploader_GUI extends JFrame implements
private final JPanel contentPanel = new JPanel();
JLabel lblPath;
JProgressBar progressBar;
- String host = "141.79.128.102";
+ String host = SessionData.session.getServerAdress();
int port = 21;
server.User user;
String filename = "";
@@ -72,8 +73,8 @@ public class FTPEditUploader_GUI extends JFrame implements
long bytesread;
boolean taskrun = false;
int progress = 0;
- ThriftConnection thrift = new ThriftConnection();
- Client client = thrift.getThriftConnection();
+ ThriftConnection con = new ThriftConnection();
+ Client client = models.Client.clientcon.getClient();
JButton btnUploadStarten = new JButton("Upload auf Server starten");
JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
JButton finishButton = new JButton("Fertigstellen");
@@ -112,6 +113,7 @@ public class FTPEditUploader_GUI extends JFrame implements
}
task.cancel(true);
}
+ con.closeThriftConnection();
System.exit(0);
}// end window closing
});
@@ -333,7 +335,7 @@ public class FTPEditUploader_GUI extends JFrame implements
}
task.cancel(true);
}
- thrift.closeThriftConnection();
+
}
});
btnZurck.addActionListener(new ActionListener() {