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:19:49 UTC
[1/5] logging-chainsaw git commit: Upgrade to Java 1.8 baseline
Repository: logging-chainsaw
Updated Branches:
refs/heads/master 765806ef1 -> 2fea11c96
Upgrade to Java 1.8 baseline
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/2d142a69
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/2d142a69
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/2d142a69
Branch: refs/heads/master
Commit: 2d142a69e7e31b09ed27b687d6a1a6e8e2aa52ae
Parents: 765806e
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:14:45 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:14:45 2018 -0600
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2d142a69/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d22344a..8086928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,11 @@
<name>Paul Smith</name>
<email>psmith@apache.org</email>
</developer>
+ <developer>
+ <id>mattsicker</id>
+ <name>Matt Sicker</name>
+ <email>mattsicker@apache.org</email>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -139,8 +144,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
[4/5] logging-chainsaw git commit: Simplify exception signatures
Posted by ma...@apache.org.
Simplify exception signatures
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/9865f5c7
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/9865f5c7
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/9865f5c7
Branch: refs/heads/master
Commit: 9865f5c753b36f023e2552b6f92894762f9c84f3
Parents: e710189
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:18:53 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:18:53 2018 -0600
----------------------------------------------------------------------
.../org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java | 2 +-
.../java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 3 +--
.../java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java | 2 +-
.../org/apache/log4j/chainsaw/LogPanelPreferenceModelTest.java | 2 +-
src/test/java/org/apache/log4j/util/Compare.java | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/9865f5c7/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 0112818..990ce85 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java
@@ -168,7 +168,7 @@ public class LogFilePatternLayoutBuilder
return new HashMap();
}
- public static Map getPropertiesFileAppenderConfiguration(File propertyFile) throws IOException, ParserConfigurationException, SAXException {
+ public static Map getPropertiesFileAppenderConfiguration(File propertyFile) throws IOException {
Map result = new HashMap();
String appenderPrefix = "log4j.appender";
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/9865f5c7/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 baf45a1..884adf6 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -181,8 +181,7 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
}
}
- public void treeWillExpand(TreeExpansionEvent event)
- throws ExpandVetoException {
+ public void treeWillExpand(TreeExpansionEvent event) {
}
});
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/9865f5c7/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
index 89574d2..895a8d2 100644
--- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
+++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
@@ -612,7 +612,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
return null;
}
- public static void main(String[] args) throws InterruptedException {
+ public static void main(String[] args) {
BasicConfigurator.resetConfiguration();
BasicConfigurator.configure();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/9865f5c7/src/test/java/org/apache/log4j/chainsaw/LogPanelPreferenceModelTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/log4j/chainsaw/LogPanelPreferenceModelTest.java b/src/test/java/org/apache/log4j/chainsaw/LogPanelPreferenceModelTest.java
index 2440826..808b17e 100644
--- a/src/test/java/org/apache/log4j/chainsaw/LogPanelPreferenceModelTest.java
+++ b/src/test/java/org/apache/log4j/chainsaw/LogPanelPreferenceModelTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
public class LogPanelPreferenceModelTest extends TestCase {
- public void testLogPanelPreferenceModelSerialization() throws Exception {
+ public void testLogPanelPreferenceModelSerialization() {
LogPanelPreferenceModel model = new LogPanelPreferenceModel();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/9865f5c7/src/test/java/org/apache/log4j/util/Compare.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/log4j/util/Compare.java b/src/test/java/org/apache/log4j/util/Compare.java
index 42aa233..9fe7ae6 100644
--- a/src/test/java/org/apache/log4j/util/Compare.java
+++ b/src/test/java/org/apache/log4j/util/Compare.java
@@ -142,7 +142,7 @@ public class Compare {
public static boolean gzCompare(final Class testClass,
final String actual,
final String expected)
- throws FileNotFoundException, IOException {
+ throws IOException {
String resourceName = expected;
int lastSlash = expected.lastIndexOf("/");
if (lastSlash >= 0) {
[3/5] logging-chainsaw git commit: Remove unnecessary casts and
vararg array wrappers
Posted by ma...@apache.org.
Remove unnecessary casts and vararg array wrappers
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/e710189c
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/e710189c
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/e710189c
Branch: refs/heads/master
Commit: e710189c1e4050ab3d2e87f991026802eeeeed6a
Parents: 2cd9f88
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:18:25 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:18:25 2018 -0600
----------------------------------------------------------------------
.../log4j/chainsaw/ChainsawAppenderHandler.java | 2 +-
.../chainsaw/ChainsawCyclicBufferTableModel.java | 6 ++----
.../java/org/apache/log4j/chainsaw/LogPanel.java | 9 ++-------
.../java/org/apache/log4j/chainsaw/LogUI.java | 19 +++++++++----------
.../log4j/chainsaw/LoggerNameModelSupport.java | 4 ++--
.../log4j/chainsaw/LoggerNameTreePanel.java | 4 ++--
.../log4j/chainsaw/osx/OSXIntegration.java | 16 ++++++++--------
.../receivers/PluginPropertyEditorPanel.java | 5 ++---
.../chainsaw/receivers/ReceiversHelper.java | 2 +-
.../java/org/apache/log4j/db/DBAppender.java | 2 +-
10 files changed, 30 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/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 3e1ab8b..314494a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
@@ -328,7 +328,7 @@ public class ChainsawAppenderHandler extends AppenderSkeleton {
* @param eventBatch
*/
private void dispatchEventBatch(ChainsawEventBatch eventBatch) {
- EventBatchListener[] listeners = (EventBatchListener[]) listenerList
+ EventBatchListener[] listeners = listenerList
.getListeners(EventBatchListener.class);
for (Iterator iter = eventBatch.identifierIterator(); iter.hasNext();) {
String identifier = (String) iter.next();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/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 9bed427..751a268 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -285,9 +285,7 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
}
public void notifyCountListeners() {
- EventCountListener[] listeners =
- (EventCountListener[]) eventListenerList.getListeners(
- EventCountListener.class);
+ EventCountListener[] listeners = eventListenerList.getListeners(EventCountListener.class);
int filteredListSize;
int unfilteredListSize;
@@ -753,7 +751,7 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
*/
private void fireNewKeyColumnAdded(NewKeyEvent e) {
NewKeyListener[] listeners =
- (NewKeyListener[]) eventListenerList.getListeners(NewKeyListener.class);
+ eventListenerList.getListeners(NewKeyListener.class);
for (int i = 0; i < listeners.length; i++) {
NewKeyListener listener = listeners[i];
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/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 6fe2a8b..c7b2e84 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -735,8 +735,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
public void eventCountChanged(int currentCount, int totalCount) {
if (preferenceModel.isCyclic()) {
double percent =
- ((double) totalCount) / ((ChainsawCyclicBufferTableModel) tableModel)
- .getMaxSize();
+ ((double) totalCount) / tableModel.getMaxSize();
String msg = null;
boolean wasWarning = warning75 || warning100;
if ((percent > 0.75) && (percent < 1.0) && !warning75) {
@@ -4273,11 +4272,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
ThumbnailLoggingEventWrapper that = (ThumbnailLoggingEventWrapper) o;
- if (loggingEventWrapper != null ? !loggingEventWrapper.equals(that.loggingEventWrapper) : that.loggingEventWrapper != null) {
- return false;
- }
-
- return true;
+ return loggingEventWrapper != null ? loggingEventWrapper.equals(that.loggingEventWrapper) : that.loggingEventWrapper == null;
}
public int hashCode() {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/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 e252fd0..538cae5 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -1165,8 +1165,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
stopTutorial.setEnabled(
- ((Boolean) startTutorial.getValue("TutorialStarted")).equals(
- Boolean.TRUE));
+ startTutorial.getValue("TutorialStarted").equals(Boolean.TRUE));
startButton.setSelected(stopTutorial.isEnabled());
}
};
@@ -1281,7 +1280,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
if (method != null) {
try {
- method.invoke(e.getPlugin(), new Object[] { socketListener });
+ method.invoke(e.getPlugin(), socketListener);
} catch (Exception ex) {
MessageCenter.getInstance().getLogger().error(
"Failed to add a SocketNodeEventListener", ex);
@@ -1293,7 +1292,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
try {
return p.getClass().getMethod(
"removeSocketNodeEventListener",
- new Class[] { SocketNodeEventListener.class });
+ SocketNodeEventListener.class);
} catch (Exception e) {
return null;
}
@@ -1303,7 +1302,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
try {
return p.getClass().getMethod(
"addSocketNodeEventListener",
- new Class[] { SocketNodeEventListener.class });
+ SocketNodeEventListener.class);
} catch (Exception e) {
return null;
}
@@ -1314,7 +1313,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
if (method != null) {
try {
- method.invoke(e.getPlugin(), new Object[] { socketListener });
+ method.invoke(e.getPlugin(), socketListener);
} catch (Exception ex) {
MessageCenter.getInstance().getLogger().error(
"Failed to remove SocketNodeEventListener", ex);
@@ -1470,9 +1469,9 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
Method portMethod =
networkReceiver.getClass().getMethod(
- "setPort", new Class[] { int.class });
+ "setPort", int.class);
portMethod.invoke(
- networkReceiver, new Object[] { new Integer(port) });
+ networkReceiver, new Integer(port));
networkReceiver.setThreshold(Level.TRACE);
@@ -1772,8 +1771,8 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
*/
private void fireShutdownEvent() {
ShutdownListener[] listeners =
- (ShutdownListener[]) shutdownListenerList.getListeners(
- ShutdownListener.class);
+ shutdownListenerList.getListeners(
+ ShutdownListener.class);
for (int i = 0; i < listeners.length; i++) {
listeners[i].shuttingDown();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java b/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java
index 9f5ca76..26e2f34 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java
@@ -61,7 +61,7 @@ public class LoggerNameModelSupport implements LoggerNameModel {
public void reset() {
loggerNameSet.clear();
- LoggerNameListener[] eventListeners = (LoggerNameListener[]) listenerList.getListeners(LoggerNameListener.class);
+ LoggerNameListener[] eventListeners = listenerList.getListeners(LoggerNameListener.class);
for (int i = 0; i < eventListeners.length; i++)
{
@@ -77,7 +77,7 @@ public class LoggerNameModelSupport implements LoggerNameModel {
*/
private void notifyListeners(String loggerName)
{
- LoggerNameListener[] eventListeners = (LoggerNameListener[]) listenerList.getListeners(LoggerNameListener.class);
+ LoggerNameListener[] eventListeners = listenerList.getListeners(LoggerNameListener.class);
for (int i = 0; i < eventListeners.length; i++)
{
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/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 d537aea..9d73a5c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
@@ -591,7 +591,7 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
hiddenSet.remove(logger);
}
- visibilityRuleDelegate.firePropertyChange("hiddenSet", (Object) null, (Object) null);
+ visibilityRuleDelegate.firePropertyChange("hiddenSet", null, null);
}
/**
@@ -1317,7 +1317,7 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
private void fireChangeEvent()
{
ChangeListener[] listeners =
- (ChangeListener[]) listenerList.getListeners(ChangeListener.class);
+ listenerList.getListeners(ChangeListener.class);
ChangeEvent e = null;
for (int i = 0; i < listeners.length; i++)
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java b/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
index dec20b0..7d67687 100644
--- a/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
+++ b/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
@@ -52,13 +52,13 @@ public class OSXIntegration {
applicationInstance = applicationClazz.newInstance();
// now register that we want that Preferences menu
- Method enablePreferenceMethod = applicationClazz.getMethod("setEnabledPreferencesMenu", new Class[] {boolean.class});
- enablePreferenceMethod.invoke(applicationInstance, new Object[] {Boolean.TRUE});
+ Method enablePreferenceMethod = applicationClazz.getMethod("setEnabledPreferencesMenu", boolean.class);
+ enablePreferenceMethod.invoke(applicationInstance, Boolean.TRUE);
// no About menu for us for now.
- Method enableAboutMethod = applicationClazz.getMethod("setEnabledAboutMenu", new Class[] {boolean.class});
- enableAboutMethod.invoke(applicationInstance, new Object[] {Boolean.TRUE});
+ Method enableAboutMethod = applicationClazz.getMethod("setEnabledAboutMenu", boolean.class);
+ enableAboutMethod.invoke(applicationInstance, Boolean.TRUE);
// Need to create a Proxy object to represent an anonymous impl of the ApplicationListener class
Object listenerProxy = Proxy.newProxyInstance(OSXIntegration.class.getClassLoader(),
@@ -81,12 +81,12 @@ public class OSXIntegration {
}
private void setHandled(Object event, Boolean val) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
- Method handleMethod = event.getClass().getMethod("setHandled", new Class[] {boolean.class});
- handleMethod.invoke(event, new Object[] {val});
+ Method handleMethod = event.getClass().getMethod("setHandled", boolean.class);
+ handleMethod.invoke(event, val);
}});
// register the proxy object via the addApplicationListener method, cross fingers...
- Method registerListenerMethod = applicationClazz.getMethod("addApplicationListener", new Class[] {listenerClass});
- registerListenerMethod.invoke(applicationInstance, new Object[] {listenerProxy});
+ Method registerListenerMethod = applicationClazz.getMethod("addApplicationListener", listenerClass);
+ registerListenerMethod.invoke(applicationInstance, listenerProxy);
} catch (Exception e) {
LOG.error("Failed to setup OSXIntegration", e);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
----------------------------------------------------------------------
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 2c1ef2b..b4f5385 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
@@ -282,8 +282,7 @@ public class PluginPropertyEditorPanel extends JPanel {
try {
- Object object = d.getReadMethod().invoke(plugin,
- new Object[0]);
+ Object object = d.getReadMethod().invoke(plugin);
if (object != null) {
@@ -360,7 +359,7 @@ public class PluginPropertyEditorPanel extends JPanel {
try {
descriptors[rowIndex].getWriteMethod().invoke(plugin,
- new Object[] { aValue });
+ aValue);
fireTableCellUpdated(rowIndex, columnIndex);
} catch (IllegalArgumentException e) {
// ignore
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
index a1737f4..9837481 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
@@ -179,7 +179,7 @@ public class ReceiversHelper {
if (d.getReadMethod().getName().equals("getLoggerRepository")) {
continue;
}
- Object o = d.getReadMethod().invoke(receiver, new Object[] {} );
+ Object o = d.getReadMethod().invoke(receiver);
if (o != null) {
Element paramElement = document.createElement("param");
paramElement.setAttribute("name", d.getName());
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/e710189c/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 f94e98b..e87132e 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -301,7 +301,7 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
for (Iterator i = propertiesKeys.iterator(); i.hasNext();) {
String key = (String) i.next();
- String value = (String) event.getProperty(key);
+ String value = event.getProperty(key);
//LogLog.info("id " + eventId + ", key " + key + ", value " + value);
insertPropertiesStatement.setInt(1, eventId);
[5/5] logging-chainsaw git commit: All methods are public,
and all fields are static and final.
Posted by ma...@apache.org.
All methods are public, and all fields are static and final.
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/2fea11c9
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/2fea11c9
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/2fea11c9
Branch: refs/heads/master
Commit: 2fea11c9689945eb40a3ea70fed2e38c889ab4ec
Parents: 9865f5c
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:19:19 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:19:19 2018 -0600
----------------------------------------------------------------------
.../apache/log4j/chainsaw/EventBatchListener.java | 4 ++--
.../apache/log4j/chainsaw/EventCountListener.java | 2 +-
.../apache/log4j/chainsaw/LoggerNameListener.java | 4 ++--
.../org/apache/log4j/chainsaw/LoggerNameModel.java | 10 +++++-----
.../org/apache/log4j/chainsaw/NewKeyListener.java | 2 +-
.../org/apache/log4j/chainsaw/ShutdownListener.java | 2 +-
.../org/apache/log4j/chainsaw/color/Colorizer.java | 4 ++--
.../apache/log4j/chainsaw/prefs/Profileable.java | 2 +-
.../log4j/chainsaw/prefs/SettingsListener.java | 4 ++--
.../java/org/apache/log4j/db/ConnectionSource.java | 16 ++++++++--------
.../org/apache/log4j/db/dialect/SQLDialect.java | 2 +-
11 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java b/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java
index 0873922..e7140fe 100644
--- a/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java
@@ -36,7 +36,7 @@ public interface EventBatchListener extends EventListener {
* any identifier
* @return String identifier of the interested source
*/
- public String getInterestedIdentifier();
+ String getInterestedIdentifier();
/**
* Implementations receive a list of LoggingEvent instances only if they are interested,
@@ -44,5 +44,5 @@ public interface EventBatchListener extends EventListener {
* @param events List of LoggingEvent instances
* @param identifier the identifier this list of LoggingEvents is associated with
*/
- public void receiveEventBatch(String identifier, List events);
+ void receiveEventBatch(String identifier, List events);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java b/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java
index 294f02b..42d38ff 100644
--- a/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java
@@ -26,5 +26,5 @@ import java.util.EventListener;
* @author Scott Deboy <sdeboy@apache.org>
*/
public interface EventCountListener extends EventListener{
- public void eventCountChanged(int currentCount, int totalCount);
+ void eventCountChanged(int currentCount, int totalCount);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java b/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
index aeefc25..6a27ffe 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
@@ -32,10 +32,10 @@ public interface LoggerNameListener extends EventListener {
* Logger name string has been introduced into the model
* @param loggerName the new, unique loggerName
*/
- public void loggerNameAdded(String loggerName);
+ void loggerNameAdded(String loggerName);
/**
* Logger names were reset (used to clear the tree model)
*/
- public void reset();
+ void reset();
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java b/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
index aceab98..59301d7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
@@ -36,7 +36,7 @@ public interface LoggerNameModel {
*
* @return unmodifiable Collection of Logger name Strings
*/
- public Collection getLoggerNames();
+ Collection getLoggerNames();
/**
* Attempts to add the loggerName to the model, and returns
@@ -48,13 +48,13 @@ public interface LoggerNameModel {
*
* @param loggerName
*/
- public boolean addLoggerName(String loggerName);
+ boolean addLoggerName(String loggerName);
/**
* The logger names have been cleared
*/
- public void reset();
+ void reset();
- public void addLoggerNameListener(LoggerNameListener l);
- public void removeLoggerNameListener(LoggerNameListener l);
+ void addLoggerNameListener(LoggerNameListener l);
+ void removeLoggerNameListener(LoggerNameListener l);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java b/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
index b97ba18..499cdc6 100644
--- a/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
@@ -31,5 +31,5 @@ public interface NewKeyListener extends EventListener {
/**
* @param e the new key event being added
*/
- public void newKeyAdded(NewKeyEvent e);
+ void newKeyAdded(NewKeyEvent e);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
index efa020f..0839f1a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
@@ -34,5 +34,5 @@ import java.util.EventListener;
*/
public interface ShutdownListener extends EventListener{
- public void shuttingDown();
+ void shuttingDown();
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java b/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
index ee70b0c..3a2a91e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
@@ -38,7 +38,7 @@ public interface Colorizer {
* @param event
* @return background color
*/
- public Color getBackgroundColor(LoggingEvent event);
+ Color getBackgroundColor(LoggingEvent event);
- public Color getForegroundColor(LoggingEvent event);
+ Color getForegroundColor(LoggingEvent event);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java b/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java
index bce8a57..414f65c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java
@@ -34,7 +34,7 @@ public interface Profileable extends SettingsListener {
* Must be able to provide a name which is used to determine at a minimum,
* the default profile name prefix for this component.
*/
- public String getNamespace();
+ String getNamespace();
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
index 625add9..c4c78dc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
@@ -49,7 +49,7 @@ public interface SettingsListener extends EventListener {
*
* @param event
*/
- public void loadSettings(LoadSettingsEvent event);
+ void loadSettings(LoadSettingsEvent event);
- public void saveSettings(SaveSettingsEvent event);
+ void saveSettings(SaveSettingsEvent event);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/db/ConnectionSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/db/ConnectionSource.java b/src/main/java/org/apache/log4j/db/ConnectionSource.java
index d473ebf..12c3495 100644
--- a/src/main/java/org/apache/log4j/db/ConnectionSource.java
+++ b/src/main/java/org/apache/log4j/db/ConnectionSource.java
@@ -33,12 +33,12 @@ import java.sql.SQLException;
*/
public interface ConnectionSource extends Component, OptionHandler {
- final int UNKNOWN_DIALECT = 0;
- final int POSTGRES_DIALECT = 1;
- final int MYSQL_DIALECT = 2;
- final int ORACLE_DIALECT = 3;
- final int MSSQL_DIALECT = 4;
- final int HSQL_DIALECT = 5;
+ int UNKNOWN_DIALECT = 0;
+ int POSTGRES_DIALECT = 1;
+ int MYSQL_DIALECT = 2;
+ int ORACLE_DIALECT = 3;
+ int MSSQL_DIALECT = 4;
+ int HSQL_DIALECT = 5;
/**
* Obtain a {@link java.sql.Connection} for use. The client is
* responsible for closing the {@link java.sql.Connection} when it is no
@@ -64,6 +64,6 @@ public interface ConnectionSource extends Component, OptionHandler {
/**
* If the connection does not support batch updates, we will avoid using them.
- */
- public boolean supportsBatchUpdates();
+ */
+ boolean supportsBatchUpdates();
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2fea11c9/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java b/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java
index 291283f..2fcb0f7 100644
--- a/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java
+++ b/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java
@@ -22,6 +22,6 @@ package org.apache.log4j.db.dialect;
*/
public interface SQLDialect {
- public String getSelectInsertId();
+ String getSelectInsertId();
}
[2/5] logging-chainsaw git commit: Simplify expressions
Posted by ma...@apache.org.
Simplify expressions
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/2cd9f883
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/2cd9f883
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/2cd9f883
Branch: refs/heads/master
Commit: 2cd9f883bdd227c33242419286bdb8ea4240b635
Parents: 2d142a6
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:15:59 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:15:59 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/log4j/chainsaw/ExpressionRuleContext.java | 5 +----
.../java/org/apache/log4j/chainsaw/LoggingEventWrapper.java | 6 +-----
src/main/java/org/apache/log4j/chainsaw/RuleMediator.java | 6 +-----
src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java | 4 +---
4 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2cd9f883/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java b/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java
index 5c45f28..95f2902 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ExpressionRuleContext.java
@@ -222,11 +222,8 @@ public class ExpressionRuleContext extends KeyAdapter {
text.substring(lastFieldStartPosition, lastFieldPosition).toUpperCase()
.trim();
- if (resolver.isField(field)) {
- return true;
- }
+ return resolver.isField(field);
- return false;
}
//returns the currently active field which can be used to display a context menu
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2cd9f883/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java b/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java
index 63363a3..0077702 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggingEventWrapper.java
@@ -173,11 +173,7 @@ public class LoggingEventWrapper {
LoggingEventWrapper that = (LoggingEventWrapper) o;
- if (id != that.id) {
- return false;
- }
-
- return true;
+ return id == that.id;
}
public int hashCode() {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2cd9f883/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java b/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
index 301534a..b8f6270 100644
--- a/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/RuleMediator.java
@@ -63,11 +63,7 @@ public class RuleMediator extends AbstractRule {
return false;
}
- if (filterRule != null && !filterRule.evaluate(e, null)) {
- return false;
- }
-
- return true;
+ return filterRule == null || filterRule.evaluate(e, null);
}
public boolean isFindRuleRequired() {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2cd9f883/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java b/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java
index 647a92c..b1461fb 100644
--- a/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java
+++ b/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java
@@ -171,9 +171,7 @@ public class FileDnDTarget implements DropTargetListener{
int sa = e.getSourceActions();
// we're saying that these actions are necessary
- if ((sa & acceptableActions) == 0)
- return false;
- return true;
+ return (sa & acceptableActions) != 0;
}
/**