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/13 06:24:58 UTC
[1/5] logging-chainsaw git commit: Replace null arrays with empty
varargs
Repository: logging-chainsaw
Updated Branches:
refs/heads/master cdc4f3cab -> ba10849cc
Replace null arrays with empty varargs
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/45687c97
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/45687c97
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/45687c97
Branch: refs/heads/master
Commit: 45687c97a7ad2f713b30a3acada0b7cad5c99fed
Parents: cdc4f3c
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 13 01:06:36 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 13 01:06:36 2018 -0500
----------------------------------------------------------------------
src/main/java/org/apache/log4j/db/DBAppender.java | 4 ++--
src/main/java/org/apache/log4j/db/dialect/Util.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/45687c97/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 f9c0094..e612a84 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -146,7 +146,7 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
//
Method getGeneratedKeysMethod;
try {
- getGeneratedKeysMethod = PreparedStatement.class.getMethod("getGeneratedKeys", null);
+ getGeneratedKeysMethod = PreparedStatement.class.getMethod("getGeneratedKeys");
} catch(Exception ex) {
getGeneratedKeysMethod = null;
}
@@ -247,7 +247,7 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
boolean gotGeneratedKeys = false;
if (cnxSupportsGetGeneratedKeys) {
try {
- rs = (ResultSet) GET_GENERATED_KEYS_METHOD.invoke(insertStatement, null);
+ rs = (ResultSet) GET_GENERATED_KEYS_METHOD.invoke(insertStatement);
gotGeneratedKeys = true;
} catch(InvocationTargetException ex) {
Throwable target = ex.getTargetException();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/45687c97/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 2013137..c0cd503 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);
+ return (Boolean) DatabaseMetaData.class.getMethod("supportsGetGeneratedKeys").invoke(meta);
} catch(Throwable e) {
getLogger().info("Could not call supportsGetGeneratedKeys method. This may be recoverable");
return false;
[5/5] logging-chainsaw git commit: Make synchronized variables final
Posted by ma...@apache.org.
Make synchronized variables 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/ba10849c
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/ba10849c
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/ba10849c
Branch: refs/heads/master
Commit: ba10849ccce6898b49ddff4b7726973dbc2645dc
Parents: 3250bb1
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 13 01:24:51 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 13 01:24:51 2018 -0500
----------------------------------------------------------------------
.../java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java | 2 +-
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 2 +-
.../java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java | 2 +-
.../java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java | 2 +-
.../org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java | 2 +-
.../java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java | 2 +-
src/main/java/org/apache/log4j/net/MulticastReceiver.java | 2 +-
src/main/java/org/apache/log4j/net/SocketHubReceiver.java | 2 +-
src/main/java/org/apache/log4j/net/SocketNode13.java | 2 +-
src/main/java/org/apache/log4j/net/SocketReceiver.java | 2 +-
src/main/java/org/apache/log4j/net/UDPReceiver.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
index 74f9702..360820c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
@@ -51,7 +51,7 @@ public class LogPanelPreferenceModel implements Serializable{
Properties properties = SettingsManager.getInstance().getDefaultSettings();
for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) {
- Map.Entry entry = (Map.Entry) objectObjectEntry;
+ Map.Entry entry = objectObjectEntry;
if (entry.getKey().toString().startsWith("DateFormat")) {
list.add(entry.getValue());
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/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 7454f89..cbaee9a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -178,7 +178,7 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
* until notified.
*/
private boolean isGUIFullyInitialized = false;
- private Object initializationLock = new Object();
+ private final Object initializationLock = new Object();
/**
* The shutdownAction is called when the user requests to exit Chainsaw, and
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/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 87c5945..a1801ff 100644
--- a/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
+++ b/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
@@ -38,7 +38,7 @@ import org.apache.log4j.spi.LoggingEvent;
* @author Paul Smith <psmith@apache.org>
*/
public class EventDetailLayout extends Layout {
- private EnhancedPatternLayout patternLayout = new EnhancedPatternLayout();
+ private final EnhancedPatternLayout patternLayout = new EnhancedPatternLayout();
public EventDetailLayout() {
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/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 19df785..d0b8f0b 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
@@ -66,7 +66,7 @@ public class LoadSettingsEvent extends SettingsEvent {
Collection c = new ArrayList();
for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) {
- Map.Entry entry = (Map.Entry) objectObjectEntry;
+ Map.Entry entry = objectObjectEntry;
if (entry.getKey().toString().startsWith(string)) {
c.add(entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/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 8b4470d..4a733ef 100644
--- a/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
@@ -167,7 +167,7 @@ public class VFSLogFilePatternReceiver extends LogFilePatternReceiver implements
private boolean promptForUserInfo = false;
private Container container;
- private Object waitForContainerLock = new Object();
+ private final Object waitForContainerLock = new Object();
private boolean autoReconnect;
private VFSReader vfsReader;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/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 89c16a5..93b69f9 100644
--- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
+++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
@@ -88,7 +88,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
private ZeroConfPreferenceModel preferenceModel;
- private Map serviceInfoToReceiveMap = new HashMap();
+ private final Map serviceInfoToReceiveMap = new HashMap();
private JMenu connectToMenu = new JMenu("Connect to");
private JMenuItem helpItem = new JMenuItem(new AbstractAction("Learn more about ZeroConf...",
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/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 5e4f283..f0a542f 100644
--- a/src/main/java/org/apache/log4j/net/MulticastReceiver.java
+++ b/src/main/java/org/apache/log4j/net/MulticastReceiver.java
@@ -174,7 +174,7 @@ public class MulticastReceiver extends Receiver implements PortBased,
}
class MulticastHandlerThread extends Thread {
- private List list = new ArrayList();
+ private final List list = new ArrayList();
public MulticastHandlerThread() {
setDaemon(true);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/src/main/java/org/apache/log4j/net/SocketHubReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/SocketHubReceiver.java b/src/main/java/org/apache/log4j/net/SocketHubReceiver.java
index 73f88e5..5bef1e1 100644
--- a/src/main/java/org/apache/log4j/net/SocketHubReceiver.java
+++ b/src/main/java/org/apache/log4j/net/SocketHubReceiver.java
@@ -85,7 +85,7 @@ extends Receiver implements SocketNodeEventListener, PortBased {
/**
* Listener list.
*/
- private List listenerList = Collections.synchronizedList(new ArrayList());
+ private final List listenerList = Collections.synchronizedList(new ArrayList());
private boolean advertiseViaMulticastDNS;
private ZeroConfSupport zeroConf;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/src/main/java/org/apache/log4j/net/SocketNode13.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/SocketNode13.java b/src/main/java/org/apache/log4j/net/SocketNode13.java
index fb7a585..1d5d77c 100644
--- a/src/main/java/org/apache/log4j/net/SocketNode13.java
+++ b/src/main/java/org/apache/log4j/net/SocketNode13.java
@@ -74,7 +74,7 @@ public class SocketNode13 extends ComponentBase implements Runnable, Pauseable {
/**
* List of listeners.
*/
- private List listenerList = Collections.synchronizedList(new ArrayList());
+ private final List listenerList = Collections.synchronizedList(new ArrayList());
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/src/main/java/org/apache/log4j/net/SocketReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/SocketReceiver.java b/src/main/java/org/apache/log4j/net/SocketReceiver.java
index 6c482f0..821935f 100644
--- a/src/main/java/org/apache/log4j/net/SocketReceiver.java
+++ b/src/main/java/org/apache/log4j/net/SocketReceiver.java
@@ -87,7 +87,7 @@ public class SocketReceiver extends Receiver implements Runnable, PortBased,
/**
* Listeners.
*/
- private List listenerList = Collections.synchronizedList(new ArrayList());
+ private final List listenerList = Collections.synchronizedList(new ArrayList());
private boolean advertiseViaMulticastDNS;
private ZeroConfSupport zeroConf;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/ba10849c/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 bc927ab..562d495 100644
--- a/src/main/java/org/apache/log4j/net/UDPReceiver.java
+++ b/src/main/java/org/apache/log4j/net/UDPReceiver.java
@@ -171,7 +171,7 @@ public class UDPReceiver extends Receiver implements PortBased, Pauseable {
}
class UDPHandlerThread extends Thread {
- private List list = new ArrayList();
+ private final List list = new ArrayList();
public UDPHandlerThread() {
setDaemon(true);
[3/5] logging-chainsaw git commit: Remove unused and redundant
assignments
Posted by ma...@apache.org.
Remove unused and redundant assignments
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/82725cc9
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/82725cc9
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/82725cc9
Branch: refs/heads/master
Commit: 82725cc9defcef70c5cdca385cc994022f70cad6
Parents: 2e18dc2
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 13 01:15:33 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 13 01:15:33 2018 -0500
----------------------------------------------------------------------
.../log4j/chainsaw/ChainsawAppenderHandler.java | 1 -
.../ChainsawCyclicBufferTableModel.java | 6 ++--
.../apache/log4j/chainsaw/FileLoadAction.java | 4 +--
.../org/apache/log4j/chainsaw/LogPanel.java | 6 ++--
.../org/apache/log4j/chainsaw/NewKeyEvent.java | 2 +-
.../chainsaw/layout/DefaultLayoutFactory.java | 2 +-
.../log4j/chainsaw/prefs/SettingsManager.java | 2 +-
.../apache/log4j/db/CustomSQLDBReceiver.java | 32 +++++++++-----------
.../java/org/apache/log4j/db/DBAppender.java | 4 ---
.../java/org/apache/log4j/db/DBReceiverJob.java | 23 +++++++-------
.../apache/log4j/db/JNDIConnectionSource.java | 2 +-
.../java/org/apache/log4j/net/JMSReceiver.java | 2 +-
.../java/org/apache/log4j/net/SocketNode13.java | 2 +-
.../org/apache/log4j/net/XMLSocketNode.java | 3 +-
.../org/apache/log4j/net/XMLSocketReceiver.java | 1 -
.../log4j/varia/LogFilePatternReceiver.java | 20 ++++++------
.../apache/log4j/xml/LogFileXMLReceiver.java | 2 +-
.../java/org/apache/log4j/xml/XMLDecoder.java | 2 +-
18 files changed, 53 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 2259676..b4d670f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
@@ -341,7 +341,6 @@ public class ChainsawAppenderHandler extends AppenderSkeleton {
listener.receiveEventBatch(identifier, eventList);
}
}
- eventList = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 050d1c7..e659f87 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -64,7 +64,7 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
private static final int DEFAULT_CAPACITY = 5000;
//cyclic field used internally in this class, but not exposed via the eventcontainer
private boolean cyclic = true;
- private int cyclicBufferSize = DEFAULT_CAPACITY;
+ private int cyclicBufferSize;
//original list of LoggingEventWrapper instances
List unfilteredList;
//filtered list of LoggingEventWrapper instances
@@ -834,8 +834,8 @@ fireTableRowsInserted(begin, end);
logger.debug(
"Changing Model, isCyclic is now " + cyclic);
- List newUnfilteredList = null;
- List newFilteredList = null;
+ List newUnfilteredList;
+ List newFilteredList;
if (cyclic) {
newUnfilteredList = new CyclicBufferList(cyclicBufferSize);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 b89ad31..22d98ca 100644
--- a/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java
@@ -51,11 +51,11 @@ class FileLoadAction extends AbstractAction {
* the events it loads
*
*/
- Decoder decoder = null;
+ Decoder decoder;
private LogUI parent;
- private boolean remoteURL = false;
+ private boolean remoteURL;
public FileLoadAction(LogUI parent, Decoder decoder, String title,
boolean isRemoteURL) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 96eb716..a7f8109 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -700,7 +700,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
if (preferenceModel.isCyclic()) {
double percent =
((double) totalCount) / tableModel.getMaxSize();
- String msg = null;
+ String msg;
boolean wasWarning = warning75 || warning100;
if ((percent > 0.75) && (percent < 1.0) && !warning75) {
msg =
@@ -2262,7 +2262,7 @@ detailPaneUpdater.setAndUpdateSelectedRow(table.getSelectedRow());
* @see LogPanelPreferenceModel
*/
public void saveSettings(SaveSettingsEvent event) {
- File xmlFile = null;
+ File xmlFile;
try {
xmlFile = new File(SettingsManager.getInstance().getSettingsDirectory(), URLEncoder.encode(identifier, "UTF-8") + ".xml");
} catch (UnsupportedEncodingException e) {
@@ -3026,7 +3026,7 @@ detailPaneUpdater.setAndUpdateSelectedRow(table.getSelectedRow());
searchColumnNameMap.put(searchTable.getColumnName(i).toUpperCase(), searchColumnModel.getColumn(i));
}
- int index = 0;
+ int index;
StringTokenizer tok = new StringTokenizer(columnOrder, ",");
List sortedColumnList = new ArrayList();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java b/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
index 4cb5298..6c6dcce 100644
--- a/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
@@ -28,7 +28,7 @@ import java.util.EventObject;
*
*/
public class NewKeyEvent extends EventObject {
- private int newModelIndex = -1;
+ private int newModelIndex;
private Object key;
private Object value;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java b/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java
index f2eb454..5a17650 100644
--- a/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java
+++ b/src/main/java/org/apache/log4j/chainsaw/layout/DefaultLayoutFactory.java
@@ -60,7 +60,7 @@ public class DefaultLayoutFactory {
new BufferedReader(
new InputStreamReader(defaultLayoutURL.openStream()));
- String line = "";
+ String line;
while ((line = reader.readLine()) != null) {
content.append(line).append("\n");
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java
index 4228882..5bebe59 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java
@@ -229,7 +229,7 @@ public final class SettingsManager {
*/
private void saveProfileableSetting(File settingsDir) {
EventListener[] listeners = listenerList.getListeners(SettingsListener.class);
- SaveSettingsEvent event = null;
+ SaveSettingsEvent event;
for (EventListener listener : listeners) {
SettingsListener settingsListener = (SettingsListener) listener;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 5dc69ae..55ade75 100644
--- a/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
+++ b/src/main/java/org/apache/log4j/db/CustomSQLDBReceiver.java
@@ -288,21 +288,21 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn
connection = connectionSource.getConnection();
Statement statement = connection.createStatement();
- Logger eventLogger = null;
- long timeStamp = 0L;
- String level = null;
- String threadName = null;
- Object message = null;
- String ndc = null;
- Hashtable mdc = null;
- String[] throwable = null;
- String className = null;
- String methodName = null;
- String fileName = null;
- String lineNumber = null;
- Hashtable properties = null;
-
- String currentSQLStatement = sqlStatement;
+ Logger eventLogger;
+ long timeStamp;
+ String level;
+ String threadName;
+ Object message;
+ String ndc;
+ Hashtable mdc;
+ String[] throwable;
+ String className;
+ String methodName;
+ String fileName;
+ String lineNumber;
+ Hashtable properties;
+
+ String currentSQLStatement;
if (whereExists) {
currentSQLStatement = sqlStatement + AND_CLAUSE + idField
+ " > " + lastID;
@@ -424,11 +424,9 @@ public class CustomSQLDBReceiver extends Receiver implements Pauseable, Unrecogn
//log when rows are retrieved
if (lastID != oldLastID) {
getLogger().debug("lastID: " + lastID);
- oldLastID = lastID;
}
statement.close();
- statement = null;
} catch (SQLException sqle) {
getLogger()
.error("*************Problem receiving events", sqle);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 e612a84..a9e728f 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -279,12 +279,10 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
// we no longer need the insertStatement
if(insertStatement != null) {
insertStatement.close();
- insertStatement = null;
}
if(idStatement != null) {
idStatement.close();
- idStatement = null;
}
Set propertiesKeys = event.getPropertyKeySet();
@@ -314,7 +312,6 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
}
insertPropertiesStatement.close();
- insertPropertiesStatement = null;
}
String[] strRep = event.getThrowableStrRep();
@@ -339,7 +336,6 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
insertExceptionStatement.executeBatch();
}
insertExceptionStatement.close();
- insertExceptionStatement = null;
}
connection.commit();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/db/DBReceiverJob.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/db/DBReceiverJob.java b/src/main/java/org/apache/log4j/db/DBReceiverJob.java
index 19d3fe0..30139b4 100644
--- a/src/main/java/org/apache/log4j/db/DBReceiverJob.java
+++ b/src/main/java/org/apache/log4j/db/DBReceiverJob.java
@@ -73,16 +73,16 @@ class DBReceiverJob extends ComponentBase implements Job {
//rs.beforeFirst();
while (rs.next()) {
- Logger logger = null;
- long timeStamp = 0L;
- String level = null;
- String threadName = null;
- Object message = null;
- String ndc = null;
- String className = null;
- String methodName = null;
- String fileName = null;
- String lineNumber = null;
+ Logger logger;
+ long timeStamp;
+ String level;
+ String threadName;
+ Object message;
+ String ndc;
+ String className;
+ String methodName;
+ String fileName;
+ String lineNumber;
Hashtable properties = new Hashtable();
@@ -103,7 +103,7 @@ class DBReceiverJob extends ComponentBase implements Job {
methodName = rs.getString(11);
lineNumber = rs.getString(12).trim();
- LocationInfo locationInfo = null;
+ LocationInfo locationInfo;
if (fileName.equals(LocationInfo.NA)) {
locationInfo = LocationInfo.NA_LOCATION_INFO;
} else {
@@ -144,7 +144,6 @@ class DBReceiverJob extends ComponentBase implements Job {
}
} // while
statement.close();
- statement = null;
} catch (SQLException sqle) {
getLogger().error("Problem receiving events", sqle);
} finally {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java b/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java
index d2d0acd..5f972a9 100644
--- a/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java
+++ b/src/main/java/org/apache/log4j/db/JNDIConnectionSource.java
@@ -84,7 +84,7 @@ public class JNDIConnectionSource
*/
public Connection getConnection()
throws SQLException {
- Connection conn = null;
+ Connection conn;
try {
if(dataSource == null) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/net/JMSReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/JMSReceiver.java b/src/main/java/org/apache/log4j/net/JMSReceiver.java
index d22e25c..1c21da9 100644
--- a/src/main/java/org/apache/log4j/net/JMSReceiver.java
+++ b/src/main/java/org/apache/log4j/net/JMSReceiver.java
@@ -198,7 +198,7 @@ public class JMSReceiver extends Receiver implements MessageListener {
try {
remoteInfo = topicFactoryName + ":" + topicName;
- Context ctx = null;
+ Context ctx;
if (jndiPath == null || jndiPath.equals("")) {
ctx = new InitialContext();
} else {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/net/SocketNode13.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/SocketNode13.java b/src/main/java/org/apache/log4j/net/SocketNode13.java
index cc9e1d0..fb7a585 100644
--- a/src/main/java/org/apache/log4j/net/SocketNode13.java
+++ b/src/main/java/org/apache/log4j/net/SocketNode13.java
@@ -144,7 +144,7 @@ public class SocketNode13 extends ComponentBase implements Runnable, Pauseable {
LoggingEvent event;
Logger remoteLogger;
Exception listenerException = null;
- ObjectInputStream ois = null;
+ ObjectInputStream ois;
try {
ois =
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 09a3238..b6b0c53 100644
--- a/src/main/java/org/apache/log4j/net/XMLSocketNode.java
+++ b/src/main/java/org/apache/log4j/net/XMLSocketNode.java
@@ -98,10 +98,9 @@ public class XMLSocketNode extends ComponentBase implements Runnable {
public void run() {
Logger remoteLogger;
Exception listenerException = null;
- InputStream is = null;
+ InputStream is;
if ((this.receiver == null) || (this.decoder == null)) {
- is = null;
listenerException =
new Exception(
"No receiver or decoder provided. Cannot process xml socket events");
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
index 4fcd3d0..ad60a89 100644
--- a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
+++ b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
@@ -282,7 +282,6 @@ public class XMLSocketReceiver extends Receiver implements Runnable, PortBased,
XMLSocketNode node = new XMLSocketNode(decoder, socket, this);
node.setLoggerRepository(this.repository);
new Thread(node).start();
- socket = null;
}
getLogger().debug("waiting to accept socket");
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 34853b9..a73ab59 100644
--- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
@@ -912,16 +912,16 @@ public class LogFilePatternReceiver extends Receiver {
exception = emptyException;
}
- Logger logger = null;
+ Logger logger;
long timeStamp = 0L;
- String level = null;
- String threadName = null;
- Object message = null;
- String ndc = null;
- String className = null;
- String methodName = null;
- String eventFileName = null;
- String lineNumber = null;
+ String level;
+ String threadName;
+ Object message;
+ String ndc;
+ String className;
+ String methodName;
+ String eventFileName;
+ String lineNumber;
Hashtable properties = new Hashtable();
logger = Logger.getLogger((String) fieldMap.remove(LOGGER));
@@ -987,7 +987,7 @@ public class LogFilePatternReceiver extends Receiver {
//all remaining entries in fieldmap are properties
properties.putAll(fieldMap);
- LocationInfo info = null;
+ LocationInfo info;
if ((eventFileName != null) || (className != null) || (methodName != null)
|| (lineNumber != null)) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java
index ab73627..c725467 100644
--- a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java
+++ b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java
@@ -239,7 +239,7 @@ public class LogFileXMLReceiver extends Receiver {
BufferedReader bufferedReader = new BufferedReader(unbufferedReader);
char[] content = new char[10000];
getLogger().debug("processing starting: " + fileURL);
- int length = 0;
+ int length;
do {
System.out.println("in do loop-about to process");
while ((length = bufferedReader.read(content)) > -1) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/82725cc9/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 f13dea2..6395a23 100644
--- a/src/main/java/org/apache/log4j/xml/XMLDecoder.java
+++ b/src/main/java/org/apache/log4j/xml/XMLDecoder.java
@@ -236,7 +236,7 @@ public class XMLDecoder implements Decoder {
if (document.trim().equals("")) {
return null;
}
- String newDoc = null;
+ String newDoc;
String newPartialEvent = null;
//separate the string into the last portion ending with
// </log4j:event> (which will be processed) and the
[4/5] logging-chainsaw git commit: Simplify JDBC expression for
updated JDK
Posted by ma...@apache.org.
Simplify JDBC expression for updated JDK
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/3250bb1c
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/3250bb1c
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/3250bb1c
Branch: refs/heads/master
Commit: 3250bb1c491642c9849d5c0c6d027d179b5f9a4e
Parents: 82725cc
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 13 01:17:38 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 13 01:20:13 2018 -0500
----------------------------------------------------------------------
.../java/org/apache/log4j/db/DBAppender.java | 27 +++-----------------
.../java/org/apache/log4j/db/dialect/Util.java | 5 +---
2 files changed, 4 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3250bb1c/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 a9e728f..4f116c5 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -122,7 +122,6 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
static final String insertExceptionSQL =
"INSERT INTO logging_event_exception (event_id, i, trace_line) VALUES (?, ?, ?)";
static final String insertSQL;
- private static final Method GET_GENERATED_KEYS_METHOD;
static {
@@ -141,16 +140,6 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
"caller_line) " +
" VALUES (?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?)";
insertSQL = sql;
- //
- // PreparedStatement.getGeneratedKeys added in JDK 1.4
- //
- Method getGeneratedKeysMethod;
- try {
- getGeneratedKeysMethod = PreparedStatement.class.getMethod("getGeneratedKeys");
- } catch(Exception ex) {
- getGeneratedKeysMethod = null;
- }
- GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod;
}
ConnectionSource connectionSource;
@@ -173,7 +162,7 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
}
sqlDialect = Util.getDialectFromCode(connectionSource.getSQLDialectCode());
- cnxSupportsGetGeneratedKeys = GET_GENERATED_KEYS_METHOD != null && connectionSource.supportsGetGeneratedKeys();
+ cnxSupportsGetGeneratedKeys = connectionSource.supportsGetGeneratedKeys();
cnxSupportsBatchUpdates = connectionSource.supportsBatchUpdates();
if (!cnxSupportsGetGeneratedKeys && (sqlDialect == null)) {
throw new IllegalStateException(
@@ -246,18 +235,8 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
Statement idStatement = null;
boolean gotGeneratedKeys = false;
if (cnxSupportsGetGeneratedKeys) {
- try {
- rs = (ResultSet) GET_GENERATED_KEYS_METHOD.invoke(insertStatement);
- gotGeneratedKeys = true;
- } catch(InvocationTargetException ex) {
- Throwable target = ex.getTargetException();
- if (target instanceof SQLException) {
- throw (SQLException) target;
- }
- throw ex;
- } catch(IllegalAccessException ex) {
- LogLog.warn("IllegalAccessException invoking PreparedStatement.getGeneratedKeys", ex);
- }
+ rs = insertStatement.getGeneratedKeys();
+ gotGeneratedKeys = true;
}
if (!gotGeneratedKeys) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/3250bb1c/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 c0cd503..ff308e8 100644
--- a/src/main/java/org/apache/log4j/db/dialect/Util.java
+++ b/src/main/java/org/apache/log4j/db/dialect/Util.java
@@ -99,10 +99,7 @@ public class Util extends ComponentBase {
*/
public boolean supportsGetGeneratedKeys(DatabaseMetaData meta) {
try {
- //
- // invoking JDK 1.4 method by reflection
- //
- return (Boolean) DatabaseMetaData.class.getMethod("supportsGetGeneratedKeys").invoke(meta);
+ return meta.supportsGetGeneratedKeys();
} catch(Throwable e) {
getLogger().info("Could not call supportsGetGeneratedKeys method. This may be recoverable");
return false;
[2/5] logging-chainsaw git commit: Fix magic constant usage
Posted by ma...@apache.org.
Fix magic constant usage
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/2e18dc25
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/2e18dc25
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/2e18dc25
Branch: refs/heads/master
Commit: 2e18dc259c6870a1004002a650e51fd351490365
Parents: 45687c9
Author: Matt Sicker <bo...@gmail.com>
Authored: Tue Mar 13 01:09:52 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Tue Mar 13 01:09:52 2018 -0500
----------------------------------------------------------------------
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 6 +++---
.../org/apache/log4j/chainsaw/ProgressPanel.java | 2 +-
.../log4j/chainsaw/ReceiverConfigurationPanel.java | 16 ++--------------
.../log4j/chainsaw/zeroconf/ZeroConfPlugin.java | 14 ++------------
4 files changed, 8 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2e18dc25/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 7615a54..7454f89 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -817,15 +817,15 @@ e.printStackTrace();
Action gotoLine =
new AbstractAction() {
public void actionPerformed(ActionEvent e) {
- String inputLine = JOptionPane.showInputDialog(LogUI.this, "Enter the line number to go:", "Goto Line", -1);
+ String inputLine = JOptionPane.showInputDialog(LogUI.this, "Enter the line number to go:", "Goto Line", JOptionPane.PLAIN_MESSAGE);
try {
int lineNumber = Integer.parseInt(inputLine);
int row = getCurrentLogPanel().setSelectedEvent(lineNumber);
if (row == -1) {
- JOptionPane.showMessageDialog(LogUI.this, "You have entered an invalid line number", "Error", 0);
+ JOptionPane.showMessageDialog(LogUI.this, "You have entered an invalid line number", "Error", JOptionPane.ERROR_MESSAGE);
}
} catch (NumberFormatException nfe) {
- JOptionPane.showMessageDialog(LogUI.this, "You have entered an invalid line number", "Error", 0);
+ JOptionPane.showMessageDialog(LogUI.this, "You have entered an invalid line number", "Error", JOptionPane.ERROR_MESSAGE);
}
}
};
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2e18dc25/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java b/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
index 23800b2..e78bd82 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ProgressPanel.java
@@ -43,7 +43,7 @@ public class ProgressPanel extends JPanel {
ProgressPanel(int min, int max, String msg) {
this.progressBar = new JProgressBar(min, max);
setBorder(BorderFactory.createLineBorder(Color.black, 1));
- messageLabel.setHorizontalAlignment(SwingConstants.HORIZONTAL);
+ messageLabel.setHorizontalAlignment(SwingConstants.CENTER);
messageLabel.setText(msg);
setLayout(new BorderLayout());
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2e18dc25/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
index aa9aaf1..7244179 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
@@ -35,19 +35,7 @@ import java.net.URL;
import java.util.List;
import java.util.Locale;
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
+import javax.swing.*;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import javax.swing.text.StyledDocument;
@@ -676,7 +664,7 @@ class ReceiverConfigurationPanel extends JPanel {
JFrame frame = new JFrame();
frame.getContentPane().add(new ReceiverConfigurationPanel());
- frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.pack();
frame.setVisible(true);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/2e18dc25/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 de5ec14..89c16a5 100644
--- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
+++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
@@ -34,17 +34,7 @@ import javax.jmdns.JmDNS;
import javax.jmdns.ServiceEvent;
import javax.jmdns.ServiceInfo;
import javax.jmdns.ServiceListener;
-import javax.swing.AbstractAction;
-import javax.swing.ImageIcon;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.JToolBar;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.LogManager;
@@ -608,7 +598,7 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
JFrame frame = new JFrame();
- frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.getContentPane().setLayout(new BorderLayout());
frame.getContentPane().add(plugin, BorderLayout.CENTER);