diff options
| author | Nino Breuer | 2014-12-11 12:26:18 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-12-11 12:26:18 +0100 |
| commit | 0c9b00b492d41fbac64dc3423c30087345edf149 (patch) | |
| tree | 12ab619e09ed7328debc80cfed559ec589898c50 /dozentenmodul/src/main/java | |
| parent | d (diff) | |
| parent | • [Client] fixed incorrect JOptionPane (diff) | |
| download | tutor-module-0c9b00b492d41fbac64dc3423c30087345edf149.tar.gz tutor-module-0c9b00b492d41fbac64dc3423c30087345edf149.tar.xz tutor-module-0c9b00b492d41fbac64dc3423c30087345edf149.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java | 4 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index c6f0727d..b1fde196 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -453,7 +453,7 @@ public class DeleteImage_GUI extends JFrame { + "' konnte nicht gelöscht werden."); JOptionPane - .showConfirmDialog( + .showMessageDialog( c, "Image konnte nicht gelöscht werden.", "Fehler", @@ -467,7 +467,7 @@ public class DeleteImage_GUI extends JFrame { + "' konnte nicht von Server gelöscht werden."); JOptionPane - .showConfirmDialog( + .showMessageDialog( c, "Image konnte nicht vom Server gelöscht werden.", "Fehler", diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 2f94f55f..f918d0f4 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -723,8 +723,9 @@ public class FTPEditUploader_GUI extends JFrame implements //if a new file has been uploaded and new filename is set if (Image.image.getNewName() != null) { - // LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath=" - // + Image.image.getImagepath()); + LOGGER.debug("New file uploaded and new filename is set"); + //LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath()); + client.updateImageData( Image.image.getImagename(), Image.image.getImagename(), @@ -749,6 +750,7 @@ public class FTPEditUploader_GUI extends JFrame implements } else { //no new file uploaded and old file name stays //LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath()); + LOGGER.debug("old file should remain"); client.updateImageData( Image.image.getImagename(), @@ -783,13 +785,14 @@ public class FTPEditUploader_GUI extends JFrame implements // 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 " + /*System.out.println("Writing additional rights for user " + RightsManagement.rightsManagement .getPermittedUserList().get(i).getUserID() + ", User " + i + "/" + RightsManagement.rightsManagement.getPermittedUserList().size()); + */ client.writeAdditionalImageRights(Image.image.getImageId(), RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), |