Upload mit dynamischen User, welcher nach dem Upload wieder gelöscht wird

2 files changed, 19 insertions, 29 deletions

diff --git a/Dozentenmodul/src/GUI/FTPDownloader.java b/Dozentenmodul/src/GUI/FTPDownloader.java
index 5d7ec8da..a8ed8785 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader.java
@@ -190,18 +190,7 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

 			getContentPane().add(buttonPane, BorderLayout.SOUTH);

 			{

-				JButton okButton = new JButton("OK");

-				okButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent arg0) {

-						dispose();

-					}

-				});

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-				getRootPane().setDefaultButton(okButton);

-			}

-			{

-				JButton cancelButton = new JButton("Zur\u00FCck");

+				JButton cancelButton = new JButton("Schlie\u00DFen");

 				cancelButton.addActionListener(new ActionListener() {

 					public void actionPerformed(ActionEvent e) {

 						if(taskrun==true)

diff --git a/Dozentenmodul/src/GUI/FTPUploader.java b/Dozentenmodul/src/GUI/FTPUploader.java
index d4908914..73a4bc5b 100644
--- a/Dozentenmodul/src/GUI/FTPUploader.java
+++ b/Dozentenmodul/src/GUI/FTPUploader.java
@@ -51,7 +51,6 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 	String host="141.79.128.121";

 	int port=21;

 	User user;

-	String uploadPath="/";

 	String filename="";

 	File uploadFile;

 	static String arg="";

@@ -67,6 +66,8 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 		double speed;

 		long bytesread;

 		boolean taskrun=false;

+        RmiClientMethods rmi=new RmiClientMethods();

+        ServerInterface sint=rmi.getInterface();

 	/**

 	 * Launch the application.

 	 */

@@ -92,6 +93,12 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 			public void windowClosing(WindowEvent arg0) {

 				if(taskrun==true)

 				{

+					try {

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

+					} catch (RemoteException e1) {

+						// TODO Auto-generated catch block

+						e1.printStackTrace();

+					}

 				task.cancel(true);

 				}

 			}

@@ -108,7 +115,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 			// TODO Auto-generated catch block

 			e.printStackTrace();

 		}

-	

+

 		//filename=name;

 		setBackground(Color.WHITE);

 		setTitle("Dozentenmodul *Prototyp*");

@@ -218,23 +225,18 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

 			getContentPane().add(buttonPane, BorderLayout.SOUTH);

 			{

-				JButton okButton = new JButton("OK");

-				okButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent arg0) {

-						dispose();

-					}

-				});

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-				getRootPane().setDefaultButton(okButton);

-			}

-			{

-				JButton cancelButton = new JButton("Zur\u00FCck");

+				JButton cancelButton = new JButton("Schlie\u00DFen");

 				cancelButton.addActionListener(new ActionListener() {

 					public void actionPerformed(ActionEvent e) {

 						dispose();

 						if(taskrun==true)

 						{

+						try {

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

+						} catch (RemoteException e1) {

+							// TODO Auto-generated catch block

+							e1.printStackTrace();

+						}

 						task.cancel(true);

 						}

 						

@@ -268,8 +270,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
 	    	//System.out.println("OK");

 	    //}

         progressBar.setValue(0);

-        RmiClientMethods rmi=new RmiClientMethods();

-        ServerInterface sint=rmi.getInterface();

+

         try {

 			user=sint.getFtpUser();

 		} catch (RemoteException e) {

@@ -279,7 +280,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener {
         System.out.println("username: "+user.getUsername());

         labeluser.setText(user.getUsername());

         labelpass.setText(user.getPass());

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

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

         task.addPropertyChangeListener(this);

         task.execute();

         taskrun=true;