summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorMichael Wilson2014-10-01 12:22:36 +0200
committerMichael Wilson2014-10-01 12:22:36 +0200
commit831a9506709c127bd52e076c80855891aee92652 (patch)
tree1f35958d86b5a372381aec0cde98a47af68f0434 /dozentenmodul/src/main/java
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-831a9506709c127bd52e076c80855891aee92652.tar.gz
tutor-module-831a9506709c127bd52e076c80855891aee92652.tar.xz
tutor-module-831a9506709c127bd52e076c80855891aee92652.zip
Verlinkung der Seiten gefixt
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java7
-rw-r--r--dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java7
2 files changed, 8 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index c441abd1..d6ddc911 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -69,7 +69,7 @@ public class PermissionCreateImage_GUI extends JFrame {
String[] result;
private JTable table;
private Class[] classes;
- Object[] titles = { "Name", "Read", "Write", "Link allowed","Admin"};
+ Object[] titles = { "Name", "Read", "Write", "Link","Admin"};
final DefaultTableModel model = new DefaultTableModel(titles, 0) {
@@ -342,8 +342,9 @@ public class PermissionCreateImage_GUI extends JFrame {
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- CreateImageFreigabe_GUI sr = new CreateImageFreigabe_GUI();
- sr.setVisible(true);
+ //CreateImageFreigabe_GUI sr = new CreateImageFreigabe_GUI();
+ CreateImageTechnisch_GUI ci = new CreateImageTechnisch_GUI();
+ ci.setVisible(true);
dispose();
}
});
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 0eb64911..b70138eb 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -69,7 +69,7 @@ public class PermissionEditImage_GUI extends JFrame {
String[] result;
private JTable table;
private Class[] classes;
- Object[] titles = { "Name", "Read", "Write", "Link allowed","Admin"};
+ Object[] titles = { "Name", "Read", "Write", "Link","Admin"};
final DefaultTableModel model = new DefaultTableModel(titles, 0) {
@@ -329,8 +329,9 @@ public class PermissionEditImage_GUI extends JFrame {
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- EditImageFreigabe_GUI sr = new EditImageFreigabe_GUI();
- sr.setVisible(true);
+ //EditImageFreigabe_GUI sr = new EditImageFreigabe_GUI();
+ EditImageTechnisch_GUI ei = new EditImageTechnisch_GUI();
+ ei.setVisible(true);
dispose();
}
});