summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org
diff options
context:
space:
mode:
authorJonathan Bauer2016-03-04 15:01:03 +0100
committerJonathan Bauer2016-03-04 15:01:03 +0100
commitc8668a9e4ce5a92addc518340f631e8049df3191 (patch)
treeba8f6afbe7734f6dec8d7eb7b793f003a3e382a0 /dozentenmodul/src/main/java/org
parent[client] ... (diff)
downloadtutor-module-c8668a9e4ce5a92addc518340f631e8049df3191.tar.gz
tutor-module-c8668a9e4ce5a92addc518340f631e8049df3191.tar.xz
tutor-module-c8668a9e4ce5a92addc518340f631e8049df3191.zip
[client] fix bugs with line splitting per System.lineSeparator()
Diffstat (limited to 'dozentenmodul/src/main/java/org')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/AdvancedConfigurator.java7
1 files changed, 4 insertions, 3 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 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<NetRule> 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;