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

Conflicts:
	dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
g

6 files changed, 250 insertions, 163 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 595a97d0..54dda92b 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -906,7 +906,7 @@ public class DeleteImage_GUI extends JFrame {
 		List<server.generated.Image> images;
 		try {
 			// Hole eine Liste der Images
-			images = client.getImageList();
+			images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID());
 
 			Iterator<server.generated.Image> i = images.iterator();
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 9d65d42e..4e5ce376 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -115,7 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	/**
 	 * Create the frame.
 	 */
-	public FTPCreateUploader_GUI(final Component formerGUI) {
+	public FTPCreateUploader_GUI(Component formerGUI) {
 
 		final Object[] options = { "Beenden", "Abbrechen" };
 
@@ -466,13 +466,12 @@ public class FTPCreateUploader_GUI extends JFrame implements
 											"Abbrechen und zurück",
 											JOptionPane.YES_NO_OPTION);
 							if (selectedOption == JOptionPane.YES_OPTION) {
-								System.out.println("CreateUploader X:"+formerGUI.getLocation().getX());
-								System.out.println("CreateUploader X:"+formerGUI.getLocation().getY());
-								dispose();
-								PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(formerGUI);
-								m.setLocationRelativeTo(formerGUI);
-								
+								//System.out.println("CreateUploader X:"+formerGUI.getLocation().getX());
+								//System.out.println("CreateUploader X:"+formerGUI.getLocation().getY());
+								PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(c);
+								//m.setLocationRelativeTo(formerGUI);
 								m.setVisible(true);
+								dispose();
 								
 							} else {
 								// for actions if "no" is selected. tbd.
@@ -685,15 +684,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					person.verantwortlicher.getRole()
 					);
 			
-			for(int i=0; i< RightsManagement.rightsManagement.getPmImageCreateList().size(); i++){
-				System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPmImageCreateList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPmImageCreateList().size());
+			for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){
+				System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
 				client.writeAdditionalImageRights(
 						Image.image.getImagename(),
-						RightsManagement.rightsManagement.getPmImageCreateList().get(i).getUserID(),
-						RightsManagement.rightsManagement.getPmImageCreateList().get(i).isRead(),
-						RightsManagement.rightsManagement.getPmImageCreateList().get(i).isWrite(),
-						RightsManagement.rightsManagement.getPmImageCreateList().get(i).isLinkAllowed(),
-						RightsManagement.rightsManagement.getPmImageCreateList().get(i).isAdmin()
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isRead(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isWrite(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isLinkAllowed(),
+						RightsManagement.rightsManagement.getPermittedUserList().get(i).isAdmin()
 						);
 			
 			}//end for
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index a51912c4..cc96bc5a 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -67,14 +67,15 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class PermissionCreateImage_GUI extends JFrame {
 
-	private final static Logger LOGGER = Logger.getLogger(PermissionCreateImage_GUI.class);
+	private final static Logger LOGGER = Logger
+			.getLogger(PermissionCreateImage_GUI.class);
 	Client client = models.Client.clientcon.getClient();
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTable table = null;
 	private Class[] classes;
 	Object[] titles = { "Name", "Read", "Write", "Link", "Admin", "userID" };
-	private List<Person> map = null;
+	private List<Person> map = null; // List of people who have rights
 	Component c = null;
 	// Map<String,String> ogUsers = new HashMap();
 
@@ -107,13 +108,13 @@ public class PermissionCreateImage_GUI extends JFrame {
 	private JLabel lblWriteDesc;
 	private JLabel lblAdminDesc;
 	private JLabel lblLinkallowedDesc;
-	private static final String HELP_MESSAGE = 	"<html><div align=\"center\">" +
-			"Legen Sie fest, welche Personen welche Rechte an Ihrem Image haben.<br />" +
-			"Sie können die Rechte read, write, link und admin vergeben.<br />" +
-			"Link bedeutet, dass diese Person Veranstaltungen auf Ihr Image verlinken darf und dieses somit<br />" +
-			"implizit freigeben darf. Eine Person mit Adminrechten darf zusätzlich das Image löschen und Berechtigungen<br />" +
-			"für andere Benutzer festlegen und ist somit wie der Besitzer zu betrachten." +
-			"</div></html>";
+	private static final String HELP_MESSAGE = "<html><div align=\"center\">"
+			+ "Legen Sie fest, welche Personen welche Rechte an Ihrem Image haben.<br />"
+			+ "Sie können die Rechte read, write, link und admin vergeben.<br />"
+			+ "Link bedeutet, dass diese Person Veranstaltungen auf Ihr Image verlinken darf und dieses somit<br />"
+			+ "implizit freigeben darf. Eine Person mit Adminrechten darf zusätzlich das Image löschen und Berechtigungen<br />"
+			+ "für andere Benutzer festlegen und ist somit wie der Besitzer zu betrachten."
+			+ "</div></html>";
 
 	public PermissionCreateImage_GUI(Component formerGUI) {
 		addWindowListener(new WindowAdapter() {
@@ -135,8 +136,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 
 		setBounds(0, 0, 603, 722);
 		setLocationRelativeTo(formerGUI);
-		
-		
 
 		getContentPane().setLayout(null);
 		{
@@ -182,35 +181,28 @@ public class PermissionCreateImage_GUI extends JFrame {
 		panel_1.add(scrollPane);
 
 		table = new JTable();
-		table.addMouseListener(new MouseAdapter() 
-		{
+		table.addMouseListener(new MouseAdapter() {
 			@Override
-			public void mouseClicked(MouseEvent e) 
-			{
+			public void mouseClicked(MouseEvent e) {
 				checkIntegrity(-1);
 			}
 
 		});
-		
+
 		table.setModel(model);
 		table.setSelectionForeground(Color.WHITE);
 
-		
 		// invisible attribute userID for identifying selected user
 		table.getColumnModel().getColumn(5).setWidth(0);
 		table.getColumnModel().getColumn(5).setMinWidth(0);
 		table.getColumnModel().getColumn(5).setMaxWidth(0);
 
 		// if new session, get values for table from database
-		if (RightsManagement.rightsManagement.getPmImageCreateList().size() <= 0) {
+		if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) {
 			System.out.println("Loading data from db");
-			//System.out.println(RightsManagement.rightsManagement.getPmImageCreateList().size());
-			
-			person.verantwortlicher.getUserID();
-			//System.out.println("Current userID: " +person.verantwortlicher.getUserID());
-			
 			try {
-				map = client.getAllOtherSatelliteUsers(person.verantwortlicher.getUserID());
+				map = client.getAllOtherSatelliteUsers(person.verantwortlicher
+						.getUserID());
 				Iterator<server.generated.Person> i = map.iterator();
 
 				int x = 0;
@@ -231,7 +223,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 					x++;
 
 				}
-				//System.out.println("Number of returned users in permission list: "+ map.size());
 
 			} catch (TException e1) {
 				// TODO Auto-generated catch block
@@ -239,18 +230,19 @@ public class PermissionCreateImage_GUI extends JFrame {
 			}
 		} else // read from model
 		{
+			System.out.println("reading from model");
 			System.out
-					.println("RightsManagement.rightsManagement.getPmImageCreateList().size() "
+					.println("RightsManagement.rightsManagement.getPermittedUserList().size() = "
 							+ RightsManagement.rightsManagement
-									.getPmImageCreateList().size());
-			System.out.println("reading from model");
+									.getPermittedUserList().size());
+
 			List<person> listt = RightsManagement.rightsManagement
-					.getPmImageCreateList();
+					.getPermittedUserList();
 			Iterator<person> i = listt.iterator();
 
 			int x = 0;
 			while (i.hasNext()) {
-				//System.out.println("current pos=" + x);
+				// System.out.println("current pos=" + x);
 				// erzeuge Objekte fuer die Tabelle
 				person temp = i.next();
 
@@ -268,9 +260,8 @@ public class PermissionCreateImage_GUI extends JFrame {
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
-
 			}
-		}
+		}// end set list of permitted users
 
 		TableCellRenderer rend = table.getTableHeader().getDefaultRenderer();
 
@@ -279,8 +270,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));
 		tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(),
 				(String) titles[1]));
-		//tc1.setCellRenderer(cellRenderer)
-		
+		// tc1.setCellRenderer(cellRenderer)
 
 		TableColumn tc2 = table.getColumnModel().getColumn(2);
 		tc2.setCellEditor(table.getDefaultEditor(Boolean.class));
@@ -300,7 +290,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 		tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),
 				(String) titles[4]));
 
-
 		scrollPane.setViewportView(table);
 
 		JPanel panel = new JPanel();
@@ -429,8 +418,8 @@ public class PermissionCreateImage_GUI extends JFrame {
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
-
-						CreateImageTechnisch_GUI ci = new CreateImageTechnisch_GUI(c);
+						CreateImageTechnisch_GUI ci = new CreateImageTechnisch_GUI(
+								c);
 						ci.setVisible(true);
 						dispose();
 					}
@@ -443,11 +432,12 @@ public class PermissionCreateImage_GUI extends JFrame {
 				JButton continueButton = new JButton("Weiter");
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-						//before save, check integrity to avoid dblClick errors of rights
-						for(int i = 0; i < table.getRowCount(); i++)
-						{
-							checkIntegrity(i); //check integrity of each line again
+
+						// before save, check integrity to avoid dblClick errors
+						// of rights
+						for (int i = 0; i < table.getRowCount(); i++) {
+							checkIntegrity(i); // check integrity of each line
+												// again
 							System.out.println("in auto-correct");
 						}
 
@@ -531,62 +521,49 @@ public class PermissionCreateImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmAbout);
-		
+
 		JMenu mnNewMenu_Info = new JMenu("Info");
 		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
+				JOptionPane.showMessageDialog(c, HELP_MESSAGE,
+						"Hilfe zu dieser Oberfläche",
+						JOptionPane.INFORMATION_MESSAGE);
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
 		c = this;
-		//System.out.println("formergui unten X:"+formerGUI.getLocation().getX());
-		//System.out.println("formergui unten Y:"+formerGUI.getLocation().getY());
-		
-		//System.out.println("this unten X: "+this.getLocation().getX());
-		//System.out.println("this unten Y: "+this.getLocation().getY());
-		
-		
+
 		this.setLocationRelativeTo(formerGUI);
-		
-		//this.setLocation(1238, 53);
-		
 		this.setVisible(true);
-		
-		//System.out.println("this on screen unten X: "+this.getLocationOnScreen().getX());
-		//System.out.println("this on screen unten Y: "+this.getLocationOnScreen().getY());
-	}
-	
-	private void checkIntegrity(int row) 
-	{
-		
+	}// end constructor
+
+	private void checkIntegrity(int row) {
+
 		int selectedRow;
-		
-		if(row == -1)
-		{
+
+		if (row == -1) {
 			selectedRow = table.getSelectedRow();
-		}
-		else
-		{
+		} else {
 			selectedRow = row;
 		}
-		
+
 		boolean isRead, isWrite, isLink, isAdmin;
-		
-		//collect all row data
-		isRead  = (boolean) table.getValueAt(selectedRow, 1);
+
+		// collect all row data
+		isRead = (boolean) table.getValueAt(selectedRow, 1);
 		isWrite = (boolean) table.getValueAt(selectedRow, 2);
-		isLink  = (boolean) table.getValueAt(selectedRow, 3);
+		isLink = (boolean) table.getValueAt(selectedRow, 3);
 		isAdmin = (boolean) table.getValueAt(selectedRow, 4);
-		
-		boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite, isLink, isAdmin);
-		
+
+		boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite,
+				isLink, isAdmin);
+
 		table.setValueAt(checkedVals[0], selectedRow, 1);
 		table.setValueAt(checkedVals[1], selectedRow, 2);
 		table.setValueAt(checkedVals[2], selectedRow, 3);
 		table.setValueAt(checkedVals[3], selectedRow, 4);
-	}
+	}// end checkIntegrity()
 
 	// Read column
 	class MyItemListener1 implements ItemListener {
@@ -601,7 +578,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		}
 	}
 
-	//Write column
+	// Write column
 	class MyItemListener2 implements ItemListener {
 		public void itemStateChanged(ItemEvent e) {
 			Object source = e.getSource();
@@ -615,7 +592,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		}
 	}
 
-	//Link column
+	// Link column
 	class MyItemListener3 implements ItemListener {
 		public void itemStateChanged(ItemEvent e) {
 			Object source = e.getSource();
@@ -629,7 +606,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		}
 	}
 
-	//Admin column
+	// Admin column
 	class MyItemListener4 implements ItemListener {
 		public void itemStateChanged(ItemEvent e) {
 			Object source = e.getSource();
@@ -644,8 +621,8 @@ public class PermissionCreateImage_GUI extends JFrame {
 			}
 		}
 	}
-	
-	//invisible userID column
+
+	// invisible userID column
 	class MyItemListener5 implements ItemListener {
 		public void itemStateChanged(ItemEvent e) {
 			Object source = e.getSource();
@@ -658,10 +635,12 @@ public class PermissionCreateImage_GUI extends JFrame {
 		}
 	}
 
-	public void createRightsList() {
-		// /////
-	}
+	// public void createRightsList() {
+	// /////
+	// }
 
+	// save the entered rights into the model and prepare them to be written to
+	// the database
 	private void saveTableToList() {
 		System.out.println("Saving Table to List");
 
@@ -670,11 +649,12 @@ public class PermissionCreateImage_GUI extends JFrame {
 		int seperatorIndex = 0;
 
 		// get values from table and save the checkbox values
-		if(map==null) System.out.println("Fuck: map is null");
-		
-		//for (int i = 0; i < map.size(); i++) {
+		if (map == null)
+			System.out.println("Error: map is null");
+
+		// for (int i = 0; i < map.size(); i++) {
 		for (int i = 0; i < table.getRowCount(); i++) {
-			//System.out.println("in for, rowcount="+table.getRowCount());
+			// System.out.println("in for, rowcount="+table.getRowCount());
 			person temp = new person();
 
 			// table.getModel().setValueAt(map.get, i, 5);
@@ -696,33 +676,28 @@ public class PermissionCreateImage_GUI extends JFrame {
 			temp.setVorname(table.getModel().getValueAt(i, 0).toString()
 					.substring(seperatorIndex + 2));
 
-			//check if at least one checkbox is checked. If yes, save this entry into list, if not ignore this entry
-			if (temp.isAdmin() || temp.isLinkAllowed() || temp.isWrite() || temp.isRead() ){
-				//save entry
+			// check if at least one checkbox is checked. If yes, save this
+			// entry into list, if not ignore this entry
+			if (temp.isAdmin() || temp.isLinkAllowed() || temp.isWrite()
+					|| temp.isRead()) {
+				// save entry
 				list.add(temp);
 			} else {
-				//do nothing
+				// do nothing
 			}
-					
-
-			/*
-			System.out.println(temp.getName() + ", " + temp.getVorname() + ", "
-					+ temp.getUserID() + ", " + temp.isAdmin() + ", "
-					+ temp.isLinkAllowed() + ", " + temp.isWrite() + ", "
-					+ temp.isRead());
-			*/
 		}
-		
-		System.out.println("Setting list information.\tTable size: "+table.getRowCount()+"\t List length (=selected users): "+ list.size());
+
+		System.out.println("Setting list information.\tTable size: "
+				+ table.getRowCount() + "\t List length (=selected users): "
+				+ list.size());
 		for (int y = 0; y < list.size(); y++) {
 			System.out.println("" + list.get(y).getName());
 		}
-		
-		RightsManagement.rightsManagement.setPmImageCreateList(list);
 
-	}
+		RightsManagement.rightsManagement.setPermittedUserList(list);
+	}// end saveTableToList()
 
-}
+} // end class
 
 class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
 		MouseListener {
@@ -735,9 +710,6 @@ class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
 		rendererComponent.addItemListener(itemListener);
 		rendererComponent.setText(text);
 	}
-	
-	
-	
 
 	public Component getTableCellRendererComponent(JTable table, Object value,
 			boolean isSelected, boolean hasFocus, int row, int column) {
@@ -753,7 +725,6 @@ class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
 		}
 		setColumn(column);
 
-
 		return rendererComponent;
 	}
 
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index de7e4129..a584c0ff 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -18,6 +18,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.swing.AbstractButton;
 import javax.swing.DefaultComboBoxModel;
@@ -45,19 +47,27 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
+import org.apache.thrift.TException;
+
 import models.Image;
 import models.Links;
+import models.RightsManagement;
+import models.person;
+import server.generated.Person;
+import server.generated.Server.Client;
 import util.GuiOrganizer;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
 public class PermissionEditImage_GUI extends JFrame {
 
+	Client client = models.Client.clientcon.getClient();
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTable table;
 	private Class[] classes;
-	Object[] titles = { "Name", "Read", "Write", "Link","Admin"};
+	Object[] titles = { "Name", "Read", "Write", "Link", "Admin", "userID" };
+	private List<Person> map = null; // List of people who have rights
 	Component c = null;
 
 	final DefaultTableModel model = new DefaultTableModel(titles, 0) {
@@ -84,13 +94,13 @@ public class PermissionEditImage_GUI extends JFrame {
 	private JLabel label_5;
 	private JLabel label_6;
 	private JLabel lblvolleRechteRead;
-	private static final String HELP_MESSAGE = 	"<html><div align=\"center\">" +
-			"Verändern Sie die Berechtigungen für Ihr Image.<br />" +
-			"Sie können die Rechte read, write, link und admin vergeben.<br />" +
-			"Link bedeutet, dass diese Person Veranstaltungen auf Ihr Image verlinken darf und dieses somit<br />" +
-			"implizit freigeben darf. Eine Person mit Adminrechten darf zusätzlich das Image löschen und Berechtigungen<br />" +
-			"für andere Benutzer festlegen und ist somit wie der Besitzer zu betrachten." +
-			"</div></html>";
+	private static final String HELP_MESSAGE = "<html><div align=\"center\">"
+			+ "Verändern Sie die Berechtigungen für Ihr Image.<br />"
+			+ "Sie können die Rechte read, write, link und admin vergeben.<br />"
+			+ "Link bedeutet, dass diese Person Veranstaltungen auf Ihr Image verlinken darf und dieses somit<br />"
+			+ "implizit freigeben darf. Eine Person mit Adminrechten darf zusätzlich das Image löschen und Berechtigungen<br />"
+			+ "für andere Benutzer festlegen und ist somit wie der Besitzer zu betrachten."
+			+ "</div></html>";
 
 	public PermissionEditImage_GUI(Component formerGUI) {
 		addWindowListener(new WindowAdapter() {
@@ -159,9 +169,102 @@ public class PermissionEditImage_GUI extends JFrame {
 		table = new JTable();
 		table.setModel(model);
 		table.setSelectionForeground(Color.WHITE);
-		Object[] rowdata = { "Max Mustermann", new Boolean(false),
-				new Boolean(false), new Boolean(false), new Boolean(false) };
-		model.addRow(rowdata);
+
+		// invisible attribute userID for identifying selected user
+		table.getColumnModel().getColumn(5).setWidth(0);
+		table.getColumnModel().getColumn(5).setMinWidth(0);
+		table.getColumnModel().getColumn(5).setMaxWidth(0);
+
+		// if new session, get values for table from database
+		if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) {
+			System.out.println("Loading data from db");
+			try {
+				//map = client.getAllOtherSatelliteUsers(person.verantwortlicher.getUserID());
+				
+				
+				/*
+				 * 
+				 * 
+				 * 
+				 * 
+				 * Hier gehts weiter. Problem: wie greifen wir auf die Rechte zu????
+				 * 
+				 * 
+				 * 
+				 * 
+				 * 
+				 * */
+				
+				
+				
+				
+				
+				map = client.getPermissionForUserAndImage(person.verantwortlicher.getUserID(), Image.image.getImageId());
+				Iterator<server.generated.Person> i = map.iterator();
+
+				int x = 0;
+				while (i.hasNext()) {
+					// erzeuge Objekte fuer die Tabelle
+					Object[] obj = {
+							map.get(x).getNachname() + ", "
+									+ map.get(x).getVorname(), // Name
+							false, // Read
+							false, // Write
+							false, // Link
+							false, // Admin
+							map.get(x).getUserID() // userID
+					};
+					// Fuege diese Objekte der Tabelle hinzu
+					model.addRow(obj);
+					i.next();
+					x++;
+
+				}
+
+			} catch (TException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+		} else // read from model
+		{
+			System.out.println("reading from model");
+			System.out
+					.println("RightsManagement.rightsManagement.getPermittedUserList().size() = "
+							+ RightsManagement.rightsManagement
+									.getPermittedUserList().size());
+
+			List<person> listt = RightsManagement.rightsManagement
+					.getPermittedUserList();
+			Iterator<person> i = listt.iterator();
+
+			int x = 0;
+			while (i.hasNext()) {
+				// System.out.println("current pos=" + x);
+				// erzeuge Objekte fuer die Tabelle
+				person temp = i.next();
+
+				Object[] obj = { temp.getName() + ", " + temp.getVorname(), // Name
+						temp.isRead(), // Read
+						temp.isWrite(), // Write
+						temp.isLinkAllowed(), // Link
+						temp.isAdmin(), // Admin
+						temp.getUserID() // userID
+				};
+				System.out.println("Processing: " + temp.getName() + ", "
+						+ temp.getVorname() + ", " + temp.isRead() + ", "
+						+ temp.isWrite() + ", " + temp.isLinkAllowed() + ", "
+						+ temp.isAdmin() + ", " + temp.getUserID());
+				// Fuege diese Objekte der Tabelle hinzu
+				model.addRow(obj);
+				x++;
+			}
+		}// end set list of permitted users
+
+		/*
+		 * Object[] rowdata = { "Max Mustermann", new Boolean(false), new
+		 * Boolean(false), new Boolean(false), new Boolean(false) };
+		 * model.addRow(rowdata);
+		 */
 
 		TableCellRenderer rend = table.getTableHeader().getDefaultRenderer();
 
@@ -189,27 +292,31 @@ public class PermissionEditImage_GUI extends JFrame {
 		tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),
 				(String) titles[4]));
 		/*
-		TableColumn tc5 = table.getColumnModel().getColumn(5);
-		tc5.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc5.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc5.setHeaderRenderer(new CheckBoxHeader(new MyItemListener5(),
-				(String) titles[5]));
-		*/
+		 * TableColumn tc5 = table.getColumnModel().getColumn(5);
+		 * tc5.setCellEditor(table.getDefaultEditor(Boolean.class));
+		 * tc5.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		 * tc5.setHeaderRenderer(new CheckBoxHeader(new MyItemListener5(),
+		 * (String) titles[5]));
+		 */
 		scrollPane.setViewportView(table);
-		
+
 		JPanel panel_2 = new JPanel();
 		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBorder(new TitledBorder(null, "Freigabe",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_2.setBackground(SystemColor.menu);
 		panel_2.setBounds(10, 227, 537, 80);
 		panel_1.add(panel_2);
-		
+
 		JLabel label_7 = new JLabel("Freigabemodus:");
 		label_7.setBounds(10, 30, 250, 20);
 		panel_2.add(label_7);
-		
+
 		final JComboBox comboBox_1 = new JComboBox();
-		comboBox_1.setModel(new DefaultComboBoxModel(new String[] {"Lokal (Eigene Hochschule)", "Öffentlich (Alle Hochschulen)"}));
+		comboBox_1
+				.setModel(new DefaultComboBoxModel(new String[] {
+						"Lokal (Eigene Hochschule)",
+						"Öffentlich (Alle Hochschulen)" }));
 		comboBox_1.setSelectedIndex(Image.image.getShareMode());
 		comboBox_1.setBounds(270, 30, 250, 20);
 		panel_2.add(comboBox_1);
@@ -290,20 +397,22 @@ public class PermissionEditImage_GUI extends JFrame {
 				"Image anpassen und überschreiben, jedoch nicht löschen.");
 		lblImageAnpassenUnd.setBounds(120, 38, 380, 20);
 		panel.add(lblImageAnpassenUnd);
-		
+
 		lblLinkAllowed = new JLabel("Link");
 		lblLinkAllowed.setBounds(20, 58, 90, 20);
 		panel.add(lblLinkAllowed);
-		
+
 		label_5 = new JLabel("Admin");
 		label_5.setBounds(20, 78, 90, 20);
 		panel.add(label_5);
-		
-		label_6 = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
+
+		label_6 = new JLabel(
+				"Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
 		label_6.setBounds(120, 58, 380, 20);
 		panel.add(label_6);
-		
-		lblvolleRechteRead = new JLabel("<HTML>Volle Rechte: read, write, löschen, Link und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
+
+		lblvolleRechteRead = new JLabel(
+				"<HTML>Volle Rechte: read, write, löschen, Link und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
 		lblvolleRechteRead.setBounds(120, 78, 380, 40);
 		panel.add(lblvolleRechteRead);
 		{
@@ -317,8 +426,10 @@ public class PermissionEditImage_GUI extends JFrame {
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
-						//EditImageFreigabe_GUI sr = new EditImageFreigabe_GUI();
-						EditImageTechnisch_GUI ei = new EditImageTechnisch_GUI(c);
+						// EditImageFreigabe_GUI sr = new
+						// EditImageFreigabe_GUI();
+						EditImageTechnisch_GUI ei = new EditImageTechnisch_GUI(
+								c);
 						ei.setVisible(true);
 						dispose();
 					}
@@ -331,7 +442,7 @@ public class PermissionEditImage_GUI extends JFrame {
 				JButton continueButton = new JButton("Weiter");
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
+
 						Image.image.setShareMode(comboBox_1.getSelectedIndex());
 						FTPEditUploader_GUI ea = new FTPEditUploader_GUI(c);
 						ea.setVisible(true);
@@ -410,12 +521,14 @@ public class PermissionEditImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmAbout);
-		
+
 		JMenu mnNewMenu_Info = new JMenu("Info");
 		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
+				JOptionPane.showMessageDialog(c, HELP_MESSAGE,
+						"Hilfe zu dieser Oberfläche",
+						JOptionPane.INFORMATION_MESSAGE);
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index f295a1c4..e92b04b0 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -98,6 +98,7 @@ public class SearchEditImage_GUI extends JFrame {
 	boolean activeSearch = false;
 	private JTextField textFieldName;
 	Component c = null;
+	int requiredPermission = 1; // 0=Read, 1= Write, 2=LinkAllowed, 3=Admin
 	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };// Angezeigt
 																				// werden
@@ -108,6 +109,7 @@ public class SearchEditImage_GUI extends JFrame {
 																				// Verantwortlicher (4),
 																				// Letztes
 																				// Update (5)
+	
 	private static final String HELP_MESSAGE = 	"<html><div align=\"center\">" +
 			"Suchen Sie Images und laden Sie sie direkt herunter.<br />" +
 			"Sie können die Volltextsuche nutzen und nach Betriebssystemen filtern.<br />" +
@@ -890,8 +892,10 @@ public class SearchEditImage_GUI extends JFrame {
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
 		List<server.generated.Image> images;
 		try {
-			// Hole eine Liste der Images
-			images = client.getImageList();
+			// Hole eine Liste der passenden Images
+			 images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID());
+			 System.out.println("User is: "+person.verantwortlicher.getUserID());
+			//images = client.getImageList(person.verantwortlicher.getUserID(), requiredPermission);
 
 			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -937,7 +941,7 @@ public class SearchEditImage_GUI extends JFrame {
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
-			labelVerantwortlicher.setText(res.get("owner"));
+			labelVerantwortlicher.setText(res.get("owner") + " (" + res.get("mail") + ")");
 			labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");
 			if (res.get("template").equals("true")) {
 				labelVorlage.setText("Ja");
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 97128318..3a5e6ccf 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -894,7 +894,7 @@ public class SearchImage_GUI extends JFrame {
 		List<server.generated.Image> images;

 		try {

 			// Hole eine Liste der Images

-			images = client.getImageList();

+			images = client.getImageListPermissionRead(person.verantwortlicher.getUserID());

 

 			Iterator<server.generated.Image> i = images.iterator();

 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");