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

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

1 files changed, 23 insertions, 19 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 21ad40f5..b6c1a09c 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -3,7 +3,6 @@ package gui.image;
 import gui.intro.About_GUI;
 import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
-
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.FlowLayout;
@@ -23,7 +22,6 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.swing.AbstractButton;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
@@ -51,18 +49,17 @@ import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
-
 import models.Image;
-import models.ImageRights;
 import models.Links;
 import models.RightsManagement;
-
+import models.person;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import server.generated.Person;
+
 
 import server.generated.Server.Client;
-import server.generated.Person;
-import models.person;
+import util.GuiOrganizer;
 
 import util.OpenLinks;
 
@@ -204,12 +201,11 @@ public class PermissionCreateImage_GUI extends JFrame {
 
 		// if new session, get values for table from database
 		if (RightsManagement.rightsManagement.getPmImageCreateList().size() <= 0) {
-			System.out.println("getting data from db");
-			System.out.println(RightsManagement.rightsManagement
-					.getPmImageCreateList().size());
+			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());
+			//System.out.println("Current userID: " +person.verantwortlicher.getUserID());
 			
 			try {
 				map = client.getAllOtherSatelliteUsers(person.verantwortlicher.getUserID());
@@ -233,9 +229,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 					x++;
 
 				}
-				System.out
-						.println("Number of returned users in permission list: "
-								+ map.size());
+				//System.out.println("Number of returned users in permission list: "+ map.size());
 
 			} catch (TException e1) {
 				// TODO Auto-generated catch block
@@ -254,7 +248,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 
 			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();
 
@@ -637,7 +631,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		
 		//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);
@@ -659,18 +653,28 @@ public class PermissionCreateImage_GUI extends JFrame {
 			temp.setVorname(table.getModel().getValueAt(i, 0).toString()
 					.substring(seperatorIndex + 2));
 
-			list.add(temp);
+			//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
+			}
+					
 
+			/*
 			System.out.println(temp.getName() + ", " + temp.getVorname() + ", "
 					+ temp.getUserID() + ", " + temp.isAdmin() + ", "
 					+ temp.isLinkAllowed() + ", " + temp.isWrite() + ", "
 					+ temp.isRead());
+			*/
 		}
-		System.out.println("Now setting List information. Length is: "
-				+ 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);
 
 	}