• fixed bug, where there could only be one image and one lecture with the same name

2 files changed, 34 insertions, 28 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 25c59fa7..f5b157de 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -95,6 +95,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	boolean activeSearch = false;
 	Component c = null;
 	private JTextField textFieldName;
+	private String uuid = null;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template", "Beschreibung" };
 	ThriftConnection con = new ThriftConnection();
@@ -436,8 +437,8 @@ public class CreateLectureLink_GUI extends JFrame {
 						if (tablemyImages.getSelectedRow() != -1) {
 
 							// a row is selected, do operations
-							String imagename = tablemyImages.getValueAt(
-									tablemyImages.getSelectedRow(), 0)
+							String imageID = tablemyImages.getValueAt(
+									tablemyImages.getSelectedRow(), 6)
 									.toString();
 							try {
 								DateFormat formatter = new SimpleDateFormat(
@@ -448,25 +449,24 @@ public class CreateLectureLink_GUI extends JFrame {
 										Lecture.lecture.getName(),
 										Lecture.lecture.getShortDesc(),
 										Lecture.lecture.getDesc(),
-										formatter.format(
-												Lecture.lecture.getStartdate())
-												.toString(),
-										formatter.format(
-												Lecture.lecture.getEnddate())
-												.toString(),
+										formatter.format(Lecture.lecture.getStartdate()).toString(),
+										formatter.format(Lecture.lecture.getEnddate()).toString(),
 										Lecture.lecture.isActive(),
-										imagename,
+										imageID,
 										person.verantwortlicher.getUsername(),
 										person.verantwortlicher.getVorname(),
 										person.verantwortlicher.getName(),
 										person.verantwortlicher.getHochschule(),
 										person.verantwortlicher.getEMail(),
 										person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultaet());
-								
+										person.verantwortlicher.getFakultaet(),
+										uuid);
+								System.out.println("imageID" + " " + imageID);
+								System.out.println("lectureID" + " " + uuid);
 								//set rights for this user
+								
 								client.writeLectureRights(
-										Lecture.lecture.getName(),
+										uuid,
 										person.verantwortlicher.getUsername(),
 										person.verantwortlicher.getName(),
 										person.verantwortlicher.getVorname(),
@@ -478,7 +478,7 @@ public class CreateLectureLink_GUI extends JFrame {
 								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+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
 									client.writeAdditionalLectureRights(
-											Lecture.lecture.getName(),
+											uuid,
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write(),
@@ -728,6 +728,16 @@ public class CreateLectureLink_GUI extends JFrame {
 			}
 		});
 		menuBar.add(mnNewMenu_Info);
+		
+		try 
+		{
+			uuid = client.createRandomUUID();
+		} 
+		catch (TException e1) 
+		{
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 
 		c = this;
 	}
@@ -740,8 +750,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		// images =
 		// client.getImageListPermissionLink(person.verantwortlicher.getUserID());
-		images = client.getImageListPermissionLink(person.verantwortlicher
-				.getUserID());
+		images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
 
 		Iterator<server.generated.Image> i = images.iterator();
 		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 929f9b2d..09f7295f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -611,16 +611,12 @@ public class EditLectureLink_GUI extends JFrame {
 
 								// update the lecture
 								client.updateLecturedata(
-										Lecture.lecture.getName(),
+										Lecture.lecture.getid(),
 										Lecture.lecture.getNewName(),
 										Lecture.lecture.getShortDesc(),
 										Lecture.lecture.getDesc(),
-										formatter.format(
-												Lecture.lecture.getStartdate())
-												.toString(),
-										formatter.format(
-												Lecture.lecture.getEnddate())
-												.toString(),
+										formatter.format(Lecture.lecture.getStartdate()).toString(),
+										formatter.format(Lecture.lecture.getEnddate()).toString(),
 										Lecture.lecture.isActive(),
 										modelMyImages
 												.getValueAt(
@@ -651,10 +647,10 @@ public class EditLectureLink_GUI extends JFrame {
 
 								// then, add user permissions as they have been
 								// set new
-								for (int i = 0; i < RightsManagement.rightsManagement
-										.getPermittedUserList().size(); i++) {
-									System.out
-											.println("Writing additional rights for user "
+								for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) 
+								{
+									/*
+									System.out.println("Writing additional rights for user "
 													+ RightsManagement.rightsManagement
 															.getPermittedUserList()
 															.get(i).getUserID()
@@ -667,10 +663,11 @@ public class EditLectureLink_GUI extends JFrame {
 													+", r="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read()
 													+", w="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write()
 													+", a="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin()
-															);
+										);
+										*/
 									
 									client.writeAdditionalLectureRights(
-											Lecture.lecture.getName(),
+											Lecture.lecture.getid(),
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
 													.get(i).getUserID(), // userID