logging-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sde...@apache.org
Subject svn commit: r999780 - in /logging/chainsaw/trunk/src/main: java/org/apache/log4j/chainsaw/ resources/org/apache/log4j/chainsaw/help/ resources/org/apache/log4j/chainsaw/prefs/
Date Wed, 22 Sep 2010 06:58:51 GMT
Author: sdeboy
Date: Wed Sep 22 06:58:50 2010
New Revision: 999780

URL: http://svn.apache.org/viewvc?rev=999780&view=rev
Log:
Changed 'Wrap message field' preference default to true
UI fixes
 - logger tree panel can now set to a smaller width
 - adding millis delta property explicitly to default column list to ensure it is added by
default in a reliable location with a pre-defined size
 - moved 'wrap message' and 'highlight search matches' preferences to 'visuals' tab of log
panel preferences

Modified:
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.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/prefs/default.properties

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
Wed Sep 22 06:58:50 2010
@@ -30,7 +30,7 @@ import java.util.Vector;
  */
 public class ApplicationPreferenceModel {
 
-    private boolean showNoReceiverWarning = false ;
+    private boolean showNoReceiverWarning = true;
     private boolean statusBar = true;
     private boolean toolbar = true;
     private boolean receivers = false; //setting this to true will cause the receivers panel
to be displayed by default

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawColumns.java Wed
Sep 22 06:58:50 2010
@@ -47,6 +47,7 @@ public class ChainsawColumns {
     columnNames.add(ChainsawConstants.CLASS_COL_NAME);
     columnNames.add(ChainsawConstants.METHOD_COL_NAME);
     columnNames.add(ChainsawConstants.FILE_COL_NAME);
+    columnNames.add(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE.toUpperCase()); //add
uppercase col name
     columnNames.add(ChainsawConstants.LINE_COL_NAME);
 
     //NOTE:  ID must ALWAYS be last field because the model adds this value itself as an
identifier to the end of the consructed vector
@@ -65,7 +66,8 @@ public class ChainsawColumns {
   public static final int INDEX_METHOD_COL_NAME = 10;
   public static final int INDEX_FILE_COL_NAME = 11;
   public static final int INDEX_LINE_COL_NAME = 12;
-  public static final int INDEX_ID_COL_NAME = 13;
+  public static final int INDEX_MILLIS_DELTA_COL_NAME = 13;
+  public static final int INDEX_ID_COL_NAME = 14;
 
  public static final Cursor CURSOR_FOCUS_ON;
  static{

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawConstants.java
Wed Sep 22 06:58:50 2010
@@ -31,7 +31,6 @@ import java.net.URL;
 public class ChainsawConstants {
   private ChainsawConstants(){}
   
-  public static final String MILLIS_DELTA = "millisdelta";
   public static final int MILLIS_DELTA_RENDERING_HEIGHT_MAX = 50;
   public static final float MILLIS_DELTA_RENDERING_FACTOR = .002F;
 
@@ -83,6 +82,7 @@ public class ChainsawConstants {
   static final String FILE_COL_NAME = "FILE";
   static final String LINE_COL_NAME = "LINE";
   static final String PROPERTIES_COL_NAME = "PROPERTIES";
+  static final String MILLIS_DELTA_COL_NAME_LOWERCASE = "millisdelta";
   static final String ID_COL_NAME = "ID";
 
   //none is not a real column name, but is used by filters as a way to apply no filter for
colors or display

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
Wed Sep 22 06:58:50 2010
@@ -534,6 +534,9 @@ class ChainsawCyclicBufferTableModel ext
     case ChainsawColumns.INDEX_LOG4J_MARKER_COL_NAME:
       return event.getProperty(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE);
 
+    case ChainsawColumns.INDEX_MILLIS_DELTA_COL_NAME:
+      return event.getProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
+
     case ChainsawColumns.INDEX_LOGGER_COL_NAME:
       return event.getLoggerName();
 
@@ -553,32 +556,20 @@ class ChainsawCyclicBufferTableModel ext
       return event.getThrowableStrRep();
 
     case ChainsawColumns.INDEX_CLASS_COL_NAME:
-      return ((info == null)
-      || ("?".equals(info.getClassName()))) ? ""
-                                                              : info
-      .getClassName();
-
-    case ChainsawColumns.INDEX_FILE_COL_NAME:
-      return ((info == null)
-      || ("?".equals(info.getFileName()))) ? ""
-                                                             : info
-      .getFileName();
-
-    case ChainsawColumns.INDEX_LINE_COL_NAME:
-      return ((info == null)
-      || ("?".equals(info.getLineNumber()))) ? ""
-                                                               : info
-      .getLineNumber();
-
-    case ChainsawColumns.INDEX_METHOD_COL_NAME:
-      return ((info == null)
-      || ("?".equals(info.getMethodName()))) ? ""
-                                                               : info
-      .getMethodName();
+      return ((info == null) || ("?".equals(info.getClassName()))) ? "" : info.getClassName();
+
+        case ChainsawColumns.INDEX_FILE_COL_NAME:
+      return ((info == null) || ("?".equals(info.getFileName()))) ? "" : info.getFileName();
+
+        case ChainsawColumns.INDEX_LINE_COL_NAME:
+      return ((info == null) || ("?".equals(info.getLineNumber()))) ? "" : info.getLineNumber();
+
+        case ChainsawColumns.INDEX_METHOD_COL_NAME:
+      return ((info == null) || ("?".equals(info.getMethodName()))) ? "" : info.getMethodName();
 
-    default:
+        default:
 
-      if (columnIndex < columnNames.size()) {
+            if (columnIndex < columnNames.size()) {
         //case may not match..try case sensitive and fall back to case-insensitive
         String result = event.getProperty(columnNames.get(columnIndex).toString());
         if (result == null) {

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ExtendedLoggingEvent.java
Wed Sep 22 06:58:50 2010
@@ -102,7 +102,7 @@ public class ExtendedLoggingEvent extend
         markerHeight = DEFAULT_HEIGHT;
         msgHeight = DEFAULT_HEIGHT;
         if (!b) {
-            setProperty(ChainsawConstants.MILLIS_DELTA, "");
+            setProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE, "");
         }
     }
 
@@ -112,6 +112,6 @@ public class ExtendedLoggingEvent extend
 
     public void setPreviousDisplayedEventTimestamp(long previousDisplayedEventTimeStamp)
     {
-        setProperty(ChainsawConstants.MILLIS_DELTA, String.valueOf(timeStamp - previousDisplayedEventTimeStamp));
+        setProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE, String.valueOf(timeStamp
- previousDisplayedEventTimeStamp));
     }
 }

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java Wed Sep 22
06:58:50 2010
@@ -291,6 +291,7 @@ public class LogPanel extends DockablePa
     columnNameKeywordMap.put(ChainsawConstants.THROWABLE_COL_NAME, LoggingEventFieldResolver.EXCEPTION_FIELD);
     columnNameKeywordMap.put(ChainsawConstants.TIMESTAMP_COL_NAME, LoggingEventFieldResolver.TIMESTAMP_FIELD);
     columnNameKeywordMap.put(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE.toUpperCase(),
LoggingEventFieldResolver.PROP_FIELD + ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE);
+    columnNameKeywordMap.put(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE.toUpperCase(),
LoggingEventFieldResolver.PROP_FIELD + ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
 
     logPanelPreferencesFrame.setTitle("'" + identifier + "' Log Panel Preferences");
     logPanelPreferencesFrame.setIconImage(
@@ -2778,6 +2779,7 @@ public class LogPanel extends DockablePa
     preferenceModel.setDetailPaneVisible(event.asBoolean("detailPaneVisible"));
     preferenceModel.setLogTreePanelVisible(event.asBoolean("logTreePanelVisible"));
     preferenceModel.setHighlightSearchMatchText(event.asBoolean("highlightSearchMatchText"));
+    preferenceModel.setWrapMessage(event.asBoolean("wrapMessage"));
     //re-add columns to the table in the order provided from the list
     for (Iterator iter = sortedColumnList.iterator(); iter.hasNext();) {
       TableColumn element = (TableColumn) iter.next();
@@ -3363,7 +3365,7 @@ public class LogPanel extends DockablePa
         }
 
         boolean primaryMatches(EventWrapper wrapper) {
-            String millisDelta = wrapper.loggingEvent.getProperty(ChainsawConstants.MILLIS_DELTA);
+            String millisDelta = wrapper.loggingEvent.getProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
             if (millisDelta != null && !millisDelta.trim().equals("")) {
                 long millisDeltaLong = Long.parseLong(millisDelta);
                 //arbitrary
@@ -3425,7 +3427,7 @@ public class LogPanel extends DockablePa
                         int startX = 1;
                         int width = getWidth() - (startX * 2);
                         //max out at 50, min 2...
-                        String millisDelta = wrapper.loggingEvent.getProperty(ChainsawConstants.MILLIS_DELTA);
+                        String millisDelta = wrapper.loggingEvent.getProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
                         long millisDeltaLong = Long.parseLong(millisDelta);
                         long delta = Math.min(ChainsawConstants.MILLIS_DELTA_RENDERING_HEIGHT_MAX,
Math.max(0, (long) (millisDeltaLong * ChainsawConstants.MILLIS_DELTA_RENDERING_FACTOR)));
                         float widthMaxMillisDeltaRenderRatio = ((float)width / ChainsawConstants.MILLIS_DELTA_RENDERING_HEIGHT_MAX);

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
Wed Sep 22 06:58:50 2010
@@ -83,7 +83,8 @@ public class LogPanelPreferenceModel imp
 
   private Collection hiddenLoggers = new HashSet();
   private String timeZone;
-  private boolean wrapMsg;
+  //default wrapMsg to true
+  private boolean wrapMsg = true;
   private boolean highlightSearchMatchText;
   private String hiddenExpression;
   private String clearTableExpression;

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
Wed Sep 22 06:58:50 2010
@@ -245,8 +245,6 @@ public class LogPanelPreferencePanel ext
     private final JTextField timeZone = new JTextField(10);
     private final JRadioButton rdLevelIcons = new JRadioButton("Icons ");
     private final JRadioButton rdLevelText = new JRadioButton("Text ");
-    private final JCheckBox wrapMessage = new JCheckBox("Wrap message field (display multi-line
rows) ");
-    private final JCheckBox highlightSearchMatchText = new JCheckBox("Highlight search match
text ");
     private JRadioButton rdLast;
 
     //~ Constructors ==========================================================
@@ -366,8 +364,6 @@ public class LogPanelPreferencePanel ext
       levelFormatPanel.add(rdLevelText);
 
       add(levelFormatPanel);
-      add(wrapMessage);
-      add(highlightSearchMatchText);
 
       JPanel loggerFormatPanel = new JPanel();
       loggerFormatPanel.setLayout(
@@ -506,26 +502,6 @@ public class LogPanelPreferencePanel ext
           }
         };
 
-      ActionListener wrapMessageListener = new ActionListener()
-      {
-          public void actionPerformed(ActionEvent e)
-          {
-              preferenceModel.setWrapMessage(wrapMessage.isSelected());
-          }
-      };
-
-      wrapMessage.addActionListener(wrapMessageListener);
-
-      ActionListener highlightSearchMatchTextListener = new ActionListener()
-      {
-          public void actionPerformed(ActionEvent e)
-          {
-              preferenceModel.setHighlightSearchMatchText(highlightSearchMatchText.isSelected());
-          }
-      };
-
-      highlightSearchMatchText.addActionListener(highlightSearchMatchTextListener);
-
       rdLevelIcons.addActionListener(levelIconListener);
       rdLevelText.addActionListener(levelIconListener);
 
@@ -539,27 +515,6 @@ public class LogPanelPreferencePanel ext
             rdLevelText.setSelected(!value);
           }
         });
-        
-        preferenceModel.addPropertyChangeListener(
-          "wrapMessage", new PropertyChangeListener()
-          {
-            public void propertyChange(PropertyChangeEvent evt)
-            {
-              boolean value = ((Boolean) evt.getNewValue()).booleanValue();
-              wrapMessage.setSelected(value);
-            }
-          });
-
-        preferenceModel.addPropertyChangeListener(
-          "highlightSearchMatchText", new PropertyChangeListener()
-          {
-            public void propertyChange(PropertyChangeEvent evt)
-            {
-              boolean value = ((Boolean) evt.getNewValue()).booleanValue();
-              highlightSearchMatchText.setSelected(value);
-            }
-          });
-
     }
   }
 
@@ -581,6 +536,8 @@ public class LogPanelPreferencePanel ext
 
     private final JCheckBox loggerTreePanel =
       new JCheckBox("Show Logger Tree");
+    private final JCheckBox wrapMessage = new JCheckBox("Wrap message field (display multi-line
rows) ");
+    private final JCheckBox highlightSearchMatchText = new JCheckBox("Highlight search match
text ");
     private final JCheckBox scrollToBottom =
       new JCheckBox("Scroll to bottom (view tracks with new events)");
     private final JCheckBox showMillisDeltaAsGap =
@@ -623,6 +580,9 @@ public class LogPanelPreferencePanel ext
       add(detailPanelVisible);
       add(loggerTreePanel);
       add(scrollToBottom);
+      add(wrapMessage);
+      add(highlightSearchMatchText);
+
       add(showMillisDeltaAsGap);
       JPanel clearPanel = new JPanel(new BorderLayout());
       clearPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
@@ -645,6 +605,46 @@ public class LogPanelPreferencePanel ext
     */
     private void setupListeners()
     {
+        ActionListener wrapMessageListener = new ActionListener()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
+                preferenceModel.setWrapMessage(wrapMessage.isSelected());
+            }
+        };
+
+        wrapMessage.addActionListener(wrapMessageListener);
+
+        ActionListener highlightSearchMatchTextListener = new ActionListener()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
+                preferenceModel.setHighlightSearchMatchText(highlightSearchMatchText.isSelected());
+            }
+        };
+
+        highlightSearchMatchText.addActionListener(highlightSearchMatchTextListener);
+
+        preferenceModel.addPropertyChangeListener(
+          "wrapMessage", new PropertyChangeListener()
+          {
+            public void propertyChange(PropertyChangeEvent evt)
+            {
+              boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+              wrapMessage.setSelected(value);
+            }
+          });
+
+        preferenceModel.addPropertyChangeListener(
+          "highlightSearchMatchText", new PropertyChangeListener()
+          {
+            public void propertyChange(PropertyChangeEvent evt)
+            {
+              boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+              highlightSearchMatchText.setSelected(value);
+            }
+          });
+
       toolTips.addActionListener(new ActionListener()
         {
           public void actionPerformed(ActionEvent e)

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
Wed Sep 22 06:58:50 2010
@@ -181,6 +181,10 @@ final class LoggerNameTreePanel extends 
 
     setLayout(new BorderLayout());
     ignoreExpressionEntryField.setPreferredSize(new Dimension(300, 150));
+
+    ignoreExpressionSummary.setMinimumSize(new Dimension(10, ignoreExpressionSummary.getHeight()));
+    ignoreSummary.setMinimumSize(new Dimension(10, ignoreSummary.getHeight()));
+
     JTextComponentFormatter.applySystemFontAndSize(ignoreExpressionEntryField);
 
 
@@ -297,7 +301,8 @@ final class LoggerNameTreePanel extends 
 
     JPanel ignorePanel = new JPanel();
     ignorePanel.setLayout(new BoxLayout(ignorePanel, BoxLayout.Y_AXIS));
-    JPanel ignoreSummaryPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+    JPanel ignoreSummaryPanel = new JPanel();
+    ignoreSummaryPanel.setLayout(new BoxLayout(ignoreSummaryPanel, BoxLayout.X_AXIS));
     ignoreSummaryPanel.add(ignoreSummary);
     
     Action showIgnoreDialogAction = new AbstractAction("...") {
@@ -317,7 +322,8 @@ final class LoggerNameTreePanel extends 
     ignoreSummaryPanel.add(btnShowIgnoreDialog);
     ignorePanel.add(ignoreSummaryPanel);
 
-    JPanel ignoreExpressionPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+    JPanel ignoreExpressionPanel = new JPanel();
+    ignoreExpressionPanel.setLayout(new BoxLayout(ignoreExpressionPanel, BoxLayout.X_AXIS));
     ignoreExpressionPanel.add(ignoreExpressionSummary);
     showIgnoreExpressionDialogAction.putValue(Action.SHORT_DESCRIPTION, "Click to view and
manage your hidden/ignored expression");
     JButton btnShowIgnoreExpressionDialog = new SmallButton(showIgnoreExpressionDialogAction);
@@ -1427,7 +1433,7 @@ final class LoggerNameTreePanel extends 
   }
 
   private void updateIgnoreExpressionSummary() {
-    ignoreExpressionSummary.setText(ignoreExpressionRule != null?"Ignore expression (set)":"Ignore
expression (unset)");
+    ignoreExpressionSummary.setText(ignoreExpressionRule != null?"Ignore (set)":"Ignore (unset)");
   }
   
   private void toggleFocusOnState()

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
Wed Sep 22 06:58:50 2010
@@ -21,7 +21,6 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Insets;
 import java.awt.Toolkit;
 import java.awt.font.FontRenderContext;
 import java.awt.font.LineBreakMeasurer;
@@ -570,7 +569,7 @@ public class TableColorizingRenderer ext
         return "" + (((Date)field).getTime() - relativeTimestampBase);
     }
     if (useRelativeTimesToPrevious) {
-        return loggingEvent.getProperty(ChainsawConstants.MILLIS_DELTA);
+        return loggingEvent.getProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
     }
 
     return dateFormatInUse.format((Date) field);

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=999780&r1=999779&r2=999780&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
Wed Sep 22 06:58:50 2010
@@ -10,6 +10,10 @@
 <b>NOTE:</b> The mechanism and format used to persist settings in Chainsaw is
subject to change.  If you are experiencing problems displaying events in Chainsaw, please
delete everything in the $user.dir/.chainsaw directory and restart Chainsaw.
 <br>
 <h1>2.1</h1>
+<h2>20 Sep 2010</h2>
+<ul>
+<li>Changed 'Wrap message field' preference default to true</li>
+</ul>
 <h2>15 Sep 2010</h2>
 <ul>
 <li>New feature: Clickable thumbnail bar on the left shows time delta to prior displayed
event if the time delta is > 1 second (behaves similarly to the thumbnail bar on the right
which shows colors and search matches, but represents the time delta between events).  A bigger
delta is represented as a wider line.</li>

Modified: logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/prefs/default.properties
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/prefs/default.properties?rev=999780&r1=999779&r2=999780&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/prefs/default.properties
(original)
+++ logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/prefs/default.properties
Wed Sep 22 06:58:50 2010
@@ -24,8 +24,8 @@ main.window.y=0
 main.window.width=1024
 main.window.height=768
 
-table.columns.order=ID,TIMESTAMP,MARKER,LEVEL,LOGGER,MESSAGE,THROWABLE,THREAD,NDC,CLASS,METHOD,FILE,LINE
-table.columns.widths=50,80,95,50,100,300,100,150,150,300,150,100,100
+table.columns.order=ID,TIMESTAMP,MARKER,LEVEL,LOGGER,MESSAGE,THROWABLE,THREAD,NDC,CLASS,METHOD,FILE,LINE,MILLISDELTA
+table.columns.widths=50,80,95,50,100,300,100,150,150,300,150,100,100,100
 
 SavedConfigs.Size=0
 DateFormat.1=HH:mm:ss
@@ -41,4 +41,5 @@ toolTips=false
 scrollToBottom=true
 logTreePanelVisible=true
 detailPaneVisible=true
-highlightSearchMatchText=true
\ No newline at end of file
+highlightSearchMatchText=true
+wrapMessage=true
\ No newline at end of file



Mime
View raw message