removed extra gui for defining visbility of VM in different universities

7 files changed, 48 insertions, 13 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageFreigabe_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageFreigabe_GUI.java
index 9337683f..bbf12396 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageFreigabe_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageFreigabe_GUI.java
@@ -101,12 +101,12 @@ public class CreateImageFreigabe_GUI extends JFrame {
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Freigabe",
 				TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 51, 557, 124);
+		panel_1.setBounds(10, 51, 557, 80);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 
 		JLabel lblNewLabel_2 = new JLabel("Freigabemodus:");
-		lblNewLabel_2.setBounds(10, 55, 250, 20);
+		lblNewLabel_2.setBounds(10, 30, 250, 20);
 		panel_1.add(lblNewLabel_2);
 
 		comboBox = new JComboBox();
@@ -114,7 +114,7 @@ public class CreateImageFreigabe_GUI extends JFrame {
 				"Lokal (Eigene Hochschule)",
 				"Öffentlich (Alle Hochschulen)" }));
 		comboBox.setSelectedIndex(0);
-		comboBox.setBounds(270, 55, 250, 20);
+		comboBox.setBounds(270, 30, 250, 20);
 		panel_1.add(comboBox);
 
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 9ada1fe9..58f058ce 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -341,7 +341,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
 						Image.image.setOS(comboBox.getSelectedItem().toString());
 						LOGGER.info("Betriebssystem: "+Image.image.getOS()+",  istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+",  RAM: "+Image.image.getRam());
-						CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI();
+						PermissionCreateImage_GUI ea=new PermissionCreateImage_GUI();
 						ea.setVisible(true);
 						dispose();
 					}
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageFreigabe_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageFreigabe_GUI.java
index dce8447d..398f020f 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageFreigabe_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageFreigabe_GUI.java
@@ -103,18 +103,18 @@ public class EditImageFreigabe_GUI extends JFrame {
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 51, 557, 124);
+		panel_1.setBounds(10, 51, 557, 80);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		JLabel lblNewLabel_2 = new JLabel("Freigabemodus:");
-		lblNewLabel_2.setBounds(10, 55, 250, 20);
+		lblNewLabel_2.setBounds(10, 30, 250, 20);
 		panel_1.add(lblNewLabel_2);
 		
 		comboBox = new JComboBox();
 		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Lokal (Eigene Hochschule)", "Öffentlich (Alle Hochschulen)"}));
 		comboBox.setSelectedIndex(Image.image.getShareMode());
-		comboBox.setBounds(270, 55, 250, 20);
+		comboBox.setBounds(270, 30, 250, 20);
 		panel_1.add(comboBox);
 		
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 565df8cf..1f6e2509 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -415,7 +415,7 @@ public class EditImageTechnisch_GUI extends JFrame {
 									", CPU: " + Image.image.getCpu() +
 									",  RAM: " + Image.image.getRam());
 						// oeffnet das naechste Fenster
-						EditImageFreigabe_GUI ea=new EditImageFreigabe_GUI();
+						PermissionEditImage_GUI ea=new PermissionEditImage_GUI();
 						ea.setVisible(true);
 						dispose();
 
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 6d06e46a..e949e323 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -163,7 +163,7 @@ public class PermissionCreateImage_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();
@@ -209,6 +209,23 @@ public class PermissionCreateImage_GUI extends JFrame {
 		*/
 		scrollPane.setViewportView(table);
 		
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Freigabe",
+						TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(10, 201, 537, 80);
+		panel_1.add(panel);
+		
+		JLabel label = new JLabel("Freigabemodus:");
+		label.setBounds(10, 30, 250, 20);
+		panel.add(label);
+		
+		JComboBox comboBox_1 = new JComboBox();
+		comboBox_1.setSelectedIndex(0);
+		comboBox_1.setBounds(270, 30, 250, 20);
+		panel.add(comboBox_1);
+		
 		JLabel lblHauptmen = new JLabel("Hauptmenü");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
@@ -253,7 +270,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		lblHochschule.setBounds(275, 36, 80, 20);
 		contentPanel.add(lblHochschule);
 
-		JComboBox comboBox = new JComboBox();
+		final JComboBox comboBox = new JComboBox();
 		comboBox.setModel(new DefaultComboBoxModel(new String[] {
 				"Hochschule Offenburg", "Hochschule Reutlingen",
 				"Universität Freiburg" }));
@@ -336,6 +353,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
+						Image.image.setShareMode(comboBox.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 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();
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index dbb667fe..2d65fda3 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -714,7 +714,7 @@ public class SearchEditImage_GUI extends JFrame {
 							}
 						} else if (tabbedPane.getSelectedIndex() == 1) {
 							if (tablePublicVorlagen.getSelectedRow() != -1
-									&& modelPublicVorlagen
+									&& modelPublicVorlagen //deprecated(?) 
 											.getValueAt(
 													tablePublicVorlagen
 															.convertRowIndexToModel(tablePublicVorlagen