[client] moved main function to App.java & refined Config stuff

7 files changed, 28 insertions, 60 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 9b026a59..ded9098b 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -163,7 +163,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
 					
-					fc = new JFileChooser(Config.getString("main", "Letzter Uploadpfad", System.getProperty("user.home")));
+					fc = new JFileChooser(Config.getLastUploadPath());
 					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 
 					fc.showOpenDialog(getParent());
@@ -186,7 +186,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			contentPanel.add(btnSpeicherortAuswhlen);
 		}
 		lblPath = new JLabel("");
-		lblPath.setText(Config.getString("main", "Letzter Uploadpfad", System.getProperty("user.home")));
+		lblPath.setText(Config.getLastUploadPath());
 
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
@@ -346,11 +346,11 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						File f = new File(lblPath.getText());
 						if (f.isDirectory()) {
 							// shouldn't be a directory, but let's check that case anyway
-							Config.setString("main", "Letzter Uploadpfad", f.toString());
+							Config.setLastUploadPath(f.toString());
 						} else if (f.getParentFile().isDirectory()) {
-							Config.setString("main", "Letzter Uploadpfad", f.getParentFile().toString());
+							Config.setLastUploadPath(f.getParentFile().toString());
 						}
-						// save config.
+						// save configuration
 						Config.store();
 						
 						dispose();
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index eb864d91..08f1b223 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -154,7 +154,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
 
-					fc = new JFileChooser(Config.getString("main", "Letzter Downloadpfad", System.getProperty("user.home")));
+					fc = new JFileChooser(Config.getLastDownloadPath());
 					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
 					fc.showOpenDialog(getParent());
 
@@ -178,7 +178,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		}
 
 		lblPath = new JLabel("");
-		lblPath.setText(Config.getString("main", "Letzter Downloadpfad", System.getProperty("user.home")));
+		lblPath.setText(Config.getLastDownloadPath());
 
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
@@ -437,9 +437,9 @@ public class FTPEditDownloader_GUI extends JFrame implements
 						// always save download path
 						File f = new File(lblPath.getText());
 						if (f.isDirectory()) {
-							Config.setString("main", "Letzter Downloadpfad", f.toString());
+							Config.setLastDownloadPath(f.toString());
 						} else if (f.getParentFile().isDirectory()) {
-							Config.setString("main", "Letzter Downloadpfad", f.getParentFile().toString());
+							Config.setLastDownloadPath(f.getParentFile().toString());
 						}
 						Config.store();
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 6d84f247..3b856881 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -160,7 +160,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					fc = new JFileChooser(Config.getString("main", "Letzter Uploadpfad", System.getProperty("user.home")));
+					fc = new JFileChooser(Config.getLastUploadPath());
 					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 
 					fc.showOpenDialog(getParent());
@@ -184,7 +184,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 		}
 
 		lblPath = new JLabel("");
-		lblPath.setText(Config.getString("main", "Letzter Uploadpfad", System.getProperty("user.home")));
+		lblPath.setText(Config.getLastUploadPath());
 		
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
@@ -337,9 +337,9 @@ public class FTPEditUploader_GUI extends JFrame implements
 						updateData();
 						File f = new File(lblPath.getText());
 						if (f.isDirectory()) {
-							Config.setString("main", "Letzter Downloadpfad", f.toString());
+							Config.setLastUploadPath(f.toString());
 						} else if (f.getParentFile().isDirectory()) {
-							Config.setString("main", "Letzter Downloadpfad", f.getParentFile().toString());
+							Config.setLastUploadPath(f.getParentFile().toString());
 						}
 						Config.store();
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index db80bc35..34e0cf80 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -155,7 +155,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 					"Speicherort auswählen");
 			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					fc = new JFileChooser(Config.getString("main", "Letzter Downloadpfad", System.getProperty("user.home")));
+					fc = new JFileChooser(Config.getLastDownloadPath());
 					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
 					fc.showOpenDialog(getParent());
 
@@ -180,7 +180,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 
 		// read last download path from config
 		lblPath = new JLabel("");
-		lblPath.setText(Config.getString("main", "Letzter Downloadpfad", System.getProperty("user.home")));
+		lblPath.setText(Config.getLastDownloadPath());
 
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
@@ -445,7 +445,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 							dispose();
 						}// end else
 						// save config in any case
-						Config.setString("main", "Letzter Downloadpfad", lblPath.getText());
+						Config.setLastDownloadPath(lblPath.getText());
 						Config.store();
 					}//end action
 				});
