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

Conflicts:
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/sql/SQL.java

1 files changed, 17 insertions, 28 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index 778fbed1..89548a9b 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -37,6 +37,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
 import models.Image;
+import models.ItemOwner;
 import models.Links;
 import models.person;
 
@@ -104,7 +105,6 @@ public class EditImageAllgemein_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
@@ -159,8 +159,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		Vorname.setEditable(false);
 		Vorname.setEnabled(false);
 		Vorname.setBackground(Color.WHITE);
-		Vorname.setText(person.verantwortlicher.getVorname());
-		//Vorname.setText(Image.image.get);
+		//Vorname.setText(person.verantwortlicher.getVorname());
+		Vorname.setText(ItemOwner.itemOwner.getVorname());
 		Vorname.setColumns(10);
 		Vorname.setBounds(145, 245, 350, 20);
 		panel_1.add(Vorname);
@@ -174,7 +174,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		Nachname.setEnabled(false);
 		Nachname.setEditable(false);
 		Nachname.setBackground(Color.WHITE);
-		Nachname.setText(person.verantwortlicher.getName());
+		//Nachname.setText(person.verantwortlicher.getName());
+		Nachname.setText(ItemOwner.itemOwner.getNachname());
 		Nachname.setColumns(10);
 		Nachname.setBounds(145, 276, 350, 20);
 		panel_1.add(Nachname);
@@ -188,7 +189,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		Hochschule.setEnabled(false);
 		Hochschule.setEditable(false);
 		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
+		//Hochschule.setText(person.verantwortlicher.getHochschule());
+		Hochschule.setText(ItemOwner.itemOwner.getHochschule());
 		Hochschule.setColumns(10);
 		Hochschule.setBounds(145, 307, 350, 20);
 		panel_1.add(Hochschule);
@@ -202,7 +204,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 		EMail.setEnabled(false);
 		EMail.setEditable(false);
 		EMail.setBackground(Color.WHITE);
-		EMail.setText(person.verantwortlicher.getEMail());
+		//EMail.setText(person.verantwortlicher.getEMail());
+		EMail.setText(ItemOwner.itemOwner.getEmail());
 		EMail.setColumns(10);
 		EMail.setBounds(145, 338, 350, 20);
 		panel_1.add(EMail);
@@ -337,12 +340,12 @@ public class EditImageAllgemein_GUI extends JFrame {
 							Image.image.setImagename(imagename.getText());
 							Image.image.setDesc(textAreadesc.getText());
 							// Info
-							LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
-											+ Image.image.getImagename()
-											+ ", NewImageName=\""
-											+ Image.image.getNewName()
-											+ "\", Imagebeschreibung=\""
-											+ Image.image.getDesc()+"\"");
+							//LOGGER.info("Alle Eingaben in Ordnung. Imagename= \""
+							//				+ Image.image.getImagename()
+							//				+ ", NewImageName=\""
+							//				+ Image.image.getNewName()
+							//				+ "\", Imagebeschreibung=\""
+							//				+ Image.image.getDesc()+"\"");
 
 							
 							EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(c);
@@ -385,11 +388,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					
 					open.openWebpage(windows);
-					
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
@@ -407,11 +407,8 @@ public class EditImageAllgemein_GUI extends JFrame {
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					
 					open.openWebpage(windows);
-					
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 				
@@ -427,14 +424,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(menuItem);
-		// setFocusTraversalPolicy(new FocusTraversalOnArray(new
-		// Component[]{getContentPane(), panel_2, lblNewLabel,
-		// txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7,
-		// Nachname, label_8, Hochschule, label_9, EMail, lblImagename,
-		// imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen,
-		// label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton,
-		// okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq,
-		// mntmOtrs}));
+
 		JMenu mnNewMenu_Info = new JMenu("Info");
 		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
 			@Override
@@ -461,7 +451,7 @@ public class EditImageAllgemein_GUI extends JFrame {
 			} else {
 				Image.image.setLicensed(true);
 			}
-			LOGGER.debug(map.get("template"));
+			//LOGGER.debug(map.get("template"));
 			if (map.get("template").equals("false")) {
 				Image.image.setVorlage(false);
 			} else {
@@ -484,7 +474,6 @@ public class EditImageAllgemein_GUI extends JFrame {
 			Image.image.setShareMode(mode);
 			Image.image.setOS(map.get("os"));
 		} catch (TException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",