diff options
author | Jonathan Bauer | 2016-09-05 14:31:12 +0200 |
---|---|---|
committer | Jonathan Bauer | 2016-09-05 14:31:12 +0200 |
commit | 5f74fa9f181400677119e1ab4e5185bf2a282b28 (patch) | |
tree | 62206ab849f5f6504e6f31028863adf81c81ece8 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java | |
parent | Added improved default template texts.(#2946). (diff) | |
download | tutor-module-5f74fa9f181400677119e1ab4e5185bf2a282b28.tar.gz tutor-module-5f74fa9f181400677119e1ab4e5185bf2a282b28.tar.xz tutor-module-5f74fa9f181400677119e1ab4e5185bf2a282b28.zip |
[client] remove unneeded wrapped class for netrules/runscript + fix some save button enable problems once more...
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/NetrulesConfigurator.java | 40 |
1 files changed, 19 insertions, 21 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 c518739f..e715d075 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 @@ -37,6 +37,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout { private static final long serialVersionUID = -3497629601818983994L; private final static Logger LOGGER = Logger .getLogger(NetrulesConfigurator.class); + private List<NetRule> originalNetRules = null; private String originalRawRuleText = null; /** * Character defining how the rules are parsed, e.g. for whitespace \\s @@ -73,14 +74,11 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout { * rules as List<NetRule> and the raw runscript text as String * @see org.openslx.dozmod.gui.control.NetrulesConfigurator.AdvancedConfiguration */ - public NetrulesConfiguration getState() { + public List<NetRule> getState() { // cleanup the TextPane for network rules if needed String input = tpNetworkRules.getText().trim(); - List<NetRule> rules = parseNetRules(input); - if (rules != null) { - return new NetrulesConfiguration(rules); - } - return null; + final List<NetRule> rules = parseNetRules(input); + return rules != null ? rules : new ArrayList<NetRule>(); } /** @@ -91,9 +89,9 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout { * @param config * AdvancedConfiguration to set the state to */ - public void setState(final NetrulesConfiguration config) { + public void setState(final List<NetRule> netrules) { // setText() blanks the text area if null is given, so no null checks - originalRawRuleText = decodeNetRulesToText(config.netRulesList); + originalRawRuleText = decodeNetRulesToText(netrules); this.tpNetworkRules.setText(originalRawRuleText); } @@ -341,19 +339,19 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout { tpNetworkRules.setCharacterAttributes(set, true); } - /** - * Wrapper class for the advanced configuration information needed since we - * need to return a single object from the runAndReturn routine. This class - * has two members: the list of NetRule(s) (as List<NetRule>) and the - * runScriptText (as String) - */ - public static class NetrulesConfiguration { - public List<NetRule> netRulesList; - - public NetrulesConfiguration(List<NetRule> netRulesList) { - this.netRulesList = netRulesList; - } - } +// /** +// * Wrapper class for the advanced configuration information needed since we +// * need to return a single object from the runAndReturn routine. This class +// * has two members: the list of NetRule(s) (as List<NetRule>) and the +// * runScriptText (as String) +// */ +// public static class NetrulesConfiguration { +// public List<NetRule> netRulesList; +// +// public NetrulesConfiguration(List<NetRule> netRulesList) { +// this.netRulesList = netRulesList; +// } +// } /** * Custom event mechanism to detect changes to the user list (Mostly needed |