Simplify boolean return expressions
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
index c15a2e8..81887b6 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -766,15 +766,12 @@
* @see javax.swing.table.TableModel#isCellEditable(int, int)
*/
public boolean isCellEditable(int rowIndex, int columnIndex) {
- if (getColumnName(columnIndex).equalsIgnoreCase(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE)) {
- return true;
- }
+ if (getColumnName(columnIndex).equalsIgnoreCase(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE)) {
+ return true;
+ }
- if (columnIndex >= columnNames.size()) {
- return false;
- }
+ return columnIndex < columnNames.size() && super.isCellEditable(rowIndex, columnIndex);
- return super.isCellEditable(rowIndex, columnIndex);
}
/* (non-Javadoc)
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index 98174ad..82aba92 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -1580,11 +1580,7 @@
Map.Entry entry = (Map.Entry) aPanelSet;
Object o = entry.getValue();
boolean valueToSend;
- if (o instanceof LogPanel) {
- valueToSend = ((DockablePanel) entry.getValue()).isDocked();
- } else {
- valueToSend = true;
- }
+ valueToSend = !(o instanceof LogPanel) || ((DockablePanel) entry.getValue()).isDocked();
m.put(entry.getKey(), valueToSend);
}
@@ -1780,11 +1776,8 @@
* @return log tree panel visible flag
*/
public boolean isLogTreePanelVisible() {
- if (getCurrentLogPanel() == null) {
- return false;
- }
+ return getCurrentLogPanel() != null && getCurrentLogPanel().isLogTreeVisible();
- return getCurrentLogPanel().isLogTreeVisible();
}
/**
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
index 84a53f9..79ab5c0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
@@ -195,19 +195,14 @@
colorRuleDelegate =
new AbstractRule()
{
- public boolean evaluate(LoggingEvent e, Map matches)
- {
+ public boolean evaluate(LoggingEvent e, Map matches) {
boolean hiddenLogger = e.getLoggerName() != null && isHiddenLogger(e.getLoggerName());
boolean hiddenExpression = (ignoreExpressionRule != null && ignoreExpressionRule.evaluate(e, null));
boolean alwaysDisplayExpression = (alwaysDisplayExpressionRule != null && alwaysDisplayExpressionRule.evaluate(e, null));
boolean hidden = (!alwaysDisplayExpression) && (hiddenLogger || hiddenExpression);
String currentlySelectedLoggerName = getCurrentlySelectedLoggerName();
- if (!isFocusOnSelected() && !hidden && currentlySelectedLoggerName != null && !"".equals(currentlySelectedLoggerName))
- {
- return (e.getLoggerName().startsWith(currentlySelectedLoggerName+".") || e.getLoggerName().endsWith(currentlySelectedLoggerName)) ;
- }
- return false;
+ return !isFocusOnSelected() && !hidden && currentlySelectedLoggerName != null && !"".equals(currentlySelectedLoggerName) && (e.getLoggerName().startsWith(currentlySelectedLoggerName + ".") || e.getLoggerName().endsWith(currentlySelectedLoggerName));
}
};
diff --git a/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java b/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
index b8f6270..0e26fb9 100644
--- a/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
@@ -50,20 +50,17 @@
* @see org.apache.log4j.chainsaw.rule.Rule#evaluate(org.apache.log4j.spi.LoggingEvent)
*/
public boolean evaluate(LoggingEvent e, Map matches) {
- if (findRuleRequired) {
- if (findRule == null) {
- return false;
+ if (findRuleRequired) {
+ if (findRule == null) {
+ return false;
+ }
+ if (!findRule.evaluate(e, null)) {
+ return false;
+ }
}
- if (!findRule.evaluate(e, null)) {
- return false;
- }
- }
- if (loggerRule != null && !loggerRule.evaluate(e, null)) {
- return false;
- }
+ return (loggerRule == null || loggerRule.evaluate(e, null)) && (filterRule == null || filterRule.evaluate(e, null));
- return filterRule == null || filterRule.evaluate(e, null);
}
public boolean isFindRuleRequired() {
diff --git a/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java b/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
index 505fb15..459356d 100644
--- a/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
@@ -75,10 +75,7 @@
}
public boolean modelExists(String fieldName) {
- if (fieldName != null) {
- return modelMap.keySet().contains(fieldName.toUpperCase());
- }
- return false;
+ return fieldName != null && modelMap.keySet().contains(fieldName.toUpperCase());
}
public ListModel getModel(String fieldName) {
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
index 7479931..9cd329c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
@@ -318,12 +318,8 @@
public boolean isCellEditable(int rowIndex, int columnIndex) {
// TODO Determine if the property is one of the ones a User could edit
- if (columnIndex == 1) {
+ return columnIndex == 1 && descriptors[rowIndex].getWriteMethod() != null;
- return descriptors[rowIndex].getWriteMethod() != null;
- }
-
- return false;
}
/* (non-Javadoc)
diff --git a/src/main/java/org/apache/log4j/db/DBAppender.java b/src/main/java/org/apache/log4j/db/DBAppender.java
index f1efbea..799d5b5 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -167,27 +167,23 @@
}
public void activateOptions() {
- LogLog.debug("DBAppender.activateOptions called");
+ LogLog.debug("DBAppender.activateOptions called");
- if (connectionSource == null) {
- throw new IllegalStateException(
- "DBAppender cannot function without a connection source");
- }
+ if (connectionSource == null) {
+ throw new IllegalStateException(
+ "DBAppender cannot function without a connection source");
+ }
- sqlDialect = Util.getDialectFromCode(connectionSource.getSQLDialectCode());
- if (GET_GENERATED_KEYS_METHOD != null) {
- cnxSupportsGetGeneratedKeys = connectionSource.supportsGetGeneratedKeys();
- } else {
- cnxSupportsGetGeneratedKeys = false;
- }
- cnxSupportsBatchUpdates = connectionSource.supportsBatchUpdates();
- if (!cnxSupportsGetGeneratedKeys && (sqlDialect == null)) {
- throw new IllegalStateException(
- "DBAppender cannot function if the JDBC driver does not support getGeneratedKeys method *and* without a specific SQL dialect");
- }
-
- // all nice and dandy on the eastern front
- super.activateOptions();
+ sqlDialect = Util.getDialectFromCode(connectionSource.getSQLDialectCode());
+ cnxSupportsGetGeneratedKeys = GET_GENERATED_KEYS_METHOD != null && connectionSource.supportsGetGeneratedKeys();
+ cnxSupportsBatchUpdates = connectionSource.supportsBatchUpdates();
+ if (!cnxSupportsGetGeneratedKeys && (sqlDialect == null)) {
+ throw new IllegalStateException(
+ "DBAppender cannot function if the JDBC driver does not support getGeneratedKeys method *and* without a specific SQL dialect");
+ }
+
+ // all nice and dandy on the eastern front
+ super.activateOptions();
}
/**
