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

1 files changed, 26 insertions, 25 deletions

diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index d0c83350..d4bb2fd8 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -43,6 +43,7 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
+import models.GUIRights;
 import models.ImageRights;
 import models.Links;
 import models.SessionData;
@@ -546,39 +547,39 @@ public class MainMenue_GUI extends JFrame {
 		
 		// role==Student
 		if (person.verantwortlicher.getRole().equals("Student")) {
-			ImageRights.rights.setRead(1);
-			ImageRights.rights.setWrite(0);
-			ImageRights.rights.setChangePermission(0);
-			ImageRights.rights.setAdmin(0);
-			ImageRights.rights.setLinkAllowed(0);
+			GUIRights.rights.setRead(1);
+			GUIRights.rights.setWrite(0);
+			GUIRights.rights.setChangePermission(0);
+			GUIRights.rights.setAdmin(0);
+			GUIRights.rights.setLinkAllowed(0);
 
 		} else if (person.verantwortlicher.getRole().equals("Dozent")) { // role==Dozent
-			ImageRights.rights.setRead(1);
-			ImageRights.rights.setWrite(1);
-			ImageRights.rights.setChangePermission(0);
-			ImageRights.rights.setAdmin(0);
-			ImageRights.rights.setLinkAllowed(1);
+			GUIRights.rights.setRead(1);
+			GUIRights.rights.setWrite(1);
+			GUIRights.rights.setChangePermission(0);
+			GUIRights.rights.setAdmin(0);
+			GUIRights.rights.setLinkAllowed(1);
 		} else if (person.verantwortlicher.getRole().equals("Admin")) { // role==Admin
-			ImageRights.rights.setRead(1);
-			ImageRights.rights.setWrite(1);
-			ImageRights.rights.setChangePermission(1);
-			ImageRights.rights.setAdmin(1);
-			ImageRights.rights.setLinkAllowed(1);
+			GUIRights.rights.setRead(1);
+			GUIRights.rights.setWrite(1);
+			GUIRights.rights.setChangePermission(1);
+			GUIRights.rights.setAdmin(1);
+			GUIRights.rights.setLinkAllowed(1);
 		} else { // role==Nothing
-			ImageRights.rights.setRead(0);
-			ImageRights.rights.setWrite(0);
-			ImageRights.rights.setChangePermission(0);
-			ImageRights.rights.setAdmin(0);
-			ImageRights.rights.setLinkAllowed(0);
+			GUIRights.rights.setRead(0);
+			GUIRights.rights.setWrite(0);
+			GUIRights.rights.setChangePermission(0);
+			GUIRights.rights.setAdmin(0);
+			GUIRights.rights.setLinkAllowed(0);
 		}// end if else
 		
 		// always print rights information 
 		LOGGER.info("Rights: (r, w, cp, a, la) = ("
-				+ ImageRights.rights.getRead() + ", "
-				+ ImageRights.rights.getWrite() + ", "
-				+ ImageRights.rights.getChangePermission() + ", "
-				+ ImageRights.rights.getAdmin() + ", "
-				+ ImageRights.rights.getLinkAllowed() + ")");
+				+ GUIRights.rights.getRead() + ", "
+				+ GUIRights.rights.getWrite() + ", "
+				+ GUIRights.rights.getChangePermission() + ", "
+				+ GUIRights.rights.getAdmin() + ", "
+				+ GUIRights.rights.getLinkAllowed() + ")");
 	}// end setRoleRights
 
 	public void setCorrectRadioButton() {