diff options
| author | Nino Breuer | 2014-10-01 13:08:21 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-01 13:08:21 +0200 |
| commit | ebeaf5de018d03a39b3fd499ed121263f6185f2b (patch) | |
| tree | a5873b5568baa3ace882de12e1f9f24b1eaffe29 | |
| parent | dg (diff) | |
| parent | Verlinkung der Seiten gefixt (diff) | |
| download | tutor-module-ebeaf5de018d03a39b3fd499ed121263f6185f2b.tar.gz tutor-module-ebeaf5de018d03a39b3fd499ed121263f6185f2b.tar.xz tutor-module-ebeaf5de018d03a39b3fd499ed121263f6185f2b.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java | 7 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java | 7 |
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(); } }); |