[2/2] logging-chainsaw git commit: CHAINSAW-1: Add generics

[mattsicker]

CHAINSAW-1: Add generics


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/4b8b96ff
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/4b8b96ff
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/4b8b96ff

Branch: refs/heads/master
Commit: 4b8b96ff5073f449bbb318e17589551a27d43e64
Parents: ba10849
Author: Matt Sicker 
Authored: Tue Mar 13 01:32:24 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:33:09 2018 -0500

--
 .../apache/log4j/LoggerRepositoryExImpl.java| 18 +++
 .../log4j/chainsaw/AbstractPreferencePanel.java |  6 +--
 .../chainsaw/ApplicationPreferenceModel.java|  8 +--
 .../ApplicationPreferenceModelPanel.java|  6 +--
 .../log4j/chainsaw/ChainsawAppenderHandler.java | 18 +++
 .../apache/log4j/chainsaw/ChainsawColumns.java  |  4 +-
 .../ChainsawCyclicBufferTableModel.java | 10 ++--
 .../log4j/chainsaw/ChainsawEventBatch.java  | 12 ++---
 .../apache/log4j/chainsaw/ChainsawSplash.java   |  2 +-
 .../log4j/chainsaw/EventBatchListener.java  |  2 +-
 .../apache/log4j/chainsaw/EventContainer.java   |  2 +-
 .../org/apache/log4j/chainsaw/Generator.java|  2 +-
 .../chainsaw/LogFilePatternLayoutBuilder.java   | 18 +++
 .../org/apache/log4j/chainsaw/LogPanel.java | 50 -
 .../log4j/chainsaw/LogPanelLoggerTreeModel.java |  4 +-
 .../log4j/chainsaw/LogPanelPreferenceModel.java |  2 +-
 .../java/org/apache/log4j/chainsaw/LogUI.java   | 36 ++---
 .../log4j/chainsaw/LoggerNameModelSupport.java  |  2 +-
 .../log4j/chainsaw/LoggerNameTreePanel.java |  4 +-
 .../chainsaw/ReceiverConfigurationPanel.java| 57 ++--
 .../log4j/chainsaw/TableColorizingRenderer.java |  4 +-
 .../apache/log4j/chainsaw/ThresholdSlider.java  |  2 +-
 .../org/apache/log4j/chainsaw/WelcomePanel.java |  4 +-
 .../apache/log4j/chainsaw/color/ColorPanel.java | 46 
 .../log4j/chainsaw/dnd/FileDnDTarget.java   |  2 +-
 .../filter/EventTypeEntryContainer.java | 16 +++---
 .../apache/log4j/chainsaw/help/HelpLocator.java |  2 +-
 .../log4j/chainsaw/helper/SwingHelper.java  |  4 +-
 .../chainsaw/helper/TableCellEditorFactory.java |  4 +-
 .../log4j/chainsaw/icons/LevelIconFactory.java  |  4 +-
 .../chainsaw/layout/EventDetailLayout.java  |  6 +--
 .../log4j/chainsaw/layout/LayoutEditorPane.java |  2 +-
 .../log4j/chainsaw/messages/MessageCenter.java  |  4 +-
 .../plugins/PluginClassLoaderFactory.java   |  2 +-
 .../log4j/chainsaw/prefs/LoadSettingsEvent.java |  2 +-
 .../log4j/chainsaw/prefs/MRUFileList.java   |  2 +-
 .../receivers/ReceiverTreeCellRenderer.java |  4 +-
 .../chainsaw/receivers/ReceiversHelper.java |  8 +--
 .../chainsaw/receivers/ReceiversPanel.java  |  4 +-
 .../chainsaw/zeroconf/ZeroConfDeviceModel.java  | 10 ++--
 .../log4j/chainsaw/zeroconf/ZeroConfPlugin.java | 10 ++--
 .../zeroconf/ZeroConfPreferenceModel.java   | 12 ++---
 .../apache/log4j/db/CustomSQLDBReceiver.java|  8 +--
 .../java/org/apache/log4j/db/DBReceiverJob.java |  4 +-
 .../apache/log4j/helpers/UtilLoggingLevel.java  |  4 +-
 .../org/apache/log4j/net/MulticastAppender.java |  2 +-
 .../org/apache/log4j/net/MulticastReceiver.java |  6 +--
 .../org/apache/log4j/net/SocketReceiver.java| 14 ++---
 .../java/org/apache/log4j/net/UDPReceiver.java  |  6 +--
 .../org/apache/log4j/net/XMLSocketNode.java |  2 +-
 .../org/apache/log4j/net/XMLSocketReceiver.java |  2 +-
 .../apache/log4j/plugins/PluginRegistry.java| 12 ++---
 .../log4j/rewrite/PropertyRewritePolicy.java|  2 +-
 .../org/apache/log4j/scheduler/Scheduler.java   | 14 ++---
 src/main/java/org/apache/log4j/spi/Decoder.java |  4 +-
 .../apache/log4j/spi/LoggerRepositoryEx.java|  4 +-
 .../apache/log4j/varia/ListModelAppender.java   |  4 +-
 .../log4j/varia/LogFilePatternReceiver.java | 24 -
 .../apache/log4j/xml/LogFileXMLReceiver.java|  2 +-
 .../apache/log4j/xml/UtilLoggingXMLDecoder.java | 18 +++
 .../java/org/apache/log4j/xml/XMLDecoder.java   | 16 +++---
 .../java/org/apache/log4j/VectorAppender.java   |  6 +--
 .../org/apache/log4j/db/FullCycleDBTest.java| 18 +++
 .../log4j/rewrite/RewriteAppenderTest.java  |  2 +-
 .../java/org/apache/log4j/util/Compare.java | 12 ++---
 .../org/apache/log4j/xml/XMLDecoderTest.java|  8 +--
 66 files changed, 306 insertions(+), 305 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java
--
diff --git a/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java 

[1/2] logging-chainsaw git commit: CHAINSAW-1: Add generics

[mattsicker]

Repository: logging-chainsaw
Updated Branches:
  refs/heads/master ba10849cc -> 4b8b96ff5


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java 
b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
index 93b69f9..7f08c25 100644
--- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
+++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
@@ -88,7 +88,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
 
 private ZeroConfPreferenceModel preferenceModel;
 
