diverses

5 files changed, 13 insertions, 15 deletions

diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index 82b274da..c6f475c4 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index d3e2f24a..9d61104d 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index c916c440..112ee228 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -200,7 +200,13 @@ public class Login_GUI extends JFrame {
 		JLabel LabelPass = new JLabel("bwIDM-Passwort:");
 		LabelPass.setBounds(111, 195, 134, 20);
 		contentPane.add(LabelPass);
-
+		
+		lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT);
+		lblConnectionInfo.setBounds(111, 290, 418, 20);
+		lblConnectionInfo.setEnabled(true);
+		lblConnectionInfo.setText("Info: Bereit für Login");
+		contentPane.add(lblConnectionInfo);
+		
 		// Erzeugen, Hinzufuegen und definierung der Aktion des Buttons
 		JButton BtnLogin = new JButton("Login");
 		BtnLogin.addActionListener(new ActionListener() {
@@ -215,9 +221,7 @@ public class Login_GUI extends JFrame {
 
 
 
-		lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT);
-		lblConnectionInfo.setBounds(111, 290, 418, 20);
-		contentPane.add(lblConnectionInfo);
+		
 
 
 		//GuiOrganizer.centerGUI(this);
@@ -242,6 +246,7 @@ public class Login_GUI extends JFrame {
 				
 				// package has information				
 				//User-Info
+
 				System.out.println("Authentifiziere - warte auf Masterserver");
 				lblConnectionInfo.setForeground(Color.black);
 				lblConnectionInfo.setText("Authentifiziere - warte auf Antwort von Server...");
@@ -295,7 +300,7 @@ public class Login_GUI extends JFrame {
 					person.verantwortlicher.setVorname(user.firstName);
 					person.verantwortlicher.setEMail(user.eMail);
 					person.verantwortlicher.setHochschule(hochschule);
-					//Später über result.getRole zum Beispiel die Rolle holen
+					//Sp�ter �ber result.getRole zum Beispiel die Rolle holen
 					person.verantwortlicher.setRole("Student");
 
 					try {
@@ -383,10 +388,11 @@ public class Login_GUI extends JFrame {
 
 	public boolean checkClientPackage() {
 		// check if client is null or has been returned with information
+		System.out.println("Prüfe Eingangsdaten");
 		if (client != null) {
 			// client contains information
 			isClientReturnedCorrectly = true;
-			System.out.println("Verbindungsinformationen erhalten");
+			System.out.println("Verbindungsdaten erhalten");
 		} else {
 			// client has returned with error
 			isClientReturnedCorrectly = false;
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index faf24528..5020ad07 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -467,15 +467,11 @@ public class MainMenue_GUI extends JFrame {
 		mntmFaq.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-
 				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-
 					open.openWebpage(windows);
-
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -488,20 +484,15 @@ public class MainMenue_GUI extends JFrame {
 		mntmOtrs.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-
 				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-
 					open.openWebpage(windows);
-
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-
 			}
 		});
 		mnNewMenu_1.add(mntmOtrs);
diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java
index dd572770..f72284b0 100644
--- a/Dozentenmodul/src/models/Links.java
+++ b/Dozentenmodul/src/models/Links.java
@@ -9,6 +9,7 @@ public class Links {
 	private static String OTRS = "http://bwlehrpool.hs-offenburg.de/";
 	private static String uriWindows = "https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
 	private static String uriLinux = "https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
+	private static String AnleitungVMDK = "http://www.hs-offenburg.de/fileadmin/Einrichtungen/hrz/Projekte/bwLehrpool/2_bwLehrpool_-_Eigene_Images_erstellen.pdf";
 
 	public static String getFAQ() {
 		return FAQ;