[client] Refactor change monitor classes, better error message handling

4 files changed, 17 insertions, 9 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LdapFilterConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LdapFilterConfigurator.java
index 1950327d..b4e5a4a8 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LdapFilterConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LdapFilterConfigurator.java
@@ -163,8 +163,7 @@ public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout {
 	}
 
 	public void addToChangeMonitor(DialogChangeMonitor changeMonitor) {
-		// TODO Auto-generated method stub
-		
+		changeMonitor.add(tblFilters);
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
index f880cf7b..863028f0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java
@@ -370,8 +370,8 @@ public class LocationSelector extends JPanel {
 	}
 
 	public void addToChangeMonitor(DialogChangeMonitor changeMonitor) {
-		treeChangeHandler = changeMonitor.add(locationTree, null, null);
-		changeMonitor.add(grpLocationExclusive, null, null);
+		treeChangeHandler = changeMonitor.add(locationTree);
+		changeMonitor.add(grpLocationExclusive);
 	}
 
 	public void addCheckChangeEventListener(CheckChangeEventListener checkChangeEventListener) {
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 4603cffd..036f3726 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
@@ -122,9 +122,9 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout {
 	 * 
 	 * @return the list of rules as parsed by parseNetRules()
 	 */
-	public List<NetRule> getState() {
+	public List<NetRule> getState(boolean silent) {
 		// cleanup the TextPane for network rules if needed
-		return parseNetRules(false);
+		return parseNetRules(silent);
 	}
 
 	/**
@@ -190,11 +190,16 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout {
 
 		// split it line by line
 		boolean invalid = false; // True if the rules are invalid and null should be returned
-		DefaultStyledDocument newdoc = new DefaultStyledDocument(); // Used to build new document with colors
+		DefaultStyledDocument newdoc = null;
+		if (!silent) {
+			newdoc = new DefaultStyledDocument(); // Used to build new document with colors
+		}
 		StringBuilder errors = new StringBuilder(); // Error messages to show (if not silent)
 		int lineNo = 0; // Show line numbers in error messages
 		Set<String> warnedHosts = new HashSet<>(); // Ask only once about each unknown host
 		for (String ruleLine : rawNetRules.split("[\r\n]+")) {
+			if (silent && invalid)
+				return null;
 			Color lineColor = null;
 			LOGGER.debug("Parsing rule: " + ruleLine);
 			// split the fields and check if we have 3 as expected.
@@ -288,7 +293,9 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout {
 					+ "an.",
 					MessageType.ERROR, null, null);
 		}
-		tpNetworkRules.setDocument(newdoc);
+		if (newdoc != null) {
+			tpNetworkRules.setDocument(newdoc);
+		}
 		if (invalid) {
 			return null;
 		}
@@ -297,6 +304,8 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout {
 	}
 
 	private int addLine(DefaultStyledDocument doc, String line, Color color, boolean bold) {
+		if (doc == null)
+			return 0;
 		if (color == null) {
 			color = FOREGROUND_TEXT_COLOR;
 		}
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 49adce6e..3378294c 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
@@ -200,7 +200,7 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 	
 	public void addToChangeMonitor(DialogChangeMonitor changeMonitor) {
 		changeMonitor.add(taRunScript);
-		changeMonitor.addEditableCombo(cboRunscriptType, null, null, null);
+		changeMonitor.addEditableCombo(cboRunscriptType, null);
 	}
 	
 }