diff options
| author | Jonathan Bauer | 2016-09-09 15:26:03 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2016-09-09 15:26:03 +0200 |
| commit | cf8d6fae09bf000d60c6c69c19fd75aead6aedc5 (patch) | |
| tree | 98aa539c1d99bcbe787765686c5af65ba8e312d9 /dozentenmodul/src/main/java | |
| parent | [client] hide vmx edit button if dmsd does not support it (diff) | |
| download | tutor-module-cf8d6fae09bf000d60c6c69c19fd75aead6aedc5.tar.gz tutor-module-cf8d6fae09bf000d60c6c69c19fd75aead6aedc5.tar.xz tutor-module-cf8d6fae09bf000d60c6c69c19fd75aead6aedc5.zip | |
[client] do not close Netrules page if parsing returned an error
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java | 2 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureNetrulesWindow.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java index f4fe01e7..040fc6eb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java @@ -78,7 +78,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout { // cleanup the TextPane for network rules if needed String input = tpNetworkRules.getText().trim(); final List<NetRule> rules = parseNetRules(input); - return rules != null ? rules : new ArrayList<NetRule>(); + return rules; } /** diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureNetrulesWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureNetrulesWindow.java index 8178d274..f570cc0e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureNetrulesWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureNetrulesWindow.java @@ -3,6 +3,7 @@ package org.openslx.dozmod.gui.window; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; @@ -55,7 +56,7 @@ public class LectureNetrulesWindow extends LectureNetrulesWindowLayout setVisible(true); if (!apply) return null; - return newRules; + return newRules != null ? newRules : new ArrayList<NetRule>(); } /** |