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..
- *
+ * <p>
  * 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;
-  }
-
-  public void setDisplayed(boolean b) {
-    markerHeight = DEFAULT_HEIGHT;
-    msgHeight = DEFAULT_HEIGHT;
-    displayed = b;
-  }
-
-  public void setPreviousDisplayedEventTimestamp(long 
previousDisplayedEventTimeStamp) {
-    setProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE, 
String.valueOf(loggingEvent.getTimeStamp() - previousDisplayedEventTimeStamp));
-  }
-
-  public boolean isDisplayed() {
-    return displayed;
-  }
-
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-
-    LoggingEventWrapper that = (LoggingEventWrapper) o;
-
-      return id == that.id;
-  }
-
-  public int hashCode() {
-    return id;
-  }
-
-  public String toString() {
-    return "LoggingEventWrapper - id: " + id + " background: " + 
getBackground() + ", foreground: " + getForeground() + ", msg: " + 
loggingEvent.getMessage();
-  }
+    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;
+    }
+
+    public void setDisplayed(boolean b) {
+        markerHeight = DEFAULT_HEIGHT;
+        msgHeight = DEFAULT_HEIGHT;
+        displayed = b;
+    }
+
+    public void setPreviousDisplayedEventTimestamp(long 
previousDisplayedEventTimeStamp) {
+        setProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE, 
String.valueOf(loggingEvent.getTimeStamp() - previousDisplayedEventTimeStamp));
+    }
+
+    public boolean isDisplayed() {
+        return displayed;
+    }
+
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        LoggingEventWrapper that = (LoggingEventWrapper) o;
+
+        return id == that.id;
+    }
+
+    public int hashCode() {
+        return id;
+    }
+
+    public String toString() {
+        return "LoggingEventWrapper - id: " + id + " background: " + 
getBackground() + ", foreground: " + getForeground() + ", msg: " + 
loggingEvent.getMessage();
+    }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/ModifiableListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ModifiableListModel.java 
b/src/main/java/org/apache/log4j/chainsaw/ModifiableListModel.java
index a41c511..9f5a824 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ModifiableListModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ModifiableListModel.java
@@ -16,15 +16,14 @@
  */
 package org.apache.log4j.chainsaw;
 
