Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/ftp/DownloadTask.class
	Dozentenmodul/bin/ftp/UploadTask.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class

6 files changed, 139 insertions, 14 deletions

diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
index 46d3a6ab..dca17047 100644
--- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
index a9e27d2f..0e5c8340 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 291bc065..fe0e6d72 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -76,6 +76,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	JLabel labelfilesize;
 	JLabel labelZeit;
 	JLabel labelverbleibend;
+	JFileChooser fc;
 	long filesize;
 	double speed;
 	long bytesread;
@@ -159,7 +160,21 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					JFileChooser fc = new JFileChooser();
+					try {
+						Wini ini = new Wini(
+								new File(
+										"C:\\Users\\"
+												+ System.getProperty("user.name")
+												+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+						fc = new JFileChooser(ini.get("main", "Letzter Uploadpfad",String.class));
+					} catch (InvalidFileFormatException e2) {
+						// TODO Auto-generated catch block
+						e2.printStackTrace();
+					} catch (IOException e2) {
+						// TODO Auto-generated catch block
+						e2.printStackTrace();
+					}
+					
 					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 
 					fc.showOpenDialog(getParent());
@@ -653,4 +668,4 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
 
-}// end class
\ No newline at end of file
+}// end class
diff --git a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
index c68ccff2..aae76861 100644
--- a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
@@ -72,6 +72,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	JLabel lblBytesread;
 	JLabel lblNewLabel_3;
 	JLabel labelVerbleibend;
+	JFileChooser fc;
 	long filesize;
 	double speed;
 	int progress = 0; // progress of download
@@ -152,10 +153,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 					"Speicherort ausw\u00E4hlen");
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					JFileChooser fc = new JFileChooser();
-					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
 
-					fc.showOpenDialog(getParent());
 					try {
 						Wini ini = new Wini(
 								new File(
@@ -163,7 +161,10 @@ public class FTPEditDownloader_GUI extends JFrame implements
 												+ System.getProperty("user.name")
 												+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
 						System.out.println("FileChooser Pfad: "+ini.get("main", "Letzter Downloadpfad", String.class));
-						fc.setCurrentDirectory(new File(ini.get("main", "Letzter Downloadpfad", String.class)));
+						fc = new JFileChooser(ini.get("main", "Letzter Downloadpfad", String.class));
+						fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+
+						fc.showOpenDialog(getParent());
 					} catch (InvalidFileFormatException e2) {
 						// TODO Auto-generated catch block
 						e2.printStackTrace();
@@ -171,6 +172,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 						// TODO Auto-generated catch block
 						e2.printStackTrace();
 					}
+
 					File dir = fc.getSelectedFile();
 					// check if directory is selected
 					if (dir != null) {
@@ -572,4 +574,4 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		System.out.println("isCurrentlyLoading"+isCurrentlyLoading);
 		return isCurrentlyLoading;
 	}// end isCurrentlyLoading()
-}// end class
\ No newline at end of file
+}// end class
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index f54bea82..12a5d6bb 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -14,6 +14,7 @@ import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.text.DateFormat;
@@ -43,6 +44,8 @@ import models.SessionData;
 import models.person;
 
 import org.apache.thrift.TException;
+import org.ini4j.InvalidFileFormatException;
+import org.ini4j.Wini;
 
 import server.Server.Client;
 import thrift.ThriftConnection;
@@ -73,6 +76,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JLabel labelfilesize;
 	JLabel labelZeit;
 	JLabel labelverbleibend;
+	JFileChooser fc;
 	long filesize;
 	double speed;
 	long bytesread;
