Simplify expressions
diff --git a/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java b/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
index ae6f196..cd10ec1 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ColumnComparator.java
@@ -161,7 +161,7 @@
//other columns may be Property values - see if there is an Property value matching column name
default:
if (e1.getProperty(columnName) != null && e2.getProperty(columnName) != null) {
- sort = e1.getProperty(columnName).toString().compareToIgnoreCase(e2.getProperty(columnName).toString());
+ sort = e1.getProperty(columnName).compareToIgnoreCase(e2.getProperty(columnName));
}
}
}
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
index d1e7199..88aa9ef 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -3122,9 +3122,7 @@
}
private String getToolTipTextForEvent(LoggingEventWrapper loggingEventWrapper) {
- StringBuilder buf = new StringBuilder();
- buf.append(detailLayout.getHeader()).append(detailLayout.format(loggingEventWrapper.getLoggingEvent())).append(detailLayout.getFooter());
- return buf.toString();
+ return detailLayout.getHeader() + detailLayout.format(loggingEventWrapper.getLoggingEvent()) + detailLayout.getFooter();
}
/**
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
index 0d57646..74f9702 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
@@ -361,12 +361,12 @@
if (isVisible && !wasVisible) {
visibleColumns.add(col);
visibleColumnOrder.add(col);
- propertySupport.firePropertyChange("visibleColumns", new Boolean(isVisible), new Boolean(wasVisible));
+ propertySupport.firePropertyChange("visibleColumns", Boolean.valueOf(isVisible), Boolean.valueOf(wasVisible));
}
if (!isVisible && wasVisible) {
visibleColumns.remove(col);
visibleColumnOrder.remove(col);
- propertySupport.firePropertyChange("visibleColumns", new Boolean(isVisible), new Boolean(wasVisible));
+ propertySupport.firePropertyChange("visibleColumns", Boolean.valueOf(isVisible), Boolean.valueOf(wasVisible));
}
}
diff --git a/src/main/java/org/apache/log4j/db/DBAppender.java b/src/main/java/org/apache/log4j/db/DBAppender.java
index c17d79a..f9c0094 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -126,22 +126,21 @@
static {
- StringBuilder sql = new StringBuilder();
- sql.append("INSERT INTO logging_event (");
- sql.append("sequence_number, ");
- sql.append("timestamp, ");
- sql.append("rendered_message, ");
- sql.append("logger_name, ");
- sql.append("level_string, ");
- sql.append("ndc, ");
- sql.append("thread_name, ");
- sql.append("reference_flag, ");
- sql.append("caller_filename, ");
- sql.append("caller_class, ");
- sql.append("caller_method, ");
- sql.append("caller_line) ");
- sql.append(" VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?)");
- insertSQL = sql.toString();
+ String sql = "INSERT INTO logging_event (" +
+ "sequence_number, " +
+ "timestamp, " +
+ "rendered_message, " +
+ "logger_name, " +
+ "level_string, " +
+ "ndc, " +
+ "thread_name, " +
+ "reference_flag, " +
+ "caller_filename, " +
+ "caller_class, " +
+ "caller_method, " +
+ "caller_line) " +
+ " VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?)";
+ insertSQL = sql;
//
// PreparedStatement.getGeneratedKeys added in JDK 1.4
//
diff --git a/src/main/java/org/apache/log4j/helpers/MessageFormatter.java b/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
index 85c8cd7..5f82d73 100644
--- a/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
+++ b/src/main/java/org/apache/log4j/helpers/MessageFormatter.java
@@ -78,11 +78,10 @@
// present
return messagePattern;
} else {
- StringBuilder sbuf = new StringBuilder(len + 20);
- sbuf.append(messagePattern.substring(0, j));
- sbuf.append(argument);
- sbuf.append(messagePattern.substring(j + 2));
- return sbuf.toString();
+ String sbuf = messagePattern.substring(0, j) +
+ argument +
+ messagePattern.substring(j + 2);
+ return sbuf;
}
}
}
diff --git a/src/main/java/org/apache/log4j/plugins/PluginRegistry.java b/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
index 5cb8e8f..5b22529 100644
--- a/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
+++ b/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
@@ -165,9 +165,7 @@
synchronized (pluginMap) {
List pluginList = new ArrayList(pluginMap.size());
- for (Object o : pluginMap.values()) {
- pluginList.add(o);
- }
+ pluginList.addAll(pluginMap.values());
return pluginList;
}
}
diff --git a/src/main/java/org/apache/log4j/spi/Log4JULogger.java b/src/main/java/org/apache/log4j/spi/Log4JULogger.java
index 2476810..0540445 100644
--- a/src/main/java/org/apache/log4j/spi/Log4JULogger.java
+++ b/src/main/java/org/apache/log4j/spi/Log4JULogger.java
@@ -78,7 +78,7 @@
final Object param2) {
if (logger.isDebugEnabled()) {
logger.debug(MessageFormatter.format(
- parameterizedMsg.toString(), param1, param2));
+ parameterizedMsg, param1, param2));
}
}
@@ -125,7 +125,7 @@
final Object param2) {
if (logger.isInfoEnabled()) {
logger.info(MessageFormatter.format(
- parameterizedMsg.toString(),
+ parameterizedMsg,
param1,
param2));
}
@@ -171,7 +171,7 @@
final Object param2) {
if (logger.isEnabledFor(Level.WARN)) {
logger.warn(MessageFormatter.format(
- parameterizedMsg.toString(), param1, param2));
+ parameterizedMsg, param1, param2));
}
}
@@ -215,7 +215,7 @@
final Object param2) {
if (logger.isEnabledFor(Level.ERROR)) {
logger.error(MessageFormatter.format(
- parameterizedMsg.toString(), param1, param2));
+ parameterizedMsg, param1, param2));
}
}
diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
index 7af7b06..d28baae 100644
--- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
@@ -715,7 +715,7 @@
buildingKeywords.add(shortProp);
propertyNames.add(longPropertyName);
current = current.substring(longPropertyName.length() + 1 + index);
- newPattern = singleReplace(newPattern, longPropertyName, new Integer(buildingKeywords.size() -1).toString());
+ newPattern = singleReplace(newPattern, longPropertyName, Integer.toString(buildingKeywords.size() - 1));
} else {
//no properties
index = -1;
@@ -735,7 +735,7 @@
int index2 = newPattern.indexOf(keyword);
if (index2 > -1) {
buildingKeywords.add(keyword);
- newPattern = singleReplace(newPattern, keyword, new Integer(buildingKeywords.size() - 1).toString());
+ newPattern = singleReplace(newPattern, keyword, Integer.toString(buildingKeywords.size() - 1));
}
}
diff --git a/src/main/java/org/apache/log4j/xml/XMLDecoder.java b/src/main/java/org/apache/log4j/xml/XMLDecoder.java
index caee24b..f13dea2 100644
--- a/src/main/java/org/apache/log4j/xml/XMLDecoder.java
+++ b/src/main/java/org/apache/log4j/xml/XMLDecoder.java
@@ -161,14 +161,8 @@
* 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
*/
- StringBuilder buf = new StringBuilder(1024);
-
- buf.append(BEGINPART);
- buf.append(data);
- buf.append(ENDPART);
-
- InputSource inputSource =
- new InputSource(new StringReader(buf.toString()));
+ String buf = BEGINPART + data + ENDPART;
+ InputSource inputSource = new InputSource(new StringReader(buf));
document = docBuilder.parse(inputSource);
} catch (Exception e) {
e.printStackTrace();