-import javax.swing.DefaultListModel;
+import javax.swing.*;
 
 /**
  * @author Paul Smith &lt;psm...@apache.org&gt;
- *
  */
 public class ModifiableListModel extends DefaultListModel {
-  public void fireContentsChanged(){
-    fireContentsChanged(this,0, this.size());
-  }
+    public void fireContentsChanged() {
+        fireContentsChanged(this, 0, this.size());
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java 
b/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
index 6c6dcce..d754bb6 100644
--- a/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.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.
@@ -25,42 +25,41 @@ import java.util.EventObject;
  * not been seen previously.
  *
  * @author Paul Smith &lt;psm...@apache.org&gt;
- *
  */
 public class NewKeyEvent extends EventObject {
-  private int newModelIndex;
-  private Object key;
-  private Object value;
+    private int newModelIndex;
+    private Object key;
+    private Object value;
 
-  /**
-   * @param source
-   */
-  public NewKeyEvent(
-    Object source, int newModelIndex, Object key, Object value) {
-    super(source);
-    this.newModelIndex = newModelIndex;
-    this.key = key;
-    this.value = value;
-  }
+    /**
+     * @param source
+     */
+    public NewKeyEvent(
+        Object source, int newModelIndex, Object key, Object value) {
+        super(source);
+        this.newModelIndex = newModelIndex;
+        this.key = key;
+        this.value = value;
+    }
 
-  /**
-   * @return key
-   */
-  public Object getKey() {
-    return key;
-  }
+    /**
+     * @return key
+     */
+    public Object getKey() {
+        return key;
+    }
 
-  /**
-   * @return model index
-   */
-  public int getNewModelIndex() {
-    return newModelIndex;
-  }
+    /**
+     * @return model index
+     */
+    public int getNewModelIndex() {
+        return newModelIndex;
+    }
 
-  /**
-   * @return value
-   */
-  public Object getValue() {
-    return value;
-  }
+    /**
+     * @return value
+     */
+    public Object getValue() {
+        return value;
+    }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java 
b/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
index 499cdc6..05120ac 100644
--- a/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.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.
@@ -23,13 +23,13 @@ import java.util.EventListener;
 /**
  * Interested parties are notified when a MDC/Property key has arrived
  * that has not been seen before by the source Model
- * 
- * @author Paul Smith 
+ *
+ * @author Paul Smith
  */
 public interface NewKeyListener extends EventListener {
-       
-       /**
-        * @param e the new key event being added
-        */
+
+    /**
+     * @param e the new key event being added
+     */
     void newKeyAdded(NewKeyEvent e);
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/PopupListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/PopupListener.java 
b/src/main/java/org/apache/log4j/chainsaw/PopupListener.java
index 37ab4fa..a969e18 100644
--- a/src/main/java/org/apache/log4j/chainsaw/PopupListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/PopupListener.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,44 +17,40 @@
 
 package org.apache.log4j.chainsaw;
 
+import javax.swing.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
-import javax.swing.JPopupMenu;
-
 
 /**
- * 
  * Ensures that a specific popupMenu is displayed when the relevant
  * mouse events are trapped.
- * 
+ *
  * @author Scott Deboy &lt;sde...@apache.org&gt;
  * @author Paul Smith &lt;psm...@apache.org&gt;
- * 
  */
 public class PopupListener extends MouseAdapter {
-  final JPopupMenu popupMenu;
-
-  public PopupListener(JPopupMenu popupMenu) {
-    this.popupMenu = popupMenu;
-  }
-
-  public void mousePressed(MouseEvent e) {
-    checkPopup(e);
-  }
-
-  public void mouseReleased(MouseEvent e) {
-    checkPopup(e);
-  }
-  
-  public void mouseClicked(MouseEvent e)
-  {
-      checkPopup(e);
-  }
-
-  private void checkPopup(MouseEvent e) {
-    if (e.isPopupTrigger()) {
-      popupMenu.show(e.getComponent(), e.getX(), e.getY());
+    final JPopupMenu popupMenu;
+
+    public PopupListener(JPopupMenu popupMenu) {
+        this.popupMenu = popupMenu;
+    }
+
+    public void mousePressed(MouseEvent e) {
+        checkPopup(e);
+    }
+
+    public void mouseReleased(MouseEvent e) {
+        checkPopup(e);
+    }
+
+    public void mouseClicked(MouseEvent e) {
+        checkPopup(e);
+    }
+
+    private void checkPopup(MouseEvent e) {
+        if (e.isPopupTrigger()) {
+            popupMenu.show(e.getComponent(), e.getX(), e.getY());
+        }
     }
-  }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/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 e78bd82..e5c3a5a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.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,56 +17,48 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
+import javax.swing.*;
+import java.awt.*;
 import java.lang.reflect.InvocationTargetException;
 
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-
 /**
  * A simple ProgressPanel that can be used, a little more flexible
  * than ProgressMonitor when you want it to be shown REGARDLESS
  * of any timeouts etc.
- * 
- * @author Paul Smith &lt;psm...@apache.org&gt;
  *
+ * @author Paul Smith &lt;psm...@apache.org&gt;
  */
 public class ProgressPanel extends JPanel {
-  private final JLabel messageLabel = new JLabel();
-  private final JProgressBar progressBar;
+    private final JLabel messageLabel = new JLabel();
+    private final JProgressBar progressBar;
 
-  ProgressPanel(int min, int max, String msg) {
-    this.progressBar = new JProgressBar(min, max);
-    setBorder(BorderFactory.createLineBorder(Color.black, 1));
-    messageLabel.setHorizontalAlignment(SwingConstants.CENTER);
-    messageLabel.setText(msg);
-    setLayout(new BorderLayout());
+    ProgressPanel(int min, int max, String msg) {
+        this.progressBar = new JProgressBar(min, max);
+        setBorder(BorderFactory.createLineBorder(Color.black, 1));
+        messageLabel.setHorizontalAlignment(SwingConstants.CENTER);
+        messageLabel.setText(msg);
+        setLayout(new BorderLayout());
 
-    add(progressBar, BorderLayout.CENTER);
-    add(messageLabel, BorderLayout.SOUTH);
-  }
+        add(progressBar, BorderLayout.CENTER);
+        add(messageLabel, BorderLayout.SOUTH);
+    }
 
-  public void setMessage(final String string) {
-    SwingUtilities.invokeLater(
+    public void setMessage(final String string) {
+        SwingUtilities.invokeLater(
             () -> messageLabel.setText(string));
-  }
-
-  public void setProgress(final int progress) {
-    try {
-      Runnable runnable = () -> progressBar.setValue(progress);
-    if (!SwingUtilities.isEventDispatchThread()) {
-        SwingUtilities.invokeAndWait(runnable);
-    }else {
-        runnable.run();
     }
-    } catch (InterruptedException | InvocationTargetException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+
+    public void setProgress(final int progress) {
+        try {
+            Runnable runnable = () -> progressBar.setValue(progress);
+            if (!SwingUtilities.isEventDispatchThread()) {
+                SwingUtilities.invokeAndWait(runnable);
+            } else {
+                runnable.run();
+            }
+        } catch (InterruptedException | InvocationTargetException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
     }
-  }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/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 be19870..2faa1bb 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.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,14 +16,19 @@
  */
 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.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.chainsaw.helper.SwingHelper;
+import org.apache.log4j.chainsaw.prefs.SettingsManager;
+import org.apache.log4j.net.SocketReceiver;
+import org.apache.log4j.net.UDPReceiver;
+import org.apache.log4j.plugins.Receiver;
+
+import javax.swing.*;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyledDocument;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
@@ -33,20 +38,7 @@ import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
-
 import java.util.Locale;
-import javax.swing.*;
-import javax.swing.text.SimpleAttributeSet;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyledDocument;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.log4j.chainsaw.helper.SwingHelper;
-import org.apache.log4j.chainsaw.prefs.SettingsManager;
-import org.apache.log4j.net.SocketReceiver;
-import org.apache.log4j.net.UDPReceiver;
-import org.apache.log4j.plugins.Receiver;
 
 
 /**
@@ -112,7 +104,7 @@ class ReceiverConfigurationPanel extends JPanel {
     //used as frame for file open dialogs
     private Container dialog;
 
-  ReceiverConfigurationPanel() {
+    ReceiverConfigurationPanel() {
         setBorder(BorderFactory.createEmptyBorder(5, 15, 5, 15));
         setLayout(new GridBagLayout());
 
@@ -163,7 +155,7 @@ class ReceiverConfigurationPanel extends JPanel {
         c.fill = GridBagConstraints.HORIZONTAL;
         c.insets = new Insets(10, 10, 10, 0);
         add(lowerPanel, c);
-        
+
         c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = yPos++;
@@ -183,7 +175,7 @@ class ReceiverConfigurationPanel extends JPanel {
          * This listener activates/deactivates certain controls based on the 
current
          * state of the options
          */
-        ActionListener al = e -> updateEnabledState((Component)e.getSource());
+        ActionListener al = e -> updateEnabledState((Component) e.getSource());
 
         logFileReceiverRadioButton.addActionListener(al);
         log4jConfigReceiverRadioButton.addActionListener(al);
@@ -231,40 +223,36 @@ class ReceiverConfigurationPanel extends JPanel {
         c.gridy = 0;
         panel.add(okCancelButtons.get(1), c);
 
-        cancelButton.addActionListener(new ActionListener()
-        {
-            public void actionPerformed(ActionEvent e)
-            {
+        cancelButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
                 panelModel.setCancelled(true);
                 completionActionListener.actionPerformed(new ActionEvent(this, 
-1, "cancelled"));
             }
         });
 
-        okButton.addActionListener(new ActionListener()
-        {
-            public void actionPerformed(ActionEvent e)
-            {
+        okButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
                 panelModel.setCancelled(false);
                 if (logFileFormatComboBox.getSelectedItem() != null && 
!(logFileFormatComboBox.getSelectedItem().toString().trim().equals(""))) {
-                  
panelModel.setLogFormat(logFileFormatComboBox.getSelectedItem().toString());
+                    
panelModel.setLogFormat(logFileFormatComboBox.getSelectedItem().toString());
                 }
                 completionActionListener.actionPerformed(new ActionEvent(this, 
-1, "ok"));
             }
         });
 
-      saveButton.addActionListener(e -> {
-        try {
-            URL url = browseFile("Choose a path and file name to save", false);
-            if (url != null) {
-              File file = new File(url.toURI());
-              panelModel.setSaveConfigFile(file);
+        saveButton.addActionListener(e -> {
+            try {
+                URL url = browseFile("Choose a path and file name to save", 
false);
+                if (url != null) {
+                    File file = new File(url.toURI());
+                    panelModel.setSaveConfigFile(file);
+                }
+            } catch (Exception ex) {
+                logger.error(
+                    "Error browsing for log file", ex);
             }
-        } catch (Exception ex) {
-            logger.error(
-                "Error browsing for log file", ex);
-        }
-      });
-      return panel;
+        });
+        return panel;
     }
 
     private JPanel buildBottomDescriptionPanel() {
@@ -333,20 +321,20 @@ class ReceiverConfigurationPanel extends JPanel {
     private JPanel buildLog4jConfigReceiverPanel() {
         log4jConfigURLTextField = new JTextField();
         browseLog4jConfigButton = new JButton(new AbstractAction(" Open 
File... ") {
-                    public void actionPerformed(ActionEvent e) {
-                        try {
-
-                            URL url = browseConfig();
-
-                            if (url != null) {
-                                
log4jConfigURLTextField.setText(url.toExternalForm());
-                            }
-                        } catch (Exception ex) {
-                            logger.error(
-                                "Error browsing for log4j config file", ex);
-                        }
+            public void actionPerformed(ActionEvent e) {
+                try {
+
+                    URL url = browseConfig();
+
+                    if (url != null) {
+                        log4jConfigURLTextField.setText(url.toExternalForm());
                     }
-                });
+                } catch (Exception ex) {
+                    logger.error(
+                        "Error browsing for log4j config file", ex);
+                }
+            }
+        });
 
         browseLog4jConfigButton.setToolTipText(
             "Shows a File Open dialog to allow you to find a log4j 
configuration file");
@@ -487,14 +475,13 @@ class ReceiverConfigurationPanel extends JPanel {
         c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = 5;
-        c.gridwidth=5;
+        c.gridwidth = 5;
         c.insets = new Insets(15, 5, 0, 5);
         panel.add(new JLabel("<html> See PatternLayout or 
LogFilePatternReceiver JavaDoc for details </html>"), c);
         return panel;
     }
 
-    private void seedLogFileFormatComboBoxModel()
-    {
+    private void seedLogFileFormatComboBoxModel() {
         logFileFormatComboBoxModel.addElement("MESSAGE");
         logFileFormatComboBoxModel.addElement("%p %t %c - %m%n");
         logFileFormatComboBoxModel.addElement("LEVEL THREAD LOGGER - MESSAGE");
@@ -502,8 +489,7 @@ class ReceiverConfigurationPanel extends JPanel {
         logFileFormatComboBoxModel.addElement("TIMESTAMP LEVEL [LOGGER] 
MESSAGE");
     }
 
-    private void seedLogFileFormatTimestampComboBoxModel()
-    {
+    private void seedLogFileFormatTimestampComboBoxModel() {
         logFileFormatTimestampFormatComboBoxModel.addElement("yyyy-MM-dd 
HH:mm:ss,SSS");
         logFileFormatTimestampFormatComboBoxModel.addElement("yyyyMMdd 
HH:mm:ss.SSS");
         logFileFormatTimestampFormatComboBoxModel.addElement("yyyy/MM/dd 
HH:mm:ss");
@@ -536,22 +522,22 @@ class ReceiverConfigurationPanel extends JPanel {
             });
 
         browseForAnExistingConfigurationButton = new JButton(new 
AbstractAction(" Open File... ") {
-                    public void actionPerformed(ActionEvent e) {
-                        try {
-
-                            URL url = browseConfig();
-
-                            if (url != null) {
-                                
existingConfigurationComboBoxModel.addElement(url.toExternalForm());
-                                
existingConfigurationComboBox.getModel().setSelectedItem(
-                                    url);
-                            }
-                        } catch (Exception ex) {
-                            logger.error(
-                                "Error browsing for Configuration file", ex);
-                        }
+            public void actionPerformed(ActionEvent e) {
+                try {
+
+                    URL url = browseConfig();
+
+                    if (url != null) {
+                        
existingConfigurationComboBoxModel.addElement(url.toExternalForm());
+                        
existingConfigurationComboBox.getModel().setSelectedItem(
+                            url);
                     }
-                });
+                } catch (Exception ex) {
+                    logger.error(
+                        "Error browsing for Configuration file", ex);
+                }
+            }
+        });
 
         browseForAnExistingConfigurationButton.setToolTipText(
             "Shows a File Open dialog to allow you to find a configuration 
file");
@@ -583,6 +569,7 @@ class ReceiverConfigurationPanel extends JPanel {
 
     /**
      * Returns the current Model/state of the chosen options by the user.
+     *
      * @return model
      */
     PanelModel getModel() {
@@ -593,6 +580,7 @@ class ReceiverConfigurationPanel extends JPanel {
      * Clients of this panel can configure the ActionListener to be used
      * when the user presses the OK button, so they can read
      * back this Panel's model top determine what to do.
+     *
      * @param actionListener listener which will be notified that ok was 
selected
      */
     void setCompletionActionListener(ActionListener actionListener) {
@@ -633,7 +621,7 @@ class ReceiverConfigurationPanel extends JPanel {
             result = null;
         }
         if (selectedFile != null) {
-          result = selectedFile.toURI().toURL();
+            result = selectedFile.toURI().toURL();
         }
         EventQueue.invokeLater(() -> dialog.setVisible(true));
         return result;
@@ -655,7 +643,7 @@ class ReceiverConfigurationPanel extends JPanel {
             result = null;
         }
         if (selectedFile != null) {
-          result = selectedFile.toURI().toURL();
+            result = selectedFile.toURI().toURL();
         }
         EventQueue.invokeLater(() -> dialog.setVisible(true));
         return result;
@@ -678,24 +666,23 @@ class ReceiverConfigurationPanel extends JPanel {
         return dontwarnIfNoReceiver.isSelected();
     }
 
-  public void setDialog(Container dialog) {
-    this.dialog = dialog;
-  }
+    public void setDialog(Container dialog) {
+        this.dialog = dialog;
+    }
 
-  /**
+    /**
      * This class represents the model of the chosen options the user
      * has configured.
-     *
      */
     class PanelModel {
 
-    private File file;
-    //default to cancelled
-    private boolean cancelled = true;
-    private String lastLogFormat;
-    private File saveConfigFile;
+        private File file;
+        //default to cancelled
+        private boolean cancelled = true;
+        private String lastLogFormat;
+        private File saveConfigFile;
 
-    public PanelModel(){
+        public PanelModel() {
             file = new 
File(SettingsManager.getInstance().getSettingsDirectory(), 
"receiver-config.xml");
         }
 
@@ -728,12 +715,9 @@ class ReceiverConfigurationPanel extends JPanel {
 
         URL getConfigToLoad() {
 
-            try
-            {
+            try {
                 return new 
URL(existingConfigurationComboBoxModel.getSelectedItem().toString());
-            }
-            catch (MalformedURLException e)
-            {
+            } catch (MalformedURLException e) {
                 return null;
             }
         }
@@ -748,23 +732,20 @@ class ReceiverConfigurationPanel extends JPanel {
         }
 
         File getSaveConfigFile() {
-          return saveConfigFile;
+            return saveConfigFile;
         }
 
         void setSaveConfigFile(File file) {
-          this.saveConfigFile = file;
+            this.saveConfigFile = file;
         }
 
         URL getLogFileURL() {
-            try
-            {
+            try {
                 Object item = logFileURLTextField.getText();
                 if (item != null) {
                     return new URL(item.toString());
                 }
-            }
-            catch (MalformedURLException e)
-            {
+            } catch (MalformedURLException e) {
                 logger.error("Error retrieving log file URL", e);
             }
             return null;
@@ -772,7 +753,7 @@ class ReceiverConfigurationPanel extends JPanel {
 
         String getLogFormat() {
             if (cancelled) {
-              return lastLogFormat;
+                return lastLogFormat;
             }
             Object item = logFileFormatComboBox.getSelectedItem();
             if (item != null) {
@@ -795,30 +776,29 @@ class ReceiverConfigurationPanel extends JPanel {
             return null;
         }
 
-        public void setCancelled(boolean cancelled)
-        {
+        public void setCancelled(boolean cancelled) {
             this.cancelled = cancelled;
         }
 
         public void setLogFormat(String lastLogFormat) {
-          this.lastLogFormat = lastLogFormat;
-          logFileFormatComboBoxModel.removeElement(lastLogFormat);
-          logFileFormatComboBoxModel.insertElementAt(lastLogFormat, 0);
-          logFileFormatComboBox.setSelectedIndex(0);
+            this.lastLogFormat = lastLogFormat;
+            logFileFormatComboBoxModel.removeElement(lastLogFormat);
+            logFileFormatComboBoxModel.insertElementAt(lastLogFormat, 0);
+            logFileFormatComboBox.setSelectedIndex(0);
         }
 
         public boolean isCancelled() {
-          return cancelled;
+            return cancelled;
         }
 
-    public File getLog4jConfigFile() {
-      try {
-        URL newConfigurationURL = new URL(log4jConfigURLTextField.getText());
-        return new File(newConfigurationURL.toURI());
-      } catch (URISyntaxException | MalformedURLException e) {
-        e.printStackTrace();
-      }
-        return null;
+        public File getLog4jConfigFile() {
+            try {
+                URL newConfigurationURL = new 
URL(log4jConfigURLTextField.getText());
+                return new File(newConfigurationURL.toURI());
+            } catch (URISyntaxException | MalformedURLException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
     }
-  }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java 
b/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
index 0e26fb9..f698167 100644
--- a/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/RuleMediator.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,19 +17,19 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Map;
-
 import org.apache.log4j.rule.AbstractRule;
 import org.apache.log4j.rule.Rule;
 import org.apache.log4j.spi.LoggingEvent;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Map;
+
 
 /**
- * A mediator class that implements the Rule interface, by combining several 
+ * A mediator class that implements the Rule interface, by combining several
  * optional rules used by Chainsaw's filtering GUI's into a single Rule.
- *
+ * <p>
  * <p>Setting the individual sub-rules propagates a PropertyChangeEvent as per
  * standard Java beans principles.
  *
@@ -37,69 +37,70 @@ import org.apache.log4j.spi.LoggingEvent;
  * @author Scott Deboy &lt;sde...@apache.org&gt;
  */
 public class RuleMediator extends AbstractRule {
-  private Rule loggerRule;
-  private Rule filterRule;
-  private Rule findRule;
-  private final PropertyChangeListener ruleChangerNotifier = new 
RuleChangerNotifier();
-  private boolean findRuleRequired;
+    private Rule loggerRule;
+    private Rule filterRule;
+    private Rule findRule;
+    private final PropertyChangeListener ruleChangerNotifier = new 
RuleChangerNotifier();
+    private boolean findRuleRequired;
 
-  public RuleMediator(boolean findRuleRequired) {
-    this.findRuleRequired = findRuleRequired;
-  }
-  /* (non-Javadoc)
-   * @see 
org.apache.log4j.chainsaw.rule.Rule#evaluate(org.apache.log4j.spi.LoggingEvent)
-   */
-  public boolean evaluate(LoggingEvent e, Map matches) {
-      if (findRuleRequired) {
-          if (findRule == null) {
-              return false;
-          }
-          if (!findRule.evaluate(e, null)) {
-              return false;
-          }
-      }
+    public RuleMediator(boolean findRuleRequired) {
+        this.findRuleRequired = findRuleRequired;
+    }
+
+    /* (non-Javadoc)
+     * @see 
org.apache.log4j.chainsaw.rule.Rule#evaluate(org.apache.log4j.spi.LoggingEvent)
+     */
+    public boolean evaluate(LoggingEvent e, Map matches) {
+        if (findRuleRequired) {
+            if (findRule == null) {
+                return false;
+            }
+            if (!findRule.evaluate(e, null)) {
+                return false;
+            }
+        }
+
+        return (loggerRule == null || loggerRule.evaluate(e, null)) && 
(filterRule == null || filterRule.evaluate(e, null));
 
-      return (loggerRule == null || loggerRule.evaluate(e, null)) && 
(filterRule == null || filterRule.evaluate(e, null));
+    }
 
-  }
+    public boolean isFindRuleRequired() {
+        return findRuleRequired;
+    }
 
-  public boolean isFindRuleRequired() {
-    return findRuleRequired;
-  }
-  
-  public void setFilterRule(Rule r) {
-    Rule oldFilterRule = this.filterRule;
-    this.filterRule = r;
-    firePropertyChange("filterRule", oldFilterRule, this.filterRule);
-  }
+    public void setFilterRule(Rule r) {
+        Rule oldFilterRule = this.filterRule;
+        this.filterRule = r;
+        firePropertyChange("filterRule", oldFilterRule, this.filterRule);
+    }
 
-  public void setFindRule(Rule r) {
-    Rule oldFindRule = this.findRule;
-    this.findRule = r;
-    firePropertyChange("findRule", oldFindRule, this.findRule);
-  }
+    public void setFindRule(Rule r) {
+        Rule oldFindRule = this.findRule;
+        this.findRule = r;
+        firePropertyChange("findRule", oldFindRule, this.findRule);
+    }
 
-  public void setLoggerRule(Rule r) {
-    Rule oldLoggerRule = this.loggerRule;
-    this.loggerRule = r;
-    if(oldLoggerRule!=null){
-      oldLoggerRule.removePropertyChangeListener(ruleChangerNotifier);
+    public void setLoggerRule(Rule r) {
+        Rule oldLoggerRule = this.loggerRule;
+        this.loggerRule = r;
+        if (oldLoggerRule != null) {
+            oldLoggerRule.removePropertyChangeListener(ruleChangerNotifier);
+        }
+        this.loggerRule.addPropertyChangeListener(ruleChangerNotifier);
+        firePropertyChange("loggerRule", oldLoggerRule, this.loggerRule);
     }
-    this.loggerRule.addPropertyChangeListener(ruleChangerNotifier);
-    firePropertyChange("loggerRule", oldLoggerRule, this.loggerRule);
-  }
 
-  /**
-   * Helper class that propagates internal Rules propertyChange events
-   * to external parties, since an internal rule changing really means
-   * this outter rule is going to change too.
-   */
-  private class RuleChangerNotifier implements PropertyChangeListener {
-    /* (non-Javadoc)
-     * @see 
java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+    /**
+     * Helper class that propagates internal Rules propertyChange events
+     * to external parties, since an internal rule changing really means
+     * this outter rule is going to change too.
      */
-    public void propertyChange(PropertyChangeEvent evt) {
-      RuleMediator.this.firePropertyChange(evt);
+    private class RuleChangerNotifier implements PropertyChangeListener {
+        /* (non-Javadoc)
+         * @see 
java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
+         */
+        public void propertyChange(PropertyChangeEvent evt) {
+            RuleMediator.this.firePropertyChange(evt);
+        }
     }
-  }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/SavableTabSetting.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/SavableTabSetting.java 
b/src/main/java/org/apache/log4j/chainsaw/SavableTabSetting.java
index a71f5eb..56a2dd5 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SavableTabSetting.java
+++ b/src/main/java/org/apache/log4j/chainsaw/SavableTabSetting.java
@@ -36,8 +36,7 @@ public class SavableTabSetting {
         this.chainsawLog = chainsawLog;
     }
 
-    public void setZeroconf(boolean zeroConf)
-    {
+    public void setZeroconf(boolean zeroConf) {
         this.zeroConf = zeroConf;
     }
 

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java 
b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
index 0839f1a..59ddd4e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.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,18 +21,17 @@ import java.util.EventListener;
 /**
  * Chainsaw notifies these Listeners when the user has requested
  * it to shutdown.
- * 
+ * <p>
  * Listeners should use this opportunity to release any resources
  * and/or perform any clean up activity.
- * 
+ * <p>
  * Listeners should <B>NOT</b> perform the action of actual shutting down
  * however (i.e. do not call System.exit()).
- * 
- * @see LogUI#setShutdownAction(Action)
- * 
+ *
  * @author Paul Smith &lt;psm...@apache.org&gt;
+ * @see LogUI#setShutdownAction(Action)
  */
-public interface ShutdownListener extends EventListener{
+public interface ShutdownListener extends EventListener {
 
-  void shuttingDown();
+    void shuttingDown();
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/SmallButton.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/SmallButton.java 
b/src/main/java/org/apache/log4j/chainsaw/SmallButton.java
index a91c40f..42595b7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SmallButton.java
+++ b/src/main/java/org/apache/log4j/chainsaw/SmallButton.java
@@ -16,21 +16,19 @@
  */
 package org.apache.log4j.chainsaw;
 
-import java.awt.Insets;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-
-import javax.swing.Action;
-import javax.swing.JButton;
+import javax.swing.*;
 import javax.swing.border.BevelBorder;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.SoftBevelBorder;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 
 
 /**
  * A better button class that has nice roll over effects.
- *
+ * <p>
  * This class is borrowed (quite heavily, but with modifications)
  * from the "Swing: Second Edition"
  * book by Matthew Robinson and Pavel Vorobeiv. An excellent book on Swing.
@@ -38,109 +36,108 @@ import javax.swing.border.SoftBevelBorder;
  * @author Matthew Robinson
  * @author Pavel Vorobeiv
  * @author Paul Smith &lt;psm...@apache.org&gt;
- *
  */
 public class SmallButton extends JButton implements MouseListener {
-  protected Border m_inactive = new EmptyBorder(3, 3, 3, 3);
-  protected Border m_border = m_inactive;
-  protected Border m_lowered = new SoftBevelBorder(BevelBorder.LOWERED);
-  protected Border m_raised = new SoftBevelBorder(BevelBorder.RAISED);
-  protected Insets m_ins = new Insets(4, 4, 4, 4);
+    protected Border m_inactive = new EmptyBorder(3, 3, 3, 3);
+    protected Border m_border = m_inactive;
+    protected Border m_lowered = new SoftBevelBorder(BevelBorder.LOWERED);
+    protected Border m_raised = new SoftBevelBorder(BevelBorder.RAISED);
+    protected Insets m_ins = new Insets(4, 4, 4, 4);
+
+    public SmallButton() {
+        super();
+        setBorder(m_inactive);
+        setMargin(m_ins);
+        setRequestFocusEnabled(false);
+        addMouseListener(this);
+    }
 
-  public SmallButton() {
-    super();
-    setBorder(m_inactive);
-    setMargin(m_ins);
-    setRequestFocusEnabled(false);
-    addMouseListener(this);
-  }
+    public SmallButton(Action act) {
+        this();
+        setAction(act);
+        setRequestFocusEnabled(false);
 
-  public SmallButton(Action act) {
-    this();
-    setAction(act);
-    setRequestFocusEnabled(false);
+        //      addActionListener(act);
+        addMouseListener(this);
+    }
 
-    //      addActionListener(act);
-    addMouseListener(this);
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public float getAlignmentY() {
+        return 0.5f;
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @return DOCUMENT ME!
-   */
-  public float getAlignmentY() {
-    return 0.5f;
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public Border getBorder() {
+        return m_border;
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @return DOCUMENT ME!
-   */
-  public Border getBorder() {
-    return m_border;
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public Insets getInsets() {
+        return m_ins;
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @return DOCUMENT ME!
-   */
-  public Insets getInsets() {
-    return m_ins;
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseClicked(MouseEvent e) {
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mouseClicked(MouseEvent e) {
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseEntered(MouseEvent e) {
+        if (isEnabled()) {
+            m_border = m_raised;
+            setBorder(m_raised);
+        }
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mouseEntered(MouseEvent e) {
-    if (isEnabled()) {
-      m_border = m_raised;
-      setBorder(m_raised);
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseExited(MouseEvent e) {
+        m_border = m_inactive;
+        setBorder(m_inactive);
     }
-  }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mouseExited(MouseEvent e) {
-    m_border = m_inactive;
-    setBorder(m_inactive);
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mousePressed(MouseEvent e) {
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mousePressed(MouseEvent e) {
-    
-    if (isEnabled()) {
-      m_border = m_lowered;
-      setBorder(m_lowered);
+        if (isEnabled()) {
+            m_border = m_lowered;
+            setBorder(m_lowered);
+        }
     }
-  }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mouseReleased(MouseEvent e) {
-    m_border = m_inactive;
-    setBorder(m_inactive);
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseReleased(MouseEvent e) {
+        m_border = m_inactive;
+        setBorder(m_inactive);
+    }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java 
b/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java
index aecdb99..f6531bc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java
+++ b/src/main/java/org/apache/log4j/chainsaw/SmallToggleButton.java
@@ -16,24 +16,20 @@
  */
 package org.apache.log4j.chainsaw;
 
-import java.awt.Insets;
+import javax.swing.*;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
+import javax.swing.border.SoftBevelBorder;
+import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JToggleButton;
-import javax.swing.SwingConstants;
-import javax.swing.border.BevelBorder;
-import javax.swing.border.Border;
-import javax.swing.border.SoftBevelBorder;
-
 
 /**
  * A better button class that has nice roll over effects.
- *
+ * <p>
  * This class is borrowed (quite heavily, but with modifications)
  * from the "Swing: Second Edition"
  * book by Matthew Robinson and Pavel Vorobeiv. An excellent book on Swing.
@@ -43,113 +39,113 @@ import javax.swing.border.SoftBevelBorder;
  * @author Paul Smith &lt;psm...@apache.org&gt;
  */
 class SmallToggleButton extends JToggleButton implements ItemListener,
-  MouseListener {
-  protected Border m_highlighted = new SoftBevelBorder(BevelBorder.RAISED);
-  protected Border m_raised = BorderFactory.createEmptyBorder(3, 3, 3, 3);
-  protected Border m_inactive = m_raised;
-  protected Border m_border = m_inactive;
-  protected Border m_lowered = new SoftBevelBorder(BevelBorder.LOWERED);
-  protected Insets m_ins = new Insets(4, 4, 4, 4);
+    MouseListener {
+    protected Border m_highlighted = new SoftBevelBorder(BevelBorder.RAISED);
+    protected Border m_raised = BorderFactory.createEmptyBorder(3, 3, 3, 3);
+    protected Border m_inactive = m_raised;
+    protected Border m_border = m_inactive;
+    protected Border m_lowered = new SoftBevelBorder(BevelBorder.LOWERED);
+    protected Insets m_ins = new Insets(4, 4, 4, 4);
 
-  public SmallToggleButton() {
-    super();
-    setHorizontalAlignment(SwingConstants.CENTER);
-    setBorder(isSelected() ? m_lowered : m_raised);
-    setMargin(m_ins);
-    setRequestFocusEnabled(false);
-    addItemListener(this);
-    addMouseListener(this);
-    setText("");
-  }
+    public SmallToggleButton() {
+        super();
+        setHorizontalAlignment(SwingConstants.CENTER);
+        setBorder(isSelected() ? m_lowered : m_raised);
+        setMargin(m_ins);
+        setRequestFocusEnabled(false);
+        addItemListener(this);
+        addMouseListener(this);
+        setText("");
+    }
 
-  public SmallToggleButton(Action action) {
-    this();
-    setAction(action);
-  }
+    public SmallToggleButton(Action action) {
+        this();
+        setAction(action);
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @return DOCUMENT ME!
-   */
-  public float getAlignmentY() {
-    return 0.5f;
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public float getAlignmentY() {
+        return 0.5f;
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @return DOCUMENT ME!
-   */
-  public Border getBorder() {
-    return m_border;
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public Border getBorder() {
+        return m_border;
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @return DOCUMENT ME!
-   */
-  public Insets getInsets() {
-    return m_ins;
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public Insets getInsets() {
+        return m_ins;
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void itemStateChanged(ItemEvent e) {
-    setBorder(isSelected() ? m_lowered : m_raised);
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void itemStateChanged(ItemEvent e) {
+        setBorder(isSelected() ? m_lowered : m_raised);
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mouseClicked(MouseEvent e) {
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseClicked(MouseEvent e) {
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mouseEntered(MouseEvent e) {
-    if (isEnabled()) {
-      m_border = m_highlighted;
-      setBorder(m_highlighted);
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseEntered(MouseEvent e) {
+        if (isEnabled()) {
+            m_border = m_highlighted;
+            setBorder(m_highlighted);
+        }
     }
-  }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mouseExited(MouseEvent e) {
-    m_border = m_inactive;
-    setBorder(m_inactive);
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseExited(MouseEvent e) {
+        m_border = m_inactive;
+        setBorder(m_inactive);
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mousePressed(MouseEvent e) {
-    m_border = m_lowered;
-    setBorder(m_lowered);
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mousePressed(MouseEvent e) {
+        m_border = m_lowered;
+        setBorder(m_lowered);
+    }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param e DOCUMENT ME!
-   */
-  public void mouseReleased(MouseEvent e) {
-    m_border = m_inactive;
-    setBorder(m_inactive);
-  }
+    /**
+     * DOCUMENT ME!
+     *
+     * @param e DOCUMENT ME!
+     */
+    public void mouseReleased(MouseEvent e) {
+        m_border = m_inactive;
+        setBorder(m_inactive);
+    }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/SortArrowIcon.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/SortArrowIcon.java 
b/src/main/java/org/apache/log4j/chainsaw/SortArrowIcon.java
index 7b225bb..8d768eb 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SortArrowIcon.java
+++ b/src/main/java/org/apache/log4j/chainsaw/SortArrowIcon.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,59 +17,59 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.awt.*;
-
 import javax.swing.*;
+import java.awt.*;
 
 
 /**
  * An Icon that is a Nice arrow to be used for displaying which
  * Column is being used for sorting.
+ *
  * @author Claude Duguay
-*/
+ */
 public class SortArrowIcon implements Icon {
-  public static final int NONE = 0;
-  public static final int DECENDING = 1;
-  public static final int ASCENDING = 2;
-  protected int direction;
-  protected int width = 8;
-  protected int height = 8;
+    public static final int NONE = 0;
+    public static final int DECENDING = 1;
+    public static final int ASCENDING = 2;
+    protected int direction;
+    protected int width = 8;
+    protected int height = 8;
 
-  public SortArrowIcon(int direction) {
-    this.direction = direction;
-  }
+    public SortArrowIcon(int direction) {
+        this.direction = direction;
+    }
 
-  public int getIconWidth() {
-    return width;
-  }
+    public int getIconWidth() {
+        return width;
+    }
 
-  public int getIconHeight() {
-    return height;
-  }
+    public int getIconHeight() {
+        return height;
+    }
 
-  public void paintIcon(Component c, Graphics g, int x, int y) {
-    Color bg = c.getBackground();
-    Color light = bg.brighter();
-    Color shade = bg.darker();
+    public void paintIcon(Component c, Graphics g, int x, int y) {
+        Color bg = c.getBackground();
+        Color light = bg.brighter();
+        Color shade = bg.darker();
 
-    int w = width;
-    int h = height;
-    int m = w / 2;
+        int w = width;
+        int h = height;
+        int m = w / 2;
 
-    if (direction == ASCENDING) {
-      g.setColor(shade);
-      g.drawLine(x, y, x + w, y);
-      g.drawLine(x, y, x + m, y + h);
-      g.setColor(light);
-      g.drawLine(x + w, y, x + m, y + h);
-    }
+        if (direction == ASCENDING) {
+            g.setColor(shade);
+            g.drawLine(x, y, x + w, y);
+            g.drawLine(x, y, x + m, y + h);
+            g.setColor(light);
+            g.drawLine(x + w, y, x + m, y + h);
+        }
 
-    if (direction == DECENDING) {
-      g.setColor(shade);
-      g.drawLine(x + m, y, x, y + h);
-      g.setColor(light);
-      g.drawLine(x, y + h, x + w, y + h);
-      g.drawLine(x + m, y, x + w, y + h);
+        if (direction == DECENDING) {
+            g.setColor(shade);
+            g.drawLine(x + m, y, x, y + h);
+            g.setColor(light);
+            g.drawLine(x, y + h, x + w, y + h);
+            g.drawLine(x + m, y, x + w, y + h);
+        }
     }
-  }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/SortHeaderRenderer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/SortHeaderRenderer.java 
b/src/main/java/org/apache/log4j/chainsaw/SortHeaderRenderer.java
index d03bb3a..3b09fe2 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SortHeaderRenderer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/SortHeaderRenderer.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,62 +17,62 @@
 
 package org.apache.log4j.chainsaw;
 
-import java.awt.*;
-
 import javax.swing.*;
-import javax.swing.table.*;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.JTableHeader;
+import java.awt.*;
 
 
 /**
  * A Table Column header renederer that displays a nice Up/Down arrow
  * depending on whether this column is the current sort column or not,
  * and which way the sort is functioning
+ *
  * @author Claude Duguay
-*/
+ */
 public class SortHeaderRenderer extends DefaultTableCellRenderer {
-  public static final Icon NONSORTED = new SortArrowIcon(SortArrowIcon.NONE);
-  public static final Icon ASCENDING = new 
SortArrowIcon(SortArrowIcon.ASCENDING);
-  public static final Icon DECENDING = new 
SortArrowIcon(SortArrowIcon.DECENDING);
+    public static final Icon NONSORTED = new SortArrowIcon(SortArrowIcon.NONE);
+    public static final Icon ASCENDING = new 
SortArrowIcon(SortArrowIcon.ASCENDING);
+    public static final Icon DECENDING = new 
SortArrowIcon(SortArrowIcon.DECENDING);
 
-  public SortHeaderRenderer() {
-    setHorizontalTextPosition(LEFT);
-    setHorizontalAlignment(CENTER);
-  }
+    public SortHeaderRenderer() {
+        setHorizontalTextPosition(LEFT);
+        setHorizontalAlignment(CENTER);
+    }
 
-  public Component getTableCellRendererComponent(
-    JTable table, Object value, boolean isSelected, boolean hasFocus, int row,
-    int col) {
-    int index = -1;
-    boolean ascending = true;
+    public Component getTableCellRendererComponent(
+        JTable table, Object value, boolean isSelected, boolean hasFocus, int 
row,
+        int col) {
+        int index = -1;
+        boolean ascending = true;
 
-    if (table instanceof JSortTable) {
-      JSortTable sortTable = (JSortTable) table;
-      index = sortTable.getSortedColumnIndex();
-      ascending = sortTable.isSortedColumnAscending();
-    }
+        if (table instanceof JSortTable) {
+            JSortTable sortTable = (JSortTable) table;
+            index = sortTable.getSortedColumnIndex();
+            ascending = sortTable.isSortedColumnAscending();
+        }
 
-    if (table != null) {
-      JTableHeader header = table.getTableHeader();
+        if (table != null) {
+            JTableHeader header = table.getTableHeader();
 
-      if (header != null) {
-        setForeground(header.getForeground());
-        setBackground(header.getBackground());
-        Font font = header.getFont();
-               if (col == index) {
-                       
-                       setFont(new Font(font.getName(), Font.BOLD, 
font.getSize()));
-               }
-               else {
-                 setFont(font);
-               }
-      }
-    }
+            if (header != null) {
+                setForeground(header.getForeground());
+                setBackground(header.getBackground());
+                Font font = header.getFont();
+                if (col == index) {
 
-    Icon icon = ascending ? ASCENDING : DECENDING;
-    setIcon((col == index) ? icon : NONSORTED);
-    setText((value == null) ? "" : value.toString());
-    setBorder(UIManager.getBorder("TableHeader.cellBorder"));
+                    setFont(new Font(font.getName(), Font.BOLD, 
font.getSize()));
+                } else {
+                    setFont(font);
+                }
+            }
+        }
 
-    return this;
-  }
+        Icon icon = ascending ? ASCENDING : DECENDING;
+        setIcon((col == index) ? icon : NONSORTED);
+        setText((value == null) ? "" : value.toString());
+        setBorder(UIManager.getBorder("TableHeader.cellBorder"));
+
+        return this;
+    }
 }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/96ebd9ad/src/main/java/org/apache/log4j/chainsaw/SortTableModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/SortTableModel.java 
b/src/main/java/org/apache/log4j/chainsaw/SortTableModel.java
index fe753be..5b55a3e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SortTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/SortTableModel.java
@@ -24,13 +24,13 @@ import javax.swing.table.TableModel;
  * An extended TableModel interface that allows Column sorting
  *
  * @author Claude Duguay
-*/
+ */
 public interface SortTableModel extends TableModel {
-  void sortColumn(int col, boolean ascending);
+    void sortColumn(int col, boolean ascending);
 
-  void sort();
+    void sort();
 
-  boolean isSortable(int col);
+    boolean isSortable(int col);
 
-  boolean isSortEnabled();
+    boolean isSortEnabled();
 }

Reply via email to