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

4 files changed, 32 insertions, 34 deletions

diff --git a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java
index c67ad6cb..4c24e035 100644
--- a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java
@@ -79,9 +79,8 @@ public class ListAllOtherUsers_GUI extends JFrame {
 
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelUsers = new DefaultTableModel(titles, 0);
-	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
-			modelUsers);
+	//final DefaultTableModel modelUsers = new DefaultTableModel(titles, 0);
+	
 	private JButton btnAdd;
 	private List<Person> map = null; // List of people
 	private JTextField textField;
@@ -96,6 +95,16 @@ public class ListAllOtherUsers_GUI extends JFrame {
 			+ "Sie können die Veranstaltungen hier löschen. Alternativ werden veraltete Einträge irgendwann automatisch gelöscht.<br />"
 			+ "Veraltet bedeutet, dass Veranstaltungen, die drei Monate lang nicht augerufen wurden, vorerst deaktiviert werden."
 			+ "</div></html>";
+	
+	
+	//prevent table cells being clickable
+	final DefaultTableModel modelUsers = new DefaultTableModel(titles, 0){
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
+	};
+	
+	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(modelUsers);
 
 	/**
 	 * 
@@ -267,11 +276,6 @@ public class ListAllOtherUsers_GUI extends JFrame {
 								model.addRow(obj);
 							}
 
-							System.out.println("Info in row("
-									+ pos
-									+ ") is="
-									+ tableUsers.getValueAt(selectedRows[pos],
-											0));
 							pos++;// next selected row
 						}
 					}// end if
@@ -359,21 +363,17 @@ public class ListAllOtherUsers_GUI extends JFrame {
 	// get users from db which are not in listed in the permission yet
 	public void initTableContent() {
 		
-		LOGGER.info("Getting list of all other users from server");
+		//LOGGER.info("Getting list of all other users from server");
 		try {
 			
 			//set users which are NOT to be listed in table
 			//logged on user
-			System.out.println("adding value'"+ person.verantwortlicher.getUserID());
 			user.add(0, person.verantwortlicher.getUserID());
 			
 			//users already in table
 			for(int y=0; y<table.getRowCount(); y++){
-				System.out.println("adding value'"+table.getValueAt(y, userIDPos)+"'");
 				user.add(""+table.getValueAt(y, userIDPos));
-			}
-			System.out.println("user has '"+user.size()+"' elements.");
-			
+			}			
 			
 			//get the info
 			map = client.getAllOtherSatelliteUsers(user);
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 879ae879..e2105074 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -373,8 +373,8 @@ public class Login_GUI extends JFrame {
 			models.Client.clientcon.setClient(bwClient);
 
 			// User-Info
-			LOGGER.debug("Session-ID: " + result.sessionId);
-			LOGGER.debug("Token: " + result.authToken);
+			//LOGGER.debug("Session-ID: " + result.sessionId);
+			//LOGGER.debug("Token: " + result.authToken);
 			setStatus(Color.green, "Daten erhalten.", null);
 			
 			String hochschule = user.eMail.substring(user.eMail.indexOf("@") + 1);
@@ -476,9 +476,9 @@ public class Login_GUI extends JFrame {
 		server.generated.Server.Client client_2 = models.Client.clientcon.getClient();
 		try {
 			String pk_institution = client_2.setInstitution(person.verantwortlicher.getHochschule());
-			LOGGER.info("Institution of user is: "+pk_institution);
+			//LOGGER.info("Institution of user is: "+pk_institution);
 			client_2.setPerson(person.verantwortlicher.getUserID(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), pk_institution);
-			LOGGER.info("user data, ID="+person.verantwortlicher.getUserID()+" , Name="+person.verantwortlicher.getName()+" , Vorname="+ person.verantwortlicher.getVorname()+" , E-Mail="+ person.verantwortlicher.getEMail()+" , Institution="+ pk_institution);
+			//LOGGER.info("user data, ID="+person.verantwortlicher.getUserID()+" , Name="+person.verantwortlicher.getName()+" , Vorname="+ person.verantwortlicher.getVorname()+" , E-Mail="+ person.verantwortlicher.getEMail()+" , Institution="+ pk_institution);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 0f68de44..724eac5c 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -47,6 +47,7 @@ import javax.swing.border.TitledBorder;
 import models.GUIRights;
 import models.Image;
 import models.ImageRights;
+import models.ItemOwner;
 import models.Lecture;
 import models.Links;
 import models.RightsManagement;
@@ -139,12 +140,16 @@ public class MainMenue_GUI extends JFrame {
 			panel.add(txtpnBitteWhlenSie);
 		}
 		
-		//reset the list of permissions every time the user goes back to the main menu
+		
+		
+		//reset the list of permissions and models
+		//every time the user goes back to the main menu
 		RightsManagement.rightsManagement.getPermittedUserList().clear();
-		//reset model
 		Image.image.reset();
-		//Lecture.lecture.reset();
+		ItemOwner.itemOwner.reset();
 
+		
+		
 		setResizable(false); // window is not resizable
 		
 		contentPanel.setBounds(10, 104, 567, 502);
@@ -597,13 +602,6 @@ public class MainMenue_GUI extends JFrame {
 			GUIRights.rights.setLinkAllowed(0);
 		}// end if else
 		
-		// always print rights information 
-		//LOGGER.info("Rights: (r, w, cp, a, la) = ("
-		//		+ GUIRights.rights.getRead() + ", "
-		//		+ GUIRights.rights.getWrite() + ", "
-		//		+ GUIRights.rights.getChangePermission() + ", "
-		//		+ GUIRights.rights.getAdmin() + ", "
-		//		+ GUIRights.rights.getLinkAllowed() + ")");
 	}// end setRoleRights
 
 	public void setCorrectRadioButton() {
diff --git a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
index 2d50fd8b..fe3c1c9c 100644
--- a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
@@ -60,7 +60,7 @@ public class VmWareLink_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite");
@@ -131,7 +131,7 @@ public class VmWareLink_GUI extends JFrame {
 					open.openWebpage(windows);
 					
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 				
@@ -151,7 +151,7 @@ public class VmWareLink_GUI extends JFrame {
 					open.openWebpage(linux);
 					
 				} catch (URISyntaxException f) {
-					// TODO Auto-generated catch block
+					 
 					f.printStackTrace();
 				}
 			}
@@ -170,7 +170,7 @@ public class VmWareLink_GUI extends JFrame {
 					anleitung = new URI(Links.getAnleitungVMDK());
 					open.openWebpage(anleitung);
 				} catch (URISyntaxException e1) {
-					// TODO Auto-generated catch block
+					 
 					e1.printStackTrace();
 				}
 			}
@@ -229,7 +229,7 @@ public class VmWareLink_GUI extends JFrame {
 								open.openWebpage(windows);
 								
 							} catch (URISyntaxException e) {
-								// TODO Auto-generated catch block
+								 
 								e.printStackTrace();
 							}
 
@@ -253,7 +253,7 @@ public class VmWareLink_GUI extends JFrame {
 								open.openWebpage(windows);
 								
 							} catch (URISyntaxException e) {
-								// TODO Auto-generated catch block
+								 
 								e.printStackTrace();
 							}