[client/server] make all netshare fields mandatory

and remove the overcomplicating/unnecessary tag when no mount
point/drive letter is given

1 files changed, 10 insertions, 8 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetshareConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetshareConfigurator.java
index 5ae805db..2927587f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetshareConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetshareConfigurator.java
@@ -118,24 +118,24 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 				// creating a new one, check for input either way
 				NetShare input = new NetShare();
 
+				input.path = tfSharePath.getText();
+				if (input.path == null || input.path.isEmpty()) {
+					lblError.setText("Kein Pfad angegeben!");
+					return;
+				}
 				String inputShareName = tfShareName.getText();
 				if (inputShareName.isEmpty()) {
 					lblError.setText("Kein Anzeigename angegeben!");
 					return;
 				}
 				input.displayname = inputShareName;
-
+				
 				NetShareAuth inputNetShareAuth = cboNetshareAuth.getItemAt(cboNetshareAuth.getSelectedIndex());
 				if (inputNetShareAuth == null) {
 					lblError.setText("Kein Authentifizierungstyp angegeben!");
 					return;
 				}
 				input.auth = inputNetShareAuth;
-				input.path = tfSharePath.getText();
-				if (input.path == null || input.path.isEmpty()) {
-					lblError.setText("Kein Pfad angegeben!");
-					return;
-				}
 				switch (inputNetShareAuth) {
 				case LOGIN_USER:
 					// this uses the bwLehrpool client's logged in user
@@ -164,9 +164,11 @@ public class NetshareConfigurator extends NetshareConfiguratorLayout {
 				}
 				// now check for optional mount path
 				Character inputMountPoint = cboNetshareMountPoint.getItemAt(cboNetshareMountPoint.getSelectedIndex());
-				if (inputMountPoint != null) {
-					input.mountpoint = inputMountPoint.toString() + ":";
+				if (inputMountPoint == null) {
+					lblError.setText("Kein Ziel angegeben!");
+					return;
 				}
+				input.mountpoint = inputMountPoint.toString() + ":";
 				// now decide whether to create a new entry or update existing one
 				NetShare oldEntry = tblNetshare.getSelectedItem();
 				if (oldEntry != null) {