actual

1 files changed, 40 insertions, 8 deletions

diff --git a/Dozentenmodul/src/GUI/FTPDownloader.java b/Dozentenmodul/src/GUI/FTPDownloader.java
index b936a966..5f062ff0 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader.java
@@ -3,7 +3,13 @@ package GUI;
 import java.awt.BorderLayout;

 import java.awt.Color;

 import java.awt.FlowLayout;

+import java.io.BufferedReader;

 import java.io.File;

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.InputStreamReader;

+import java.util.Properties;

+

 import javax.swing.JButton;

 import javax.swing.JFileChooser;

 import javax.swing.JFrame;

@@ -15,9 +21,15 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;

 import javax.swing.border.EmptyBorder;

 

-import downloader.DownloadTask;

+import Models.person;

+import Models.vm;

+

+import com.jcraft.jsch.ChannelExec;

+import com.jcraft.jsch.JSch;

+import com.jcraft.jsch.JSchException;

+import com.jcraft.jsch.Session;

 

-import ftp.ftp;

+import downloader.DownloadTask;

 import java.awt.event.ActionListener;

 import java.awt.event.ActionEvent;

 import java.beans.PropertyChangeEvent;

@@ -30,13 +42,13 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 	private JPanel contentPane;

 	private final JPanel contentPanel = new JPanel();

 	JLabel lblNewLabel;

+	JLabel downspeed;

 	JProgressBar progressBar;

-	ftp f=new ftp();

-	String host="openslx-nfs.rz.hs-offenburg.de";

+	String host="132.230.4.16";

 	int port=21;

-	String username="tspitzer";

-	String password="21071989";

-	String downloadPath="_vorlagen/";

+	String username="openslx";

+	String password="openslx-ng";

+	String downloadPath="";

 	String filename="";

 	static String arg="";

 	/**

@@ -119,6 +131,14 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
 		

 		progressBar.setBounds(10, 45, 414, 30);

 		contentPanel.add(progressBar);

+		

+		JLabel lblDownloadgeschwindigkeit = new JLabel("Downloadgeschwindigkeit:");

+		lblDownloadgeschwindigkeit.setBounds(10, 81, 141, 14);

+		contentPanel.add(lblDownloadgeschwindigkeit);

+		

+		downspeed = new JLabel("0");

+		downspeed.setBounds(169, 81, 46, 14);

+		contentPanel.add(downspeed);

 		{

 			JPanel buttonPane = new JPanel();

 			buttonPane.setBackground(Color.WHITE);

@@ -146,6 +166,7 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
         DownloadTask task = new DownloadTask(host, port, username, password,downloadPath+filename, lblNewLabel.getText(), this);

         task.addPropertyChangeListener(this);

         task.execute();

+

     }

 

 	public void propertyChange(PropertyChangeEvent arg0) {

@@ -153,9 +174,20 @@ public class FTPDownloader extends JFrame implements PropertyChangeListener {
             int progress = (Integer) arg0.getNewValue();

             progressBar.setValue(progress);

         }

+        if("speed"==arg0.getPropertyName()){

+        	double speed=(double)arg0.getNewValue();

+        	//if(speed<=1){

+        		downspeed.setText(String.valueOf(speed));

+        //	}else

+        	//{

+        		//double MBSpeed=speed/1024;

+        		//downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf(".")));

+        	//}

+        	

+        }

 		

 	}

- 

 	

 

+	

 }
\ No newline at end of file