[client] cleanup network rules input text, remove empty lines + trim

1 files changed, 13 insertions, 14 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/AdvancedConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/AdvancedConfigurator.java
index df036aa3..78d71f36 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/AdvancedConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/AdvancedConfigurator.java
@@ -46,10 +46,18 @@ public class AdvancedConfigurator extends AdvancedConfiguratorLayout {
 		super();
 	}
 
+	/**
+	 *
+	 */
 	public AdvancedConfiguration getState() {
-		List<NetRule> rules = parseNetRules(taNetworkRules.getText());
+		// cleanup the TextPane for network rules if needed
+		String input = taNetworkRules.getText();
+		input = input.replaceAll("(?m)^\\s*", "").trim();
+		taNetworkRules.setText(input);
+
+		List<NetRule> rules = parseNetRules(input);
 		if (rules != null) {
-			return new AdvancedConfiguration(rules, taRunScript.getText());
+			return new AdvancedConfiguration(rules, input);
 		}
 		return null;
 	}
@@ -60,17 +68,6 @@ public class AdvancedConfigurator extends AdvancedConfiguratorLayout {
 		this.taRunScript.setText(config.runScriptText);
 	}
 
-	public boolean isValidState() {
-		// TODO test state validity?
-		List<NetRule> tmp = parseNetRules(taNetworkRules.getText());
-		if (tmp != null)
-			LOGGER.debug("Parsed: " + tmp.toString());
-		else {
-			LOGGER.debug("Parsed null.");
-		}
-		return tmp != null && !tmp.isEmpty();
-	}
-
 	/**
 	 * @param netRulesList
 	 *            list of NetRule to decode
@@ -119,6 +116,8 @@ public class AdvancedConfigurator extends AdvancedConfiguratorLayout {
 		// split it line by line
 		final String[] netRules = rawNetRules.split(System.lineSeparator());
 		for (String ruleLine : netRules) {
+			if (ruleLine.isEmpty())
+				continue;
 			LOGGER.debug("Parsing rule: " + ruleLine);
 			// split the fields and check if we have 3 as expected.
 			String[] fields = ruleLine.split(FIELD_DELIMITER);
@@ -172,8 +171,8 @@ public class AdvancedConfigurator extends AdvancedConfiguratorLayout {
 			try {
 				ruleHost = InetAddress.getByName(fields[0]);
 			} catch (UnknownHostException e) {
-				LOGGER.debug("Invalid hostname (java.net): ", e);
 				// might be good to see this exception in the log file
+				//LOGGER.debug("Invalid hostname (java.net): ", e);
 			}
 			if (ruleHost == null) {
 				// either invalid IP-Address or an invalid resolvable hostname