[client] fix newlines removed beeing counted to the number of rules that were parsed (even though they were ignored)

1 files changed, 9 insertions, 5 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 38cd4917..3849621f 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
@@ -5,6 +5,7 @@ import java.awt.Insets;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.EventListener;
 import java.util.EventObject;
 import java.util.Iterator;
@@ -157,11 +158,14 @@ public class AdvancedConfigurator extends AdvancedConfiguratorLayout {
 		prunedRawNetRules = prunedRawNetRules.replaceAll("(?m)\\s*$", "");
 
 		// split it line by line
-		final String[] netRules = rawNetRules.split("["
-				+ System.lineSeparator() + "]");
-		for (String ruleLine : netRules) {
-			if (ruleLine.isEmpty())
+		List<String> netRules = Arrays.asList(prunedRawNetRules.split("["
+				+ System.lineSeparator() + "]"));
+		for (int i = 0; i < netRules.size(); i++) {
+			final String ruleLine = netRules.get(i);
+			if (ruleLine == null || ruleLine.isEmpty()) {
+				netRules.remove(i);
 				continue;
+			}
 			LOGGER.debug("Parsing rule: " + ruleLine);
 			// split the fields and check if we have 3 as expected.
 			String[] fields = ruleLine.split(FIELD_DELIMITER);
@@ -250,7 +254,7 @@ public class AdvancedConfigurator extends AdvancedConfiguratorLayout {
 			rulesList.add(new NetRule(NetDirection.valueOf(fields[2]
 					.toUpperCase()), fields[0], port));
 		}
-		if (netRules.length == rulesList.size()) {
+		if (netRules.size() == rulesList.size()) {
 			// pruned rules were successfully parsed so they are valid: set the textpane to it
 			tpNetworkRules.setText(prunedRawNetRules);
 			LOGGER.debug("Success");