1 files changed, 38 insertions, 32 deletions

diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
index d4d1d414..1a76b7b3 100644
--- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
@@ -1,43 +1,44 @@
-package GUI;

+package gui;

 

 import java.awt.BorderLayout;

-import rmi.*;

-import server.ServerInterface;

 import java.awt.Color;

 import java.awt.Dimension;

 import java.awt.EventQueue;

 import java.awt.FlowLayout;

+import java.awt.Font;

+import java.awt.SystemColor;

 import java.awt.Toolkit;

+import java.awt.event.ActionEvent;

+import java.awt.event.ActionListener;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+import java.beans.PropertyChangeEvent;

+import java.beans.PropertyChangeListener;

 import java.io.File;

-import java.rmi.RemoteException;

+

 import javax.swing.JButton;

 import javax.swing.JFileChooser;

 import javax.swing.JFrame;

 import javax.swing.JLabel;

+import javax.swing.JMenu;

+import javax.swing.JMenuBar;

 import javax.swing.JPanel;

 import javax.swing.JProgressBar;

+import javax.swing.JSeparator;

+import javax.swing.JTextPane;

 import javax.swing.SwingConstants;

 import javax.swing.UIManager;

 import javax.swing.UnsupportedLookAndFeelException;

 import javax.swing.border.EmptyBorder;

-import downloader.UploadTask;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import java.beans.PropertyChangeEvent;

-import java.beans.PropertyChangeListener;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

 

-import Models.Image;

-import Models.User;

-import Models.person;

+import models.Image;

+import models.person;

 

-import java.awt.SystemColor;

-import java.awt.Font;

-import javax.swing.JTextPane;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JSeparator;

+import org.apache.thrift.TException;

+

+import server.Server.Client;

+import thrift.ThriftConnection;

+import ftp.UploadTask;

 

 

 @SuppressWarnings("serial")

@@ -50,7 +51,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 	JProgressBar progressBar;

 	String host="141.79.128.121";

 	int port=21;

-	User user;

+	server.User user;

 	String filename="";

 	File uploadFile;

 	static String arg="";

@@ -64,8 +65,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 	double speed;

 	long bytesread;

 	boolean taskrun=false;

-    RmiClientMethods rmi=new RmiClientMethods();

-    ServerInterface sint=rmi.getInterface();

+	ThriftConnection thrift=new ThriftConnection();

+	Client client=thrift.getThriftConnection();

 	/**

 	 * Launch the application.

 	 */

@@ -92,8 +93,9 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 				if(taskrun==true)

 				{

 					try {

-						sint.DeleteFtpUser(user.getUsername());

-					} catch (RemoteException e1) {

+						

+						client.DeleteFtpUser(user.userName);

+					} catch (TException e1) {

 						// TODO Auto-generated catch block

 						e1.printStackTrace();

 					}

@@ -273,9 +275,9 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
 						if(taskrun==true)

 						{

 						try {

-							sint.DeleteFtpUser(user.getUsername());

+							client.DeleteFtpUser(user.userName);

 							

-						} catch (RemoteException e1) {

+						} catch (TException  e1) {

 							// TODO Auto-generated catch block

 							e1.printStackTrace();

 						}

@@ -324,13 +326,17 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
         progressBar.setValue(0);

 

         try {

-			user=sint.getFtpUser();

-		} catch (RemoteException e) {

+			user=client.getFtpUser();

+			System.out.println("name"+user.userName);

+			System.out.println("path"+user.path);

+			System.out.println("pass"+user.password);

+		} catch (TException e) {

 			// TODO Auto-generated catch block

 			e.printStackTrace();

 		}

 

-        task=new UploadTask(host,port,user.getUsername(),user.getPass(),user.getPath(), uploadFile);

+        task=new UploadTask(host,port,user.userName,user.password,user.path, uploadFile);

+      

         task.addPropertyChangeListener(this);

         task.execute();

         taskrun=true;

@@ -382,8 +388,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
     public boolean writeData(){

     	

     	try {

-			sint.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicenseneed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu());

-		} catch (RemoteException e) {

+			client.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu());

+		} catch (TException e) {

 			// TODO Auto-generated catch block

 			e.printStackTrace();

 			return false;