[client] remove unneeded wrapped class for netrules/runscript + fix some save button enable problems once more...

2 files changed, 28 insertions, 54 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
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/RunscriptConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/RunscriptConfigurator.java
index 8a517c4f..b4c375d2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/RunscriptConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/RunscriptConfigurator.java
@@ -41,23 +41,13 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 	}
 
 	/**
-	 * Gets the state of the widget. This will first try to parse the
-	 * tpNetworkRules and taRunScript and build the corresponding
-	 * AdvancedConfiguration Object returned.
+	 * Gets the runscript as String.
 	 * 
-	 * @return advanced configuration object composed of the parsed network
-	 *         rules as List<NetRule> and the raw runscript text as String
-	 * @see org.openslx.dozmod.gui.control.AdvancedConfigurator.AdvancedConfiguration
+	 * @return runscript as String. If not text was entered, returns a empty string.
 	 */
-	public RunscriptConfiguration getState() {
-		// cleanup the TextPane for network rules if needed
-		
-		
-		String runscriptString = taRunScript.getText();
-		if (runscriptString != null) {
-			return new RunscriptConfiguration(runscriptString);
-		}
-		return null;
+	public String getState() {
+		String input = taRunScript.getText();
+		return input != null ? input : "";
 	}
 
 	/**
@@ -68,26 +58,10 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 	 * @param config
 	 *            AdvancedConfiguration to set the state to
 	 */
-	public void setState(final RunscriptConfiguration config) {
-		// setText() blanks the text area if null is given, so no null checks
-		originalRunScript = config.runScriptText != null ? config.runScriptText
-				: "";
-		this.taRunScript.setText(originalRunScript);
+	public void setState(final String config) {
+		this.taRunScript.setText(config != null ? config : "" );
 	}
 
-	/**
-	 * 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 RunscriptConfiguration {
-		public String runScriptText;
-
-		public RunscriptConfiguration(String runScriptText) {
-			this.runScriptText = runScriptText;
-		}
-	}
 
 	/**
 	 * Custom event mechanism to detect changes to the user list (Mostly needed
@@ -168,6 +142,8 @@ class RunscriptConfiguratorLayout extends JPanel {
 				.add(new WordWrapLabel(txtRunScriptDesc, false, true))
 				.fill(true, false).expand(true, false);
 		gridRunScript.nextRow();
+		// TODO add checkbox for script's interpreter type: sh, bash, powershell...
+		
 		gridRunScript.add(scpRunScript).fill(true, true).expand(true, true);
 		gridRunScript.finish(false);