[client] Compiles again, but is broken....

2 files changed, 9 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index c4627a3a..7cfc1181 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -79,7 +80,7 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 	private JTable tablemyImages = new JTable();
 	private JTextField textFieldName;
 	private JLabel lblTotalResults;
-	private String uuid = null;
+	private String lectureUuid = null;
 	private String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher",
 			"Letztes Update", "ID", "Version", "Template", "Beschreibung" };
 
@@ -385,13 +386,13 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 										formatter.format(Lecture.lecture.getEnddate()).toString(),
 										Lecture.lecture.isActive(), imageID, SessionData.authToken,
 										person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultaet(), uuid,
+										person.verantwortlicher.getFakultaet(), lectureUuid,
 										person.verantwortlicher.getHochschule());
 								System.out.println("imageID" + " " + imageID);
-								System.out.println("lectureID" + " " + uuid);
+								System.out.println("lectureID" + " " + lectureUuid);
 								//set rights for this user
 
-								ThriftManager.getSatClient().writeLectureRights(uuid,
+								ThriftManager.getSatClient().writeLectureRights(lectureUuid,
 										person.verantwortlicher.getRole(), SessionData.authToken,
 										person.verantwortlicher.getHochschule(),
 										person.verantwortlicher.getUserID());
@@ -401,7 +402,7 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 										.size(); i++) {
 									//System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+(i+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
 									ThriftManager.getSatClient().writeAdditionalLectureRights(
-											uuid,
+											lectureUuid,
 											RightsManagement.rightsManagement.getPermittedUserList().get(i)
 													.getUserID(),
 											RightsManagement.rightsManagement.getPermittedUserList().get(i)
@@ -581,12 +582,7 @@ public class CreateLectureLink_GUI extends JInternalFrame {
 		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		scrollPane.setViewportView(textAreadesc);
 
-		try {
-			uuid = ThriftManager.getSatClient().createRandomUUID(SessionData.authToken);
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
+		lectureUuid = UUID.randomUUID().toString();
 
 	}
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 71054020..e3523d3c 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -180,8 +180,7 @@ public class DeleteLecture_GUI extends JInternalFrame {
 			JTextPane txtpnBitteWhlenSie = new JTextPane();
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie
-					.setText("Wählen Sie bitte aus der unten stehenden Liste die zu löschende Veranstaltung aus.");
+			txtpnBitteWhlenSie.setText("Wählen Sie bitte aus der unten stehenden Liste die zu löschende Veranstaltung aus.");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -338,8 +337,7 @@ public class DeleteLecture_GUI extends JInternalFrame {
 
 						// LOGGER.info("Lösche Veranstaltung: " + lectureID);
 						try {
-							if (ThriftManager.getSatClient().deleteLecture(lectureID, SessionData.authToken,
-									person.verantwortlicher.getHochschule())) {
+							if (ThriftManager.getSatClient().deleteLecture(lectureID, SessionData.authToken)) {
 
 								// delete successful
 								LOGGER.info("Veranstaltung erfolgreich '" + lectureID + "' gelöscht.");