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:40 UTC
[1/4] logging-chainsaw git commit: Replace indexOf with contains
Repository: logging-chainsaw
Updated Branches:
refs/heads/master bafd7b676 -> 3a3c4488a
Replace indexOf with contains
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/1fba9777
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/1fba9777
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/1fba9777
Branch: refs/heads/master
Commit: 1fba97776830092f20bbcfeefc2119578e6142c6
Parents: bafd7b6
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:42:13 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:42:13 2018 -0600
----------------------------------------------------------------------
.../log4j/chainsaw/LogFilePatternLayoutBuilder.java | 2 +-
.../log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java | 6 +++---
.../java/org/apache/log4j/db/CustomSQLDBReceiver.java | 10 +++++-----
src/main/java/org/apache/log4j/db/dialect/Util.java | 10 +++++-----
.../org/apache/log4j/varia/LogFilePatternReceiver.java | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1fba9777/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java b/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java
index 1aa3d90..d125bf0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java
@@ -182,7 +182,7 @@ public class LogFilePatternLayoutBuilder
String propertyName = propertyNames.nextElement().toString();
if (propertyName.startsWith(appenderPrefix)) {
String value = propertyName.substring(appenderPrefix.length() + 1);
- if (value.indexOf(".") == -1) {
+ if (!value.contains(".")) {
//no sub-values - this entry is the appender name & class
appenders.put(value, props.getProperty(propertyName).trim());
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1fba9777/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java b/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
index 9517162..4f5779e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
@@ -237,7 +237,7 @@ public class VFSLogFilePatternReceiver extends LogFilePatternReceiver implements
//we don't want to call super.activateOptions, but we do want active to be set to true
active = true;
//on receiver restart, only prompt for credentials if we don't already have them
- if (promptForUserInfo && getFileURL().indexOf("@") == -1) {
+ if (promptForUserInfo && !getFileURL().contains("@")) {
/*
if promptforuserinfo is true, wait for a reference to the container
(via the VisualReceiver callback).
@@ -305,7 +305,7 @@ public class VFSLogFilePatternReceiver extends LogFilePatternReceiver implements
} else {
//starts with protocol:/ but not protocol://
String oldURL = getFileURL();
- if (oldURL != null && oldURL.indexOf(":/") > -1 && oldURL.indexOf("://") == -1) {
+ if (oldURL != null && oldURL.contains(":/") && !oldURL.contains("://")) {
int index = oldURL.indexOf(":/");
String lastPart = oldURL.substring(index + ":/".length());
int passEndIndex = lastPart.indexOf("@");
@@ -315,7 +315,7 @@ public class VFSLogFilePatternReceiver extends LogFilePatternReceiver implements
}
vfsReader = new VFSReader();
new Thread(vfsReader).start();
- } else if (oldURL != null && oldURL.indexOf("://") > -1) {
+ } else if (oldURL != null && oldURL.contains("://")) {
//starts with protocol://
int index = oldURL.indexOf("://");
String lastPart = oldURL.substring(index + "://".length());
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1fba9777/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
index 48530c7..5dc69ae 100644
--- a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
+++ b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
@@ -170,7 +170,7 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn
throw new IllegalStateException(
"CustomSQLDBReceiver cannot function without a connection source");
}
- whereExists = (sqlStatement.toUpperCase().indexOf(WHERE_CLAUSE) > -1);
+ whereExists = (sqlStatement.toUpperCase().contains(WHERE_CLAUSE));
customReceiverJob = new CustomReceiverJob();
@@ -341,8 +341,8 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn
// support MDC being wrapped in {{name, value}}
// or
// just name, value
- if ((mdcString.indexOf("{{") > -1)
- && (mdcString.indexOf("}}") > -1)) {
+ if ((mdcString.contains("{{"))
+ && (mdcString.contains("}}"))) {
mdcString = mdcString
.substring(mdcString.indexOf("{{") + 2,
mdcString.indexOf("}}"));
@@ -374,8 +374,8 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn
if (propertiesString != null) {
// support properties being wrapped in {{name,
// value}} or just name, value
- if ((propertiesString.indexOf("{{") > -1)
- && (propertiesString.indexOf("}}") > -1)) {
+ if ((propertiesString.contains("{{"))
+ && (propertiesString.contains("}}"))) {
propertiesString = propertiesString.substring(
propertiesString.indexOf("{{") + 2,
propertiesString.indexOf("}}"));
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1fba9777/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 5d60b12..23b886c 100644
--- a/src/main/java/org/apache/log4j/db/dialect/Util.java
+++ b/src/main/java/org/apache/log4j/db/dialect/Util.java
@@ -44,15 +44,15 @@ public class Util extends ComponentBase {
String dbName = meta.getDatabaseProductName().toLowerCase();
- if (dbName.indexOf(POSTGRES_PART) != -1) {
+ if (dbName.contains(POSTGRES_PART)) {
return ConnectionSource.POSTGRES_DIALECT;
- } else if (dbName.indexOf(MYSQL_PART) != -1) {
+ } else if (dbName.contains(MYSQL_PART)) {
return ConnectionSource.MYSQL_DIALECT;
- } else if (dbName.indexOf(ORACLE_PART) != -1) {
+ } else if (dbName.contains(ORACLE_PART)) {
return ConnectionSource.ORACLE_DIALECT;
- } else if (dbName.indexOf(MSSQL_PART) != -1) {
+ } else if (dbName.contains(MSSQL_PART)) {
return ConnectionSource.MSSQL_DIALECT;
- } else if (dbName.indexOf(HSQL_PART) != -1) {
+ } else if (dbName.contains(HSQL_PART)) {
return ConnectionSource.HSQL_DIALECT;
} else {
return ConnectionSource.UNKNOWN_DIALECT;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/1fba9777/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
index 65ad4b6..e9aa05e 100644
--- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
@@ -709,7 +709,7 @@ public class LogFilePatternReceiver extends Receiver {
List propertyNames = new ArrayList();
index = 0;
while (index > -1) {
- if (current.indexOf(PROP_START) > -1 && current.indexOf(PROP_END) > -1) {
+ if (current.contains(PROP_START) && current.contains(PROP_END)) {
index = current.indexOf(PROP_START);
String longPropertyName = current.substring(current.indexOf(PROP_START), current.indexOf(PROP_END) + 1);
String shortProp = getShortPropertyName(longPropertyName);
[3/4] logging-chainsaw git commit: Remove unnecessary boxing
Posted by ma...@apache.org.
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;
[4/4] logging-chainsaw git commit: Replace while-iterator loops with
for-each loops
Posted by ma...@apache.org.
Replace while-iterator loops with for-each loops
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/3a3c4488
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/3a3c4488
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/3a3c4488
Branch: refs/heads/master
Commit: 3a3c4488af1a0f7ebc0458c580c48ab54e4c03a2
Parents: ed3fe11
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:53:03 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:53:03 2018 -0600
----------------------------------------------------------------------
.../ChainsawCyclicBufferTableModel.java | 11 ++--
.../apache/log4j/chainsaw/FileLoadAction.java | 5 +-
.../apache/log4j/chainsaw/FileSaveAction.java | 5 +-
.../java/org/apache/log4j/chainsaw/LogUI.java | 37 ++++++-------
.../apache/log4j/chainsaw/color/ColorPanel.java | 30 +++++------
.../log4j/chainsaw/color/RuleColorizer.java | 37 ++++++-------
.../org/apache/log4j/net/MulticastReceiver.java | 20 ++++---
.../java/org/apache/log4j/net/UDPReceiver.java | 20 ++++---
.../org/apache/log4j/net/XMLSocketNode.java | 55 ++++++++++----------
.../apache/log4j/plugins/PluginRegistry.java | 16 ++----
.../log4j/varia/LogFilePatternReceiver.java | 15 +++---
.../apache/log4j/xml/UtilLoggingXMLDecoder.java | 5 +-
.../java/org/apache/log4j/xml/XMLDecoder.java | 9 ++--
13 files changed, 120 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/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 16a4519..ba5512d 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -123,15 +123,14 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
synchronized (mutex) {
unfilteredCopy = new ArrayList(unfilteredList);
}
- Iterator iter = unfilteredCopy.iterator();
- while (iter.hasNext()) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) iter.next();
+ for (Object anUnfilteredCopy : unfilteredCopy) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) anUnfilteredCopy;
- if (rule.evaluate(loggingEventWrapper.getLoggingEvent(), null)) {
- list.add(loggingEventWrapper);
+ if (rule.evaluate(loggingEventWrapper.getLoggingEvent(), null)) {
+ list.add(loggingEventWrapper);
+ }
}
- }
return list;
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java b/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
index 7476a54..490d238 100644
--- a/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
@@ -127,9 +127,8 @@ class FileLoadAction extends AbstractAction {
public void run() {
try {
Vector events = decoder.decode(urlToUse);
- Iterator iter = events.iterator();
- while (iter.hasNext()) {
- handler.append((LoggingEvent) iter.next());
+ for (Object event : events) {
+ handler.append((LoggingEvent) event);
}
} catch (IOException e1) {
// TODO Handle the error with a nice msg
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/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 65cc9de..5eef108 100644
--- a/src/main/java/org/apache/log4j/chainsaw/FileSaveAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/FileSaveAction.java
@@ -115,9 +115,8 @@ class FileSaveAction extends AbstractAction {
} else {
writer = new BufferedWriter(new FileWriter(selectedFile));
}
- Iterator iter = v.iterator();
- while (iter.hasNext()) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) iter.next();
+ for (Object aV : v) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) aV;
layout.setLocationInfo(loggingEventWrapper.getLoggingEvent().getThrowableInformation() != null);
writer.write(layout.format(loggingEventWrapper.getLoggingEvent()));
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/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 3e2df44..c5223a3 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -1666,19 +1666,18 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
Map getPanels() {
Map m = new HashMap();
Set panelSet = getPanelMap().entrySet();
- Iterator iter = panelSet.iterator();
-
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- Object o = entry.getValue();
- boolean valueToSend;
- if (o instanceof LogPanel){
- valueToSend = ((DockablePanel) entry.getValue()).isDocked();
- } else {
- valueToSend = true;
+
+ for (Object aPanelSet : panelSet) {
+ Map.Entry entry = (Map.Entry) aPanelSet;
+ Object o = entry.getValue();
+ boolean valueToSend;
+ if (o instanceof LogPanel) {
+ valueToSend = ((DockablePanel) entry.getValue()).isDocked();
+ } else {
+ valueToSend = true;
+ }
+ m.put(entry.getKey(), valueToSend);
}
- m.put(entry.getKey(), valueToSend);
- }
return m;
}
@@ -2094,17 +2093,15 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
try {
List list = new ArrayList();
Rule rule = ExpressionRule.getRule(ident);
- Iterator iter = identifierPanels.iterator();
- while (iter.hasNext()) {
- LogPanel panel = (LogPanel) iter.next();
- Iterator iter2 = panel.getMatchingEvents(rule).iterator();
+ for (Object identifierPanel : identifierPanels) {
+ LogPanel panel = (LogPanel) identifierPanel;
- while (iter2.hasNext()) {
- LoggingEventWrapper e = (LoggingEventWrapper) iter2.next();
- list.add(e.getLoggingEvent());
+ for (Object o : panel.getMatchingEvents(rule)) {
+ LoggingEventWrapper e = (LoggingEventWrapper) o;
+ list.add(e.getLoggingEvent());
+ }
}
- }
buildLogPanel(true, ident, list);
} catch (IllegalArgumentException iae) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index f20dbbb..4b8c901 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -366,22 +366,20 @@ public class ColorPanel extends JPanel
private Vector getColorizerVector() {
Vector data = new Vector();
Map map = colorizer.getRules();
- Iterator iter = map.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry)iter.next();
- //update ruleset list
- if (entry.getKey().equals(currentRuleSet)) {
- Iterator iter2 = ((List)entry.getValue()).iterator();
-
- while (iter2.hasNext()) {
- ColorRule rule = (ColorRule)iter2.next();
- Vector v = new Vector();
- v.add(rule.getExpression());
- v.add(rule.getBackgroundColor());
- v.add(rule.getForegroundColor());
- data.add(v);
- }
- }
+ for (Object o1 : map.entrySet()) {
+ Map.Entry entry = (Map.Entry) o1;
+ //update ruleset list
+ if (entry.getKey().equals(currentRuleSet)) {
+
+ for (Object o : ((List) entry.getValue())) {
+ ColorRule rule = (ColorRule) o;
+ Vector v = new Vector();
+ v.add(rule.getExpression());
+ v.add(rule.getBackgroundColor());
+ v.add(rule.getForegroundColor());
+ data.add(v);
+ }
+ }
}
return data;
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java b/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
index ca3db63..6fa4331 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
@@ -127,17 +127,16 @@ public class RuleColorizer implements Colorizer {
}
public void addRules(Map newRules) {
- Iterator iter = newRules.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Object o : newRules.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
- if (rules.containsKey(entry.getKey())) {
- ((List) rules.get(entry.getKey())).addAll((List) entry.getValue());
- } else {
- rules.put(entry.getKey(), entry.getValue());
+ if (rules.containsKey(entry.getKey())) {
+ ((List) rules.get(entry.getKey())).addAll((List) entry.getValue());
+ } else {
+ rules.put(entry.getKey(), entry.getValue());
+ }
}
- }
colorChangeSupport.firePropertyChange("colorrule", false, true);
}
@@ -177,15 +176,14 @@ public class RuleColorizer implements Colorizer {
public Color getBackgroundColor(LoggingEvent event) {
if (rules.containsKey(currentRuleSet)) {
List list = (List) rules.get(currentRuleSet);
- Iterator iter = list.iterator();
- while (iter.hasNext()) {
- ColorRule rule = (ColorRule) iter.next();
+ for (Object aList : list) {
+ ColorRule rule = (ColorRule) aList;
- if ((rule.getBackgroundColor() != null) && (rule.evaluate(event, null))) {
- return rule.getBackgroundColor();
+ if ((rule.getBackgroundColor() != null) && (rule.evaluate(event, null))) {
+ return rule.getBackgroundColor();
+ }
}
- }
}
return null;
@@ -194,15 +192,14 @@ public class RuleColorizer implements Colorizer {
public Color getForegroundColor(LoggingEvent event) {
if (rules.containsKey(currentRuleSet)) {
List list = (List) rules.get(currentRuleSet);
- Iterator iter = list.iterator();
- while (iter.hasNext()) {
- ColorRule rule = (ColorRule) iter.next();
+ for (Object aList : list) {
+ ColorRule rule = (ColorRule) aList;
- if ((rule.getForegroundColor() != null) && (rule.evaluate(event, null))) {
- return rule.getForegroundColor();
+ if ((rule.getForegroundColor() != null) && (rule.evaluate(event, null))) {
+ return rule.getForegroundColor();
+ }
}
- }
}
return null;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/net/MulticastReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/MulticastReceiver.java b/src/main/java/org/apache/log4j/net/MulticastReceiver.java
index e21c5be..9500693 100644
--- a/src/main/java/org/apache/log4j/net/MulticastReceiver.java
+++ b/src/main/java/org/apache/log4j/net/MulticastReceiver.java
@@ -209,22 +209,20 @@ public class MulticastReceiver extends Receiver implements PortBased,
}
if (list2.size() > 0) {
- Iterator iter = list2.iterator();
- while (iter.hasNext()) {
- String data = (String) iter.next();
- List v = decoderImpl.decodeEvents(data.trim());
+ for (Object aList2 : list2) {
+ String data = (String) aList2;
+ List v = decoderImpl.decodeEvents(data.trim());
- if (v != null) {
- Iterator eventIter = v.iterator();
+ if (v != null) {
- while (eventIter.hasNext()) {
- if (!isPaused()) {
- doPost((LoggingEvent) eventIter.next());
+ for (Object aV : v) {
+ if (!isPaused()) {
+ doPost((LoggingEvent) aV);
+ }
+ }
}
- }
}
- }
list2.clear();
} else {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/net/UDPReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/UDPReceiver.java b/src/main/java/org/apache/log4j/net/UDPReceiver.java
index fce279c..0f6d0c2 100644
--- a/src/main/java/org/apache/log4j/net/UDPReceiver.java
+++ b/src/main/java/org/apache/log4j/net/UDPReceiver.java
@@ -215,22 +215,20 @@ public class UDPReceiver extends Receiver implements PortBased, Pauseable {
}
if (list2.size() > 0) {
- Iterator iter = list2.iterator();
- while (iter.hasNext()) {
- String data = (String) iter.next();
- List v = decoderImpl.decodeEvents(data);
+ for (Object aList2 : list2) {
+ String data = (String) aList2;
+ List v = decoderImpl.decodeEvents(data);
- if (v != null) {
- Iterator eventIter = v.iterator();
+ if (v != null) {
- while (eventIter.hasNext()) {
- if (!isPaused()) {
- doPost((LoggingEvent) eventIter.next());
+ for (Object aV : v) {
+ if (!isPaused()) {
+ doPost((LoggingEvent) aV);
+ }
+ }
}
- }
}
- }
list2.clear();
} else {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/net/XMLSocketNode.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/XMLSocketNode.java b/src/main/java/org/apache/log4j/net/XMLSocketNode.java
index c7e698a..212150d 100644
--- a/src/main/java/org/apache/log4j/net/XMLSocketNode.java
+++ b/src/main/java/org/apache/log4j/net/XMLSocketNode.java
@@ -140,35 +140,34 @@ public class XMLSocketNode extends ComponentBase implements Runnable {
List v = decoder.decodeEvents(new String(b, 0, length));
if (v != null) {
- Iterator iter = v.iterator();
-
- while (iter.hasNext()) {
- LoggingEvent e = (LoggingEvent) iter.next();
- e.setProperty(Constants.HOSTNAME_KEY, hostName);
-
- // store the known remote info in an event property
- e.setProperty("log4j.remoteSourceInfo", remoteInfo);
-
- // if configured with a receiver, tell it to post the event
- if (receiver != null) {
- receiver.doPost(e);
-
- // else post it via the hierarchy
- } else {
- // get a logger from the hierarchy. The name of the logger
- // is taken to be the name contained in the event.
- remoteLogger = repository.getLogger(e.getLoggerName());
-
- //event.logger = remoteLogger;
- // apply the logger-level filter
- if (
- e.getLevel().isGreaterOrEqual(
- remoteLogger.getEffectiveLevel())) {
- // finally log the event as if was generated locally
- remoteLogger.callAppenders(e);
- }
+
+ for (Object aV : v) {
+ LoggingEvent e = (LoggingEvent) aV;
+ e.setProperty(Constants.HOSTNAME_KEY, hostName);
+
+ // store the known remote info in an event property
+ e.setProperty("log4j.remoteSourceInfo", remoteInfo);
+
+ // if configured with a receiver, tell it to post the event
+ if (receiver != null) {
+ receiver.doPost(e);
+
+ // else post it via the hierarchy
+ } else {
+ // get a logger from the hierarchy. The name of the logger
+ // is taken to be the name contained in the event.
+ remoteLogger = repository.getLogger(e.getLoggerName());
+
+ //event.logger = remoteLogger;
+ // apply the logger-level filter
+ if (
+ e.getLevel().isGreaterOrEqual(
+ remoteLogger.getEffectiveLevel())) {
+ // finally log the event as if was generated locally
+ remoteLogger.callAppenders(e);
+ }
+ }
}
- }
}
}
} catch (java.io.EOFException e) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/plugins/PluginRegistry.java b/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
index a043a18..0e67432 100644
--- a/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
+++ b/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
@@ -165,10 +165,9 @@ public final class PluginRegistry {
public List getPlugins() {
synchronized (pluginMap) {
List pluginList = new ArrayList(pluginMap.size());
- Iterator iter = pluginMap.values().iterator();
- while (iter.hasNext()) {
- pluginList.add(iter.next());
+ for (Object o : pluginMap.values()) {
+ pluginList.add(o);
}
return pluginList;
}
@@ -185,11 +184,8 @@ public final class PluginRegistry {
public List getPlugins(final Class pluginClass) {
synchronized (pluginMap) {
List pluginList = new ArrayList(pluginMap.size());
- Iterator iter = pluginMap.values().iterator();
-
- while (iter.hasNext()) {
- Object plugin = iter.next();
+ for (Object plugin : pluginMap.values()) {
if (pluginClass.isInstance(plugin)) {
pluginList.add(plugin);
}
@@ -234,10 +230,8 @@ public final class PluginRegistry {
// remove the listener for this repository
loggerRepository.removeLoggerRepositoryEventListener(listener);
- Iterator iter = pluginMap.values().iterator();
-
- while (iter.hasNext()) {
- Plugin plugin = (Plugin) iter.next();
+ for (Object o : pluginMap.values()) {
+ Plugin plugin = (Plugin) o;
plugin.shutdown();
firePluginStopped(plugin);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
index 31256cb..442095c 100644
--- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
@@ -731,15 +731,14 @@ public class LogFilePatternReceiver extends Receiver {
* contain only one of these per entry...properties are the only 'keyword'
* that can occur multiple times in an entry
*/
- Iterator iter = keywords.iterator();
- while (iter.hasNext()) {
- String keyword = (String) iter.next();
- int index2 = newPattern.indexOf(keyword);
- if (index2 > -1) {
- buildingKeywords.add(keyword);
- newPattern = singleReplace(newPattern, keyword, new Integer(buildingKeywords.size() -1).toString());
+ for (Object keyword1 : keywords) {
+ String keyword = (String) keyword1;
+ int index2 = newPattern.indexOf(keyword);
+ if (index2 > -1) {
+ buildingKeywords.add(keyword);
+ newPattern = singleReplace(newPattern, keyword, new Integer(buildingKeywords.size() - 1).toString());
+ }
}
- }
String buildingInt = "";
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java b/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
index c6c36fa..76ad21b 100644
--- a/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
+++ b/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
@@ -408,9 +408,8 @@ public class UtilLoggingXMLDecoder implements Decoder {
if (properties == null) {
properties = new Hashtable(additionalProperties);
}
- Iterator i = additionalProperties.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry e = (Map.Entry) i.next();
+ for (Object o : additionalProperties.entrySet()) {
+ Map.Entry e = (Map.Entry) o;
properties.put(e.getKey(), e.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3a3c4488/src/main/java/org/apache/log4j/xml/XMLDecoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/xml/XMLDecoder.java b/src/main/java/org/apache/log4j/xml/XMLDecoder.java
index 2542181..e476b33 100644
--- a/src/main/java/org/apache/log4j/xml/XMLDecoder.java
+++ b/src/main/java/org/apache/log4j/xml/XMLDecoder.java
@@ -425,11 +425,10 @@ public class XMLDecoder implements Decoder {
if (properties == null) {
properties = new Hashtable(additionalProperties);
}
- Iterator i = additionalProperties.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry e = (Map.Entry) i.next();
- properties.put(e.getKey(), e.getValue());
- }
+ for (Object o : additionalProperties.entrySet()) {
+ Map.Entry e = (Map.Entry) o;
+ properties.put(e.getKey(), e.getValue());
+ }
}
}
[2/4] logging-chainsaw git commit: Replace StringBuffer with
StringBuilder
Posted by ma...@apache.org.
Replace StringBuffer with StringBuilder
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/e232b829
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/e232b829
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/e232b829
Branch: refs/heads/master
Commit: e232b829a10eec918a73a0ee709130a8a4db30da
Parents: 1fba977
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:42:37 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:42:37 2018 -0600
----------------------------------------------------------------------
.../apache/log4j/chainsaw/CopyEventsToClipboardAction.java | 2 +-
src/main/java/org/apache/log4j/chainsaw/LogPanel.java | 8 ++++----
.../org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java | 2 +-
.../java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java | 2 +-
.../java/org/apache/log4j/chainsaw/color/ColorPanel.java | 2 +-
.../org/apache/log4j/chainsaw/layout/EventDetailLayout.java | 2 +-
src/main/java/org/apache/log4j/db/DBAppender.java | 2 +-
src/main/java/org/apache/log4j/helpers/MessageFormatter.java | 4 ++--
src/main/java/org/apache/log4j/net/MulticastAppender.java | 2 +-
src/main/java/org/apache/log4j/net/UDPAppender.java | 2 +-
src/main/java/org/apache/log4j/spi/SimpleULogger.java | 2 +-
.../java/org/apache/log4j/varia/LogFilePatternReceiver.java | 4 ++--
.../java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java | 6 +++---
src/main/java/org/apache/log4j/xml/XMLDecoder.java | 6 +++---
14 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java b/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
index 5f1f7f7..6817de5 100644
--- a/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
@@ -49,7 +49,7 @@ public class CopyEventsToClipboardAction extends AbstractAction {
public void actionPerformed(ActionEvent e) {
List filteredEvents = logUi.getCurrentLogPanel().getFilteredEvents();
- StringBuffer writer = new StringBuffer(filteredEvents.size() * EVENTSIZE_FUDGE_FACTOR);
+ StringBuilder writer = new StringBuilder(filteredEvents.size() * EVENTSIZE_FUDGE_FACTOR);
for (Object filteredEvent : filteredEvents) {
LoggingEvent event = ((LoggingEventWrapper) filteredEvent).getLoggingEvent();
writer.append(layout.format(event));
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/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 edfde4c..015cd32 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -1656,7 +1656,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
}
int start = currentTable.getSelectionModel().getMinSelectionIndex();
int end = currentTable.getSelectionModel().getMaxSelectionIndex();
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int row=start;row<end+1;row++) {
for (int column=0;column<currentTable.getColumnCount();column++) {
result.append(getValueOf(row, column));
@@ -3245,7 +3245,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
}
private String getToolTipTextForEvent(LoggingEventWrapper loggingEventWrapper) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(detailLayout.getHeader()).append(detailLayout.format(loggingEventWrapper.getLoggingEvent())).append(detailLayout.getFooter());
return buf.toString();
}
@@ -3650,7 +3650,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
loggingEventWrapper = tableModel.getRow(selectedRow);
if (loggingEventWrapper != null) {
- final StringBuffer buf = new StringBuffer();
+ final StringBuilder buf = new StringBuilder();
buf.append(detailLayout.getHeader())
.append(detailLayout.format(loggingEventWrapper.getLoggingEvent())).append(
detailLayout.getFooter());
@@ -3736,7 +3736,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
String[] ti = loggingEventWrapper.getLoggingEvent().getThrowableStrRep();
if (ti != null && ti.length > 0 && (!(ti.length == 1 && ti[0].equals("")))) {
detailDialog.setTitle(throwableTable.getColumnName(throwableTable.getSelectedColumn()) + " detail...");
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(loggingEventWrapper.getLoggingEvent().getMessage());
buf.append("\n");
for (String aTi : ti) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java b/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
index df751c2..5b10f5f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelLoggerTreeModel.java
@@ -117,7 +117,7 @@ outerFor:
*/
final LogPanelTreeNode newChild = new LogPanelTreeNode(packageName);
- StringBuffer fullPackageBuf = new StringBuffer();
+ StringBuilder fullPackageBuf = new StringBuilder();
for (int j = 0; j <= i; j++) {
fullPackageBuf.append(packages[j]);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/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 53b0a7a..b5b735d 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
@@ -627,7 +627,7 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
if (path != null)
{
Object[] objects = path.getPath();
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 1; i < objects.length; i++)
{
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 97f74ba..f20dbbb 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -474,7 +474,7 @@ public class ColorPanel extends JPanel
List list = new ArrayList();
Vector vector = tableModel.getDataVector();
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < vector.size(); i++) {
Vector v = (Vector) vector.elementAt(i);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java b/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
index 910a541..c74a084 100644
--- a/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
+++ b/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
@@ -134,7 +134,7 @@ public class EventDetailLayout extends Layout {
return "";
}
- final StringBuffer buf = new StringBuffer();
+ final StringBuilder buf = new StringBuilder();
for (int i = 0; i < string.length(); i++) {
char c = string.charAt(i);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/db/DBAppender.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/db/DBAppender.java b/src/main/java/org/apache/log4j/db/DBAppender.java
index bdb162f..f1efbea 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -127,7 +127,7 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
static {
- StringBuffer sql = new StringBuffer();
+ StringBuilder sql = new StringBuilder();
sql.append("INSERT INTO logging_event (");
sql.append("sequence_number, ");
sql.append("timestamp, ");
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/helpers/MessageFormatter.java b/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
index cd9c62b..85c8cd7 100644
--- a/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
+++ b/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
@@ -78,7 +78,7 @@ public final class MessageFormatter {
// present
return messagePattern;
} else {
- StringBuffer sbuf = new StringBuffer(len + 20);
+ StringBuilder sbuf = new StringBuilder(len + 20);
sbuf.append(messagePattern.substring(0, j));
sbuf.append(argument);
sbuf.append(messagePattern.substring(j + 2));
@@ -114,7 +114,7 @@ public final class MessageFormatter {
int i = 0;
int len = messagePattern.length();
- StringBuffer sbuf = new StringBuffer(messagePattern.length() + 50);
+ StringBuilder sbuf = new StringBuilder(messagePattern.length() + 50);
for (int l = 0; l < 2; l++) {
int j = messagePattern.indexOf(DELIM_START, i);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/net/MulticastAppender.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/MulticastAppender.java b/src/main/java/org/apache/log4j/net/MulticastAppender.java
index 4b0f16a..c74f467 100644
--- a/src/main/java/org/apache/log4j/net/MulticastAppender.java
+++ b/src/main/java/org/apache/log4j/net/MulticastAppender.java
@@ -200,7 +200,7 @@ public class MulticastAppender extends AppenderSkeleton implements PortBased {
try {
- StringBuffer buf = new StringBuffer(layout.format(event));
+ StringBuilder buf = new StringBuilder(layout.format(event));
byte[] payload;
if(encoding == null) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/net/UDPAppender.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/UDPAppender.java b/src/main/java/org/apache/log4j/net/UDPAppender.java
index 6cfe2a6..896f145 100644
--- a/src/main/java/org/apache/log4j/net/UDPAppender.java
+++ b/src/main/java/org/apache/log4j/net/UDPAppender.java
@@ -220,7 +220,7 @@ public class UDPAppender extends AppenderSkeleton implements PortBased{
}
try {
- StringBuffer buf = new StringBuffer(layout.format(event));
+ StringBuilder buf = new StringBuilder(layout.format(event));
byte[] payload;
if(encoding == null) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/spi/SimpleULogger.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/spi/SimpleULogger.java b/src/main/java/org/apache/log4j/spi/SimpleULogger.java
index 714a57a..5303c72 100644
--- a/src/main/java/org/apache/log4j/spi/SimpleULogger.java
+++ b/src/main/java/org/apache/log4j/spi/SimpleULogger.java
@@ -141,7 +141,7 @@ public final class SimpleULogger implements ULogger {
private void log(final String level,
final String message,
final Throwable t) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
long millis = System.currentTimeMillis();
buf.append(millis - startTime);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
index e9aa05e..31256cb 100644
--- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
@@ -435,7 +435,7 @@ public class LogFilePatternReceiver extends Receiver {
if (additionalLines.size() == 0) {
return firstMessageLine;
}
- StringBuffer message = new StringBuffer();
+ StringBuilder message = new StringBuilder();
if (firstMessageLine != null) {
message.append(firstMessageLine);
}
@@ -809,7 +809,7 @@ public class LogFilePatternReceiver extends Receiver {
private String quoteTimeStampChars(String input) {
//put single quotes around text that isn't a supported dateformat char
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
//ok to default to false because we also check for index zero below
boolean lastCharIsDateFormat = false;
for (int i = 0;i<input.length();i++) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java b/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
index f9d8125..c6c36fa 100644
--- a/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
+++ b/src/main/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
@@ -152,7 +152,7 @@ public class UtilLoggingXMLDecoder implements Decoder {
* resetting the length of the StringBuffer is dangerous, particularly
* on some JDK 1.4 impls, there's a known Bug that causes a memory leak
*/
- StringBuffer buf = new StringBuffer(1024);
+ StringBuilder buf = new StringBuilder(1024);
if (!data.startsWith("<?xml")) {
buf.append(BEGIN_PART);
@@ -205,7 +205,7 @@ public class UtilLoggingXMLDecoder implements Decoder {
Vector events;
try {
while ((line = reader.readLine()) != null) {
- StringBuffer buffer = new StringBuffer(line);
+ StringBuilder buffer = new StringBuilder(line);
for (int i = 0; i < 1000; i++) {
buffer.append(reader.readLine()).append("\n");
}
@@ -450,7 +450,7 @@ public class UtilLoggingXMLDecoder implements Decoder {
* @return text content of all text or CDATA children of node.
*/
private String getCData(final Node n) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
NodeList nl = n.getChildNodes();
for (int x = 0; x < nl.getLength(); x++) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e232b829/src/main/java/org/apache/log4j/xml/XMLDecoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/xml/XMLDecoder.java b/src/main/java/org/apache/log4j/xml/XMLDecoder.java
index 8ced851..2542181 100644
--- a/src/main/java/org/apache/log4j/xml/XMLDecoder.java
+++ b/src/main/java/org/apache/log4j/xml/XMLDecoder.java
@@ -162,7 +162,7 @@ public class XMLDecoder implements Decoder {
* resetting the length of the StringBuffer is dangerous, particularly
* on some JDK 1.4 impls, there's a known Bug that causes a memory leak
*/
- StringBuffer buf = new StringBuffer(1024);
+ StringBuilder buf = new StringBuilder(1024);
buf.append(BEGINPART);
buf.append(data);
@@ -210,7 +210,7 @@ public class XMLDecoder implements Decoder {
Vector events;
try {
while ((line = reader.readLine()) != null) {
- StringBuffer buffer = new StringBuffer(line);
+ StringBuilder buffer = new StringBuilder(line);
for (int i = 0; i < 1000; i++) {
buffer.append(reader.readLine()).append("\n");
}
@@ -477,7 +477,7 @@ public class XMLDecoder implements Decoder {
* @return text content of all text or CDATA children of node.
*/
private String getCData(final Node n) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
NodeList nl = n.getChildNodes();
for (int x = 0; x < nl.getLength(); x++) {