[client] NetShares: Fix enable/disable logic

2 files changed, 24 insertions, 40 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java
index c6c02304..14ed1157 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java
@@ -134,7 +134,7 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout {
 				}
 			}
 		});
-		btnDel.setEnabled(false);
+		clearInputFields();
 	}
 
 	private void clearInputFields() {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java
index 4099b754..0fe7052b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java
@@ -64,14 +64,24 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 			@Override
 			public void valueChanged(ListSelectionEvent e) {
 				NetShare item = tblNetshare.getSelectedItem2();
-				// ugly block-wise sets, but only one test needed compared to
-				// doing lots of item != null ? ... : ...
+				// only activate form fields if netshare is not predefined
+				boolean editable = (item == null || item.shareId == 0);
+				// now disable as needed
+				btnDel.setEnabled(editable);
+				btnAdd.setEnabled(editable);
+				tfSharePath.setEnabled(editable);
+				tfShareName.setEnabled(editable);
+				tfUsername.setEnabled(editable);
+				tfPassword.setEnabled(editable);
+				cboNetshareAuth.setEnabled(editable);
+				cboNetshareMountPoint.setEnabled(editable);
+				chkIsPrinter.setEnabled(editable);
+				chkShowPass.setEnabled(editable);
+				
 				if (item == null) {
 					clearInputFields();
 					return;
 				}
-				// only activate form fields if netshare is not predefined
-				boolean editable = (item.shareId == 0);
 
 				// first set the fields to let any listener trigger
 				tfSharePath.setText(item.path);
@@ -85,17 +95,6 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 					cboNetshareMountPoint.setSelectedItem(Character.valueOf(item.mountpoint.charAt(0)));
 					chkIsPrinter.setSelected(item.mountpoint.equals(PRINTER_MARKER));
 				}
-				// now disable as needed
-				btnDel.setEnabled(editable);
-				btnAdd.setEnabled(editable);
-				tfSharePath.setEnabled(editable);
-				tfShareName.setEnabled(editable);
-				tfUsername.setEnabled(editable);
-				tfPassword.setEnabled(editable);
-				cboNetshareAuth.setEnabled(editable);
-				cboNetshareMountPoint.setEnabled(editable);
-				chkIsPrinter.setEnabled(editable);
-				chkShowPass.setEnabled(editable);
 				if (editable)
 					btnAdd.setText("Ändern");
 			}
@@ -117,14 +116,10 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				NetShareAuth selectedAuth = cboNetshareAuth.getItemAt(cboNetshareAuth.getSelectedIndex());
-				if (selectedAuth == null)
-					return;
-				boolean activate = selectedAuth == NetShareAuth.OTHER_USER;
+				boolean activate = selectedAuth != null && selectedAuth == NetShareAuth.OTHER_USER;
 				// username field is needed to either special or guest user 
 				tfUsername.setEnabled(activate);
-				lblUsername.setEnabled(activate);
 				tfPassword.setEnabled(activate);
-				lblPassword.setEnabled(activate);
 				chkShowPass.setEnabled(activate);
 			}
 		});
@@ -268,11 +263,7 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 				}
 			}
 		});
-		chkShowPass.setEnabled(false);
-		tfUsername.setEnabled(false);
-		lblUsername.setEnabled(false);
-		tfPassword.setEnabled(false);
-		lblPassword.setEnabled(false);
+		clearInputFields();
 	}
 
 	private void clearInputFields() {
@@ -353,8 +344,7 @@ class NetshareConfiguratorLayout extends JPanel {
 			+ " die automatisch beim Start der Veranstaltung eingebunden werden sollen."
 			+ " Der Platzhalter <em>%loginuser%</em> wird im Pfad durch den Loginnamen des Nutzers ersetzt.</html>";
 
-	protected final QLabel lblShareAuth, lblSharePath, lblShareName, lblMountPoint, lblUsername, lblPassword,
-			lblError;
+	protected final JLabel lblError;
 	protected final NetshareTable tblNetshare = new NetshareTable();
 	protected final JTextField tfSharePath, tfShareName, tfUsername;
 	protected final JPasswordField tfPassword;
@@ -396,8 +386,7 @@ class NetshareConfiguratorLayout extends JPanel {
 
 		JPanel pnlSharePath = new JPanel();
 		pnlSharePath.setLayout(new BoxLayout(pnlSharePath, BoxLayout.LINE_AXIS));
-		lblSharePath = new QLabel("Pfad");
-		gridNewShare.add(lblSharePath);
+		gridNewShare.add(new QLabel("Pfad"));
 
 		tfSharePath = new JTextField();
 		pnlSharePath.add(tfSharePath);
@@ -409,30 +398,25 @@ class NetshareConfiguratorLayout extends JPanel {
 		gridNewShare.add(pnlSharePath, 5).fill(true, false).expand(true, false);
 		gridNewShare.nextRow();
 		// bottom form to add a new share
-		lblShareName = new QLabel("Anzeigename");
-		lblMountPoint = new QLabel("Laufwerk");
 		tfShareName = new JTextField();
 		// extra panel for fancy layout purposes...
 		JPanel pnlShareName = new JPanel();
 		pnlShareName.setLayout(new BoxLayout(pnlShareName, BoxLayout.LINE_AXIS));
 		pnlShareName.add(tfShareName);
 		pnlShareName.add(Box.createHorizontalStrut(3));
-		pnlShareName.add(lblMountPoint);
+		pnlShareName.add(new QLabel("Laufwerk"));
 		pnlShareName.add(Box.createHorizontalStrut(3));
 		pnlShareName.add(cboNetshareMountPoint);
-		gridNewShare.add(lblShareName);
+		gridNewShare.add(new QLabel("Anzeigename"));
 		gridNewShare.add(pnlShareName, 5).fill(true, false).expand(true, false);
 		gridNewShare.nextRow();
-		lblShareAuth = new QLabel("Authentifizierung");
-		gridNewShare.add(lblShareAuth);
+		gridNewShare.add(new QLabel("Authentifizierung"));
 		gridNewShare.add(cboNetshareAuth, 5).fill(true, false).expand(true, false);
 		gridNewShare.nextRow();
-		lblUsername = new QLabel("Username");
-		gridNewShare.add(lblUsername);
+		gridNewShare.add(new QLabel("Username"));
 		tfUsername = new JTextField(20);
 		gridNewShare.add(tfUsername, 2).fill(true, false).expand(true, false);
-		lblPassword = new QLabel("Passwort");
-		gridNewShare.add(lblPassword);
+		gridNewShare.add(new QLabel("Passwort"));
 		tfPassword = new JPasswordField(20);
 		gridNewShare.add(tfPassword, 2).fill(true, false).expand(true, false);
 		gridNewShare.nextRow();