svn commit: r1032218 - in /logging/chainsaw/trunk/src/main: java/org/apache/log4j/chainsaw/LogUI.java resources/org/apache/log4j/chainsaw/help/release-notes.html resources/org/apache/log4j/chainsaw/help/tutorial.html

[sd...@apache.org]

Author: sdeboy
Date: Sun Nov  7 07:12:17 2010
New Revision: 1032218

URL: http://svn.apache.org/viewvc?rev=1032218&view=rev
Log:
Updated the expression handling logic to no longer require spaces around operators & operands in expressions

Modified:
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java
    logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
    logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java?rev=1032218&r1=1032217&r2=1032218&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java Sun Nov  7 07:12:17 2010
@@ -1032,7 +1032,12 @@ public class LogUI extends JFrame implem
     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));

Modified: logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html?rev=1032218&r1=1032217&r2=1032218&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html (original)
+++ logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html Sun Nov  7 07:12:17 2010
@@ -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>

Modified: logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html?rev=1032218&r1=1032217&r2=1032218&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html (original)
+++ logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/tutorial.html Sun Nov  7 07:12:17 2010
@@ -130,7 +130,6 @@ Expressions are used to define color and
 
 <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>