From 7658a51f286bad750eea3629b0fac4780c429afe Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Tue, 18 Nov 2014 15:31:20 +0100 Subject: • fixed bug, where there could only be one image and one lecture with the same name --- .../java/gui/image/EditImageTechnisch_GUI.java | 2 +- .../main/java/gui/image/FTPCreateUploader_GUI.java | 22 ++++++++---- .../main/java/gui/image/FTPEditUploader_GUI.java | 26 ++++++--------- .../java/gui/lecture/CreateLectureLink_GUI.java | 39 +++++++++++++--------- .../main/java/gui/lecture/EditLectureLink_GUI.java | 23 ++++++------- 5 files changed, 61 insertions(+), 51 deletions(-) (limited to 'dozentenmodul/src/main/java') diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index a273d7cc..012ae441 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -195,7 +195,7 @@ public class EditImageTechnisch_GUI extends JFrame { comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS())); } catch (TException e1) { // TODO Auto-generated catch block - e1.printStackTrace(); + //e1.printStackTrace(); } chckbxIsInternetBlocked.setSelected(Image.image.isInternet()); diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 66819a80..e656a711 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -101,6 +101,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // file Component c = null; private boolean isAborted = false; //down- or upload was manually aborted + private String uuid; private static final String HELP_MESSAGE = "
" + "Laden Sie hier Ihre .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.
" + @@ -561,6 +562,14 @@ public class FTPCreateUploader_GUI extends JFrame implements }); menuBar.add(mnNewMenu_Info); + try + { + uuid = client.createRandomUUID(); + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + c = this; } @@ -666,7 +675,6 @@ public class FTPCreateUploader_GUI extends JFrame implements public boolean writeData() { try { - client.writeVLdata(Image.image.getImagename(), Image.image.getDesc(), @@ -685,11 +693,12 @@ public class FTPCreateUploader_GUI extends JFrame implements Image.image.isVorlage(), Image.image.getFilesize(), Image.image.getShareMode(), - Image.image.getOS()); + Image.image.getOS(), + uuid); client.startFileCopy(Image.image.getNewName()); - client.writeImageRights(Image.image.getImagename(), + client.writeImageRights(uuid, person.verantwortlicher.getUsername(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), @@ -698,10 +707,11 @@ public class FTPCreateUploader_GUI extends JFrame implements person.verantwortlicher.getRole() ); - 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+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); + 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+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); client.writeAdditionalImageRights( - Image.image.getImagename(), + uuid, RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(), RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 95f261c2..589fbf87 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -706,28 +706,22 @@ public class FTPEditUploader_GUI extends JFrame implements person.verantwortlicher.getUserID()); // then, add user permissions as they have been set new - for (int i = 0; i < RightsManagement.rightsManagement - .getPermittedUserList().size(); i++) { + 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 + "/" - + RightsManagement.rightsManagement - .getPermittedUserList().size()); - client.writeAdditionalImageRights(Image.image.getImagename(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i).getUserID(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i).isImageRead(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i).isImageWrite(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i) - .isImageLinkAllowed(), - RightsManagement.rightsManagement - .getPermittedUserList().get(i).isImageAdmin()); + + RightsManagement.rightsManagement.getPermittedUserList().size()); + + client.writeAdditionalImageRights(Image.image.getImageId(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(), + RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()); }// end for 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 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 -- cgit v1.2.3-55-g7522