diff options
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image')
3 files changed, 27 insertions, 23 deletions
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 = "<html><div align = \"center\">" + "Laden Sie hier Ihre .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />" + @@ -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 |