Fehlermeldung entfernt und Debug-Ausgaben hinzugefuegt

23 files changed, 75 insertions, 62 deletions

diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class
index b2fce5f2..b616cb4f 100644
--- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
index 456d5d97..98947f75 100644
--- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
+++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
index dcd9a8b8..315e2376 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 96d6d2ed..e899713c 100644
--- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
+++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index 29da5290..31b8abb9 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$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
index 8f2c2337..8d37d092 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
index 55965fd2..55cd9b99 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
index d88ea420..c084472f 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
index bb811f7a..c17f71ce 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
index 1cf17778..6a8ae8a9 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
index e4c4e858..bc299712 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
index 715c30d8..1df126f0 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
index 10cac7e7..9a0c30f4 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
index c742cf3c..161cf622 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
index 193a25de..7d1f0399 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index 3bfa0437..ad440fcd 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
index 71283844..dea44e97 100644
--- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java
@@ -292,6 +292,8 @@ public class CreateImageAllgemein_GUI extends JFrame {
 							// Schreibt die Daten in das Model
 							Image.image.setImagename(imagename.getText());
 							Image.image.setDesc(textAreadesc.getText());
+							//Info
+							System.out.println("Alle Eingaben in Ordnung. Imagename= "+imagename.getText()+", Imagebeschreibung="+textAreadesc.getText());
 							CreateImageTechnisch_GUI ea = new CreateImageTechnisch_GUI();
 							ea.setVisible(true);
 							dispose();
diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index a30a33dd..a31e0ecb 100644
--- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
@@ -370,7 +370,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
 						Image.image.setOS(comboBox.getSelectedItem().toString());
-						System.out.println(Image.image.getOS());
+						System.out.println("Betriebssystem: "+Image.image.getOS()+",  istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+",  RAM: "+Image.image.getRam());
 						CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI();
 						ea.setVisible(true);
 						dispose();
diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
index ea81e3c2..f44378fb 100644
--- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java
@@ -391,6 +391,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 							Image.image.setVorlage(false);
 						}
 						Image.image.setOS(comboBox.getSelectedItem().toString());
+						System.out.println("Betriebssystem: "+Image.image.getOS()+",  istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+",  RAM: "+Image.image.getRam());
 						// oeffnet das naechste Fenster
 						EditImageFreigabe_GUI ea=new EditImageFreigabe_GUI();
 						ea.setVisible(true);
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 3d02a7ed..686ee63f 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -420,11 +420,11 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		btnUploadStarten.setText("Bitte warten");
 
 		try {
-			System.out.println("Test");
+			System.out.println("Getting FTP User");
 			user = client.getFtpUser();
-			System.out.println("FTP name" + user.userName);
-			System.out.println("FTP path" + user.path);
-			System.out.println("FTP pass" + user.password);
+			System.out.println("FTP name: " + user.userName);
+			System.out.println("FTP path: " + user.path);
+			System.out.println("FTP pass: " + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -434,7 +434,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
 
-		System.out.println(formatter.format(new Date()) + "_"
+		System.out.println("Setting new Name: " + formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
 				+ Image.image.getImagename() + ".vmdk");
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 246c6eb6..17b7449d 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -85,7 +85,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zur\u00FCck");
 
-	
 	/**
 	 * Create the frame.
 	 */
@@ -302,7 +301,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 			getContentPane().add(buttonPane, BorderLayout.SOUTH);
 			{
 
-				//finishButton.setEnabled(false);
+				// finishButton.setEnabled(false);
 				finishButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
@@ -318,13 +317,16 @@ public class FTPEditUploader_GUI extends JFrame implements
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
-								JOptionPane.showMessageDialog(null,
-										e1.getCause()+"\n"+e1.getStackTrace(),
-										"Debug-Message", JOptionPane.ERROR_MESSAGE);
+								JOptionPane.showMessageDialog(
+										null,
+										e1.getCause() + "\n"
+												+ e1.getStackTrace(),
+										"Debug-Message",
+										JOptionPane.ERROR_MESSAGE);
 							}
 							task.cancel(true);
 						}
-						
+
 					}
 				});
 				btnZurck.addActionListener(new ActionListener() {
@@ -344,58 +346,56 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
-		
+
 		JMenu menu = new JMenu("Hilfe");
 		menuBar.add(menu);
-		
+
 		JMenuItem menuItem = new JMenuItem("FAQ");
 		menuItem.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();
 				}
-				
-				
+
 			}
 		});
 
 		menu.add(menuItem);
-		
+
 		JMenuItem menuItem_1 = new JMenuItem("OTRS");
 		menuItem_1.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();
 				}
-				
 
 			}
 		});
 
 		menu.add(menuItem_1);
-		
+
 		JMenuItem mntmAbout = new JMenuItem("About");
 		mntmAbout.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@@ -416,24 +416,28 @@ public class FTPEditUploader_GUI extends JFrame implements
 
 		try {
 			user = client.getFtpUser();
-			System.out.println("FTP name" + user.userName);
-			System.out.println("FTP path" + user.path);
-			System.out.println("FTP pass" + user.password);
+			System.out.println("FTP name: " + user.userName);
+			System.out.println("FTP path: " + user.path);
+			System.out.println("FTP pass: " + user.password);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause()+"\n"+e.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 		}
 		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
