From 1b7a699a226e8b514314c697716c2cc929d2043c Mon Sep 17 00:00:00 2001
From: Nino Breuer
Date: Tue, 30 Sep 2014 16:40:05 +0200
Subject: removed extra gui for defining visbility of VM in different
 universities

---
 .../java/gui/image/PermissionEditImage_GUI.java     | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java')

diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 777d8389..e722e76f 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -157,7 +157,7 @@ public class PermissionEditImage_GUI extends JFrame {
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane
 				.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 260);
+		scrollPane.setBounds(10, 21, 537, 170);
 		panel_1.add(scrollPane);
 
 		table = new JTable();
@@ -200,6 +200,22 @@ public class PermissionEditImage_GUI extends JFrame {
 				(String) titles[5]));
 		*/
 		scrollPane.setViewportView(table);
+		
+		JPanel panel_2 = new JPanel();
+		panel_2.setLayout(null);
+		panel_2.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBounds(10, 201, 537, 80);
+		panel_1.add(panel_2);
+		
+		JLabel label_7 = new JLabel("Freigabemodus:");
+		label_7.setBounds(10, 30, 250, 20);
+		panel_2.add(label_7);
+		
+		final JComboBox comboBox_1 = new JComboBox();
+		comboBox_1.setSelectedIndex(0);
+		comboBox_1.setBounds(270, 30, 250, 20);
+		panel_2.add(comboBox_1);
 
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
@@ -325,7 +341,8 @@ public class PermissionEditImage_GUI extends JFrame {
 				JButton continueButton = new JButton("Weiter");
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-
+						
+						Image.image.setShareMode(comboBox_1.getSelectedIndex());
 						FTPEditUploader_GUI ea = new FTPEditUploader_GUI();
 						ea.setVisible(true);
 						dispose();
-- 
cgit v1.2.3-55-g7522


From e634e0cfa26721d4bd7b46f1fd695b4431df216e Mon Sep 17 00:00:00 2001
From: Nino Breuer
Date: Tue, 30 Sep 2014 17:10:56 +0200
Subject: fixed bug

---
 .../src/main/java/gui/image/PermissionCreateImage_GUI.java         | 7 +++++--
 dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java')

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);
 
-- 
cgit v1.2.3-55-g7522