@@ -154,14 +158,28 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					JFileChooser fc = new JFileChooser();
+					try {
+						Wini ini = new Wini(
+								new File(
+										"C:\\Users\\"
+												+ System.getProperty("user.name")
+												+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+						fc = new JFileChooser(ini.get("main", "Letzter Uploadpfad",String.class));
+					} catch (InvalidFileFormatException e2) {
+						// TODO Auto-generated catch block
+						e2.printStackTrace();
+					} catch (IOException e2) {
+						// TODO Auto-generated catch block
+						e2.printStackTrace();
+					}
+					
 					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 
 					fc.showOpenDialog(getParent());
 					File file = fc.getSelectedFile();
 					// check if a file is selected and exists
 					if (file != null) {
-						// file exists
+						// file selected
 						uploadFile = file;
 						filename = uploadFile.getName();
 						lblPath.setText(file.getAbsolutePath());
@@ -178,6 +196,20 @@ public class FTPEditUploader_GUI extends JFrame implements
 		}
 
 		lblPath = new JLabel("");
+		try {
+			Wini ini = new Wini(
+					new File(
+							"C:\\Users\\"
+									+ System.getProperty("user.name")
+									+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+			lblPath.setText(ini.get("main", "Letzter Uploadpfad",String.class));
+		} catch (InvalidFileFormatException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		} catch (IOException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
 				if (lblPath.getText().isEmpty()) {
@@ -327,6 +359,21 @@ public class FTPEditUploader_GUI extends JFrame implements
 					public void actionPerformed(ActionEvent e) {
 
 						updateData();
+						try {
+							Wini ini = new Wini(
+									new File(
+											"C:\\Users\\"
+													+ System.getProperty("user.name")
+													+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+							ini.put("main", "Letzter Uploadpfad", lblPath.getText().substring(0, lblPath.getText().lastIndexOf("\\")));
+							ini.store();
+						} catch (InvalidFileFormatException e2) {
+							// TODO Auto-generated catch block
+							e2.printStackTrace();
+						} catch (IOException e2) {
+							// TODO Auto-generated catch block
+							e2.printStackTrace();
+						}
 						dispose();
 						MainMenue_GUI m = new MainMenue_GUI();
 						m.setVisible(true);
diff --git a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
index ce2a3f35..ad178085 100644
--- a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
@@ -14,6 +14,7 @@ import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -39,6 +40,8 @@ import models.Links;
 import models.SessionData;
 
 import org.apache.thrift.TException;
+import org.ini4j.InvalidFileFormatException;
+import org.ini4j.Wini;
 
 import server.Server.Client;
 import server.User;
@@ -68,6 +71,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 	JLabel lblBytesread;
 	JLabel lblNewLabel_3;
 	JLabel labelVerbleibend;
+	JFileChooser fc;
 	long filesize;
 	double speed;
 	int progress = 0; // progress of download
@@ -148,10 +152,25 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 					"Speicherort ausw\u00E4hlen");
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					JFileChooser fc = new JFileChooser();
-					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+					try {
+						Wini ini = new Wini(
+								new File(
+										"C:\\Users\\"
+												+ System.getProperty("user.name")
+												+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+						System.out.println("FileChooser Pfad: "+ini.get("main", "Letzter Downloadpfad", String.class));
+						fc = new JFileChooser(ini.get("main", "Letzter Downloadpfad", String.class));
+						fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+
+						fc.showOpenDialog(getParent());
+					} catch (InvalidFileFormatException e2) {
+						// TODO Auto-generated catch block
+						e2.printStackTrace();
+					} catch (IOException e2) {
+						// TODO Auto-generated catch block
+						e2.printStackTrace();
+					}
 
-					fc.showOpenDialog(getParent());
 					File dir = fc.getSelectedFile();
 					// check if directory is selected
 					if (dir != null) {
@@ -170,6 +189,20 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 		}
 
 		lblPath = new JLabel("");
+		try {
+			Wini ini = new Wini(
+					new File(
+							"C:\\Users\\"
+									+ System.getProperty("user.name")
+									+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+			lblPath.setText(ini.get("main", "Letzter Downloadpfad",String.class));
+		} catch (InvalidFileFormatException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		} catch (IOException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
 				if (lblPath.getText().isEmpty()) {
@@ -416,7 +449,21 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 										JOptionPane.ERROR_MESSAGE);
 							}
 						}
-
+						try {
+							Wini ini = new Wini(
+									new File(
+											"C:\\Users\\"
+													+ System.getProperty("user.name")
+													+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+							ini.put("main", "Letzter Downloadpfad", lblPath.getText());
+							ini.store();
+						} catch (InvalidFileFormatException e2) {
+							// TODO Auto-generated catch block
+							e2.printStackTrace();
+						} catch (IOException e2) {
+							// TODO Auto-generated catch block
+							e2.printStackTrace();
+						}
 						SearchImage_GUI se = new SearchImage_GUI();
 						se.setVisible(true);
 						dispose();
@@ -428,7 +475,21 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 
 			btnMainMenu.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-
+					try {
+						Wini ini = new Wini(
+								new File(
+										"C:\\Users\\"
+												+ System.getProperty("user.name")
+												+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+						ini.put("main", "Letzter Downloadpfad", lblPath.getText());
+						ini.store();
+					} catch (InvalidFileFormatException e2) {
+						// TODO Auto-generated catch block
+						e2.printStackTrace();
+					} catch (IOException e2) {
+						// TODO Auto-generated catch block
+						e2.printStackTrace();
+					}
 					MainMenue_GUI mm = new MainMenue_GUI();
 					mm.setVisible(true);
 					dispose();