-		
+
+		System.out.println("Setting new Name: " + formatter.format(new Date())
+				+ "_" + person.verantwortlicher.getHochschule() + "_"
+				+ person.verantwortlicher.getUsername() + "_"
+				+ Image.image.getImagename() + ".vmdk");
 		Image.image.setNewName(formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
 				+ person.verantwortlicher.getUsername() + "_"
-				+ Image.image.getImagename()+ ".vmdk");
+				+ Image.image.getImagename() + ".vmdk");
 		task = new UploadTask(host, port, user.userName, user.password,
-				user.path+"temp/", uploadFile);
+				user.path + "temp/", uploadFile);
 
 		task.addPropertyChangeListener(this);
 		task.execute();
@@ -445,7 +449,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 		if ("progress" == arg0.getPropertyName()) {
 			progress = (Integer) arg0.getNewValue();
 			progressBar.setValue(progress);
-			
+
 			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
 			if (progress == 100) {
 				// not uploading currently
@@ -463,8 +467,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 			}
 		}
 
-		
-
 		if ("speed" == arg0.getPropertyName()) {
 			speed = (double) arg0.getNewValue();
 			// if(speed<=1){
@@ -504,32 +506,36 @@ public class FTPEditUploader_GUI extends JFrame implements
 	public boolean updateData() {
 
 		try {
-			System.out.println("NewName="+Image.image.getNewName());
-			System.out.println("OldName="+Image.image.getImagename());
-			if(Image.image.getNewName()!=null){
+			System.out.println("NewName=" + Image.image.getNewName());
+			System.out.println("OldName=" + Image.image.getImagename());
+			if (Image.image.getNewName() != null) {
 				client.updateImageData(Image.image.getImagename(),
-						Image.image.getImagename(),Image.image.getDesc(),Image.image.getImagepath(), Image.image.isLicensed(),
+						Image.image.getImagename(), Image.image.getDesc(),
+						Image.image.getImagepath(), Image.image.isLicensed(),
 						Image.image.isInternet(), Image.image.getRam(),
 						Image.image.getCpu(), Image.image.getImageId(),
-						Image.image.getVersion(), Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode(),Image.image.getOS());
+						Image.image.getVersion(), Image.image.isVorlage(),
+						Image.image.getFilesize(), Image.image.getShareMode(),
+						Image.image.getOS());
+				client.startFileCopy(Image.image.getNewName());
+			} else {
+
+				client.updateImageData(Image.image.getImagename(),
+						Image.image.getImagename(), Image.image.getDesc(),
+						"temp/" + Image.image.getNewName(),
+						Image.image.isLicensed(), Image.image.isInternet(),
+						Image.image.getRam(), Image.image.getCpu(),
+						Image.image.getImageId(), Image.image.getVersion(),
+						Image.image.isVorlage(), Image.image.getFilesize(),
+						Image.image.getShareMode(), Image.image.getOS());
 				client.startFileCopy(Image.image.getNewName());
-			}
-			else{
-				
-			
-			client.updateImageData(Image.image.getImagename(),
-					Image.image.getImagename(),Image.image.getDesc(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(),
-					Image.image.isInternet(), Image.image.getRam(),
-					Image.image.getCpu(), Image.image.getImageId(),
-					Image.image.getVersion(), Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode(),Image.image.getOS());
-			client.startFileCopy(Image.image.getNewName());
 			}
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e.getCause()+"\n"+e.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 			return false;
 		}
 		return true;
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 5104da02..a26b80c9 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -243,18 +243,18 @@ public class Login_GUI extends JFrame {
 			// null package
 			if (checkClientPackage() == true) {
 				// package has information
-				System.out.println("Auth");
+				System.out.println("Authentifiziere - warte auf Masterserver");
 				result = client.authenticate(lblusername.getText(), passText);
-				System.out.println("Succes Auth");
+				System.out.println("Authentifizierung erfolgreich");
 				SessionData.session.setAuthToken(result.authToken);
 				SessionData.session.setSessionID(result.sessionId);
 				SessionData.session.setServerAdress(result.serverAddress);
-				System.out.println("Master");
+				System.out.println("warte auf Masterserver");
 				// set connection to bwLehrpoolSuiteServer
 				ThriftConnection bwthrift = new ThriftConnection();
 				server.Server.Client bwClient = bwthrift.getThriftConnection();
 				models.Client.clientcon.setClient(bwClient);
-				System.out.println("Client");
+				System.out.println("Client macht weiter");
 				System.out.println("Session-ID: " + result.sessionId
 						+ "\nToken: " + result.authToken);
 
@@ -266,7 +266,7 @@ public class Login_GUI extends JFrame {
 								"Error: Token ist null", "Token defekt",
 								JOptionPane.ERROR_MESSAGE);
 					}
-					System.out.println("Hole jetzt Infos aus SessionData...");
+					System.out.println("Arbeite ab jetzt mit Infos aus SessionData.");
 					UserInfo user = client.getUserFromToken(SessionData.session
 							.getAuthToken());
 
@@ -354,9 +354,9 @@ public class Login_GUI extends JFrame {
 							"Anmeldung fehlgeschlagen",
 							JOptionPane.ERROR_MESSAGE);
 			e.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					e.getCause() + "\n" + e.getMessage(), "Message",
-					JOptionPane.ERROR_MESSAGE);
+			//JOptionPane.showMessageDialog(null,
+			//		e.getCause() + "\n" + e.getStackTrace(), "Message",
+			//		JOptionPane.ERROR_MESSAGE);
 			return;
 		} catch (TException e) {
 			// TODO Auto-generated catch block
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 70c12319..52632ee5 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -71,6 +71,10 @@ public class MainMenue_GUI extends JFrame {
 	 * Create the dialog.
 	 */
 	public MainMenue_GUI() {
+		
+		//Leerzeile auf Konsole bei Rueckkehr ins Hauptmenue fuer leichteres Lesen
+		System.out.println("\n");
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {