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

12 files changed, 35 insertions, 0 deletions

diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
index 8d37d092..7386f412 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
index 55cd9b99..48eda34b 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
index c084472f..c4a626a9 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
index c17f71ce..6986cdbd 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
index 6a8ae8a9..502e389a 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
index bc299712..b967f4da 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
index 1df126f0..a2842e4d 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
index 9a0c30f4..37db7038 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
index 161cf622..a8f331c8 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
index 7d1f0399..e46e3ff7 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index ad440fcd..21c6eebd 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 52632ee5..56d66c66 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -42,6 +42,7 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
+import models.ImageRights;
 import models.Links;
 import models.SessionData;
 import util.GuiOrganizer;
@@ -65,6 +66,9 @@ public class MainMenue_GUI extends JFrame {
 	JRadioButton rdbtnLectureSearch;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 	private JMenuItem mntmAbout;
+	
+	//for testing
+	ImageRights imageRights = new ImageRights();
 
 
 	/**
@@ -75,6 +79,37 @@ public class MainMenue_GUI extends JFrame {
 		//Leerzeile auf Konsole bei Rueckkehr ins Hauptmenue fuer leichteres Lesen
 		System.out.println("\n");
 		
+		//for testing
+		System.out.println("Setze Rechte für Student");
+		imageRights.setRead(1);
+		imageRights.setWrite(0);
+		imageRights.setChangePermission(0);
+		imageRights.setAdmin(0);
+		imageRights.setLinkAllowed(0);
+		System.out.println("Rechte (r,w,cp,a,la): "+imageRights.getRead()+","+imageRights.getWrite()+","+imageRights.getChangePermission()+","+imageRights.getAdmin()+","+imageRights.getAdmin());
+		
+		/*//for testing
+		System.out.println("Setze Rechte für Dozent");
+		imageRights.setRead(1);
+		imageRights.setWrite(1);
+		imageRights.setChangePermission(0);
+		imageRights.setAdmin(0);
+		imageRights.setLinkAllowed(1);
+		System.out.println("Rechte (r,w,cp,a,la): "+imageRights.getRead()+","+imageRights.getWrite()+","+imageRights.getChangePermission()+","+imageRights.getAdmin()+","+imageRights.getAdmin());
+		*/		
+		
+		/*//for testing
+		System.out.println("Setze Rechte für Admin");
+		imageRights.setRead(1);
+		imageRights.setWrite(1);
+		imageRights.setChangePermission(1);
+		imageRights.setAdmin(1);
+		imageRights.setLinkAllowed(1);
+		System.out.println("Rechte (r,w,cp,a,la): "+imageRights.getRead()+","+imageRights.getWrite()+","+imageRights.getChangePermission()+","+imageRights.getAdmin()+","+imageRights.getAdmin());
+		*/
+		
+		
+		
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {