You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2018/03/10 04:59:42 UTC

[3/4] logging-chainsaw git commit: Remove unnecessary boxing

Remove unnecessary boxing


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

Branch: refs/heads/master
Commit: ed3fe11f7d38d215dd2080f8a70a2c1f0b2f2736
Parents: e232b82
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:51:19 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:51:19 2018 -0600

----------------------------------------------------------------------
 .../ApplicationPreferenceModelPanel.java        | 26 +++++------
 .../log4j/chainsaw/ChainsawAppenderHandler.java |  4 +-
 .../ChainsawCyclicBufferTableModel.java         |  4 +-
 .../log4j/chainsaw/ChainsawToolBarAndMenus.java | 38 ++++++++--------
 .../org/apache/log4j/chainsaw/FileMenu.java     |  4 +-
 .../apache/log4j/chainsaw/FileSaveAction.java   |  2 +-
 .../org/apache/log4j/chainsaw/LogPanel.java     | 48 ++++++++++----------
 .../log4j/chainsaw/LogPanelPreferencePanel.java | 20 ++++----
 .../java/org/apache/log4j/chainsaw/LogUI.java   | 22 ++++-----
 .../log4j/chainsaw/LoggerNameTreePanel.java     |  5 +-
 .../apache/log4j/chainsaw/ThresholdSlider.java  |  2 +-
 .../log4j/chainsaw/prefs/LoadSettingsEvent.java |  2 +-
 .../chainsaw/receivers/ReceiversPanel.java      | 12 ++---
 .../chainsaw/zeroconf/ZeroConfDeviceModel.java  |  2 +-
 .../log4j/db/ConnectionSourceSkeleton.java      |  3 +-
 .../java/org/apache/log4j/db/dialect/Util.java  |  2 +-
 16 files changed, 97 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
index a1bbd5a..d876738 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
@@ -247,7 +247,7 @@ public static void main(String[] args) {
         "tabPlacement",
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
-            int value = ((Integer) evt.getNewValue()).intValue();
+            int value = (Integer) evt.getNewValue();
 
             configureTabPlacement(value);
           }
@@ -258,7 +258,7 @@ public static void main(String[] args) {
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
             statusBar.setSelected(
-              ((Boolean) evt.getNewValue()).booleanValue());
+                    (Boolean) evt.getNewValue());
           }
         });
 
@@ -266,7 +266,7 @@ public static void main(String[] args) {
         "toolbar",
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
-            toolBar.setSelected(((Boolean) evt.getNewValue()).booleanValue());
+            toolBar.setSelected((Boolean) evt.getNewValue());
           }
         });
 
@@ -275,7 +275,7 @@ public static void main(String[] args) {
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
             receivers.setSelected(
-              ((Boolean) evt.getNewValue()).booleanValue());
+                    (Boolean) evt.getNewValue());
           }
         });
 
@@ -592,21 +592,21 @@ public static void main(String[] args) {
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
             showNoReceiverWarning.setSelected(
-              ((Boolean) evt.getNewValue()).booleanValue());
+                    (Boolean) evt.getNewValue());
           }
         });
       
       uncommittedPreferenceModel.addPropertyChangeListener("showSplash", new PropertyChangeListener() {
 
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean)evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           showSplash.setSelected(value);
         }});
       
       uncommittedPreferenceModel.addPropertyChangeListener("okToRemoveSecurityManager", new PropertyChangeListener() {
 
 		public void propertyChange(PropertyChangeEvent evt) {
-            boolean newValue = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean newValue = (Boolean) evt.getNewValue();
             if(newValue) {
             okToRemoveSecurityManager.setSelected(newValue);
             }else {
@@ -628,7 +628,7 @@ public static void main(String[] args) {
         "responsiveness",
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
-            int value = ((Integer) evt.getNewValue()).intValue();
+            int value = (Integer) evt.getNewValue();
 
             if (value >= 1000) {
               int newValue = (value - 750) / 1000;
@@ -712,7 +712,7 @@ public static void main(String[] args) {
         "confirmExit",
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
-            boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean value = (Boolean) evt.getNewValue();
             confirmExit.setSelected(value);
           }
         });
@@ -733,10 +733,10 @@ public static void main(String[] args) {
     }
 
     private void setupInitialValues() {
-      sliderLabelMap.put(new Integer(1), new JLabel(" Fastest "));
-      sliderLabelMap.put(new Integer(2), new JLabel(" Fast "));
-      sliderLabelMap.put(new Integer(3), new JLabel(" Medium "));
-      sliderLabelMap.put(new Integer(4), new JLabel(" Slow "));
+      sliderLabelMap.put(1, new JLabel(" Fastest "));
+      sliderLabelMap.put(2, new JLabel(" Fast "));
+      sliderLabelMap.put(3, new JLabel(" Medium "));
+      sliderLabelMap.put(4, new JLabel(" Slow "));
 
       //          
       showNoReceiverWarning.setSelected(

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 a3c08c3..2259676 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
@@ -172,8 +172,8 @@ public class ChainsawAppenderHandler extends AppenderSkeleton {
   void setDataRate(double dataRate) {
     double oldValue = this.dataRate;
     this.dataRate = dataRate;
-    propertySupport.firePropertyChange("dataRate", new Double(oldValue),
-        new Double(this.dataRate));
+    propertySupport.firePropertyChange("dataRate", oldValue,
+            this.dataRate);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 cf9aedd..16a4519 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -553,7 +553,7 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
         return id;
       }
 
-      return new Integer(rowIndex);
+      return rowIndex;
 
     case ChainsawColumns.INDEX_LEVEL_COL_NAME:
       return event.getLevel();
@@ -622,7 +622,7 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
 
     //only set the property if it doesn't already exist
     if (id == null) {
-      id = new Integer(++uniqueRow);
+      id = ++uniqueRow;
       loggingEventWrapper.setProperty(Constants.LOG4J_ID_KEY, id.toString());
     }
 

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
index ae652b9..e40df4e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
@@ -161,7 +161,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
       "statusBar",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           toggleStatusBarCheck.setSelected(value);
         }
       });
@@ -170,7 +170,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
       "receivers",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           showReceiversButton.setSelected(value);
           toggleShowReceiversCheck.setSelected(value);
         }
@@ -211,7 +211,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
 
     action.putValue(Action.SHORT_DESCRIPTION, "Toggles the Logger Tree Pane");
     action.putValue("enabled", Boolean.TRUE);
-    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T));
+    action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_T);
     action.putValue(
       Action.ACCELERATOR_KEY,
       KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
@@ -236,7 +236,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
 
      action.putValue(Action.SHORT_DESCRIPTION, "Toggles Scroll to Bottom");
      action.putValue("enabled", Boolean.TRUE);
-     action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_B));
+     action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_B);
      action.putValue(
        Action.ACCELERATOR_KEY,
        KeyStroke.getKeyStroke(KeyEvent.VK_B, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
@@ -258,7 +258,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
 
       action.putValue(Action.SHORT_DESCRIPTION, "Scroll to top");
       action.putValue("enabled", Boolean.TRUE);
-      action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T));
+      action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_T);
       action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A,  Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
 
       return action;
@@ -276,7 +276,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
 
        action.putValue(Action.SHORT_DESCRIPTION, "Find the next marker from the current location");
        action.putValue("enabled", Boolean.TRUE);
-       action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_N));
+       action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_N);
        action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("F2"));
 
        return action;
@@ -294,7 +294,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
 
       action.putValue(Action.SHORT_DESCRIPTION, "Find the previous marker from the current location");
       action.putValue("enabled", Boolean.TRUE);
-      action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P));
+      action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_P);
       action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F2,  InputEvent.SHIFT_MASK));
 
       return action;
@@ -312,7 +312,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
 
       action.putValue(Action.SHORT_DESCRIPTION, "Toggle marker for selected row");
       action.putValue("enabled", Boolean.TRUE);
-      action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T));
+      action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_T);
       action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F2,  Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
 
       return action;
@@ -330,7 +330,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
 
       action.putValue(Action.SHORT_DESCRIPTION, "Removes all markers");
       action.putValue("enabled", Boolean.TRUE);
-      action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_R));
+      action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_R);
       action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F2,  Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK));
 
       return action;
@@ -374,7 +374,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
         }
       };
 
-    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_C));
+    action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_C);
     action.putValue(
       Action.ACCELERATOR_KEY,
       KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
@@ -402,7 +402,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
 
     //    action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.ALT_MASK));
     action.putValue(Action.SHORT_DESCRIPTION, "Toggles the Welcome tab");
-    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_C));
+    action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_C);
     action.putValue(Action.NAME, "Welcome tab");
 
     return action;
@@ -425,7 +425,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
       "toolbar",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           showToolbarCheck.setSelected(value);
         }
       });
@@ -479,7 +479,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
       };
 
     toggleStatusBarAction.putValue(
-      Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_B));
+      Action.MNEMONIC_KEY, KeyEvent.VK_B);
     toggleStatusBarCheck.setAction(toggleStatusBarAction);
     toggleStatusBarCheck.setSelected(
       logui.getApplicationPreferenceModel().isStatusBar());
@@ -588,7 +588,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
         }
       };
 
-    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P));
+    action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_P);
     action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("F12"));
     action.putValue(
       Action.SHORT_DESCRIPTION,
@@ -668,7 +668,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
         }
       };
 
-    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_E));
+    action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_E);
     action.putValue(
       Action.SHORT_DESCRIPTION,
       "Shows the currently configured Log4j Receivers");
@@ -694,7 +694,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
         }
       };
 
-    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_D));
+    action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_D);
     action.putValue(
       Action.ACCELERATOR_KEY,
       KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
@@ -716,7 +716,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
         }
       };
 
-    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T));
+    action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_T);
 
     return action;
   }
@@ -894,7 +894,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
         };
         action.putValue(Action.SHORT_DESCRIPTION, "Find the next colorized event from the current location");
         action.putValue("enabled", Boolean.TRUE);
-        action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_N));
+        action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_N);
         action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
 
       return action;
@@ -913,7 +913,7 @@ class ChainsawToolBarAndMenus implements ChangeListener {
         };
         action.putValue(Action.SHORT_DESCRIPTION, "Find the next colorized event from the current location");
         action.putValue("enabled", Boolean.TRUE);
-        action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P));
+        action.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_P);
         action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
 
       return action;

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/src/main/java/org/apache/log4j/chainsaw/FileMenu.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/FileMenu.java b/src/main/java/org/apache/log4j/chainsaw/FileMenu.java
index 2723e97..cd256e7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/FileMenu.java
+++ b/src/main/java/org/apache/log4j/chainsaw/FileMenu.java
@@ -76,7 +76,7 @@ class FileMenu extends JMenu {
       loadLog4JAction.putValue(
         Action.ACCELERATOR_KEY,
         KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
-      loadLog4JAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_L));
+      loadLog4JAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_L);
       loadLog4JAction.putValue(Action.SHORT_DESCRIPTION, "Loads events from a local XMLLayout-formatted file ");
       loadLog4JAction.putValue(Action.SMALL_ICON, new ImageIcon(ChainsawIcons.FILE_OPEN));
 
@@ -114,7 +114,7 @@ class FileMenu extends JMenu {
       Action.ACCELERATOR_KEY,
       KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
     exitAction.putValue(Action.SHORT_DESCRIPTION, "Exits the Application");
-    exitAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_X));
+    exitAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_X);
     exitAction.putValue(Action.NAME, "Exit");
 
     JMenuItem menuItemExit = new JMenuItem(exitAction);

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/src/main/java/org/apache/log4j/chainsaw/FileSaveAction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/FileSaveAction.java b/src/main/java/org/apache/log4j/chainsaw/FileSaveAction.java
index ae278e0..65cc9de 100644
--- a/src/main/java/org/apache/log4j/chainsaw/FileSaveAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/FileSaveAction.java
@@ -68,7 +68,7 @@ class FileSaveAction extends AbstractAction {
     putValue(
       Action.ACCELERATOR_KEY,
       KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
-    putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S));
+    putValue(Action.MNEMONIC_KEY, KeyEvent.VK_S);
     putValue(
       Action.SHORT_DESCRIPTION, "Saves displayed events for the current tab");
     putValue(Action.SMALL_ICON, new ImageIcon(ChainsawIcons.FILE_SAVE_AS));

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 015cd32..35ab3d8 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -372,7 +372,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       "scrollToBottom",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           if (value) {
             scrollToBottom();
           }
@@ -438,7 +438,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
     preferenceModel.addPropertyChangeListener("levelIcons",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean useIcons = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean useIcons = (Boolean) evt.getNewValue();
           renderer.setLevelUseIcons(useIcons);
           table.tableChanged(new TableModelEvent(tableModel));
           searchRenderer.setLevelUseIcons(useIcons);
@@ -452,7 +452,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
     preferenceModel.addPropertyChangeListener("wrapMessage",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean wrap = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean wrap = (Boolean) evt.getNewValue();
           renderer.setWrapMessage(wrap);
           table.tableChanged(new TableModelEvent(tableModel));
           searchRenderer.setWrapMessage(wrap);
@@ -463,7 +463,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
     preferenceModel.addPropertyChangeListener("searchResultsVisible",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean displaySearchResultsInDetailsIfAvailable = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean displaySearchResultsInDetailsIfAvailable = (Boolean) evt.getNewValue();
           if (displaySearchResultsInDetailsIfAvailable) {
             showSearchResults();
           } else {
@@ -475,7 +475,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       preferenceModel.addPropertyChangeListener("highlightSearchMatchText",
         new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
-            boolean highlightText = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean highlightText = (Boolean) evt.getNewValue();
             renderer.setHighlightSearchMatchText(highlightText);
             table.tableChanged(new TableModelEvent(tableModel));
             searchRenderer.setHighlightSearchMatchText(highlightText);
@@ -487,7 +487,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       "detailPaneVisible",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean detailPaneVisible = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean detailPaneVisible = (Boolean) evt.getNewValue();
 
           if (detailPaneVisible) {
             showDetailPane();
@@ -504,7 +504,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       "logTreePanelVisible",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean newValue = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean newValue = (Boolean) evt.getNewValue();
 
           if (newValue) {
             showLogTreePanel();
@@ -517,7 +517,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
     preferenceModel.addPropertyChangeListener("toolTips",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean toolTips = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean toolTips = (Boolean) evt.getNewValue();
           renderer.setToolTipsVisible(toolTips);
           searchRenderer.setToolTipsVisible(toolTips);
         }
@@ -618,7 +618,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
     preferenceModel.addPropertyChangeListener("toolTips",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           searchToggleToolTips.setSelected(value);
           mainToggleToolTips.setSelected(value);
         }
@@ -628,7 +628,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       "logTreePanelVisible",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           menuItemLoggerTree.setSelected(value);
         }
       });
@@ -637,7 +637,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       "detailPaneVisible",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           menuItemToggleDetails.setSelected(value);
         }
       });
@@ -982,7 +982,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       public void mouseClicked(MouseEvent e) {
         LoggingEventWrapper loggingEventWrapper = searchModel.getRow(searchTable.getSelectedRow());
         if (loggingEventWrapper != null) {
-          int id = new Integer(loggingEventWrapper.getLoggingEvent().getProperty("log4jid")).intValue();
+          int id = new Integer(loggingEventWrapper.getLoggingEvent().getProperty("log4jid"));
           //preserve the table's viewble column
           setSelectedEvent(id);
         }
@@ -1277,14 +1277,14 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
 
     JPanel rightThumbNailPanel = new JPanel();
     rightThumbNailPanel.setLayout(new BoxLayout(rightThumbNailPanel, BoxLayout.Y_AXIS));
-    rightThumbNailPanel.add(Box.createVerticalStrut(scrollBarWidth.intValue()));
+    rightThumbNailPanel.add(Box.createVerticalStrut(scrollBarWidth));
     colorizedEventAndSearchMatchThumbnail = new ColorizedEventAndSearchMatchThumbnail();
     rightThumbNailPanel.add(colorizedEventAndSearchMatchThumbnail);
-    rightThumbNailPanel.add(Box.createVerticalStrut(scrollBarWidth.intValue()));
+    rightThumbNailPanel.add(Box.createVerticalStrut(scrollBarWidth));
     rightPanel.add(rightThumbNailPanel);
     //set thumbnail width to be a bit narrower than scrollbar width
     if (scrollBarWidth != null) {
-        rightThumbNailPanel.setPreferredSize(new Dimension(scrollBarWidth.intValue() -4, -1));
+        rightThumbNailPanel.setPreferredSize(new Dimension(scrollBarWidth -4, -1));
     }
     eventsAndStatusPanel.add(rightPanel, BorderLayout.EAST);
 
@@ -1293,15 +1293,15 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
 
     JPanel leftThumbNailPanel = new JPanel();
     leftThumbNailPanel.setLayout(new BoxLayout(leftThumbNailPanel, BoxLayout.Y_AXIS));
-    leftThumbNailPanel.add(Box.createVerticalStrut(scrollBarWidth.intValue()));
+    leftThumbNailPanel.add(Box.createVerticalStrut(scrollBarWidth));
     eventTimeDeltaMatchThumbnail = new EventTimeDeltaMatchThumbnail();
     leftThumbNailPanel.add(eventTimeDeltaMatchThumbnail);
-    leftThumbNailPanel.add(Box.createVerticalStrut(scrollBarWidth.intValue()));
+    leftThumbNailPanel.add(Box.createVerticalStrut(scrollBarWidth));
     leftPanel.add(leftThumbNailPanel);
 
     //set thumbnail width to be a bit narrower than scrollbar width
     if (scrollBarWidth != null) {
-        leftThumbNailPanel.setPreferredSize(new Dimension(scrollBarWidth.intValue() -4, -1));
+        leftThumbNailPanel.setPreferredSize(new Dimension(scrollBarWidth -4, -1));
     }
     eventsAndStatusPanel.add(leftPanel, BorderLayout.WEST);
 
@@ -2688,10 +2688,10 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       detailPanel.removeAll();
       JPanel leftSpacePanel = new JPanel();
       Integer scrollBarWidth = (Integer) UIManager.get("ScrollBar.width");
-      leftSpacePanel.setPreferredSize(new Dimension(scrollBarWidth.intValue() -4, -1));
+      leftSpacePanel.setPreferredSize(new Dimension(scrollBarWidth -4, -1));
 
       JPanel rightSpacePanel = new JPanel();
-      rightSpacePanel.setPreferredSize(new Dimension(scrollBarWidth.intValue() -4, -1));
+      rightSpacePanel.setPreferredSize(new Dimension(scrollBarWidth -4, -1));
 
       detailPanel.add(detailToolbar, BorderLayout.NORTH);
       detailPanel.add(detailPane, BorderLayout.CENTER);
@@ -2717,9 +2717,9 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
       detailPanel.add(searchPane, BorderLayout.CENTER);
       Integer scrollBarWidth = (Integer) UIManager.get("ScrollBar.width");
       JPanel leftSpacePanel = new JPanel();
-      leftSpacePanel.setPreferredSize(new Dimension(scrollBarWidth.intValue() -4, -1));
+      leftSpacePanel.setPreferredSize(new Dimension(scrollBarWidth -4, -1));
       JPanel rightSpacePanel = new JPanel();
-      rightSpacePanel.setPreferredSize(new Dimension(scrollBarWidth.intValue() -4, -1));
+      rightSpacePanel.setPreferredSize(new Dimension(scrollBarWidth -4, -1));
       detailPanel.add(leftSpacePanel, BorderLayout.WEST);
       detailPanel.add(rightSpacePanel, BorderLayout.EAST);
       detailPanel.revalidate();
@@ -2809,7 +2809,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
         }
       };
 
-    dockPauseAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P));
+    dockPauseAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_P);
     dockPauseAction.putValue(
       Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("F12"));
     dockPauseAction.putValue(
@@ -2856,7 +2856,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
 
       dockToggleLogTreeAction.putValue(Action.SHORT_DESCRIPTION, "Toggles the Logger Tree Pane");
       dockToggleLogTreeAction.putValue("enabled", Boolean.TRUE);
-      dockToggleLogTreeAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T));
+      dockToggleLogTreeAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_T);
       dockToggleLogTreeAction.putValue(
         Action.ACCELERATOR_KEY,
         KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 6b37e46..027d227 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
@@ -512,7 +512,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
         {
           public void propertyChange(PropertyChangeEvent evt)
           {
-            boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean value = (Boolean) evt.getNewValue();
             rdLevelIcons.setSelected(value);
             rdLevelText.setSelected(!value);
           }
@@ -644,7 +644,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
           {
             public void propertyChange(PropertyChangeEvent evt)
             {
-              boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+              boolean value = (Boolean) evt.getNewValue();
               wrapMessage.setSelected(value);
             }
           });
@@ -654,7 +654,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
         {
           public void propertyChange(PropertyChangeEvent evt)
           {
-            boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean value = (Boolean) evt.getNewValue();
             searchResultsVisible.setSelected(value);
           }
         });
@@ -664,7 +664,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
           {
             public void propertyChange(PropertyChangeEvent evt)
             {
-              boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+              boolean value = (Boolean) evt.getNewValue();
               highlightSearchMatchText.setSelected(value);
             }
           });
@@ -694,7 +694,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
         {
           public void propertyChange(PropertyChangeEvent evt)
           {
-            boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean value = (Boolean) evt.getNewValue();
             toolTips.setSelected(value);
           }
         });
@@ -704,7 +704,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
       {
         public void propertyChange(PropertyChangeEvent evt)
         {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           thumbnailBarToolTips.setSelected(value);
         }
       });
@@ -722,7 +722,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
         {
           public void propertyChange(PropertyChangeEvent evt)
           {
-            boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean value = (Boolean) evt.getNewValue();
             detailPanelVisible.setSelected(value);
           }
         });
@@ -747,7 +747,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
       {
           public void propertyChange(PropertyChangeEvent evt)
           {
-              boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+              boolean value = (Boolean) evt.getNewValue();
               showMillisDeltaAsGap.setSelected(value);
           }
       });
@@ -756,7 +756,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
         {
           public void propertyChange(PropertyChangeEvent evt)
           {
-            boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean value = (Boolean) evt.getNewValue();
             scrollToBottom.setSelected(value);
           }
         });
@@ -774,7 +774,7 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
         {
           public void propertyChange(PropertyChangeEvent evt)
           {
-            boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+            boolean value = (Boolean) evt.getNewValue();
             loggerTreePanel.setSelected(value);
           }
         });

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 3403bc0..3e2df44 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -644,7 +644,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
           getApplicationPreferenceModel().setReceivers(
-            ((Boolean) evt.getNewValue()).booleanValue());
+                  (Boolean) evt.getNewValue());
         }
       });
   }
@@ -1006,7 +1006,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
             for (Object o : getPanels().entrySet()) {
                 Map.Entry entry = (Map.Entry) o;
                 Boolean docked = (Boolean) entry.getValue();
-                if (docked.booleanValue()) {
+                if (docked) {
                     String identifier = (String) entry.getKey();
                     int count = getTabbedPane().getTabCount();
                     boolean found = false;
@@ -1042,7 +1042,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
       "dataRate",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          double dataRate = ((Double) evt.getNewValue()).doubleValue();
+          double dataRate = (Double) evt.getNewValue();
           statusBar.setDataRate(dataRate);
         }
       });
@@ -1343,7 +1343,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
           ToolTipManager.sharedInstance().setDismissDelay(
-            ((Integer) evt.getNewValue()).intValue());
+                  (Integer) evt.getNewValue());
         }
       });
     ToolTipManager.sharedInstance().setDismissDelay(
@@ -1353,7 +1353,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
       "responsiveness",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          int value = ((Integer) evt.getNewValue()).intValue();
+          int value = (Integer) evt.getNewValue();
           handler.setQueueInterval((value * 1000) - 750);
         }
       });
@@ -1366,7 +1366,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
           SwingUtilities.invokeLater(
             new Runnable() {
               public void run() {
-                int placement = ((Integer) evt.getNewValue()).intValue();
+                int placement = (Integer) evt.getNewValue();
 
                 switch (placement) {
                 case SwingConstants.TOP:
@@ -1387,7 +1387,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
       "statusBar",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           setStatusBarVisible(value);
         }
       });
@@ -1397,7 +1397,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
       "receivers",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
 
           if (value) {
             showReceiverPanel();
@@ -1417,7 +1417,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
       "toolbar",
       new PropertyChangeListener() {
         public void propertyChange(PropertyChangeEvent evt) {
-          boolean value = ((Boolean) evt.getNewValue()).booleanValue();
+          boolean value = (Boolean) evt.getNewValue();
           toolbar.setVisible(value);
         }
       });
@@ -1470,7 +1470,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
                   networkReceiver.getClass().getMethod(
                     "setPort", int.class);
                 portMethod.invoke(
-                  networkReceiver, new Integer(port));
+                  networkReceiver, port);
 
                 networkReceiver.setThreshold(Level.TRACE);
 
@@ -1677,7 +1677,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
       } else {
         valueToSend = true;
       }
-      m.put(entry.getKey(), new Boolean(valueToSend));
+      m.put(entry.getKey(), valueToSend);
     }
 
     return m;

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 b5b735d..24986dd 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
@@ -1270,14 +1270,13 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
 
       while (depthEnum.hasMoreElements()) {
         depths.add(
-                new Integer(
-                        ((DefaultMutableTreeNode) depthEnum.nextElement()).getDepth()));
+                ((DefaultMutableTreeNode) depthEnum.nextElement()).getDepth());
       }
 
       Collections.sort(depths);
       Collections.reverse(depths);
 
-      int maxDepth = ((Integer) depths.get(0)).intValue();
+      int maxDepth = (Integer) depths.get(0);
 
       if (maxDepth > WARN_DEPTH) {
         logger.warn("Should warn user, depth=" + maxDepth);

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java b/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
index 0ae8189..237654e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
@@ -77,7 +77,7 @@ final class ThresholdSlider extends JSlider {
       for (Object aPriorityList : priorityList) {
           Level item = (Level) aPriorityList;
           labelMap.put(
-                  new Integer(priorityList.indexOf(item)), new JLabel(item.toString()));
+                  priorityList.indexOf(item), new JLabel(item.toString()));
 
           //      System.out.println("creating levels for :: " + item.toInt() + "," + item.toString());
       }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 70ef23e..695532b 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
@@ -39,7 +39,7 @@ public class LoadSettingsEvent extends SettingsEvent {
   }
   
   public boolean asBoolean(String key) {
-  	return Boolean.valueOf(getSetting(key)).booleanValue();
+  	return Boolean.valueOf(getSetting(key));
   }
   
   public int asInt(String key) {

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 150ef80..4b7061a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -222,7 +222,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
       Action.SHORT_DESCRIPTION, "Creates and configures a new Receiver");
     newReceiverButtonAction.putValue(Action.NAME, "New Receiver");
     newReceiverButtonAction.putValue(
-      Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_N));
+      Action.MNEMONIC_KEY, KeyEvent.VK_N);
 
     newReceiverButtonAction.setEnabled(true);
 
