summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorNino Breuer2014-09-30 17:10:56 +0200
committerNino Breuer2014-09-30 17:10:56 +0200
commite634e0cfa26721d4bd7b46f1fd695b4431df216e (patch)
treeff410319191d02f018912d95b0949bcec08a5b57 /dozentenmodul/src/main/java
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-e634e0cfa26721d4bd7b46f1fd695b4431df216e.tar.gz
tutor-module-e634e0cfa26721d4bd7b46f1fd695b4431df216e.tar.xz
tutor-module-e634e0cfa26721d4bd7b46f1fd695b4431df216e.zip
fixed bug
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.java3
2 files changed, 7 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index e949e323..c441abd1 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -221,7 +221,10 @@ public class PermissionCreateImage_GUI extends JFrame {
label.setBounds(10, 30, 250, 20);
panel.add(label);
- JComboBox comboBox_1 = new JComboBox();
+ final JComboBox comboBox_1 = new JComboBox();
+ comboBox_1.setModel(new DefaultComboBoxModel(new String[] {
+ "Lokal (Eigene Hochschule)",
+ "Öffentlich (Alle Hochschulen)" }));
comboBox_1.setSelectedIndex(0);
comboBox_1.setBounds(270, 30, 250, 20);
panel.add(comboBox_1);
@@ -353,7 +356,7 @@ public class PermissionCreateImage_GUI extends JFrame {
continueButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- Image.image.setShareMode(comboBox.getSelectedIndex());
+ Image.image.setShareMode(comboBox_1.getSelectedIndex());
FTPCreateUploader_GUI ea = new FTPCreateUploader_GUI();
ea.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 e722e76f..0eb64911 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -213,7 +213,8 @@ public class PermissionEditImage_GUI extends JFrame {
panel_2.add(label_7);
final JComboBox comboBox_1 = new JComboBox();
- comboBox_1.setSelectedIndex(0);
+ comboBox_1.setModel(new DefaultComboBoxModel(new String[] {"Lokal (Eigene Hochschule)", "Öffentlich (Alle Hochschulen)"}));
+ comboBox_1.setSelectedIndex(Image.image.getShareMode());
comboBox_1.setBounds(270, 30, 250, 20);
panel_2.add(comboBox_1);