summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2015-09-07 16:08:32 +0200
committerJonathan Bauer2015-09-07 16:08:32 +0200
commit1c3d5916e22a42b8e4aabf189b997ca3d01e72be (patch)
tree8bbbcd72bd6aa040599a2ea2d2605ccd74a988cb
parent[client] minor typo (diff)
downloadtutor-module-1c3d5916e22a42b8e4aabf189b997ca3d01e72be.tar.gz
tutor-module-1c3d5916e22a42b8e4aabf189b997ca3d01e72be.tar.xz
tutor-module-1c3d5916e22a42b8e4aabf189b997ca3d01e72be.zip
[client] indented code into human readable ..
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java15
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java2
2 files changed, 13 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java
index c76b4064..d48aa652 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageCustomPermissionWindow.java
@@ -48,7 +48,11 @@ public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayo
ActionListener updateDefaultPermissionListener = new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- imagePermissionManager.updateDefaultPermissions(chkCustomPermLink.isSelected(), chkCustomPermDownload.isSelected(), chkCustomPermEdit.isSelected(), chkCustomPermAdmin.isSelected());
+ imagePermissionManager.updateDefaultPermissions(
+ chkCustomPermLink.isSelected(),
+ chkCustomPermDownload.isSelected(),
+ chkCustomPermEdit.isSelected(),
+ chkCustomPermAdmin.isSelected());
}
};
@@ -67,7 +71,12 @@ public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayo
private PermissionDefaultToCustomLink<ImagePermissions> runAndReturn(){
setVisible(true);
if (okUsed){
- return new PermissionDefaultToCustomLink<ImagePermissions>(imagePermissionManager.getMap(), new ImagePermissions(chkCustomPermLink.isSelected(), chkCustomPermDownload.isSelected(), chkCustomPermEdit.isSelected(), chkCustomPermAdmin.isSelected()));
+ return new PermissionDefaultToCustomLink<ImagePermissions>(
+ imagePermissionManager.getMap(),
+ new ImagePermissions(chkCustomPermLink.isSelected(),
+ chkCustomPermDownload.isSelected(),
+ chkCustomPermEdit.isSelected(),
+ chkCustomPermAdmin.isSelected()));
} else {
return null;
}
@@ -75,7 +84,7 @@ public class ImageCustomPermissionWindow extends ImageCustomPermissionWindowLayo
/**
* Creates a new ImageCustomPermissionWindow dialog and returns the resulting Permissions
- * @param modalParent parentwindow of this dialog
+ * @param modalParent parent window of this dialog
* @param permissionMap The current user permissions with which the permission manager to initialise, null creates empty list.
* @param defaultPermissions The current default permissions, should not be null!
* @param ownerId The id of the user to exclude when adding users. Can be null.
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java
index 95a57cc7..3b9ddbd2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageCustomPermissionWindowLayout.java
@@ -53,7 +53,7 @@ public class ImageCustomPermissionWindowLayout extends JDialog {
JPanel buttonPane = new JPanel();
buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
buttonPane.add(Box.createGlue());
- btnClose = new JButton("Abbrechen");
+ btnClose = new JButton("Schließen");
buttonPane.add(btnClose);
btnOk = new JButton("Übernehmen");
buttonPane.add(btnOk);