• Beim Bearbeiten eines Image oder einer Veranstaltung wurde bisher der aktuell eingeloggte Benutzer immer neu als Verantwortlicher eingetragen --> Der Verantwortliche ändert sich nun nicht mehr und wird korrekt angezeigt

3 files changed, 53 insertions, 37 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..28dae62b 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);
@@ -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
@@ -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",
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 95f261c2..348828fe 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -659,7 +659,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 						Image.image.getDesc(),
 						//Image.image.getImagepath(),
 						"temp/"+Image.image.getNewName(),
-						
 						Image.image.isLicensed(),
 						Image.image.isInternet(),
 						Image.image.getRam(),
@@ -681,15 +680,18 @@ public class FTPEditUploader_GUI extends JFrame implements
 						Image.image.getImagename(),
 						Image.image.getImagename(),
 						Image.image.getDesc(),
-						
 						//"temp/" + Image.image.getNewName(), //wrong
 						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.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());
 
 				if (fileupload == true) {
 					client.startFileCopy(Image.image.getNewName());
@@ -697,7 +699,6 @@ public class FTPEditUploader_GUI extends JFrame implements
 				}
 			}
 
-			// set additional user rights - quick and dirty TODO refactor
 
 			// remove all additional user permissions on first stage
 
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index cfb83308..197068e8 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -53,6 +54,7 @@ import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
 import models.Image;
+import models.ItemOwner;
 import models.Links;
 import models.person;
 
@@ -442,7 +444,12 @@ public class SearchEditImage_GUI extends JFrame {
 													.convertRowIndexToModel(tablemyImages
 															.getSelectedRow()),
 											7).toString();
+							
+							//write the values into the information pane on the right hand side
 							writeImageData(imageid, version);
+							
+							//fill the itemOwnder model with information from selected item
+							setItemOwnerInformation(imageid);
 						}
 					}
 				});
@@ -673,7 +680,6 @@ public class SearchEditImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
@@ -694,7 +700,6 @@ public class SearchEditImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 
@@ -775,7 +780,6 @@ public class SearchEditImage_GUI extends JFrame {
 
 			return model;
 		} catch (TException | ParseException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
@@ -846,10 +850,32 @@ public class SearchEditImage_GUI extends JFrame {
 			
 			
 		} catch (TException | ParseException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-	}
+	}//end writeImageData
+	
+	
+	public void setItemOwnerInformation(String imageid){
+		Map<String, String> map = new HashMap<String, String>();
+		
+		try {
+			//get values from server and set them in model
+			map=client.getItemOwner(imageid);
+			
+			ItemOwner.itemOwner.setUserID(map.get("userID"));
+			ItemOwner.itemOwner.setUsername(map.get("loginName"));
+			ItemOwner.itemOwner.setNachname(map.get("Nachname"));
+			ItemOwner.itemOwner.setVorname(map.get("Vorname"));
+			ItemOwner.itemOwner.setEmail(map.get("mail"));
+			ItemOwner.itemOwner.setHochschule(map.get("institution"));
+						
+			
+		} catch (TException e) {
+			e.printStackTrace();
+		}
+		
+	}//end setItemInformation
+	
 	
 	public static String byteToGigabyte(long bytes, boolean si) {
 	    int unit = si ? 1000 : 1024;
@@ -857,5 +883,5 @@ public class SearchEditImage_GUI extends JFrame {
 	    int exp = (int) (Math.log(bytes) / Math.log(unit));
 	    String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp-1) + (si ? "" : "i");
 	    return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
-	}
-}
+	}//end byteToGigabyte
+}// end class