• fixed feature - clicking on table header in lecture permissions

• fixed bug, which caused the selected OS to be unset when going backward in creation process (is workaround, not really fixed though)

3 files changed, 14 insertions, 1 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 712b874a..2b21bd04 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -193,10 +193,14 @@ public class EditImageTechnisch_GUI extends JFrame {
 		
 		try {
 			comboBox.setSelectedItem(client.getOsNameForGuestOs(Image.image.getOS()));
-		} catch (TException e1) {
+		} catch (TException e1) 
+		{
 			// TODO Auto-generated catch block
 			//e1.printStackTrace();
+			comboBox.setSelectedItem(Image.image.getOS());
 		}
+			
+		
 		
 		chckbxIsInternetBlocked.setSelected(Image.image.isInternet());
 		chckbxIsLicensed.setSelected(Image.image.isLicensed());
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 6d6f238f..fa821f76 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -593,6 +593,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 				return;
 			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
 			for (int x = 0, y = tablePermittedUsers.getRowCount(); x < y; x++) {
+				tablePermittedUsers.setValueAt(new Boolean(checked), x, 1); //set read
 				tablePermittedUsers.setValueAt(new Boolean(checked), x, 2);
 			}
 		}
@@ -606,6 +607,8 @@ public class PermissionCreateLecture_GUI extends JFrame {
 				return;
 			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
 			for (int x = 0, y = tablePermittedUsers.getRowCount(); x < y; x++) {
+				tablePermittedUsers.setValueAt(new Boolean(checked), x, 1);
+				tablePermittedUsers.setValueAt(new Boolean(checked), x, 2); // set write
 				tablePermittedUsers.setValueAt(new Boolean(checked), x, 3);
 			}
 		}
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index 5857942c..73b2f1ca 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -652,6 +652,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 		RightsManagement.rightsManagement.setPermittedUserList(list);
 	}// end saveTableToList()
 
+	//Read column
 	class MyItemListener1 implements ItemListener {
 		public void itemStateChanged(ItemEvent e) {
 			Object source = e.getSource();
@@ -664,6 +665,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 		}
 	}
 
+	//Write column
 	class MyItemListener2 implements ItemListener {
 		public void itemStateChanged(ItemEvent e) {
 			Object source = e.getSource();
@@ -671,11 +673,13 @@ public class PermissionEditLecture_GUI extends JFrame {
 				return;
 			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
 			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 1);
 				table.setValueAt(new Boolean(checked), x, 2);
 			}
 		}
 	}
 
+	//Admin column
 	class MyItemListener3 implements ItemListener {
 		public void itemStateChanged(ItemEvent e) {
 			Object source = e.getSource();
@@ -683,6 +687,8 @@ public class PermissionEditLecture_GUI extends JFrame {
 				return;
 			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
 			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 1);
+				table.setValueAt(new Boolean(checked), x, 2);
 				table.setValueAt(new Boolean(checked), x, 3);
 			}
 		}