-private final Map serviceInfoToReceiveMap = new HashMap();
+private final Map serviceInfoToReceiveMap = new 
HashMap<>();
 
 private JMenu connectToMenu = new JMenu("Connect to");
 private JMenuItem helpItem = new JMenuItem(new AbstractAction("Learn more 
about ZeroConf...",
@@ -169,8 +169,8 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
 public void pluginStopped(PluginEvent e) {
 Plugin plugin = e.getPlugin();
 synchronized(serviceInfoToReceiveMap) {
-for (Iterator iter = 
serviceInfoToReceiveMap.entrySet().iterator(); iter.hasNext();) {
-Map.Entry entry = (Map.Entry) iter.next();
+for (Iterator> iter = 
serviceInfoToReceiveMap.entrySet().iterator(); iter.hasNext();) {
+Map.Entry entry = iter.next();
 if(entry.getValue() == plugin) {
 iter.remove();
 }
@@ -198,7 +198,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
 
 private void registerServiceListenersForAppenders()
 {
-Set serviceNames = new HashSet();
+Set serviceNames = new HashSet<>();
 serviceNames.add(MULTICAST_APPENDER_SERVICE_NAME);
 serviceNames.add(SOCKET_APPENDER_SERVICE_NAME);
 serviceNames.add(SOCKETHUB_APPENDER_SERVICE_NAME);
@@ -422,7 +422,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
 }
 Plugin plugin;
 synchronized (serviceInfoToReceiveMap) {
-plugin = (Plugin) serviceInfoToReceiveMap.get(info);
+plugin = serviceInfoToReceiveMap.get(info);
 }
 
((LoggerRepositoryEx)LogManager.getLoggerRepository()).getPluginRegistry().stopPlugin(plugin.getName());
 

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java 
b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java
index 1ac13c4..4b31690 100644
--- 
a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java
+++ 
b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPreferenceModel.java
@@ -23,8 +23,8 @@ import java.util.Set;
 
 public class ZeroConfPreferenceModel {
 
-private List monitoredZones = new ArrayList();
-private Set autoConnectDevices = new HashSet();
+private List monitoredZones = new ArrayList<>();
+private Set autoConnectDevices = new HashSet<>();
 
 //   TODO expose addPropertyChangeListener
 
@@ -38,19 +38,19 @@ public class ZeroConfPreferenceModel {
 monitoredZones.add(zone);
 }
 
-public Set getAutoConnectDevices() {
+public Set getAutoConnectDevices() {
 return autoConnectDevices;
 }
 
-public void setAutoConnectDevices(Set autoConnectDevices) {
+public void setAutoConnectDevices(Set autoConnectDevices) {
 this.autoConnectDevices = autoConnectDevices;
 }
 
-public List getMonitoredZones() {
+public List getMonitoredZones() {
 return monitoredZones;
 }
 
-public void setMonitoredZones(List monitoredZones) {
+public void setMonitoredZones(List monitoredZones) {
 this.monitoredZones = monitoredZones;
 }
 

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/4b8b96ff/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
--
diff --git a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java 
b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
index 55ade75..dc7fcce 100644
--- a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
+++ b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
@@ -294,13 +294,13 @@ public class CustomSQLDBReceiver extends Receiver 
implements Pauseable, Unrecogn
 String threadName;
 

[06/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/db/DBAppender.java
--
diff --git a/src/main/java/org/apache/log4j/db/DBAppender.java 
b/src/main/java/org/apache/log4j/db/DBAppender.java
index 4f116c5..4a566e8 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -27,12 +27,9 @@ import org.apache.log4j.xml.DOMConfigurator;
 import org.apache.log4j.xml.UnrecognizedElementHandler;
 import org.w3c.dom.Element;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 import java.util.Set;
@@ -48,7 +45,7 @@ import java.util.Set;
  * for your particular type of database system is missing, it should be quite
  * easy to write one, taking example on the already existing scripts. If you
  * send them to us, we will gladly include missing scripts in future releases.
- *
+ * 
  * 
  * If the JDBC driver you are using supports the
  * {@link java.sql.Statement#getGeneratedKeys}method introduced in JDBC 3.0
@@ -59,7 +56,7 @@ import java.util.Set;
  * not support the {@link java.sql.Statement#getGeneratedKeys getGeneratedKeys}
  * method.
  * 
- *
+ * 
  * 
  * supported dialects
  * 
@@ -93,11 +90,11 @@ import java.util.Set;
  * not present, and not needed or used
  * 
  * 
- *   HSQL
- *NO
- *present and used
+ * HSQL
+ * NO
+ * present and used
  * 
- *
+ * 
  * 
  * 
  * Performance:  Experiments show that writing a single event into the
@@ -105,9 +102,9 @@ import java.util.Set;
  * connections are used, this figure drops to under 10 milliseconds. Note that
  * most JDBC drivers already ship with connection pooling support.
  * 
- *
- *
- *
+ * 
+ * 
+ * 
  * 
  * Configuration  DBAppender can be configured programmatically, or 
using
  * {@link org.apache.log4j.xml.DOMConfigurator JoranConfigurator}. Example
@@ -117,257 +114,257 @@ import java.util.Set;
  * @author Ray DeCampo
  */
 public class DBAppender extends AppenderSkeleton implements 
UnrecognizedElementHandler {
-  static final String insertPropertiesSQL =
-"INSERT INTO  logging_event_property (event_id, mapped_key, mapped_value) 
VALUES (?, ?, ?)";
-  static final String insertExceptionSQL =
-"INSERT INTO  logging_event_exception (event_id, i, trace_line) VALUES (?, 
?, ?)";
-  static final String insertSQL;
-
-
-  static {
-  String sql = "INSERT INTO logging_event (" +
-  "sequence_number, " +
-  "timestamp, " +
-  "rendered_message, " +
-  "logger_name, " +
-  "level_string, " +
-  "ndc, " +
-  "thread_name, " +
-  "reference_flag, " +
-  "caller_filename, " +
-  "caller_class, " +
-  "caller_method, " +
-  "caller_line) " +
-  " VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?)";
-  insertSQL = sql;
-  }
-
-  ConnectionSource connectionSource;
-  boolean cnxSupportsGetGeneratedKeys = false;
-  boolean cnxSupportsBatchUpdates = false;
-  SQLDialect sqlDialect;
-  boolean locationInfo = false;
-  
-
-  public DBAppender() {
-  super(false);
-  }
-
-  public void activateOptions() {
-  LogLog.debug("DBAppender.activateOptions called");
-
-  if (connectionSource == null) {
-  throw new IllegalStateException(
-  "DBAppender cannot function without a connection source");
-  }
-
-  sqlDialect = 
Util.getDialectFromCode(connectionSource.getSQLDialectCode());
-  cnxSupportsGetGeneratedKeys = 
connectionSource.supportsGetGeneratedKeys();
-  cnxSupportsBatchUpdates = connectionSource.supportsBatchUpdates();
-  if (!cnxSupportsGetGeneratedKeys && (sqlDialect == null)) {
-  throw new IllegalStateException(
-  "DBAppender cannot function if the JDBC driver does not 
support getGeneratedKeys method *and* without a specific SQL dialect");
-  }
-
-  // all nice and dandy on the eastern front
-  super.activateOptions();
-  }
-
-  /**
-   * @return Returns the connectionSource.
-   */
-  public ConnectionSource getConnectionSource() {
-return connectionSource;
-  }
-
-  /**
-   * @param connectionSource
-   *  The connectionSource to set.
-   */
-  public void setConnectionSource(ConnectionSource connectionSource) {
-LogLog.debug("setConnectionSource called for DBAppender");
-this.connectionSource = connectionSource;
-  }
-
-  protected void append(LoggingEvent event) {
-  Connection connection = null;
-  try {
-  connection = connectionSource.getConnection();
-  connection.setAutoCommit(false);
-  
-  PreparedStatement insertStatement;
-  if 

[07/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java 
b/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
index 4a733ef..daa0c2c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999,2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy 
of
  * the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -16,42 +16,20 @@
 
 package org.apache.log4j.chainsaw.vfs;
 
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.Toolkit;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.FileSystemOptions;
-import org.apache.commons.vfs.RandomAccessContent;
-import org.apache.commons.vfs.VFS;
+import org.apache.commons.vfs.*;
 import org.apache.commons.vfs.provider.URLFileName;
 import org.apache.commons.vfs.provider.sftp.SftpFileSystemConfigBuilder;
 import org.apache.commons.vfs.util.RandomAccessMode;
 import org.apache.log4j.chainsaw.receivers.VisualReceiver;
 import org.apache.log4j.varia.LogFilePatternReceiver;
 
+import javax.swing.*;
+import java.awt.*;
+import java.io.*;
+
 /**
  * A VFS-enabled version of org.apache.log4j.varia.LogFilePatternReceiver.
- * 
+ * 
  * VFSLogFilePatternReceiver can parse and tail log files, converting entries 
into
  * LoggingEvents.  If the file doesn't exist when the receiver is initialized, 
the
  * receiver will look for the file once every 10 seconds.
@@ -63,17 +41,17 @@ import org.apache.log4j.varia.LogFilePatternReceiver;
  * file systems and the URIs needed to access the file systems.
  * 
  * Because some VFS file systems allow you to provide username/password, this 
receiver
- * provides an optional GUI dialog for entering the username/password fields 
instead 
+ * provides an optional GUI dialog for entering the username/password fields 
instead
  * of requiring you to hard code usernames and passwords into the URI.
  * 
- * If the 'promptForUserInfo' param is set to true (default is false), 
- * the receiver will wait for a call to 'setContainer', and then display 
+ * If the 'promptForUserInfo' param is set to true (default is false),
+ * the receiver will wait for a call to 'setContainer', and then display
  * a username/password dialog.
  * 
- * If you are using this receiver without a GUI, don't set promptForUserInfo 
+ * If you are using this receiver without a GUI, don't set promptForUserInfo
  * to true - it will block indefinitely waiting for a visual component.
- *  
- * If the 'promptForUserInfo' param is set to true, the fileURL should -leave 
out- 
+ * 
+ * If the 'promptForUserInfo' param is set to true, the fileURL should -leave 
out-
  * the username/password portion of the VFS-supported URI.  Examples:
  * 
  * An sftp URI that would be used with promptForUserInfo=true:
@@ -82,8 +60,8 @@ import org.apache.log4j.varia.LogFilePatternReceiver;
  * An sftp URI that would be used with promptForUserInfo=false:
  * sftp://username:password@192.168.1.100:22/home/thisuser/logfile.txt
  * 
- * This receiver relies on java.util.regex features to perform the parsing of 
text in the 
- * log file, however the only regular expression field explicitly supported is 
+ * This receiver relies on java.util.regex features to perform the parsing of 
text in the
+ * log file, however the only regular expression field explicitly supported is
  * a glob-style wildcard used to ignore fields in the log file if needed.  All 
other
  * fields are parsed by using the supplied keywords.
  * 
@@ -93,8 +71,8 @@ import org.apache.log4j.varia.LogFilePatternReceiver;
  * - specify the pattern (logFormat) used in the log file 

[12/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java 
b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 3d0789b..c449adb 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,49 +17,6 @@
 
 package org.apache.log4j.chainsaw.color;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Graphics;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.DefaultCellEditor;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.Icon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListSelectionModel;
-import javax.swing.WindowConstants;
-import javax.swing.border.Border;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
-
 import org.apache.log4j.chainsaw.ApplicationPreferenceModel;
 import org.apache.log4j.chainsaw.ChainsawConstants;
 import org.apache.log4j.chainsaw.ExpressionRuleContext;
@@ -70,868 +27,878 @@ import org.apache.log4j.rule.ColorRule;
 import org.apache.log4j.rule.ExpressionRule;
 import org.apache.log4j.rule.Rule;
 
+import javax.swing.*;
+import javax.swing.border.Border;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellRenderer;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.*;
+import java.util.List;
+
 
 /**
  * Panel which updates a RuleColorizer, allowing the user to build 
expression-based
  * color rules.
- * 
+ * 
  * TODO: examine ColorPanel/RuleColorizer/LogPanel listeners and interactions
  *
  * @author Scott Deboy sde...@apache.org
  */
-public class ColorPanel extends JPanel
-{
-  private static final String DEFAULT_STATUS = "Double click a rule 
field to edit the rule";
-  private final String currentRuleSet = "Default";
-
-  private RuleColorizer colorizer;
-  private JPanel rulesPanel;
-  private FilterModel filterModel;
-  private DefaultTableModel tableModel;
-  private JScrollPane tableScrollPane;
-  private JTable table;
-  private ActionListener closeListener;
-  private JLabel statusBar;
-  private Vector columns;
-  private final String noTab = "None";
-  private DefaultComboBoxModel logPanelColorizersModel;
-  private Map allLogPanelColorizers;
-  private RuleColorizer currentLogPanelColorizer;
-  private JTable searchTable;
-  private DefaultTableModel searchTableModel;
-  private Vector searchColumns;
-  private Vector searchDataVector;
-  private Vector searchDataVectorEntry;
-
-  private JTable alternatingColorTable;
-  private DefaultTableModel alternatingColorTableModel;
-  private Vector alternatingColorColumns;
-  private Vector alternatingColorDataVector;
-  private Vector alternatingColorDataVectorEntry;
-  private ApplicationPreferenceModel applicationPreferenceModel;
-  private JCheckBox bypassSearchColorsCheckBox;
-
-  public ColorPanel(final RuleColorizer currentLogPanelColorizer, final 
FilterModel filterModel,
-final Map allLogPanelColorizers, 
final ApplicationPreferenceModel applicationPreferenceModel) {
-super(new BorderLayout());
-
-this.currentLogPanelColorizer = currentLogPanelColorizer;
-this.colorizer = currentLogPanelColorizer;
-this.filterModel = 

[02/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/spi/SimpleULogger.java
--
diff --git a/src/main/java/org/apache/log4j/spi/SimpleULogger.java 
b/src/main/java/org/apache/log4j/spi/SimpleULogger.java
index 5303c72..b05cbff 100644
--- a/src/main/java/org/apache/log4j/spi/SimpleULogger.java
+++ b/src/main/java/org/apache/log4j/spi/SimpleULogger.java
@@ -28,17 +28,17 @@ import org.apache.log4j.helpers.MessageFormatter;
  * logger name, and the message followed by the line separator for the host.
  * In log4j terms it amounts to the "%r  [%t] %level %logger - %m%n" pattern.
  * 
-176 [main] INFO examples.Sort - Populating an array of 2 elements in reverse.
-225 [main] INFO examples.SortAlgo - Entered the sort method.
-304 [main] INFO SortAlgo.DUMP - Dump of interger array:
-317 [main] INFO SortAlgo.DUMP - Element [0] = 0
-331 [main] INFO SortAlgo.DUMP - Element [1] = 1
-343 [main] INFO examples.Sort - The next log statement should be an error msg.
-346 [main] ERROR SortAlgo.DUMP - Tried to dump an uninitialized array.
-at org.log4j.examples.SortAlgo.dump(SortAlgo.java:58)
-at org.log4j.examples.Sort.main(Sort.java:64)
-467 [main] INFO  examples.Sort - Exiting main method.
-
+ * 176 [main] INFO examples.Sort - Populating an array of 2 elements in 
reverse.
+ * 225 [main] INFO examples.SortAlgo - Entered the sort method.
+ * 304 [main] INFO SortAlgo.DUMP - Dump of interger array:
+ * 317 [main] INFO SortAlgo.DUMP - Element [0] = 0
+ * 331 [main] INFO SortAlgo.DUMP - Element [1] = 1
+ * 343 [main] INFO examples.Sort - The next log statement should be an error 
msg.
+ * 346 [main] ERROR SortAlgo.DUMP - Tried to dump an uninitialized array.
+ * at org.log4j.examples.SortAlgo.dump(SortAlgo.java:58)
+ * at org.log4j.examples.Sort.main(Sort.java:64)
+ * 467 [main] INFO  examples.Sort - Exiting main method.
+ * 
  *
  * @author Ceki Glc
  */
@@ -47,259 +47,261 @@ public final class SimpleULogger implements ULogger {
 /**
  * Logger name.
  */
-  private final String loggerName;
+private final String loggerName;
 
 
-  /**
-   * Mark the time when this class gets loaded into memory.
-   */
-  private static long startTime = System.currentTimeMillis();
+/**
+ * Mark the time when this class gets loaded into memory.
+ */
+private static long startTime = System.currentTimeMillis();
 
 /**
  * Line separator.
  */
-  public static final String LINE_SEPARATOR
-= System.getProperty("line.separator");
+public static final String LINE_SEPARATOR
+= System.getProperty("line.separator");
 
 /**
  * INFO string literal.
  */
-  private static final String INFO_STR = "INFO";
+private static final String INFO_STR = "INFO";
 /**
  * WARN string literal.
  */
-  private static final String WARN_STR = "WARN";
+private static final String WARN_STR = "WARN";
 /**
  * ERROR string literal.
  */
-  private static final String ERROR_STR = "ERROR";
-
-  /**
-   * Constructor is private to force construction through getLogger.
-   * @param name logger name
-   */
-  private SimpleULogger(final String name) {
-super();
-this.loggerName = name;
-  }
-
-  /**
-   * Creates a new instance.
-   *
-   * @param name logger name
-   * @return  logger.
-   */
-  public static SimpleULogger getLogger(final String name) {
-  return new SimpleULogger(name);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public boolean isDebugEnabled() {
-return false;
-  }
+private static final String ERROR_STR = "ERROR";
+
+/**
+ * Constructor is private to force construction through getLogger.
+ *
+ * @param name logger name
+ */
+private SimpleULogger(final String name) {
+super();
+this.loggerName = name;
+}
+
+/**
+ * Creates a new instance.
+ *
+ * @param name logger name
+ * @return logger.
+ */
+public static SimpleULogger getLogger(final String name) {
+return new SimpleULogger(name);
+}
 
 /**
  * {@inheritDoc}
  */
-  public void debug(final Object msg) {
-// NOP
-  }
+public boolean isDebugEnabled() {
+return false;
+}
 
 /**
  * {@inheritDoc}
  */
-  public void debug(final Object parameterizedMsg, final Object param1) {
-// NOP
-  }
+public void debug(final Object msg) {
+// NOP
+}
 
 /**
  * {@inheritDoc}
  */
-  public void debug(final String parameterizedMsg,
-final Object param1,
-final Object param2) {
-// NOP
-  }
+public void debug(final Object parameterizedMsg, final Object param1) {
+// NOP
+}
 
 /**
  * {@inheritDoc}
  */
-  public void debug(final Object msg, final Throwable t) {
-// NOP
-  }
-
-  /**
-   * This is our internal implementation for logging 

[23/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
index 97b0cd3..ce79562 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
@@ -18,32 +18,27 @@
 /*
  * @author Paul Smith psm...@apache.org
  *
-*/
+ */
 package org.apache.log4j.chainsaw;
 
-import java.awt.Component;
-import java.awt.EventQueue;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JTabbedPane;
-
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
-
 import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
 import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
 import org.apache.log4j.chainsaw.prefs.SettingsListener;
 import org.apache.log4j.chainsaw.prefs.SettingsManager;
 
+import javax.swing.*;
+import java.awt.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+
 
 /**
  * The only reason this class is needed is because
  * of a stupid 'issue' with the JTabbedPane.
- *
+ * 
  * If the currently selected tab is the first tab,
  * and we insert a new tab at the front, then as
  * far as the JTabbedPane is concerned, NO STATE has
@@ -51,141 +46,141 @@ import org.apache.log4j.chainsaw.prefs.SettingsManager;
  * the same (even though the TAB is different - go figure)
  * and therefore no ChangeEvent is generated and sent
  * to listeners.  Thanks very much Sun!
- *
+ * 
  * For more information on the issue:
  * http://developer.java.sun.com/developer/bugParade/bugs/4253819.html
- * 
+ *
  * @author Paul Smith psm...@apache.org
  * @author Scott Deboy sde...@apache.org
- *
  */
 
 class ChainsawTabbedPane extends JTabbedPane implements SettingsListener {
-  public SavableTabSetting tabSetting;
-  public static final String WELCOME_TAB = "Welcome";
-  public static final String ZEROCONF = "Zeroconf";
-  /**
-   *
-   * Create the tabbed pane.  
-   *
-   */
-  public ChainsawTabbedPane() {
-super();
-  }
-
-  /**
-   * Returns true if this TabbedPane has an instance of the WelcomePanel
-   * in it
-   * @return true/false
-   */
-  boolean containsWelcomePanel() {
-return indexOfTab("Welcome") > -1;
-  }
-
-  /**
-   * Our custom implementation of inserting a new tab,
-   * this method ALWAYS inserts it at the front because
-   * we get an ArrayIndexOutOfBoundsException otherwise
-   * under some JDK implementations.
-   *
-   * This method also causes a fireStateChange() to be
-   * called so that listeners get notified of the event.
-   * See the class level comments for the reason why...
-   * @param name
-   * @param component
-   */
-  public void addANewTab(String name, JComponent component, Icon icon) {
-super.insertTab(name, icon, component, null, getTabCount());
-
-super.fireStateChanged();
-if (!"chainsaw-log".equals(name)) {
-EventQueue.invokeLater(() -> setSelectedTab(getTabCount() - 1));
+public SavableTabSetting tabSetting;
+public static final String WELCOME_TAB = "Welcome";
+public static final String ZEROCONF = "Zeroconf";
+
+/**
+ * Create the tabbed pane.
+ */
+public ChainsawTabbedPane() {
+super();
+}
+
+/**
+ * Returns true if this TabbedPane has an instance of the WelcomePanel
+ * in it
+ *
+ * @return true/false
+ */
+boolean containsWelcomePanel() {
+return indexOfTab("Welcome") > -1;
+}
+
+/**
+ * Our custom implementation of inserting a new tab,
+ * this method ALWAYS inserts it at the front because
+ * we get an ArrayIndexOutOfBoundsException otherwise
+ * under some JDK implementations.
+ * 
+ * This method also causes a fireStateChange() to be
+ * called so that listeners get notified of the event.
+ * See the class level comments for the reason why...
+ *
+ * @param name
+ * @param component
+ */
+public void addANewTab(String name, JComponent component, Icon icon) {
+super.insertTab(name, icon, component, null, getTabCount());
+
+super.fireStateChanged();
+if (!"chainsaw-log".equals(name)) {
+EventQueue.invokeLater(() -> setSelectedTab(getTabCount() - 1));
+}
+}
+
+public void setSelectedTab(int index) {
+if (getTabCount() >= index) {
+setSelectedIndex(index);
+}
+
+getSelectedComponent().setVisible(true);
+getSelectedComponent().validate();
+super.fireStateChanged();
+}
+
+public void addANewTab(
+String name, JComponent component, Icon icon, String tooltip) {
+ 

[09/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/prefs/SaveSettingsEvent.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/prefs/SaveSettingsEvent.java 
b/src/main/java/org/apache/log4j/chainsaw/prefs/SaveSettingsEvent.java
index 0ea7d46..4535370 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/SaveSettingsEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SaveSettingsEvent.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,43 +21,42 @@ import java.util.Properties;
 
 /**
  * @author Paul Smith psm...@apache.org
- *
  */
 public class SaveSettingsEvent extends AbstractSettingsEvent {
 
-  
-  SaveSettingsEvent(Object source, File settingsLocation) {
-   super(source, settingsLocation);
-   }
-   
-   public void saveSetting(String key, int value) {
-   saveSetting(key, "" + value);
-   }
-
-   public void saveSetting(String key, double value) {
-   saveSetting(key, "" + value);
-   }
-
-   public void saveSetting(String key, Object value) {
-   saveSetting(key, value.toString());
-   }
-
-   public void saveSetting(String key, String value) {
-   properties.put(key, value);
-   }
-   
-   Properties getProperties() {
-   return properties;
-   }
-  
-  private Properties properties = new Properties();
-  /**
-   * @param string
-   * @param b
-   */
-  public void saveSetting(String string, boolean b)
-  {
-properties.put(string, b?Boolean.TRUE.toString():Boolean.FALSE.toString());
-
-  }
+
+SaveSettingsEvent(Object source, File settingsLocation) {
+super(source, settingsLocation);
+}
+
+public void saveSetting(String key, int value) {
+saveSetting(key, "" + value);
+}
+
+public void saveSetting(String key, double value) {
+saveSetting(key, "" + value);
+}
+
+public void saveSetting(String key, Object value) {
+saveSetting(key, value.toString());
+}
+
+public void saveSetting(String key, String value) {
+properties.put(key, value);
+}
+
+Properties getProperties() {
+return properties;
+}
+
+private Properties properties = new Properties();
+
+/**
+ * @param string
+ * @param b
+ */
+public void saveSetting(String string, boolean b) {
+properties.put(string, b ? Boolean.TRUE.toString() : 
Boolean.FALSE.toString());
+
+}
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsEvent.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsEvent.java 
b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsEvent.java
index 341ce97..50f9097 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsEvent.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,11 +20,10 @@ import java.util.EventObject;
 
 /**
  * @author Paul Smith psm...@apache.org
- *
  */
 public abstract class SettingsEvent extends EventObject {
 
-   SettingsEvent(Object source) {
-   super(source);
-   }
+SettingsEvent(Object source) {
+super(source);
+}
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java 
b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
index c4c78dc..f94bfa9 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to 

[08/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java 
b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
index aaa4642..063b539 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,892 +17,854 @@
 
 package org.apache.log4j.chainsaw.receivers;
 
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import java.io.File;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JToolBar;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
-import javax.swing.event.TreeExpansionEvent;
-import javax.swing.event.TreeModelEvent;
-import javax.swing.event.TreeModelListener;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.event.TreeWillExpandListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.ExpandVetoException;
-import javax.swing.tree.TreePath;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.chainsaw.PopupListener;
 import org.apache.log4j.chainsaw.SmallButton;
-import org.apache.log4j.chainsaw.prefs.SettingsManager;
-import org.apache.log4j.chainsaw.prefs.SettingsListener;
-import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
-import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
 import org.apache.log4j.chainsaw.help.HelpManager;
 import org.apache.log4j.chainsaw.helper.SwingHelper;
 import org.apache.log4j.chainsaw.icons.ChainsawIcons;
 import org.apache.log4j.chainsaw.icons.LevelIconFactory;
 import org.apache.log4j.chainsaw.icons.LineIconFactory;
 import org.apache.log4j.chainsaw.messages.MessageCenter;
+import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
+import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
+import org.apache.log4j.chainsaw.prefs.SettingsListener;
+import org.apache.log4j.chainsaw.prefs.SettingsManager;
 import org.apache.log4j.net.SocketNodeEventListener;
 import org.apache.log4j.net.SocketReceiver;
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Plugin;
-import org.apache.log4j.plugins.PluginEvent;
-import org.apache.log4j.plugins.PluginListener;
-import org.apache.log4j.plugins.PluginRegistry;
-import org.apache.log4j.plugins.Receiver;
+import org.apache.log4j.plugins.*;
 import org.apache.log4j.spi.LoggerRepository;
 import org.apache.log4j.spi.LoggerRepositoryEx;
 
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.ExpandVetoException;
+import javax.swing.tree.TreePath;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * This panel is used to manage all the Receivers configured within Log4j
  *
- *
  * @author Paul Smith psm...@apache.org
  * @author Scott Deboy sde...@apache.org
  */
 public class ReceiversPanel extends JPanel implements SettingsListener {
-  final Action newReceiverButtonAction;
-  final Action pauseReceiverButtonAction;
-  final Action playReceiverButtonAction;
-  final Action shutdownReceiverButtonAction;
-  final Action saveReceiversButtonAction;
-  final Action restartReceiverButtonAction;
-  private final Action showReceiverHelpAction;
-  private final Action startAllAction;
-  private final JPopupMenu popupMenu = new ReceiverPopupMenu();
-  private final JTree receiversTree = new JTree();
-  private final 

[04/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/net/SocketNode13.java
--
diff --git a/src/main/java/org/apache/log4j/net/SocketNode13.java 
b/src/main/java/org/apache/log4j/net/SocketNode13.java
index 1d5d77c..281fdb3 100644
--- a/src/main/java/org/apache/log4j/net/SocketNode13.java
+++ b/src/main/java/org/apache/log4j/net/SocketNode13.java
@@ -17,14 +17,6 @@
 
 package org.apache.log4j.net;
 
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.Constants;
 import org.apache.log4j.plugins.Pauseable;
@@ -33,266 +25,279 @@ import org.apache.log4j.spi.ComponentBase;
 import org.apache.log4j.spi.LoggerRepository;
 import org.apache.log4j.spi.LoggingEvent;
 
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 
 // Contributors:  Moses Hohman 
 
 /**
-   Read {@link LoggingEvent} objects sent from a remote client using
-   Sockets (TCP). These logging events are logged according to local
-   policy, as if they were generated locally.
-
-   For example, the socket node might decide to log events to a
-   local file and also resent them to a second socket node.
-
-Implementation lifted from org.apache.log4j.net.SocketNode
-in log4j 1.3 and renamed to prevent collision with
-log4j 1.2 implementation.
-
-@author  Ceki Glc
-@author  Paul Smith (psm...@apache.org)
-
-
-*/
+ * Read {@link LoggingEvent} objects sent from a remote client using
+ * Sockets (TCP). These logging events are logged according to local
+ * policy, as if they were generated locally.
+ * 
+ * For example, the socket node might decide to log events to a
+ * local file and also resent them to a second socket node.
+ * 
+ * Implementation lifted from org.apache.log4j.net.SocketNode
+ * in log4j 1.3 and renamed to prevent collision with
+ * log4j 1.2 implementation.
+ *
+ * @author Ceki Glc
+ * @author Paul Smith (psm...@apache.org)
+ */
 public class SocketNode13 extends ComponentBase implements Runnable, Pauseable 
{
 
 /**
  * Paused state.
  */
-  private boolean paused;
+private boolean paused;
 /**
  * Closed state.
  */
-  private boolean closed;
+private boolean closed;
 /**
  * Socket.
  */
-  private Socket socket;
+private Socket socket;
 /**
  * Receiver.
  */
-  private Receiver receiver;
+private Receiver receiver;
 /**
  * List of listeners.
  */
-  private final List listenerList = Collections.synchronizedList(new 
ArrayList());
-
-
-
-  /**
-Constructor for socket and logger repository.
-   @param s socket
-   @param hierarchy logger repository
-   */
-  public SocketNode13(final Socket s,
-final LoggerRepository hierarchy) {
-super();
-this.socket = s;
-this.repository = hierarchy;
-  }
-
-  /**
-Constructor for socket and receiver.
-   @param s socket
-   @param r receiver
-   */
-  public SocketNode13(final Socket s, final Receiver r) {
-super();
-this.socket = s;
-this.receiver = r;
-  }
-
-  /**
-   * Set the event listener on this node.
-   *
-   * @deprecated Now supports mutliple listeners, this method
-   * simply invokes the removeSocketNodeEventListener() to remove
-   * the listener, and then readds it.
-   * @param l listener
-   */
-  public void setListener(final SocketNodeEventListener l) {
-removeSocketNodeEventListener(l);
-addSocketNodeEventListener(l);
-  }
-
-  /**
-   * Adds the listener to the list of listeners to be notified of the
-   * respective event.
-   * @param listener the listener to add to the list
-   */
-  public void addSocketNodeEventListener(
-  final SocketNodeEventListener listener) {
-listenerList.add(listener);
-  }
-
-  /**
-   * Removes the registered Listener from this instances list of
-   * listeners.  If the listener has not been registered, then invoking
-   * this method has no effect.
-   *
-   * @param listener the SocketNodeEventListener to remove
-   */
-  public void removeSocketNodeEventListener(
-  final SocketNodeEventListener listener) {
-listenerList.remove(listener);
-  }
+private final List listenerList = Collections.synchronizedList(new 
ArrayList());
 
 
 /**
- * Deserialize events from socket until interrupted.
+ * Constructor for socket and logger repository.
+ *
+ * @param s socket
+ * @param hierarchy logger repository
  */
-  public void run() {
-LoggingEvent event;
-Logger remoteLogger;
-Exception 

[17/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/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 8ace4fd..f723cb0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -17,76 +17,7 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.Frame;
-import java.awt.Point;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.AllPermission;
-import java.security.CodeSource;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JEditorPane;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.JToolBar;
-import javax.swing.JWindow;
-import javax.swing.KeyStroke;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.ToolTipManager;
-import javax.swing.UIManager;
-import javax.swing.WindowConstants;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
-import javax.swing.event.HyperlinkEvent;
-
-import org.apache.log4j.Appender;
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.log4j.LoggerRepositoryExImpl;
+import org.apache.log4j.*;
 import org.apache.log4j.chainsaw.color.RuleColorizer;
 import org.apache.log4j.chainsaw.dnd.FileDnDTarget;
 import org.apache.log4j.chainsaw.help.HelpManager;
@@ -97,20 +28,12 @@ import org.apache.log4j.chainsaw.icons.LineIconFactory;
 import org.apache.log4j.chainsaw.messages.MessageCenter;
 import org.apache.log4j.chainsaw.osx.OSXIntegration;
 import org.apache.log4j.chainsaw.plugins.PluginClassLoaderFactory;
-import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
-import org.apache.log4j.chainsaw.prefs.MRUFileListPreferenceSaver;
-import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
-import org.apache.log4j.chainsaw.prefs.SettingsListener;
-import org.apache.log4j.chainsaw.prefs.SettingsManager;
+import org.apache.log4j.chainsaw.prefs.*;
 import org.apache.log4j.chainsaw.receivers.ReceiversHelper;
 import org.apache.log4j.chainsaw.receivers.ReceiversPanel;
 import org.apache.log4j.chainsaw.vfs.VFSLogFilePatternReceiver;
 import org.apache.log4j.net.SocketNodeEventListener;
-import org.apache.log4j.plugins.Plugin;
-import org.apache.log4j.plugins.PluginEvent;
-import org.apache.log4j.plugins.PluginListener;
-import org.apache.log4j.plugins.PluginRegistry;
-import org.apache.log4j.plugins.Receiver;
+import org.apache.log4j.plugins.*;
 import org.apache.log4j.rewrite.PropertyRewritePolicy;
 import org.apache.log4j.rewrite.RewriteAppender;
 import org.apache.log4j.rule.ExpressionRule;
@@ -122,1896 +45,1901 @@ import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.xml.DOMConfigurator;
 import org.apache.log4j.xml.XMLDecoder;
 
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.HyperlinkEvent;
+import java.awt.*;
+import java.awt.event.*;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.*;
+import java.util.*;
+import java.util.List;
+
 
 /**
  * The main entry point for Chainsaw, this class represents the first frame
  * that is used to display a Welcome panel, and 

[20/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java 
b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
index dcf16a0..8bbd2d4 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -17,113 +17,8 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Point;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.StringSelection;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionAdapter;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import javax.swing.AbstractAction;
-import javax.swing.AbstractListModel;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
-import javax.swing.ComboBoxEditor;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JColorChooser;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JEditorPane;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JSplitPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.JToolBar;
-import javax.swing.KeyStroke;
-import javax.swing.ListSelectionModel;
-import javax.swing.MutableComboBoxModel;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.WindowConstants;
-import javax.swing.event.CellEditorListener;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-import javax.swing.event.TableColumnModelEvent;
-import javax.swing.event.TableColumnModelListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-import javax.swing.text.Document;
-
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
@@ -150,8 +45,25 @@ import org.apache.log4j.rule.Rule;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.LoggingEventFieldResolver;
 
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
+import javax.swing.*;
+import javax.swing.event.*;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
+import javax.swing.text.Document;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.*;
+import 

[05/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
--
diff --git a/src/main/java/org/apache/log4j/helpers/MessageFormatter.java 
b/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
index 5f82d73..05a753d 100644
--- a/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
+++ b/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,8 +20,8 @@ package org.apache.log4j.helpers;
 
 /**
  * Formats messages according to very simple rules.
- * See {@link #format(String,Object)} and
- * {@link #format(String,Object,Object)} for more details.
+ * See {@link #format(String, Object)} and
+ * {@link #format(String, Object, Object)} for more details.
  *
  * @author Ceki Glc
  */
@@ -45,17 +45,15 @@ public final class MessageFormatter {
 /**
  * Performs single argument substitution for the 'messagePattern' passed as
  * parameter.
- *
+ * 
  * For example, MessageFormatter.format("Hi {}.", "there");
  * will return the string "Hi there.".
  * 
  * The {} pair is called the formatting element. It serves to designate the
  * location where the argument needs to be inserted within the pattern.
  *
- * @param messagePattern
- * The message pattern which will be parsed and formatted
- * @param argument
- * The argument to be inserted instead of the formatting element
+ * @param messagePattern The message pattern which will be parsed and 
formatted
+ * @param argument   The argument to be inserted instead of the 
formatting element
  * @return The formatted message
  */
 public static String format(final String messagePattern,
@@ -79,8 +77,8 @@ public final class MessageFormatter {
 return messagePattern;
 } else {
 String sbuf = messagePattern.substring(0, j) +
-argument +
-messagePattern.substring(j + 2);
+argument +
+messagePattern.substring(j + 2);
 return sbuf;
 }
 }
@@ -90,7 +88,7 @@ public final class MessageFormatter {
  * /**
  * Performs a two argument substitution for the 'messagePattern' passed as
  * parameter.
- *
+ * 
  * For example, MessageFormatter.format("Hi {}. My name is {}.",
  * "there", "David"); will return the string
  * "Hi there. My name is David.".
@@ -99,12 +97,9 @@ public final class MessageFormatter {
  * location where the arguments need to be inserted within
  * the message pattern.
  *
- * @param messagePattern
- * The message pattern which will be parsed and formatted
- * @param arg1
- * The first argument to replace the first formatting element
- * @param arg2
- * The second argument to replace the second formatting element
+ * @param messagePattern The message pattern which will be parsed and 
formatted
+ * @param arg1   The first argument to replace the first 
formatting element
+ * @param arg2   The second argument to replace the second 
formatting element
  * @return The formatted message
  */
 public static String format(final String messagePattern,
@@ -126,7 +121,7 @@ public final class MessageFormatter {
 // add the tail string which contains no variables
 // and return the result.
 sbuf.append(messagePattern.substring(i,
-messagePattern.length()));
+messagePattern.length()));
 return sbuf.toString();
 }
 } else {
@@ -134,7 +129,7 @@ public final class MessageFormatter {
 if ((delimStop != DELIM_STOP)) {
 // invalid DELIM_START/DELIM_STOP pair
 sbuf.append(messagePattern.substring(i,
-messagePattern.length()));
+messagePattern.length()));
 return sbuf.toString();
 }
 sbuf.append(messagePattern.substring(i, j));

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java

[14/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java 
b/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java
index 0077702..752501f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java
@@ -16,171 +16,171 @@
  */
 package org.apache.log4j.chainsaw;
 
-import java.awt.Color;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.log4j.helpers.Constants;
 import org.apache.log4j.rule.Rule;
 import org.apache.log4j.spi.LoggingEvent;
 
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Wrap access to a LoggingEvent.  All property updates need to go through 
this object and not through the wrapped logging event,
  * since the properties are shared by two views of the same backing 
LoggingEvent, and loggingEvent itself creates a copy of passed-in properties..
- *
+ * 
  * Property reads can be made on the actual LoggingEvent.
  */
 public class LoggingEventWrapper {
-  private final LoggingEvent loggingEvent;
-  private static final int DEFAULT_HEIGHT = -1;
-
-  private Color colorRuleBackground = 
ChainsawConstants.COLOR_DEFAULT_BACKGROUND;
-  private Color colorRuleForeground = 
ChainsawConstants.COLOR_DEFAULT_FOREGROUND;
-  private int markerHeight = DEFAULT_HEIGHT;
-  private int msgHeight = DEFAULT_HEIGHT;
-
-  //set to the log4jid value via setId - assumed to never change
-  private int id;
-
-  private boolean searchMatch = false;
-  //a Map of event fields to Sets of string matches (can be used to render 
matches differently)
-  Map eventMatches = new HashMap();
-  private LoggingEventWrapper syncWrapper;
-  private boolean displayed;
-
-  public LoggingEventWrapper(LoggingEvent loggingEvent) {
-this.loggingEvent = loggingEvent;
-  }
-
-  public LoggingEventWrapper(LoggingEventWrapper loggingEventWrapper) {
-this.loggingEvent = loggingEventWrapper.getLoggingEvent();
-this.id = loggingEventWrapper.id;
-this.syncWrapper = loggingEventWrapper;
-loggingEventWrapper.syncWrapper = this;
-  }
-
-  public LoggingEvent getLoggingEvent() {
-return loggingEvent;
-  }
-
-  public void setProperty(String propName, String propValue) {
-loggingEvent.setProperty(propName, propValue);
-if (id == 0 && propName.equals(Constants.LOG4J_ID_KEY)) {
-  id = Integer.parseInt(propValue);
-}
-if (syncWrapper != null && 
!propName.equals(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE)) {
-  syncWrapper.getLoggingEvent().setProperty(propName, propValue);
-}
-  }
-
-  public Object removeProperty(String propName) {
-Object result = loggingEvent.removeProperty(propName);
-if (syncWrapper != null && 
!propName.equals(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE)) {
-  syncWrapper.getLoggingEvent().removeProperty(propName);
-}
-return result;
-  }
-
-  public Set getPropertyKeySet() {
-return loggingEvent.getPropertyKeySet();
-  }
-
-  public void updateColorRuleColors(Color backgroundColor, Color 
foregroundColor) {
-if (backgroundColor != null && foregroundColor != null) {
-  this.colorRuleBackground = backgroundColor;
-  this.colorRuleForeground = foregroundColor;
-  if (syncWrapper != null) {
-syncWrapper.colorRuleBackground = this.colorRuleBackground;
-syncWrapper.colorRuleForeground = this.colorRuleForeground;
-  }
-} else {
-  this.colorRuleBackground = ChainsawConstants.COLOR_DEFAULT_BACKGROUND;
-  this.colorRuleForeground = ChainsawConstants.COLOR_DEFAULT_FOREGROUND;
-  if (syncWrapper != null) {
-syncWrapper.colorRuleBackground = this.colorRuleBackground;
-syncWrapper.colorRuleForeground = this.colorRuleForeground;
-  }
-}
-  }
-
-  public void evaluateSearchRule(Rule searchRule) {
-eventMatches.clear();
-searchMatch = searchRule != null && searchRule.evaluate(loggingEvent, 
eventMatches);
-  }
-
-  public Map getSearchMatches() {
-return eventMatches;
-  }
-
-  public Color getForeground() {
-return colorRuleForeground;
-  }
-
-  public Color getBackground() {
-return colorRuleBackground;
-  }
-
-  public Color getColorRuleBackground() {
-return colorRuleBackground;
-  }
-
-  public Color getColorRuleForeground() {
-return colorRuleForeground;
-  }
-
-  public boolean isSearchMatch() {
-return searchMatch;
-  }
-
-  public void setMarkerHeight(int markerHeight) {
-this.markerHeight = markerHeight;
-  }
-
-  public int getMarkerHeight() {
-return markerHeight;
-  }
-
-  public void setMsgHeight(int msgHeight) {
-this.msgHeight = msgHeight;
-  }
-
-  public int getMsgHeight() {
-return msgHeight;
-  }

[26/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java 
b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
index dc9..eac5b1e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModel.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,20 +16,18 @@
  */
 package org.apache.log4j.chainsaw;
 
-import java.awt.Color;
+import javax.swing.*;
+import java.awt.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
-import javax.swing.UIManager;
-
 /**
  * Encapsulates the Chainsaw Application wide properties
  *
  * @author Paul Smith psm...@apache.org
- *
  */
 public class ApplicationPreferenceModel {
 
@@ -53,13 +51,13 @@ public class ApplicationPreferenceModel {
 
 private transient final PropertyChangeSupport propertySupport =
 new PropertyChangeSupport(this);
-
+
 private int tabPlacement = 3;
-
+
 /**
  * If not 'empty', this property will be used as the URL to load log4j 
configuration at startup
  */
-private Vector configurationURLs=new Vector<>();
+private Vector configurationURLs = new Vector<>();
 
 private String configurationURL = "";
 
@@ -68,8 +66,8 @@ public class ApplicationPreferenceModel {
  */
 private transient String bypassConfigurationURL = null;
 /**
- *this means for Receivers that require optional jars that can't be 
delivered
- *by the Web start classloader, we need to be able to remove the 
SecurityManager in place
+ * this means for Receivers that require optional jars that can't be 
delivered
+ * by the Web start classloader, we need to be able to remove the 
SecurityManager in place
  */
 private boolean okToRemoveSecurityManager = false;
 private static final int CONFIGURATION_URL_ENTRY_COUNT = 10;
@@ -77,7 +75,7 @@ public class ApplicationPreferenceModel {
 private boolean defaultColumnsSet;
 private boolean bypassSearchColors = false;
 
-  /**
+/**
  * @param listener
  */
 public void addPropertyChangeListener(PropertyChangeListener listener) {
@@ -89,7 +87,7 @@ public class ApplicationPreferenceModel {
  * @param listener
  */
 public void addPropertyChangeListener(String propertyName,
-PropertyChangeListener listener) {
+  PropertyChangeListener listener) {
 propertySupport.addPropertyChangeListener(propertyName, listener);
 }
 
@@ -99,7 +97,7 @@ public class ApplicationPreferenceModel {
  * @param newValue
  */
 private void firePropertyChange(String propertyName, boolean oldValue,
-boolean newValue) {
+boolean newValue) {
 propertySupport.firePropertyChange(propertyName, oldValue, newValue);
 }
 
@@ -109,7 +107,7 @@ public class ApplicationPreferenceModel {
  * @param newValue
  */
 private void firePropertyChange(String propertyName, int oldValue,
-int newValue) {
+int newValue) {
 propertySupport.firePropertyChange(propertyName, oldValue, newValue);
 }
 
@@ -119,7 +117,7 @@ public class ApplicationPreferenceModel {
  * @param newValue
  */
 private void firePropertyChange(String propertyName, Object oldValue,
-Object newValue) {
+Object newValue) {
 propertySupport.firePropertyChange(propertyName, oldValue, newValue);
 }
 
@@ -145,7 +143,7 @@ public class ApplicationPreferenceModel {
 
 return showNoReceiverWarning;
 }
-
+
 public final String getIdentifierExpression() {
 return identifierExpression;
 }
@@ -155,7 +153,7 @@ public class ApplicationPreferenceModel {
 cyclicBufferSize = newCyclicBufferSize;
 firePropertyChange("cyclicBufferSize", oldCyclicBufferSize, 
newCyclicBufferSize);
 }
-
+
 public final int getCyclicBufferSize() {
 return cyclicBufferSize;
 }
@@ -165,13 +163,13 @@ public class ApplicationPreferenceModel {
 toolTipDisplayMillis = 

[25/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
index bbdc7bc..2c6924b 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
@@ -16,333 +16,330 @@
  */
 package org.apache.log4j.chainsaw;
 
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.swing.event.EventListenerList;
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.helpers.Constants;
 import org.apache.log4j.net.SocketReceiver;
 import org.apache.log4j.rule.ExpressionRule;
 import org.apache.log4j.rule.Rule;
-import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.LoggerRepositoryEx;
+import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.LoggingEventFieldResolver;
 
+import javax.swing.event.EventListenerList;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.*;
+
 /**
  * A handler class that either extends a particular appender hierarchy or can 
be
  * bound into the Log4j appender framework, and queues events, to be later
  * dispatched to registered/interested parties.
- * 
+ *
  * @author Scott Deboy sde...@apache.org
  * @author Paul Smith psm...@apache.org
- * 
  */
 public class ChainsawAppenderHandler extends AppenderSkeleton {
-  private static final String DEFAULT_IDENTIFIER = "Unknown";
-  private final Object mutex = new Object();
-  private int sleepInterval = 1000;
-  private EventListenerList listenerList = new EventListenerList();
-  private double dataRate = 0.0;
-  private String identifierExpression;
-  private final LoggingEventFieldResolver resolver = LoggingEventFieldResolver
-  .getInstance();
-  private PropertyChangeSupport propertySupport = new PropertyChangeSupport(
-  this);
-  private Map customExpressionRules = new HashMap<>();
-
-  /**
-   * NOTE: This variable needs to be physically located LAST, because
-   * of the initialization sequence, the WorkQueue constructor starts a thread 
-   * which ends up needing some reference to fields created in 
ChainsawAppenderHandler (outer instance)
-   * which may not have been created yet.  Becomes a race condition, and 
therefore
-   * this field initialization should be kept last.
-   */
-  private WorkQueue worker = new WorkQueue();
-  
-  public ChainsawAppenderHandler(final ChainsawAppender appender) {
-super(true);
-appender.setAppender(this);
-  }
-
-  public ChainsawAppenderHandler() {
-super(true);
-  }
-
-  public void setIdentifierExpression(String identifierExpression) {
-synchronized (mutex) {
-  this.identifierExpression = identifierExpression;
-  mutex.notify();
+private static final String DEFAULT_IDENTIFIER = "Unknown";
+private final Object mutex = new Object();
+private int sleepInterval = 1000;
+private EventListenerList listenerList = new EventListenerList();
+private double dataRate = 0.0;
+private String identifierExpression;
+private final LoggingEventFieldResolver resolver = 
LoggingEventFieldResolver
+.getInstance();
+private PropertyChangeSupport propertySupport = new PropertyChangeSupport(
+this);
+private Map customExpressionRules = new HashMap<>();
+
+/**
+ * NOTE: This variable needs to be physically located LAST, because
+ * of the initialization sequence, the WorkQueue constructor starts a 
thread
+ * which ends up needing some reference to fields created in 
ChainsawAppenderHandler (outer instance)
+ * which may not have been created yet.  Becomes a race condition, and 
therefore
+ * this field initialization should be kept last.
+ */
+private WorkQueue worker = new WorkQueue();
+
+public ChainsawAppenderHandler(final ChainsawAppender appender) {
+super(true);
+appender.setAppender(this);
 }
-  }
-
-  public String getIdentifierExpression() {
-return identifierExpression;
-  }
-
-  public void addCustomEventBatchListener(String identifier,
-  EventBatchListener l) throws IllegalArgumentException {
-customExpressionRules.put(identifier, ExpressionRule.getRule(identifier));
-listenerList.add(EventBatchListener.class, l);
-  }
-
-  public void addEventBatchListener(EventBatchListener l) {
-listenerList.add(EventBatchListener.class, l);
-  }
-
-  public void removeEventBatchListener(EventBatchListener l) {
-

[01/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

Repository: logging-chainsaw
Updated Branches:
  refs/heads/master a805396cf -> 96ebd9ad2


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
--
diff --git a/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java 
b/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
index 00d6f7c..3190b1a 100644
--- a/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
+++ b/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
@@ -17,37 +17,28 @@
 
 package org.apache.log4j.xml;
 
-import java.awt.Component;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.StringReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Vector;
-import java.util.zip.ZipInputStream;
-
-import javax.swing.ProgressMonitorInputStream;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.UtilLoggingLevel;
 import org.apache.log4j.spi.Decoder;
+import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.ThrowableInformation;
-import org.apache.log4j.spi.LocationInfo;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
+import javax.swing.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.io.*;
+import java.net.URL;
+import java.util.*;
+import java.util.zip.ZipInputStream;
+
 
 /**
  * Decodes JDK 1.4's java.util.logging package events
@@ -55,380 +46,386 @@ import org.xml.sax.InputSource;
  *
  * @author Scott Deboy (sde...@apache.org)
  * @author Paul Smith (psm...@apache.org)
- *
  */
 public class UtilLoggingXMLDecoder implements Decoder {
-  //NOTE: xml section is only handed on first delivery of events
-  //on this first delivery of events, there is no end tag for the log element
-  /**
-   * Document prolog.
-   */
-  private static final String BEGIN_PART =
-"";
+//NOTE: xml section is only handed on first delivery of events
+//on this first delivery of events, there is no end tag for the log element
+/**
+ * Document prolog.
+ */
+private static final String BEGIN_PART =
+"";
 /**
  * Document close.
  */
-  private static final String END_PART = "";
+private static final String END_PART = "";
 /**
  * Document builder.
  */
-  private DocumentBuilder docBuilder;
+private DocumentBuilder docBuilder;
 /**
  * Additional properties.
  */
-  private Map additionalProperties = new HashMap();
+private Map additionalProperties = new HashMap();
 /**
  * Partial event.
  */
-  private String partialEvent;
+private String partialEvent;
 /**
  * Record end.
  */
-  private static final String RECORD_END = "";
+private static final String RECORD_END = "";
 /**
  * Owner.
  */
-  private Component owner = null;
+private Component owner = null;
 
-  private static final String ENCODING = "UTF-8";
+private static final String ENCODING = "UTF-8";
 
 /**
  * Create new instance.
+ *
  * @param o owner
  */
-  public UtilLoggingXMLDecoder(final Component o) {
-  this();
-  this.owner = o;
-  }
+public UtilLoggingXMLDecoder(final Component o) {
+this();
+this.owner = o;
+}
 
 /**
  * Create new instance.
  */
-  public UtilLoggingXMLDecoder() {
-DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-dbf.setValidating(false);
-
-try {
-  docBuilder = dbf.newDocumentBuilder();
-  docBuilder.setErrorHandler(new SAXErrorHandler());
-  docBuilder.setEntityResolver(new UtilLoggingEntityResolver());
-} catch (ParserConfigurationException pce) {
-  System.err.println("Unable to get document builder");
+public UtilLoggingXMLDecoder() {
+DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+dbf.setValidating(false);
+
+try {
+docBuilder = dbf.newDocumentBuilder();
+docBuilder.setErrorHandler(new SAXErrorHandler());
+docBuilder.setEntityResolver(new UtilLoggingEntityResolver());
+} catch (ParserConfigurationException pce) {
+System.err.println("Unable to get document builder");
+}
 }
-  }
-
-  /**
-   * Sets an additionalProperty map, where each Key/Value pair is
-   * automatically added to each 

[03/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
--
diff --git a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java 
b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
index 104b2f7..56f45f5 100644
--- a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
+++ b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,299 +17,304 @@
 
 package org.apache.log4j.net;
 
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.List;
-import java.util.Vector;
-
 import org.apache.log4j.plugins.Pauseable;
 import org.apache.log4j.plugins.Plugin;
 import org.apache.log4j.plugins.Receiver;
 import org.apache.log4j.spi.LoggerRepository;
 import org.apache.log4j.spi.LoggingEvent;
 
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.List;
+import java.util.Vector;
+
 
 /**
-  XMLSocketReceiver receives a remote logging event via XML on a configured
-  socket and "posts" it to a LoggerRepository as if the event were
-  generated locally. This class is designed to receive events from
-  the XMLSocketAppender class (or classes that send compatible events).
-  
-  This receiver supports log files created using log4j's XMLLayout, as well as 
java.util.logging
-  XMLFormatter (via the org.apache.log4j.spi.Decoder interface).
-  
-  By default, log4j's XMLLayout is supported (no need to specify a decoder in 
that case).
-  
-  To configure this receiver to support java.util.logging's XMLFormatter, 
specify a 'decoder' param
-  of org.apache.log4j.xml.UtilLoggingXMLDecoder.
-  
-  Once the event has been "posted", it will be handled by the
-  appenders currently configured in the LoggerRespository.
-
-  @author Mark Womack
-  @author Scott Deboy sde...@apache.org
-
-*/
+ * XMLSocketReceiver receives a remote logging event via XML on a configured
+ * socket and "posts" it to a LoggerRepository as if the event were
+ * generated locally. This class is designed to receive events from
+ * the XMLSocketAppender class (or classes that send compatible events).
+ * 
+ * This receiver supports log files created using log4j's XMLLayout, as well 
as java.util.logging
+ * XMLFormatter (via the org.apache.log4j.spi.Decoder interface).
+ * 
+ * By default, log4j's XMLLayout is supported (no need to specify a decoder in 
that case).
+ * 
+ * To configure this receiver to support java.util.logging's XMLFormatter, 
specify a 'decoder' param
+ * of org.apache.log4j.xml.UtilLoggingXMLDecoder.
+ * 
+ * Once the event has been "posted", it will be handled by the
+ * appenders currently configured in the LoggerRespository.
+ *
+ * @author Mark Womack
+ * @author Scott Deboy sde...@apache.org
+ */
 public class XMLSocketReceiver extends Receiver implements Runnable, 
PortBased, Pauseable {
-  private boolean paused;
-  //default to log4j xml decoder
-  protected String decoder = "org.apache.log4j.xml.XMLDecoder";
-  private ServerSocket serverSocket;
-  private List socketList = new Vector<>();
-  private Thread rThread;
-  public static final int DEFAULT_PORT = 4448;
-  protected int port = DEFAULT_PORT;
-  private boolean advertiseViaMulticastDNS;
-  private ZeroConfSupport zeroConf;
-
-  /**
-   * The MulticastDNS zone advertised by an XMLSocketReceiver
-   */
-  public static final String ZONE = "_log4j_xml_tcpaccept_receiver.local.";
-
-  /*
-   * Log4j doesn't provide an XMLSocketAppender, but the MulticastDNS zone 
that should be advertised by one is:
-   * _log4j_xml_tcpconnect_appender.local.
-   */
-
-  public XMLSocketReceiver() {
-  }
-
-  public XMLSocketReceiver(int _port) {
-port = _port;
-  }
-
-  public XMLSocketReceiver(int _port, LoggerRepository _repository) {
-port = _port;
-repository = _repository;
-  }
-
-  /**
-Get the port to receive logging events on. */
-  public int getPort() {
-return port;
-  }
-
-  /**
-Set the port to receive logging events on. */
-  public void setPort(int _port) {
-port = _port;
-  }
-
-  public String getDecoder() {
-return decoder;
-  }
-
-  /**
-   *Specify the class name implementing org.apache.log4j.spi.Decoder that can 
process the file.
-   */
-  public void setDecoder(String _decoder) {
-decoder = _decoder;
-  }
-
-  public boolean isPaused() {
-return paused;
-  }
-
-  public void setPaused(boolean b) {
-paused = b;
-  }
-
-  /**

[13/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java 
b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
index 3b6a662..3161792 100644
--- a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
@@ -17,11 +17,18 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Toolkit;
+import org.apache.log4j.chainsaw.color.RuleColorizer;
+import org.apache.log4j.chainsaw.icons.LevelIconFactory;
+import org.apache.log4j.helpers.Constants;
+import org.apache.log4j.rule.Rule;
+import org.apache.log4j.spi.LoggingEventFieldResolver;
+
+import javax.swing.*;
+import javax.swing.border.Border;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.text.*;
+import java.awt.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -29,43 +36,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
 
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTable;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableColumn;
-import javax.swing.text.AbstractDocument;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.BoxView;
-import javax.swing.text.ComponentView;
-import javax.swing.text.Element;
-import javax.swing.text.IconView;
-import javax.swing.text.LabelView;
-import javax.swing.text.MutableAttributeSet;
-import javax.swing.text.ParagraphView;
-import javax.swing.text.SimpleAttributeSet;
-import javax.swing.text.Style;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyledDocument;
-import javax.swing.text.StyledEditorKit;
-import javax.swing.text.TabSet;
-import javax.swing.text.TabStop;
-import javax.swing.text.View;
-import javax.swing.text.ViewFactory;
-
-import org.apache.log4j.chainsaw.color.RuleColorizer;
-import org.apache.log4j.chainsaw.icons.LevelIconFactory;
-import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.rule.Rule;
-import org.apache.log4j.spi.LoggingEventFieldResolver;
-
 
 /**
  * A specific TableCellRenderer that colourizes a particular cell based on
@@ -74,262 +44,261 @@ import org.apache.log4j.spi.LoggingEventFieldResolver;
  * @author Claude Duguay
  * @author Scott Deboy sde...@apache.org
  * @author Paul Smith psm...@apache.org
- *
  */
 public class TableColorizingRenderer extends DefaultTableCellRenderer {
-  private static final DateFormat DATE_FORMATTER = new 
SimpleDateFormat(Constants.SIMPLE_TIME_PATTERN);
-  private static final Map iconMap = 
LevelIconFactory.getInstance().getLevelToIconMap();
-  private RuleColorizer colorizer;
-  private boolean levelUseIcons = false;
-  private boolean wrap = false;
-  private boolean highlightSearchMatchText;
-  private DateFormat dateFormatInUse = DATE_FORMATTER;
-  private int loggerPrecision = 0;
-  private boolean toolTipsVisible;
-  private String dateFormatTZ;
-  private boolean useRelativeTimesToFixedTime = false;
-  private long relativeTimestampBase;
-
-  private static int borderWidth = ChainsawConstants.TABLE_BORDER_WIDTH;
-
-  private final Color borderColor;
-
-  private final JTextPane levelTextPane = new JTextPane();
-  private JTextPane singleLineTextPane = new JTextPane();
-
-  private final JPanel multiLinePanel = new JPanel(new BorderLayout());
-  private final JPanel generalPanel = new JPanel(new BorderLayout());
-  private final JPanel levelPanel = new JPanel(new BorderLayout());
-  private ApplicationPreferenceModel applicationPreferenceModel;
-  private JTextPane multiLineTextPane;
-  private MutableAttributeSet boldAttributeSet;
-  private TabSet tabs;
-  private int maxHeight;
-  private boolean useRelativeTimesToPrevious;
-  private EventContainer eventContainer;
-  private LogPanelPreferenceModel logPanelPreferenceModel;
-  private SimpleAttributeSet insetAttributeSet;
-  private boolean colorizeSearch;
-
-  /**
-   * Creates a new TableColorizingRenderer object.
-   */
-  public TableColorizingRenderer(RuleColorizer colorizer, 
ApplicationPreferenceModel applicationPreferenceModel,
- EventContainer eventContainer, 
LogPanelPreferenceModel logPanelPreferenceModel,
- boolean colorizeSearch) {
-this.applicationPreferenceModel = 

[27/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

Reformat code for consistency


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/96ebd9ad
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/96ebd9ad
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/96ebd9ad

Branch: refs/heads/master
Commit: 96ebd9ad265846f6a8ec723b360aad4911220f62
Parents: a805396
Author: Matt Sicker 
Authored: Tue Mar 13 02:04:22 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 02:04:22 2018 -0500

--
 pom.xml |8 +-
 .../apache/log4j/LoggerRepositoryExImpl.java| 1055 +--
 src/main/java/org/apache/log4j/ULogger.java |  178 +-
 .../log4j/chainsaw/AbstractPreferencePanel.java |  302 +-
 .../chainsaw/ApplicationPreferenceModel.java|  328 +-
 .../ApplicationPreferenceModelPanel.java| 1048 ++-
 .../ApplicationPreferenceModelSaver.java|   18 +-
 .../apache/log4j/chainsaw/BasicPrefPanel.java   |   50 +-
 .../apache/log4j/chainsaw/ChainsawAbout.java|   46 +-
 .../apache/log4j/chainsaw/ChainsawAppender.java |  282 +-
 .../log4j/chainsaw/ChainsawAppenderHandler.java |  589 +-
 .../apache/log4j/chainsaw/ChainsawColumns.java  |  118 +-
 .../log4j/chainsaw/ChainsawConstants.java   |  161 +-
 .../ChainsawCyclicBufferTableModel.java | 1312 ++--
 .../log4j/chainsaw/ChainsawEventBatch.java  |   83 +-
 .../apache/log4j/chainsaw/ChainsawSplash.java   |  116 +-
 .../log4j/chainsaw/ChainsawStatusBar.java   |  461 +-
 .../log4j/chainsaw/ChainsawTabbedPane.java  |  271 +-
 .../log4j/chainsaw/ChainsawToolBarAndMenus.java | 1610 +++--
 .../apache/log4j/chainsaw/ChainsawViewer.java   |   25 +-
 .../log4j/chainsaw/CheckListCellRenderer.java   |   82 +-
 .../apache/log4j/chainsaw/ColumnComparator.java |  273 +-
 .../apache/log4j/chainsaw/CommonActions.java|   40 +-
 .../chainsaw/CopyEventsToClipboardAction.java   |   26 +-
 .../apache/log4j/chainsaw/CyclicBufferList.java |  314 +-
 .../apache/log4j/chainsaw/DockablePanel.java|   31 +-
 .../log4j/chainsaw/EventBatchListener.java  |   38 +-
 .../apache/log4j/chainsaw/EventContainer.java   |  303 +-
 .../log4j/chainsaw/EventCountListener.java  |9 +-
 .../log4j/chainsaw/ExpressionRuleContext.java   |  451 +-
 .../apache/log4j/chainsaw/FileLoadAction.java   |   55 +-
 .../org/apache/log4j/chainsaw/FileMenu.java |  230 +-
 .../apache/log4j/chainsaw/FileSaveAction.java   |  174 +-
 .../org/apache/log4j/chainsaw/Generator.java|  173 +-
 .../log4j/chainsaw/GeneratorBeanInfo.java   |   29 +-
 .../org/apache/log4j/chainsaw/JSortTable.java   |  244 +-
 .../log4j/chainsaw/JTextComponentFormatter.java |   14 +-
 .../chainsaw/LogFilePatternLayoutBuilder.java   |  329 +-
 .../org/apache/log4j/chainsaw/LogPanel.java | 6488 +-
 .../log4j/chainsaw/LogPanelLoggerTreeModel.java |  255 +-
 .../log4j/chainsaw/LogPanelPreferenceModel.java |  985 +--
 .../log4j/chainsaw/LogPanelPreferencePanel.java | 1068 ++-
 .../java/org/apache/log4j/chainsaw/LogUI.java   | 3623 +-
 .../log4j/chainsaw/LoggerNameListener.java  |   27 +-
 .../apache/log4j/chainsaw/LoggerNameModel.java  |   63 +-
 .../log4j/chainsaw/LoggerNameModelSupport.java  |  124 +-
 .../apache/log4j/chainsaw/LoggerNameTree.java   |   32 +-
 .../log4j/chainsaw/LoggerNameTreePanel.java | 2875 
 .../log4j/chainsaw/LoggingEventWrapper.java |  314 +-
 .../log4j/chainsaw/ModifiableListModel.java |9 +-
 .../org/apache/log4j/chainsaw/NewKeyEvent.java  |   67 +-
 .../apache/log4j/chainsaw/NewKeyListener.java   |   16 +-
 .../apache/log4j/chainsaw/PopupListener.java|   56 +-
 .../apache/log4j/chainsaw/ProgressPanel.java|   70 +-
 .../chainsaw/ReceiverConfigurationPanel.java|  224 +-
 .../org/apache/log4j/chainsaw/RuleMediator.java |  127 +-
 .../log4j/chainsaw/SavableTabSetting.java   |3 +-
 .../apache/log4j/chainsaw/ShutdownListener.java |   17 +-
 .../org/apache/log4j/chainsaw/SmallButton.java  |  191 +-
 .../log4j/chainsaw/SmallToggleButton.java   |  210 +-
 .../apache/log4j/chainsaw/SortArrowIcon.java|   82 +-
 .../log4j/chainsaw/SortHeaderRenderer.java  |   88 +-
 .../apache/log4j/chainsaw/SortTableModel.java   |   10 +-
 .../log4j/chainsaw/TableColorizingRenderer.java |  958 ++-
 .../apache/log4j/chainsaw/ThresholdSlider.java  |  119 +-
 .../log4j/chainsaw/ThrowableRenderPanel.java|  123 +-
 .../org/apache/log4j/chainsaw/WelcomePanel.java |  208 +-
 .../apache/log4j/chainsaw/color/ColorPanel.java | 1605 +++--
 .../apache/log4j/chainsaw/color/Colorizer.java  |   29 +-
 .../log4j/chainsaw/color/RuleColorizer.java |  479 +-
 .../log4j/chainsaw/dnd/FileDnDTarget.java   |   82 +-
 .../filter/EventTypeEntryContainer.java |  195 +-
 .../log4j/chainsaw/filter/FilterModel.java  

[2/2] logging-chainsaw git commit: Use StringBuilders in loops

[mattsicker]

Use StringBuilders in loops


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/cdc4f3ca
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/cdc4f3ca
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/cdc4f3ca

Branch: refs/heads/master
Commit: cdc4f3cab31d0e07dda43c17317fa2a226657af2
Parents: 21c1e45
Author: Matt Sicker 
Authored: Tue Mar 13 01:03:34 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:03:34 2018 -0500

--
 .../org/apache/log4j/chainsaw/LogPanel.java |  8 ++---
 .../log4j/chainsaw/LoggerNameTreePanel.java | 10 +++---
 .../log4j/varia/LogFilePatternReceiver.java | 36 +++-
 3 files changed, 29 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/cdc4f3ca/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java 
b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
index 88aa9ef..96eb716 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -1864,17 +1864,17 @@ 
detailPaneUpdater.setAndUpdateSelectedRow(table.getSelectedRow());
  }
 
  if (o instanceof String[]) {
-   String value = "";
+   StringBuilder value = new StringBuilder();
   //exception - build message + throwable
   String[] ti = (String[])o;
 if (ti.length > 0 && (!(ti.length == 1 && ti[0].equals("" {
   LoggingEventWrapper loggingEventWrapper = 
((ChainsawCyclicBufferTableModel)(currentTable.getModel())).getRow(row);
-  value = 
loggingEventWrapper.getLoggingEvent().getMessage().toString();
+  value = new 
StringBuilder(loggingEventWrapper.getLoggingEvent().getMessage().toString());
   for (int i=0;i<((String[])o).length;i++) {
-  value = value + "\n" + ((String[]) o)[i];
+  value.append('\n').append(((String[]) o)[i]);
   }
 }
-   return value;
+   return value.toString();
  }
  return "";
   }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/cdc4f3ca/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java 
b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
index 2818b1b..b65ec41 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
@@ -1094,7 +1094,7 @@ final class LoggerNameTreePanel extends JPanel implements 
LoggerNameListener
 //add all top level loggers as hidden loggers
   TreePath[] paths = logTree.getSelectionPaths();
 
-  String parentPathString = "";
+  StringBuilder parentPathString = new StringBuilder();
   DefaultMutableTreeNode root;
   if ((paths == null) || (paths.length == 0))
   {
@@ -1105,12 +1105,12 @@ final class LoggerNameTreePanel extends JPanel 
implements LoggerNameListener
   //don't add 'root logger' to path string
   for (int i=1;i 1) {
-  parentPathString = parentPathString + ".";
+  parentPathString.append(".");
   }
-  parentPathString = parentPathString + path[i].toString();
+  parentPathString.append(path[i].toString());
   }
-  if (!(parentPathString.equals(""))) {
-  parentPathString = parentPathString + ".";
+  if (!(parentPathString.toString().equals(""))) {
+  parentPathString.append(".");
   }
   }
   Enumeration topLevelLoggersEnumeration = root.children();

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/cdc4f3ca/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
--
diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java 
b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
index d28baae..34853b9 100644
--- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
@@ -512,22 +512,24 @@ public class LogFilePatternReceiver extends 

[1/2] logging-chainsaw git commit: Simplify expressions

[mattsicker]

Repository: logging-chainsaw
Updated Branches:
  refs/heads/master 112382683 -> cdc4f3cab


Simplify 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/21c1e45d
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/21c1e45d
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/21c1e45d

Branch: refs/heads/master
Commit: 21c1e45d558830a963b02939d48b53fb0abebd29
Parents: 1123826
Author: Matt Sicker 
Authored: Tue Mar 13 00:53:42 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 00:53:42 2018 -0500

--
 .../apache/log4j/chainsaw/ColumnComparator.java |  2 +-
 .../org/apache/log4j/chainsaw/LogPanel.java |  4 +--
 .../log4j/chainsaw/LogPanelPreferenceModel.java |  4 +--
 .../java/org/apache/log4j/db/DBAppender.java| 31 ++--
 .../apache/log4j/helpers/MessageFormatter.java  |  9 +++---
 .../apache/log4j/plugins/PluginRegistry.java|  4 +--
 .../java/org/apache/log4j/spi/Log4JULogger.java |  8 ++---
 .../log4j/varia/LogFilePatternReceiver.java |  4 +--
 .../java/org/apache/log4j/xml/XMLDecoder.java   | 10 ++-
 9 files changed, 32 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/21c1e45d/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java 
b/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
index ae6f196..cd10ec1 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
@@ -161,7 +161,7 @@ public class ColumnComparator implements Comparator {
   //other columns may be Property values - see if there is an Property 
value matching column name
   default:
   if (e1.getProperty(columnName) != null && e2.getProperty(columnName) 
!= null) {
-  sort = 
e1.getProperty(columnName).toString().compareToIgnoreCase(e2.getProperty(columnName).toString());
+  sort = 
e1.getProperty(columnName).compareToIgnoreCase(e2.getProperty(columnName));
   }
   }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/21c1e45d/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java 
b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
index d1e7199..88aa9ef 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -3122,9 +3122,7 @@ 
detailPaneUpdater.setAndUpdateSelectedRow(table.getSelectedRow());
   }
 
   private String getToolTipTextForEvent(LoggingEventWrapper 
loggingEventWrapper) {
-StringBuilder buf = new StringBuilder();
-
buf.append(detailLayout.getHeader()).append(detailLayout.format(loggingEventWrapper.getLoggingEvent())).append(detailLayout.getFooter());
-return buf.toString();
+  return detailLayout.getHeader() + 
detailLayout.format(loggingEventWrapper.getLoggingEvent()) + 
detailLayout.getFooter();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/21c1e45d/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java 
b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
index 0d57646..74f9702 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
@@ -361,12 +361,12 @@ public class LogPanelPreferenceModel implements 
Serializable{
 if (isVisible && !wasVisible) {
visibleColumns.add(col);
visibleColumnOrder.add(col);
-   propertySupport.firePropertyChange("visibleColumns", new 
Boolean(isVisible), new Boolean(wasVisible));
+   propertySupport.firePropertyChange("visibleColumns", 
Boolean.valueOf(isVisible), Boolean.valueOf(wasVisible));
}
 if (!isVisible && wasVisible) {
visibleColumns.remove(col);
visibleColumnOrder.remove(col);
-   propertySupport.firePropertyChange("visibleColumns", new 
Boolean(isVisible), new Boolean(wasVisible));
+   propertySupport.firePropertyChange("visibleColumns", 
Boolean.valueOf(isVisible), Boolean.valueOf(wasVisible));
}
   }
   

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/21c1e45d/src/main/java/org/apache/log4j/db/DBAppender.java

[1/4] logging-chainsaw git commit: Reformat and simplify pom.xml

[mattsicker]

Repository: logging-chainsaw
Updated Branches:
  refs/heads/master 4b8b96ff5 -> a805396cf


Reformat and simplify pom.xml


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/1d3ee99c
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/1d3ee99c
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/1d3ee99c

Branch: refs/heads/master
Commit: 1d3ee99cbb5da596e19af408495a48a45f5cf0ec
Parents: 4b8b96f
Author: Matt Sicker 
Authored: Tue Mar 13 01:45:57 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:48:33 2018 -0500

--
 pom.xml | 222 +++
 1 file changed, 102 insertions(+), 120 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1d3ee99c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 178916c..51735cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,8 @@
  limitations under the License.
 
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   
 org.apache.logging
 logging-parent
@@ -113,22 +114,6 @@
 https://www.apache.org
   
   
-
-  
-
-  org.apache.maven.plugins
-  maven-javadoc-plugin
-  ${javadoc.plugin.version}
-  
-
-${javadoc.opts}
-UTF-8
-  
-
-  
-
 
   
 org.apache.rat
@@ -183,13 +168,16 @@
 site
 untag-site
 
-
- 
   
-   
-
-   
-   
-
+  
+
+
+
+  
+
+  
 
 
   run
@@ -203,7 +191,7 @@
 
 
   
-
+
   
 
   
@@ -215,7 +203,7 @@
 
 
   
-
+
   
 
   
@@ -229,8 +217,8 @@
   
 
   
-
-
+
+
   
 
   
@@ -248,51 +236,51 @@
 ant-contrib
 1.0b2
   
-   
+
+  
+  
+org.codehaus.mojo
+appassembler-maven-plugin
+
+  
+package
+
+  assemble
+
+  
+
+
+  false
+  
+
+  ${chainsaw.mainclass}
+  chainsaw
+
+  
+
   
-
-  org.codehaus.mojo
-  appassembler-maven-plugin
-  
-
-  package
-  
-assemble
-  
-
-  
-  
-false
-
-  
-${chainsaw.mainclass}
-chainsaw
-  
-
-  
-
   
 org.apache.maven.plugins
 maven-assembly-plugin
 2.4
-  
-
-  make-assembly
-  package
-  
-single
-  
-
-  
-src/assembly/bin.xml
-src/assembly/standalone.xml
-  
-
-  true
-
-
-  
+
+  
+make-assembly
+package
+
+  single
+
+
+  
+src/assembly/bin.xml
+src/assembly/standalone.xml
+  
+  
+  true
+
+  
+
   
   
 maven-javadoc-plugin
@@ -328,9 +316,9 @@
 
   
   
-  org.apache.maven.plugins
-  maven-source-plugin
-  2.1.2
+org.apache.maven.plugins
+maven-source-plugin
+2.1.2
 
   
 
@@ -341,27 +329,27 @@
   
   
   
-
-
-
-
-  
-  
-  
-  
- 

[2/4] logging-chainsaw git commit: Add editorconfig

[mattsicker]

Add editorconfig


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/65281db2
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/65281db2
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/65281db2

Branch: refs/heads/master
Commit: 65281db20d79f4c82214445c0dbf555e4c57624b
Parents: 1d3ee99
Author: Matt Sicker 
Authored: Tue Mar 13 01:48:58 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:48:58 2018 -0500

--
 .editorconfig | 27 +++
 1 file changed, 27 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/65281db2/.editorconfig
--
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..e156253
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,27 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=2
+
+[*.java]
+indent_style=space
+indent_size=4
+
+[*.css]
+indent_style=space
+indent_size=4
+
+[{messages.*,spring.handlers,spring.schemas,messages,org.codehaus.groovy.runtime.ExtensionModule,*.properties}]
+indent_style=space
+indent_size=4
+
+[{*.applejs,*.js}]
+indent_style=space
+indent_size=4
+
+[{*.gson,*.gradle,*.groovy,*.gdsl,*.gy,*.gant}]
+indent_style=space
+indent_size=4
+

[3/4] logging-chainsaw git commit: Reformat changes.xml

[mattsicker]

Reformat changes.xml


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/ae738e21
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/ae738e21
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/ae738e21

Branch: refs/heads/master
Commit: ae738e216f43e9183d3e6fd9ae41d28e42b3d37c
Parents: 65281db
Author: Matt Sicker 
Authored: Tue Mar 13 01:49:56 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:49:56 2018 -0500

--
 src/changes/changes.xml | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ae738e21/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e7c88c4..2e98c1b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,36 +20,36 @@
 Apache Chainsaw
   
   
-  
+
   
-  Doc updates
+Doc updates
   
   
-  Update to minimum Java 1.6
+Update to minimum Java 1.6
   
   
-  Branding fixes
+Branding fixes
   
   
-  Update to support maven3
+Update to support maven3
   
   
-   Added support for remembering filter expressions for each 
LogPanel
+Added support for remembering filter expressions for each LogPanel
   
   
-   Added 'Go To Line' feature to navigate to a particular event #
+Added 'Go To Line' feature to navigate to a particular event #
   
   
-   Added ability to hide Welcome and Drag and Drop panels.
-  
-   
-   Added ability to remember last created receivers in an xml 
file, and load them at startup.
-   
-   
-   Added ability to remember hidden log panels.
-   
-   Address memory leak when 
using cyclic model
-   javadoc.jar was missing NOTICE and 
LICENSE.
+Added ability to hide Welcome and Drag and Drop panels.
+  
+  
+Added ability to remember last created receivers in an xml file, and 
load them at startup.
+  
+  
+Added ability to remember hidden log panels.
+  
+  Address memory leak when 
using cyclic model
+  javadoc.jar was missing NOTICE and 
LICENSE.
 
   
 

[4/4] logging-chainsaw git commit: Add changelog entries

[mattsicker]

Add changelog entries


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/a805396c
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/a805396c
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/a805396c

Branch: refs/heads/master
Commit: a805396cf746131f53204a839eb1bcdff9f1bbe3
Parents: ae738e2
Author: Matt Sicker 
Authored: Tue Mar 13 01:53:18 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:53:18 2018 -0500

--
 src/changes/changes.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/a805396c/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2e98c1b..cf92f99 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -20,11 +20,19 @@
 Apache Chainsaw
   
   
+
+  
+Modernize syntax for newer Java versions up to 1.8.
+  
+  
+Add automated Jenkins pipeline configuration for branches and pull 
requests.
+  
+
 
   
 Doc updates
   
-  
+  
 Update to minimum Java 1.6
   
   

[18/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java 
b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
index fce03be..2d10041 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,9 +16,15 @@
  */
 package org.apache.log4j.chainsaw;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
+import javax.swing.*;
+import javax.swing.table.TableColumn;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeModel;
+import java.awt.*;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -26,618 +32,568 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JEditorPane;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-import javax.swing.table.TableColumn;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeModel;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-
 
 /**
  * GUI panel used to manipulate the PreferenceModel for a Log Panel
  *
  * @author Paul Smith
  */
-public class LogPanelPreferencePanel extends AbstractPreferencePanel
-{
-  //~ Instance fields =
+public class LogPanelPreferencePanel extends AbstractPreferencePanel {
+//~ Instance fields 
=
 
-  private final LogPanelPreferenceModel preferenceModel;
-  private final ModifiableListModel columnListModel = new 
ModifiableListModel();
-  private static final Logger logger = 
LogManager.getLogger(LogPanelPreferencePanel.class);
-  private ApplicationPreferenceModel appPreferenceModel;
+private final LogPanelPreferenceModel preferenceModel;
+private final ModifiableListModel columnListModel = new 
ModifiableListModel();
+private static final Logger logger = 
LogManager.getLogger(LogPanelPreferencePanel.class);
+private ApplicationPreferenceModel appPreferenceModel;
 
-  //~ Constructors 
+//~ Constructors 

 
-  public LogPanelPreferencePanel(LogPanelPreferenceModel model, 
ApplicationPreferenceModel appModel)
-  {
-preferenceModel = model;
-appPreferenceModel = appModel;
-initComponents();
+public LogPanelPreferencePanel(LogPanelPreferenceModel model, 
ApplicationPreferenceModel appModel) {
+preferenceModel = model;
+appPreferenceModel = appModel;
+initComponents();
 
-getOkButton().addActionListener(e -> hidePanel());
+getOkButton().addActionListener(e -> hidePanel());
 
-getCancelButton().addActionListener(e -> hidePanel());
+getCancelButton().addActionListener(e -> hidePanel());
 }
 
-  //~ Methods =
-
-  /**
-   * DOCUMENT ME!
-   *
-   * @param args DOCUMENT ME!
-   */
-  public static void main(String[] args)
-  {
-JFrame f = new JFrame("Preferences Panel Test Bed");
-LogPanelPreferenceModel model = new LogPanelPreferenceModel();
-ApplicationPreferenceModel appModel = new ApplicationPreferenceModel();
-LogPanelPreferencePanel panel = new LogPanelPreferencePanel(model, 
appModel);
-f.getContentPane().add(panel);
-
-model.addPropertyChangeListener(evt -> logger.warn(evt.toString()));
-panel.setOkCancelActionListener(e -> System.exit(1));
-
-f.setSize(640, 480);
-f.setVisible(true);
-  }
-
-  protected TreeModel 

[10/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java 
b/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java
index a7891c4..7040f45 100644
--- a/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java
+++ b/src/main/java/org/apache/log4j/chainsaw/icons/LineIconFactory.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,166 +17,158 @@
 
 package org.apache.log4j.chainsaw.icons;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsEnvironment;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
 
 /**
  * A simple factory/facade for creating some of the standard Icons that are 
based
  * on line drawings
+ *
  * @author Paul Smith psm...@apache.org
  * @author Scott Deboy sde...@apache.org
- *
  */
 public final class LineIconFactory {
-   private static final Logger logger = 
LogManager.getLogger(LineIconFactory.class);
-  /**
-   *
-   */
-  private LineIconFactory() {
-  }
-
-  public static Icon createExpandIcon() {
-  int size = 8;
-  int xOffSet = 0;
-  int yOffSet = 0;
-try {
-  GraphicsEnvironment environment =
-GraphicsEnvironment.getLocalGraphicsEnvironment();
-BufferedImage image = new BufferedImage(size, size, 
BufferedImage.TYPE_INT_ARGB);
-  Graphics2D g2D =
-environment.createGraphics(
-  image);
-g2D.setBackground(new Color(0,0,0,0));
-g2D.clearRect(0,0,size,size);
-g2D.setStroke(new BasicStroke(1.5f));
-g2D.setRenderingHint(
-  RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-g2D.setColor(Color.black);
-g2D.drawLine(
-   xOffSet, (size / 2) + yOffSet, size - xOffSet,
-   (size / 2) + yOffSet);
-
-g2D.drawLine(
-   xOffSet + (size/2), yOffSet, xOffSet + (size/2),
-   (size) + yOffSet);
-
-return new ImageIcon(image);
-} catch (Exception e) {
-  logger.error("failed to create a Expand icon", e);
+private static final Logger logger = 
LogManager.getLogger(LineIconFactory.class);
+
+/**
+ *
+ */
+private LineIconFactory() {
 }
 
-return null;
-  }
-  public static Icon createCollapseIcon() {
-  int size = 8;
-  int xOffSet = 0;
-  int yOffSet = 0;
-try {
-  GraphicsEnvironment environment =
-GraphicsEnvironment.getLocalGraphicsEnvironment();
-BufferedImage image = new BufferedImage(size, size, 
BufferedImage.TYPE_INT_ARGB);
-  Graphics2D g2D =
-environment.createGraphics(
-  image);
-g2D.setBackground(new Color(0,0,0,0));
-g2D.clearRect(0,0,size,size);
-g2D.setStroke(new BasicStroke(1.5f));
-g2D.setRenderingHint(
-  RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-g2D.setColor(Color.black);
-g2D.drawLine(
-   xOffSet, (size / 2) + yOffSet, size - xOffSet,
-   (size / 2) + yOffSet);
-
-return new ImageIcon(image);
-} catch (Exception e) {
-  logger.error("failed to create a Collapse icon", e);
+public static Icon createExpandIcon() {
+int size = 8;
+int xOffSet = 0;
+int yOffSet = 0;
+try {
+GraphicsEnvironment environment =
+GraphicsEnvironment.getLocalGraphicsEnvironment();
+BufferedImage image = new BufferedImage(size, size, 
BufferedImage.TYPE_INT_ARGB);
+Graphics2D g2D =
+environment.createGraphics(
+image);
+g2D.setBackground(new Color(0, 0, 0, 0));
+g2D.clearRect(0, 0, size, size);
+g2D.setStroke(new BasicStroke(1.5f));
+g2D.setRenderingHint(
+RenderingHints.KEY_STROKE_CONTROL, 
RenderingHints.VALUE_STROKE_PURE);
+g2D.setColor(Color.black);
+g2D.drawLine(
+xOffSet, (size / 2) + yOffSet, size - xOffSet,
+

[19/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java 
b/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
index 6ce8bdf..e5b62d3 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,61 +19,55 @@
  */
 package org.apache.log4j.chainsaw;
 
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.MutableTreeNode;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import java.util.*;
 
 
 /**
- *
  * A TreeModel that represents the Loggers for a given LogPanel
  *
  * @author Paul Smith psm...@apache.org
  */
 class LogPanelLoggerTreeModel extends DefaultTreeModel
-  implements LoggerNameListener {
-  private Map fullPackageMap = new HashMap<>();
-  private final Logger logger = 
LogManager.getLogger(LogPanelLoggerTreeModel.class);
-
-  LogPanelLoggerTreeModel() {
-super(new LogPanelTreeNode("Root Logger"));
-  }
-
-  /* (non-Javadoc)
-   * @see 
org.apache.log4j.chainsaw.LoggerNameListener#loggerNameAdded(java.lang.String)
-   */
-  public void loggerNameAdded(final String loggerName) {
-//invoke later, not on current EDT
-SwingUtilities.invokeLater(
+implements LoggerNameListener {
+private Map fullPackageMap = new HashMap<>();
+private final Logger logger = 
LogManager.getLogger(LogPanelLoggerTreeModel.class);
+
+LogPanelLoggerTreeModel() {
+super(new LogPanelTreeNode("Root Logger"));
+}
+
+/* (non-Javadoc)
+ * @see 
org.apache.log4j.chainsaw.LoggerNameListener#loggerNameAdded(java.lang.String)
+ */
+public void loggerNameAdded(final String loggerName) {
+//invoke later, not on current EDT
+SwingUtilities.invokeLater(
 () -> addLoggerNameInDispatchThread(loggerName));
-  }
+}
 
-  public void reset() {
-  DefaultMutableTreeNode current = (DefaultMutableTreeNode) getRoot();
-  current.removeAllChildren();
-  fullPackageMap.clear();
-  nodeStructureChanged(current);
-  }
+public void reset() {
+DefaultMutableTreeNode current = (DefaultMutableTreeNode) getRoot();
+current.removeAllChildren();
+fullPackageMap.clear();
+nodeStructureChanged(current);
+}
 
-  private void addLoggerNameInDispatchThread(final String loggerName) {
-String[] packages = tokenize(loggerName);
+private void addLoggerNameInDispatchThread(final String loggerName) {
+String[] packages = tokenize(loggerName);
 
-/**
- * The packages array is effectively the tree
- * path that must exist within the tree, so
- * we walk the tree ensuring each level is present
- */
-DefaultMutableTreeNode current = (DefaultMutableTreeNode) getRoot();
+/**
+ * The packages array is effectively the tree
+ * path that must exist within the tree, so
+ * we walk the tree ensuring each level is present
+ */
+DefaultMutableTreeNode current = (DefaultMutableTreeNode) getRoot();
 
 
 /**
@@ -81,116 +75,117 @@ class LogPanelLoggerTreeModel extends DefaultTreeModel
  * current tree hierachy, and it has matched a package name
  * with an already existing TreeNode.
  */
-outerFor: 
-for (int i = 0; i < packages.length; i++) {
-  String packageName = packages[i];
-  Enumeration enumeration = current.children();
-
-  while (enumeration.hasMoreElements()) {
-DefaultMutableTreeNode child =
-  (DefaultMutableTreeNode) enumeration.nextElement();
-String childName = child.getUserObject().toString();
-
-if (childName.equals(packageName)) {
-  /**
-   * This the current known branch to descend
-   */
-  current = child;
-
-  /**
-   * we've found it, so break back to the outer
-   * 

[11/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java 
b/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
index 6df8efd..40313f1 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
@@ -17,25 +17,6 @@
 
 package org.apache.log4j.chainsaw.color;
 
-import java.awt.Color;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
 import org.apache.log4j.chainsaw.ChainsawConstants;
 import org.apache.log4j.chainsaw.prefs.SettingsManager;
 import org.apache.log4j.rule.ColorRule;
@@ -43,6 +24,14 @@ import org.apache.log4j.rule.ExpressionRule;
 import org.apache.log4j.rule.Rule;
 import org.apache.log4j.spi.LoggingEvent;
 
+import java.awt.*;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.List;
+
 
 /**
  * A colorizer supporting an ordered collection of ColorRules, including 
support for notification of
@@ -51,274 +40,274 @@ import org.apache.log4j.spi.LoggingEvent;
  * @author Scott Deboy sde...@apache.org
  */
 public class RuleColorizer implements Colorizer {
-  private Map rules;
-  private final PropertyChangeSupport colorChangeSupport =
-new PropertyChangeSupport(this);
-  private Map defaultRules = new HashMap();
-  private String currentRuleSet = ChainsawConstants.DEFAULT_COLOR_RULE_NAME;
-  private Rule findRule;
-  private Rule loggerRule;
-
-  private static final String COLORS_EXTENSION = ".colors";
-
-  private final Color WARN_DEFAULT_COLOR = new Color(255, 255, 153);
-  private final Color FATAL_OR_ERROR_DEFAULT_COLOR = new Color(255, 153, 153);
-  private final Color MARKER_DEFAULT_COLOR = new Color(153, 255, 153);
-
-  private final String DEFAULT_WARN_EXPRESSION = "level == WARN";
-  private final String DEFAULT_FATAL_ERROR_EXCEPTION_EXPRESSION = "level == 
FATAL || level == ERROR || exception exists";
-  private final String DEFAULT_MARKER_EXPRESSION = "prop.marker exists";
-
-  public RuleColorizer() {
-List rulesList = new ArrayList();
-
-  String expression = DEFAULT_FATAL_ERROR_EXCEPTION_EXPRESSION;
-  rulesList.add(
-  new ColorRule(
-expression, ExpressionRule.getRule(expression), 
FATAL_OR_ERROR_DEFAULT_COLOR,
-Color.black));
-  expression = DEFAULT_WARN_EXPRESSION;
-  rulesList.add(
-  new ColorRule(
-expression, ExpressionRule.getRule(expression), WARN_DEFAULT_COLOR,
-Color.black));
-
-  expression = DEFAULT_MARKER_EXPRESSION;
-  rulesList.add(
-new ColorRule(
-  expression, ExpressionRule.getRule(expression), MARKER_DEFAULT_COLOR,
-  Color.black));
-
-defaultRules.put(currentRuleSet, rulesList);
-setRules(defaultRules);
-  }
-
-  public void setLoggerRule(Rule loggerRule) {
-this.loggerRule = loggerRule;
-colorChangeSupport.firePropertyChange("colorrule", false, true);
-  }
-
-  public void setFindRule(Rule findRule) {
-this.findRule = findRule;
-colorChangeSupport.firePropertyChange("colorrule", false, true);
-  }
-
-  public Rule getFindRule() {
-return findRule;
-  }
-
-  public Rule getLoggerRule() {
-return loggerRule;
-  }
-
-  public void setRules(Map rules) {
-this.rules = rules;
-colorChangeSupport.firePropertyChange("colorrule", false, true);
-  }
-  
-  public Map getRules() {
-return rules;
-  }
-
-  public List getCurrentRules() {
-return (List) rules.get(currentRuleSet);
-  }
-
-  public void addRules(Map newRules) {
-
-  for (Object o : newRules.entrySet()) {
-  Map.Entry entry = (Map.Entry) o;
-
-  if (rules.containsKey(entry.getKey())) {
-  ((List) rules.get(entry.getKey())).addAll((List) 
entry.getValue());
-  } else {
-  rules.put(entry.getKey(), entry.getValue());
-  }
-  }
-
-colorChangeSupport.firePropertyChange("colorrule", false, true);
-  }
-
-  public void addRule(String ruleSetName, ColorRule rule) {
-if (rules.containsKey(ruleSetName)) {
-  ((List) rules.get(ruleSetName)).add(rule);
-} else {
-  List list = new ArrayList();
-  list.add(rule);
-  rules.put(ruleSetName, list);
+private Map 

[24/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
index a33b3e3..2f79cc5 100644
--- 
a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -17,23 +17,6 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.ProgressMonitor;
-import javax.swing.event.EventListenerList;
-import javax.swing.table.AbstractTableModel;
-
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.chainsaw.color.RuleColorizer;
@@ -43,12 +26,20 @@ import org.apache.log4j.rule.Rule;
 import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
 
+import javax.swing.*;
+import javax.swing.event.EventListenerList;
+import javax.swing.table.AbstractTableModel;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.*;
+
 
 /**
  * A CyclicBuffer implementation of the EventContainer.
- *
+ * 
  * NOTE:  This implementation prevents duplicate rows from being added to the 
model.
- *
+ * 
  * Ignoring duplicates was added to support receivers which may attempt to 
deliver the same
  * event more than once but can be safely ignored (for example, the database 
receiver
  * when set to retrieve in a loop).
@@ -56,88 +47,87 @@ import org.apache.log4j.spi.LoggingEvent;
  * @author Paul Smith psm...@apache.org
  * @author Scott Deboy sde...@apache.org
  * @author Stephen Pain
- *
  */
 class ChainsawCyclicBufferTableModel extends AbstractTableModel
-  implements EventContainer, PropertyChangeListener {
-
-  private static final int DEFAULT_CAPACITY = 5000;
-  //cyclic field used internally in this class, but not exposed via the 
eventcontainer
-  private boolean cyclic = true;
-  private int cyclicBufferSize;
-  //original list of LoggingEventWrapper instances
-  List unfilteredList;
-  //filtered list of LoggingEventWrapper instances
-  List filteredList;
-  private boolean currentSortAscending;
-  private int currentSortColumn;
-  private final EventListenerList eventListenerList = new EventListenerList();
-  private final List columnNames = new 
ArrayList<>(ChainsawColumns.getColumnsNames());
-  private boolean sortEnabled = false;
-  private boolean reachedCapacity = false;
-  private final Logger logger = 
LogManager.getLogger(ChainsawCyclicBufferTableModel.class);
-
-  //  protected final Object syncLock = new Object();
-  private final LoggerNameModel loggerNameModelDelegate = new 
LoggerNameModelSupport();
-  private final Object mutex = new Object();
-
-  //because we may be using a cyclic buffer, if an ID is not provided in the 
property,
-  //use and increment this row counter as the ID for each received row
-  int uniqueRow;
-  private final Set uniquePropertyKeys = new HashSet();
-  private Rule ruleMediator;
-  private final PropertyChangeSupport propertySupport = new 
PropertyChangeSupport(this);
-  private RuleColorizer colorizer;
-  private final String tableModelName;
-
-  public ChainsawCyclicBufferTableModel(int cyclicBufferSize, RuleColorizer 
colorizer, String tableModelName) {
-propertySupport.addPropertyChangeListener("cyclic", new ModelChanger());
-this.cyclicBufferSize = cyclicBufferSize;
-this.colorizer = colorizer;
-this.tableModelName = tableModelName;
-
-unfilteredList = new CyclicBufferList(cyclicBufferSize);
-filteredList = new CyclicBufferList(cyclicBufferSize);
-  }
-
-  /* (non-Javadoc)
-   * @see 
java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
-   */
-  public void propertyChange(PropertyChangeEvent evt) {
-if (evt.getSource() instanceof Rule) {
-  if (evt.getSource() == ruleMediator && 
evt.getPropertyName().equals("findRule")) {
-if (((RuleMediator) evt.getSource()).isFindRuleRequired()) {
-  //only refilter if find rule is required
-  reFilter();
-}
-  } else {
-reFilter();
-  }
+implements EventContainer, PropertyChangeListener {
+
+private static final int DEFAULT_CAPACITY = 5000;
+//cyclic field used internally in this class, but not exposed via the 
eventcontainer
+private boolean cyclic = true;
+private int cyclicBufferSize;

[21/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/Generator.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/Generator.java 
b/src/main/java/org/apache/log4j/chainsaw/Generator.java
index e735e95..7ad7baa 100644
--- a/src/main/java/org/apache/log4j/chainsaw/Generator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/Generator.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,6 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
@@ -30,103 +27,105 @@ import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.log4j.spi.ThrowableInformation;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * Class designed to stress, and/or test the Chainsaw GUI by sending it
  * lots of Logging Events.
  *
  * @author Scott Deboy sde...@apache.org
- *
  */
 public class Generator extends Receiver implements Runnable {
-  private static final Logger logger1 =
-Logger.getLogger("com.mycompany.mycomponentA");
-  private static final Logger logger2 =
-Logger.getLogger("com.mycompany.mycomponentB");
-  private static final Logger logger3 =
-Logger.getLogger("com.someothercompany.corecomponent");
-  private final String baseString_;
-  private Thread thread;
-  private boolean shutdown;
+private static final Logger logger1 =
+Logger.getLogger("com.mycompany.mycomponentA");
+private static final Logger logger2 =
+Logger.getLogger("com.mycompany.mycomponentB");
+private static final Logger logger3 =
+Logger.getLogger("com.someothercompany.corecomponent");
+private final String baseString_;
+private Thread thread;
+private boolean shutdown;
 
-  public Generator(String name) {
-setName(name);
-baseString_ = name;
-  }
+public Generator(String name) {
+setName(name);
+baseString_ = name;
+}
 
-  private LoggingEvent createEvent(
-Level level, Logger logger, String msg, Throwable t) {
-  ThrowableInformation ti = new ThrowableInformation(t);
-  Map properties = new HashMap<>();
-  properties.put(Constants.APPLICATION_KEY, getName());
-  properties.put(Constants.HOSTNAME_KEY, "localhost");
-  LocationInfo li = new LocationInfo("file", logger.getClass().getName(), 
"method", "123");
-LoggingEvent e = new LoggingEvent(
-logger.getClass().getName(), logger, System.currentTimeMillis(), 
level, msg, "Thread=1", ti, "NDC value", li, properties);
-return e;
-  }
+private LoggingEvent createEvent(
+Level level, Logger logger, String msg, Throwable t) {
+ThrowableInformation ti = new ThrowableInformation(t);
+Map properties = new HashMap<>();
+properties.put(Constants.APPLICATION_KEY, getName());
+properties.put(Constants.HOSTNAME_KEY, "localhost");
+LocationInfo li = new LocationInfo("file", 
logger.getClass().getName(), "method", "123");
+LoggingEvent e = new LoggingEvent(
+logger.getClass().getName(), logger, System.currentTimeMillis(), 
level, msg, "Thread=1", ti, "NDC value", li, properties);
+return e;
+}
 
-  public void run() {
-NDC.push(baseString_);
-MDC.put("some string", "some value" + baseString_);
+public void run() {
+NDC.push(baseString_);
+MDC.put("some string", "some value" + baseString_);
 
-int i = 0;
+int i = 0;
 
-while (!shutdown) {
- doPost(createEvent(Level.TRACE, logger1, "tracemsg" + i++, null));
- doPost(
-createEvent(
-  Level.DEBUG, logger1,
-  "debugmsg " + i++
-  + " g dg sdfa sadf sdf safd fsda asfd sdfa sdaf asfd asdf fasd fasd 
adfs fasd adfs fads afds afds afsd afsd afsd afsd afsd fasd asfd asfd afsd fasd 
afsd",
-  null));
- doPost(createEvent(Level.INFO, logger1, "infomsg " + i++, null));
- doPost(createEvent(Level.WARN, logger1, "warnmsg " + i++, null));
- doPost(createEvent(Level.ERROR, logger1, "errormsg " + i++, null));
- doPost(createEvent(Level.FATAL, logger1, "fatalmsg " + i++, new 
Exception("someexception-" + baseString_)));
- doPost(createEvent(Level.TRACE, logger2, "tracemsg" + i++, null));
- doPost(
-createEvent(
-  

[22/27] logging-chainsaw git commit: Reformat code for consistency

[mattsicker]

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java 
b/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
index cd10ec1..75a5efe 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
@@ -17,161 +17,160 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.util.Comparator;
-
 import org.apache.log4j.helpers.Constants;
 import org.apache.log4j.spi.LoggingEvent;
 
+import java.util.Comparator;
+
 
 /**
- *
  * @author Claude Duguay
  * @author Paul Smith psm...@apache.org
  * @author Scott Deboy sde...@apache.org
-*/
+ */
 public class ColumnComparator implements Comparator {
-  protected int index;
-  protected boolean ascending;
-  protected String columnName;
-
-  public ColumnComparator(String columnName, int index, boolean ascending) {
-this.columnName = columnName;
-this.index = index;
-this.ascending = ascending;
-  }
+protected int index;
+protected boolean ascending;
+protected String columnName;
+
+public ColumnComparator(String columnName, int index, boolean ascending) {
+this.columnName = columnName;
+this.index = index;
+this.ascending = ascending;
+}
 
-  public int compare(Object o1, Object o2) {
-int sort = 1;
+public int compare(Object o1, Object o2) {
+int sort = 1;
 
-if (o1 instanceof LoggingEventWrapper && o2 instanceof 
LoggingEventWrapper) {
+if (o1 instanceof LoggingEventWrapper && o2 instanceof 
LoggingEventWrapper) {
 
 // TODO not everything catered for here yet...
 
-  LoggingEvent e1 = ((LoggingEventWrapper) o1).getLoggingEvent();
-  LoggingEvent e2 = ((LoggingEventWrapper) o2).getLoggingEvent();
-
-  switch (index + 1) {
-  case ChainsawColumns.INDEX_LEVEL_COL_NAME:
-sort = e1.getLevel().isGreaterOrEqual(e2.getLevel()) ? 1 : (-1);
-
-break;
-
-  case ChainsawColumns.INDEX_LOGGER_COL_NAME:
-sort = e1.getLoggerName().compareToIgnoreCase(e2.getLoggerName());
-
-break;
-
-  case ChainsawColumns.INDEX_MESSAGE_COL_NAME:
-sort =
-  e1.getMessage().toString().compareToIgnoreCase(
-e2.getMessage().toString());
-
-break;
-
-  case ChainsawColumns.INDEX_NDC_COL_NAME:
-if (e1.getNDC() != null && e2.getNDC() != null) {
-sort =
-e1.getNDC().compareToIgnoreCase(
-e2.getNDC());
-} else if (e1.getNDC() == null && e2.getNDC() == null) {
-   sort = 0;
-} else if (e1.getNDC() == null) {
-   sort = -1;
-} else if (e2.getNDC() == null) {
-   sort = 1;
-}
-
-break;
-
-  case ChainsawColumns.INDEX_METHOD_COL_NAME:
-
-if (
-  (e1.locationInformationExists())
-& (e2.locationInformationExists())) {
-  sort =
-e1.getLocationInformation().getMethodName().compareToIgnoreCase(
-  e2.getLocationInformation().getMethodName());
+LoggingEvent e1 = ((LoggingEventWrapper) o1).getLoggingEvent();
+LoggingEvent e2 = ((LoggingEventWrapper) o2).getLoggingEvent();
+
+switch (index + 1) {
+case ChainsawColumns.INDEX_LEVEL_COL_NAME:
+sort = e1.getLevel().isGreaterOrEqual(e2.getLevel()) ? 1 : 
(-1);
+
+break;
+
+case ChainsawColumns.INDEX_LOGGER_COL_NAME:
+sort = 
e1.getLoggerName().compareToIgnoreCase(e2.getLoggerName());
+
+break;
+
+case ChainsawColumns.INDEX_MESSAGE_COL_NAME:
+sort =
+e1.getMessage().toString().compareToIgnoreCase(
+e2.getMessage().toString());
+
+break;
+
+case ChainsawColumns.INDEX_NDC_COL_NAME:
+if (e1.getNDC() != null && e2.getNDC() != null) {
+sort =
+e1.getNDC().compareToIgnoreCase(
+e2.getNDC());
+} else if (e1.getNDC() == null && e2.getNDC() == null) {
+sort = 0;
+} else if (e1.getNDC() == null) {
+sort = -1;
+} else if (e2.getNDC() == null) {
+sort = 1;
+}
+
+break;
+
+case ChainsawColumns.INDEX_METHOD_COL_NAME:
+
+if (
+(e1.locationInformationExists())
+& (e2.locationInformationExists())) {
+sort =
+

[3/5] logging-chainsaw git commit: Remove unused and redundant assignments

[mattsicker]

Remove unused and redundant assignments


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/82725cc9
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/82725cc9
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/82725cc9

Branch: refs/heads/master
Commit: 82725cc9defcef70c5cdca385cc994022f70cad6
Parents: 2e18dc2
Author: Matt Sicker 
Authored: Tue Mar 13 01:15:33 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:15:33 2018 -0500

--
 .../log4j/chainsaw/ChainsawAppenderHandler.java |  1 -
 .../ChainsawCyclicBufferTableModel.java |  6 ++--
 .../apache/log4j/chainsaw/FileLoadAction.java   |  4 +--
 .../org/apache/log4j/chainsaw/LogPanel.java |  6 ++--
 .../org/apache/log4j/chainsaw/NewKeyEvent.java  |  2 +-
 .../chainsaw/layout/DefaultLayoutFactory.java   |  2 +-
 .../log4j/chainsaw/prefs/SettingsManager.java   |  2 +-
 .../apache/log4j/db/CustomSQLDBReceiver.java| 32 +---
 .../java/org/apache/log4j/db/DBAppender.java|  4 ---
 .../java/org/apache/log4j/db/DBReceiverJob.java | 23 +++---
 .../apache/log4j/db/JNDIConnectionSource.java   |  2 +-
 .../java/org/apache/log4j/net/JMSReceiver.java  |  2 +-
 .../java/org/apache/log4j/net/SocketNode13.java |  2 +-
 .../org/apache/log4j/net/XMLSocketNode.java |  3 +-
 .../org/apache/log4j/net/XMLSocketReceiver.java |  1 -
 .../log4j/varia/LogFilePatternReceiver.java | 20 ++--
 .../apache/log4j/xml/LogFileXMLReceiver.java|  2 +-
 .../java/org/apache/log4j/xml/XMLDecoder.java   |  2 +-
 18 files changed, 53 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
index 2259676..b4d670f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
@@ -341,7 +341,6 @@ public class ChainsawAppenderHandler extends 
AppenderSkeleton {
   listener.receiveEventBatch(identifier, eventList);
 }
   }
-  eventList = null;
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
index 050d1c7..e659f87 100644
--- 
a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ 
b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -64,7 +64,7 @@ class ChainsawCyclicBufferTableModel extends 
AbstractTableModel
   private static final int DEFAULT_CAPACITY = 5000;
   //cyclic field used internally in this class, but not exposed via the 
eventcontainer
   private boolean cyclic = true;
-  private int cyclicBufferSize = DEFAULT_CAPACITY;
+  private int cyclicBufferSize;
   //original list of LoggingEventWrapper instances
   List unfilteredList;
   //filtered list of LoggingEventWrapper instances
@@ -834,8 +834,8 @@ fireTableRowsInserted(begin, end);
   logger.debug(
 "Changing Model, isCyclic is now " + cyclic);
 
-  List newUnfilteredList = null;
-  List newFilteredList = null;
+  List newUnfilteredList;
+  List newFilteredList;
 
   if (cyclic) {
 newUnfilteredList = new 
CyclicBufferList(cyclicBufferSize);

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java 
b/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
index b89ad31..22d98ca 100644
--- a/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
@@ -51,11 +51,11 @@ class FileLoadAction extends AbstractAction {
  * the events it loads
  *  
  */
-Decoder decoder = null;
+Decoder decoder;
 
 private LogUI parent;
 
-private boolean remoteURL = false;
+private boolean remoteURL;
 
 public FileLoadAction(LogUI 

[4/5] logging-chainsaw git commit: Simplify JDBC expression for updated JDK

[mattsicker]

Simplify JDBC expression for updated JDK


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/3250bb1c
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/3250bb1c
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/3250bb1c

Branch: refs/heads/master
Commit: 3250bb1c491642c9849d5c0c6d027d179b5f9a4e
Parents: 82725cc
Author: Matt Sicker 
Authored: Tue Mar 13 01:17:38 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:20:13 2018 -0500

--
 .../java/org/apache/log4j/db/DBAppender.java| 27 +++-
 .../java/org/apache/log4j/db/dialect/Util.java  |  5 +---
 2 files changed, 4 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3250bb1c/src/main/java/org/apache/log4j/db/DBAppender.java
--
diff --git a/src/main/java/org/apache/log4j/db/DBAppender.java 
b/src/main/java/org/apache/log4j/db/DBAppender.java
index a9e728f..4f116c5 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -122,7 +122,6 @@ public class DBAppender extends AppenderSkeleton implements 
UnrecognizedElementH
   static final String insertExceptionSQL =
 "INSERT INTO  logging_event_exception (event_id, i, trace_line) VALUES (?, 
?, ?)";
   static final String insertSQL;
-  private static final Method GET_GENERATED_KEYS_METHOD;
 
 
   static {
@@ -141,16 +140,6 @@ public class DBAppender extends AppenderSkeleton 
implements UnrecognizedElementH
   "caller_line) " +
   " VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?)";
   insertSQL = sql;
-//
-//   PreparedStatement.getGeneratedKeys added in JDK 1.4
-//
-Method getGeneratedKeysMethod;
-try {
-getGeneratedKeysMethod = 
PreparedStatement.class.getMethod("getGeneratedKeys");
-} catch(Exception ex) {
-getGeneratedKeysMethod = null;
-}
-GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod;
   }
 
   ConnectionSource connectionSource;
@@ -173,7 +162,7 @@ public class DBAppender extends AppenderSkeleton implements 
UnrecognizedElementH
   }
 
   sqlDialect = 
Util.getDialectFromCode(connectionSource.getSQLDialectCode());
-  cnxSupportsGetGeneratedKeys = GET_GENERATED_KEYS_METHOD != null && 
connectionSource.supportsGetGeneratedKeys();
+  cnxSupportsGetGeneratedKeys = 
connectionSource.supportsGetGeneratedKeys();
   cnxSupportsBatchUpdates = connectionSource.supportsBatchUpdates();
   if (!cnxSupportsGetGeneratedKeys && (sqlDialect == null)) {
   throw new IllegalStateException(
@@ -246,18 +235,8 @@ public class DBAppender extends AppenderSkeleton 
implements UnrecognizedElementH
   Statement idStatement = null;
   boolean gotGeneratedKeys = false;
   if (cnxSupportsGetGeneratedKeys) {
-  try {
-  rs = (ResultSet) 
GET_GENERATED_KEYS_METHOD.invoke(insertStatement);
-  gotGeneratedKeys = true;
-  } catch(InvocationTargetException ex) {
-  Throwable target = ex.getTargetException();
-  if (target instanceof SQLException) {
-  throw (SQLException) target;
-  }
-  throw ex; 
-  } catch(IllegalAccessException ex) {
-  LogLog.warn("IllegalAccessException invoking 
PreparedStatement.getGeneratedKeys", ex);
-  }
+  rs = insertStatement.getGeneratedKeys();
+  gotGeneratedKeys = true;
   }
   
   if (!gotGeneratedKeys) {

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3250bb1c/src/main/java/org/apache/log4j/db/dialect/Util.java
--
diff --git a/src/main/java/org/apache/log4j/db/dialect/Util.java 
b/src/main/java/org/apache/log4j/db/dialect/Util.java
index c0cd503..ff308e8 100644
--- a/src/main/java/org/apache/log4j/db/dialect/Util.java
+++ b/src/main/java/org/apache/log4j/db/dialect/Util.java
@@ -99,10 +99,7 @@ public class Util extends ComponentBase {
*/
   public boolean supportsGetGeneratedKeys(DatabaseMetaData meta) {
 try {
-  //
-  //   invoking JDK 1.4 method by reflection
-  //
-  return (Boolean) 
DatabaseMetaData.class.getMethod("supportsGetGeneratedKeys").invoke(meta);
+  return meta.supportsGetGeneratedKeys();
 } catch(Throwable e) {
   getLogger().info("Could not call supportsGetGeneratedKeys method. This 
may be recoverable");
   return false;

[2/5] logging-chainsaw git commit: Fix magic constant usage

[mattsicker]

Fix magic constant usage


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/2e18dc25
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/2e18dc25
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/2e18dc25

Branch: refs/heads/master
Commit: 2e18dc259c6870a1004002a650e51fd351490365
Parents: 45687c9
Author: Matt Sicker 
Authored: Tue Mar 13 01:09:52 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:09:52 2018 -0500

--
 src/main/java/org/apache/log4j/chainsaw/LogUI.java  |  6 +++---
 .../org/apache/log4j/chainsaw/ProgressPanel.java|  2 +-
 .../log4j/chainsaw/ReceiverConfigurationPanel.java  | 16 ++--
 .../log4j/chainsaw/zeroconf/ZeroConfPlugin.java | 14 ++
 4 files changed, 8 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2e18dc25/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 7615a54..7454f89 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -817,15 +817,15 @@ e.printStackTrace();
 Action gotoLine =
   new AbstractAction() {
 public void actionPerformed(ActionEvent e) {
-  String inputLine = JOptionPane.showInputDialog(LogUI.this, "Enter 
the line number to go:", "Goto Line", -1);
+  String inputLine = JOptionPane.showInputDialog(LogUI.this, "Enter 
the line number to go:", "Goto Line", JOptionPane.PLAIN_MESSAGE);
   try {
  int lineNumber = Integer.parseInt(inputLine);
   int row = getCurrentLogPanel().setSelectedEvent(lineNumber);
   if (row == -1) {
-  JOptionPane.showMessageDialog(LogUI.this, "You have entered 
an invalid line number", "Error", 0);
+  JOptionPane.showMessageDialog(LogUI.this, "You have entered 
an invalid line number", "Error", JOptionPane.ERROR_MESSAGE);
   }
   } catch (NumberFormatException nfe) {
-  JOptionPane.showMessageDialog(LogUI.this, "You have entered an 
invalid line number", "Error", 0);
+  JOptionPane.showMessageDialog(LogUI.this, "You have entered an 
invalid line number", "Error", JOptionPane.ERROR_MESSAGE);
   }
 }
   };

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2e18dc25/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
--
diff --git a/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java 
b/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
index 23800b2..e78bd82 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
@@ -43,7 +43,7 @@ public class ProgressPanel extends JPanel {
   ProgressPanel(int min, int max, String msg) {
 this.progressBar = new JProgressBar(min, max);
 setBorder(BorderFactory.createLineBorder(Color.black, 1));
-messageLabel.setHorizontalAlignment(SwingConstants.HORIZONTAL);
+messageLabel.setHorizontalAlignment(SwingConstants.CENTER);
 messageLabel.setText(msg);
 setLayout(new BorderLayout());
 

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2e18dc25/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java 
b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
index aa9aaf1..7244179 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
@@ -35,19 +35,7 @@ import java.net.URL;
 import java.util.List;
 
 import java.util.Locale;
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
+import javax.swing.*;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
@@ -676,7 +664,7 @@ class ReceiverConfigurationPanel extends JPanel {
 
 JFrame frame = new JFrame();
 

[1/5] logging-chainsaw git commit: Replace null arrays with empty varargs

[mattsicker]

Repository: logging-chainsaw
Updated Branches:
  refs/heads/master cdc4f3cab -> ba10849cc


Replace null arrays with empty varargs


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/45687c97
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/45687c97
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/45687c97

Branch: refs/heads/master
Commit: 45687c97a7ad2f713b30a3acada0b7cad5c99fed
Parents: cdc4f3c
Author: Matt Sicker 
Authored: Tue Mar 13 01:06:36 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:06:36 2018 -0500

--
 src/main/java/org/apache/log4j/db/DBAppender.java   | 4 ++--
 src/main/java/org/apache/log4j/db/dialect/Util.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/45687c97/src/main/java/org/apache/log4j/db/DBAppender.java
--
diff --git a/src/main/java/org/apache/log4j/db/DBAppender.java 
b/src/main/java/org/apache/log4j/db/DBAppender.java
index f9c0094..e612a84 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -146,7 +146,7 @@ public class DBAppender extends AppenderSkeleton implements 
UnrecognizedElementH
 //
 Method getGeneratedKeysMethod;
 try {
-getGeneratedKeysMethod = 
PreparedStatement.class.getMethod("getGeneratedKeys", null);
+getGeneratedKeysMethod = 
PreparedStatement.class.getMethod("getGeneratedKeys");
 } catch(Exception ex) {
 getGeneratedKeysMethod = null;
 }
@@ -247,7 +247,7 @@ public class DBAppender extends AppenderSkeleton implements 
UnrecognizedElementH
   boolean gotGeneratedKeys = false;
   if (cnxSupportsGetGeneratedKeys) {
   try {
-  rs = (ResultSet) 
GET_GENERATED_KEYS_METHOD.invoke(insertStatement, null);
+  rs = (ResultSet) 
GET_GENERATED_KEYS_METHOD.invoke(insertStatement);
   gotGeneratedKeys = true;
   } catch(InvocationTargetException ex) {
   Throwable target = ex.getTargetException();

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/45687c97/src/main/java/org/apache/log4j/db/dialect/Util.java
--
diff --git a/src/main/java/org/apache/log4j/db/dialect/Util.java 
b/src/main/java/org/apache/log4j/db/dialect/Util.java
index 2013137..c0cd503 100644
--- a/src/main/java/org/apache/log4j/db/dialect/Util.java
+++ b/src/main/java/org/apache/log4j/db/dialect/Util.java
@@ -102,7 +102,7 @@ public class Util extends ComponentBase {
   //
   //   invoking JDK 1.4 method by reflection
   //
-  return (Boolean) 
DatabaseMetaData.class.getMethod("supportsGetGeneratedKeys", null).invoke(meta, 
null);
+  return (Boolean) 
DatabaseMetaData.class.getMethod("supportsGetGeneratedKeys").invoke(meta);
 } catch(Throwable e) {
   getLogger().info("Could not call supportsGetGeneratedKeys method. This 
may be recoverable");
   return false;

[5/5] logging-chainsaw git commit: Make synchronized variables final

[mattsicker]

Make synchronized variables final


Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/ba10849c
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/ba10849c
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/ba10849c

Branch: refs/heads/master
Commit: ba10849ccce6898b49ddff4b7726973dbc2645dc
Parents: 3250bb1
Author: Matt Sicker 
Authored: Tue Mar 13 01:24:51 2018 -0500
Committer: Matt Sicker 
Committed: Tue Mar 13 01:24:51 2018 -0500

--
 .../java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java| 2 +-
 src/main/java/org/apache/log4j/chainsaw/LogUI.java | 2 +-
 .../java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java   | 2 +-
 .../java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java| 2 +-
 .../org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java   | 2 +-
 .../java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java| 2 +-
 src/main/java/org/apache/log4j/net/MulticastReceiver.java  | 2 +-
 src/main/java/org/apache/log4j/net/SocketHubReceiver.java  | 2 +-
 src/main/java/org/apache/log4j/net/SocketNode13.java   | 2 +-
 src/main/java/org/apache/log4j/net/SocketReceiver.java | 2 +-
 src/main/java/org/apache/log4j/net/UDPReceiver.java| 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java 
b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
index 74f9702..360820c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
@@ -51,7 +51,7 @@ public class LogPanelPreferenceModel implements Serializable{
 Properties properties = SettingsManager.getInstance().getDefaultSettings();
 
   for (Map.Entry objectObjectEntry : 
properties.entrySet()) {
-  Map.Entry entry = (Map.Entry) objectObjectEntry;
+  Map.Entry entry = objectObjectEntry;
 
   if (entry.getKey().toString().startsWith("DateFormat")) {
   list.add(entry.getValue());

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/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 7454f89..cbaee9a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -178,7 +178,7 @@ public class LogUI extends JFrame implements 
ChainsawViewer, SettingsListener {
* until notified.
*/
   private boolean isGUIFullyInitialized = false;
-  private Object initializationLock = new Object();
+  private final Object initializationLock = new Object();
 
   /**
* The shutdownAction is called when the user requests to exit Chainsaw, and

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java 
b/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
index 87c5945..a1801ff 100644
--- a/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
+++ b/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
@@ -38,7 +38,7 @@ import org.apache.log4j.spi.LoggingEvent;
  * @author Paul Smith psm...@apache.org
  */
 public class EventDetailLayout extends Layout {
-  private EnhancedPatternLayout patternLayout = new EnhancedPatternLayout();
+  private final EnhancedPatternLayout patternLayout = new 
EnhancedPatternLayout();
 
   public EventDetailLayout() {
   }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
--
diff --git 
a/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java 
b/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
index 19df785..d0b8f0b 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
@@ -66,7 +66,7 @@ public class LoadSettingsEvent extends SettingsEvent {

logging-log4j-audit git commit: Catalog Editor now uses Spring Boot

[rgoers]

Repository: logging-log4j-audit
Updated Branches:
  refs/heads/master 540d9e579 -> a57e2f232


Catalog Editor now uses Spring Boot


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/a57e2f23
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/a57e2f23
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/a57e2f23

Branch: refs/heads/master
Commit: a57e2f2322ef19406237f2478857273e16a45946
Parents: 540d9e5
Author: Ralph Goers 
Authored: Tue Mar 13 21:02:19 2018 -0700
Committer: Ralph Goers 
Committed: Tue Mar 13 21:02:19 2018 -0700

--
 .../api/annotation/JdbcUrlCondition.java|  22 ++--
 .../catalog/jpa/config/EclipseLinkConfig.java   |   5 +
 .../jpa/config/HsqldbDataSourceConfig.java  |   6 +-
 .../jpa/config/PostgresqlDataSourceConfig.java  |   5 +
 log4j-catalog/log4j-catalog-war/pom.xml | 105 ++-
 .../log4j/catalog/AuditCatalogEditor.java   |  86 
 .../log4j/catalog/config/WebAppInitializer.java |  41 --
 .../log4j/catalog/config/WebMvcAppContext.java  |   9 +-
 .../src/main/resources/log4j2.xml   |   4 +-
 pom.xml | 131 +++
 10 files changed, 236 insertions(+), 178 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/a57e2f23/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java
--
diff --git 
a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java
 
b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java
index 435558b..84ebbbe 100644
--- 
a/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java
+++ 
b/log4j-catalog/log4j-catalog-api/src/main/java/org/apache/logging/log4j/catalog/api/annotation/JdbcUrlCondition.java
@@ -17,6 +17,8 @@ package org.apache.logging.log4j.catalog.api.annotation;
 
 import java.util.Map;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.env.Environment;
@@ -26,6 +28,8 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
  *
  */
 public class JdbcUrlCondition implements Condition {
+
+private static final Logger LOGGER = 
LogManager.getLogger(JdbcUrlCondition.class);
 @Override
 public boolean matches(ConditionContext context, AnnotatedTypeMetadata 
metadata) {
 Environment env = context.getEnvironment();
@@ -34,18 +38,20 @@ public class JdbcUrlCondition implements Condition {
 String value = map.get("value").toString();
 String jdbcUrl = env.getProperty("jdbcUrl");
 Boolean isEmbedded = 
Boolean.parseBoolean(env.getProperty("isEmbedded"));
+boolean result;
 if (value.equals("hsqldb")) {
-return jdbcUrl == null || isEmbedded;
-}
-if (jdbcUrl == null || isEmbedded) {
-return false;
-}
-if (!jdbcUrl.startsWith("jdbc:")) {
-return false;
+result = jdbcUrl == null || isEmbedded;
+} else if (jdbcUrl == null || isEmbedded) {
+result = false;
+} else if (!jdbcUrl.startsWith("jdbc:")) {
+result = false;
+} else {
+result = 
jdbcUrl.substring(5).toLowerCase().startsWith(value.toLowerCase());
 }
-boolean result = 
jdbcUrl.substring(5).toLowerCase().startsWith(value.toLowerCase());
+LOGGER.debug("Returning {} for {}", result, value);
 return result;
 }
+LOGGER.debug("No data provided");
 return false;
 }
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/a57e2f23/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/EclipseLinkConfig.java
--
diff --git 
a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/EclipseLinkConfig.java
 
b/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/EclipseLinkConfig.java
index 143e937..9ff9569 100644
--- 
a/log4j-catalog/log4j-catalog-jpa/src/main/java/org/apache/logging/log4j/catalog/jpa/config/EclipseLinkConfig.java
+++