@@ -455,7 +455,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 
 			btnMainMenu.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					Config.setString("main", "Letzter Downloadpfad", lblPath.getText());
+					Config.setLastDownloadPath(lblPath.getText());
 					Config.store();
 					
 					MainMenue_GUI mm = new MainMenue_GUI();
diff --git a/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java b/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java
index 8e943c8a..1ae73608 100644
--- a/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java
@@ -129,7 +129,7 @@ public class BillOfRights_GUI extends JFrame {
 				fwdButton = new JButton("Weiter");
 				fwdButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						Config.setBoolean("main", "BillOfRights", true);
+						Config.setBillOfRights(true);
 						Config.store();
 						VmWareLink_GUI ac=new VmWareLink_GUI();
 						ac.setVisible(true);
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 4465ec3a..ebfaf9a3 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -1,14 +1,12 @@
 package gui.intro;
 
 import java.awt.Color;
-import java.awt.EventQueue;
 import java.awt.Image;
 import java.awt.SystemColor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.IOException;
 import java.util.Arrays;
 
 import javax.swing.ImageIcon;
@@ -49,36 +47,6 @@ public class Login_GUI extends JFrame {
 	JCheckBox chckbxBenutzernameSpeichern;
 
 	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					// Pruefe und Erzeuge gegebenfalls Config
-					try {
-						Config.init();
-					} catch (IOException e) {
-						e.printStackTrace();
-						JOptionPane.showMessageDialog(null, e.getMessage(),
-								"Fehler", JOptionPane.ERROR_MESSAGE);
-						return;
-					}
-
-					// Aufruf und Anzeige des Login Fensters
-					Login_GUI frame = new Login_GUI();
-					frame.setVisible(true);
-
-				} catch (Exception e) {
-					e.printStackTrace();
-					JOptionPane.showMessageDialog(null, e.getStackTrace(),
-							"Message", JOptionPane.ERROR_MESSAGE);
-				}
-			}
-		});
-	}
-
-	/**
 	 * Create the frame.
 	 */
 	public Login_GUI() {
@@ -158,9 +126,9 @@ public class Login_GUI extends JFrame {
 				.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein.");
 
 		// Lese Information aus der Konfigurationsdatei
-		lblusername.setText(Config.getString("main", "Benutzername", ""));
-		chckbxBenutzernameSpeichern.setSelected(Config.getBoolean("main",
-				"Benutzername speichern", false));
+		System.out.println(Config.getUsername());
+		lblusername.setText(Config.getUsername());
+		chckbxBenutzernameSpeichern.setSelected(Config.getSaveUsername());
 
 		lblusername.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -278,18 +246,18 @@ public class Login_GUI extends JFrame {
 		// person.verantwortlicher.setRole("GetToTheChopper!");
 
 		if (chckbxBenutzernameSpeichern.isSelected()) {
-			Config.setString("main", "Benutzername", lblusername.getText());
-			Config.setBoolean("main", "Benutzername speichern", true);
+			Config.setUsername(lblusername.getText());
+			Config.setSaveUsername(true);
 		} else {
-			Config.setString("main", "Benutzername", "");
-			Config.setBoolean("main", "Benutzername speichern", false);
+			Config.setUsername("");
+			Config.setSaveUsername(false);
 		}
 		// speichern
 		Config.store();
 
 		// Pruefe ob Bills Of Rights schon akzeptiert wurden,
 		// wenn nicht zeige diese an
-		if (!Config.getBoolean("main", "BillOfRights", false)) {
+		if (!Config.getBillOfRights()) {
 			// Erstellen einer Instanz der Aktionsauswahl
 			BillOfRights_GUI re = new BillOfRights_GUI();
 			re.setVisible(true);
@@ -298,7 +266,7 @@ public class Login_GUI extends JFrame {
 		} else {
 			// Pruefe ob die Links zu vmware angezeigt werden
 			// sollen
-			if (!Config.getBoolean("main", "vmware", false)) {
+			if (!Config.getVmwareLicense()) {
 				VmWareLink_GUI vm = new VmWareLink_GUI();
 				vm.setVisible(true);
 				setVisible(false);
diff --git a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
index 3e927378..57d6be66 100644
--- a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
@@ -113,7 +113,7 @@ public class VmWareLink_GUI extends JFrame {
 		chckbxNewCheckBox.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent arg0) {
 				if(chckbxNewCheckBox.isSelected()) {
-					Config.setBoolean("main", "vmware", true);
+					Config.setVmwareLicense(true);
 					Config.store();
 				}
 			}