@@ -240,7 +240,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
       Action.SMALL_ICON, new ImageIcon(ChainsawIcons.ICON_RESUME_RECEIVER));
     playReceiverButtonAction.setEnabled(false);
     playReceiverButtonAction.putValue(
-      Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_R));
+      Action.MNEMONIC_KEY, KeyEvent.VK_R);
 
     pauseReceiverButtonAction =
       new AbstractAction() {
@@ -255,7 +255,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
     pauseReceiverButtonAction.putValue(Action.NAME, "Pause");
 
     pauseReceiverButtonAction.putValue(
-      Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P));
+      Action.MNEMONIC_KEY, KeyEvent.VK_P);
 
     pauseReceiverButtonAction.putValue(
       Action.SMALL_ICON, new ImageIcon(ChainsawIcons.PAUSE));
@@ -276,7 +276,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
     shutdownReceiverButtonAction.putValue(
       Action.SMALL_ICON, new ImageIcon(ChainsawIcons.ICON_STOP_RECEIVER));
     shutdownReceiverButtonAction.putValue(
-      Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S));
+      Action.MNEMONIC_KEY, KeyEvent.VK_S);
 
     shutdownReceiverButtonAction.setEnabled(false);
 
@@ -295,7 +295,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
     saveReceiversButtonAction.putValue(
       Action.SMALL_ICON, new ImageIcon(ChainsawIcons.FILE_SAVE_AS));
     saveReceiversButtonAction.putValue(
-      Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_V));
+      Action.MNEMONIC_KEY, KeyEvent.VK_V);
 
 
     restartReceiverButtonAction =
@@ -322,7 +322,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
       restartReceiverButtonAction.putValue(
         Action.SMALL_ICON, new ImageIcon(ChainsawIcons.ICON_RESTART));
       restartReceiverButtonAction.putValue(
-        Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_R));
+        Action.MNEMONIC_KEY, KeyEvent.VK_R);
 
       restartReceiverButtonAction.setEnabled(false);
 

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java
index ee35394..f5ffe5d 100644
--- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfDeviceModel.java
@@ -124,7 +124,7 @@ public class ZeroConfDeviceModel extends AbstractTableModel implements ServiceLi
         if(columnIndex!=2 || !(aValue instanceof Boolean))  {
             return;
         }
-        boolean autoConnect = ((Boolean)aValue).booleanValue();
+        boolean autoConnect = (Boolean) aValue;
         Object device = this.deviceList.get(rowIndex);
         String autoConnectHandle = getAutoConnectHandle((ServiceInfo) device);
         if(autoConnect) {

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/src/main/java/org/apache/log4j/db/ConnectionSourceSkeleton.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/db/ConnectionSourceSkeleton.java b/src/main/java/org/apache/log4j/db/ConnectionSourceSkeleton.java
index a5abecb..943075c 100644
--- a/src/main/java/org/apache/log4j/db/ConnectionSourceSkeleton.java
+++ b/src/main/java/org/apache/log4j/db/ConnectionSourceSkeleton.java
@@ -57,8 +57,7 @@ public abstract class ConnectionSourceSkeleton extends ComponentBase implements
       Util util = new Util();
       util.setLoggerRepository(repository);
       if (overriddenSupportsGetGeneratedKeys != null) {
-        supportsGetGeneratedKeys = overriddenSupportsGetGeneratedKeys
-            .booleanValue();
+        supportsGetGeneratedKeys = overriddenSupportsGetGeneratedKeys;
       } else {
         supportsGetGeneratedKeys = util.supportsGetGeneratedKeys(meta);
       }

http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ed3fe11f/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 23b886c..2013137 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)).booleanValue();
+      return (Boolean) DatabaseMetaData.class.getMethod("supportsGetGeneratedKeys", null).invoke(meta, null);
     } catch(Throwable e) {
       getLogger().info("Could not call supportsGetGeneratedKeys method. This may be recoverable");
       return false;