From c8668a9e4ce5a92addc518340f631e8049df3191 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 4 Mar 2016 15:01:03 +0100 Subject: [client] fix bugs with line splitting per System.lineSeparator() --- .../java/org/openslx/dozmod/gui/control/AdvancedConfigurator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dozentenmodul/src/main/java') 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 133ffc62..47a2aa3f 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 @@ -51,8 +51,9 @@ public class AdvancedConfigurator extends AdvancedConfiguratorLayout { */ public AdvancedConfiguration getState() { // cleanup the TextPane for network rules if needed - String input = taNetworkRules.getText(); - input = input.replaceAll("(?m)^\\s*", "").trim(); + String input = taNetworkRules.getText().trim(); + input = input.replaceAll("(?m)^\\s*", ""); + input = input.replaceAll("(?m)\\s*$", ""); taNetworkRules.setText(input); List rules = parseNetRules(input); @@ -114,7 +115,7 @@ public class AdvancedConfigurator extends AdvancedConfiguratorLayout { } // rawNetRules is the text as entered in the textarea // split it line by line - final String[] netRules = rawNetRules.split(System.lineSeparator()); + final String[] netRules = rawNetRules.split("[" + System.lineSeparator() + "]"); for (String ruleLine : netRules) { if (ruleLine.isEmpty()) continue; -- cgit v1.2.3-55-g7522