Updated the expression handling logic to no longer require spaces around operators & operands in expressions
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/9784229a Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/9784229a Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/9784229a Branch: refs/heads/master Commit: 9784229ae054b3a5e1bff054e8af4aef3e136f37 Parents: a9a78bf Author: Scott Deboy <[email protected]> Authored: Sun Nov 7 07:12:17 2010 +0000 Committer: Scott Deboy <[email protected]> Committed: Sun Nov 7 07:12:17 2010 +0000 ---------------------------------------------------------------------- src/main/java/org/apache/log4j/chainsaw/LogUI.java | 7 ++++++- .../org/apache/log4j/chainsaw/help/release-notes.html | 1 + .../resources/org/apache/log4j/chainsaw/help/tutorial.html | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/9784229a/src/main/java/org/apache/log4j/chainsaw/LogUI.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java index 61e9bf3..ce6154a 100644 --- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java +++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java @@ -1032,7 +1032,12 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener { getSettingsManager().addSettingsListener(this); getSettingsManager().addSettingsListener(MRUFileListPreferenceSaver.getInstance()); getSettingsManager().addSettingsListener(receiversPanel); - getSettingsManager().loadSettings(); + try { + //if an uncaught exception is thrown, allow the UI to continue to load + getSettingsManager().loadSettings(); + } catch (Exception e) { + e.printStackTrace(); + } //app preferences have already been loaded (and configuration url possibly set to blank if being overridden) //but we need a listener so the settings will be saved on exit (added after loadsettings was called) getSettingsManager().addSettingsListener(new ApplicationPreferenceModelSaver(applicationPreferenceModel)); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/9784229a/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html b/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html index c9799bc..681cfc0 100644 --- a/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html +++ b/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html @@ -12,6 +12,7 @@ <h1>2.1</h1> <h2>6 Nov 2010</h2> <ul> +<li>Updated the expression handling logic to no longer require spaces around operators & operands in expressions</li> <li>Log file receiver configurations can now be loaded from both log4j.xml and log4j.properties configuration fileappender entries</li> <li>Added multi-select capability to event table and 'copy selection' context menu item (multi-select by holding down alt key while selecting rows)</li> </ul> http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/9784229a/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html b/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html index 0f54454..e9b3b5d 100644 --- a/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html +++ b/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html @@ -130,7 +130,6 @@ Expressions are used to define color and display rules in Chainsaw. An expressi <ul> <li>Precedence can be controlled by applying parentheses to groups of expressions (usually used in combination with logical operators)</li> -<li>All operators, operands and parentheses must be separated by spaces</li> <li>Single tick marks can be used to delimit multi-word operands</li> <li>Example: msg ~= <b>'my msg'</b></li> <li><b>NOTE:</b> A context menu is available anywhere you can enter an expression in order to assist in constructing expressions (use the right-mouse click or ctrl-space to activate the context menu) </li>
