[3/3] git commit: Add more type safety.

[Gary Gregory]

-1. This is backwards:

-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
+import java.awt.*;

We do _not_ want * imports for normal imports, only for special cases like
static imports of JUnit Assert methods.

Gary

---------- Forwarded message ----------
From: <***@apache.org>
Date: Sat, Oct 4, 2014 at 7:55 PM
Subject: [3/3] git commit: Add more type safety.
To: ***@logging.apache.org


Add more type safety.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit:
http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/85f586c9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/85f586c9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/85f586c9

Branch: refs/heads/master
Commit: 85f586c99514cf5bc73586d2d078fe0237581ad7
Parents: 16045e6
Author: Matt Sicker <***@apache.org>
Authored: Sat Oct 4 18:55:28 2014 -0500
Committer: Matt Sicker <***@apache.org>
Committed: Sat Oct 4 18:55:28 2014 -0500

----------------------------------------------------------------------
.../apache/logging/log4j/jmx/gui/ClientGui.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/85f586c9/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
----------------------------------------------------------------------
diff --git
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
index 0215fb5..b36cc67 100644
---
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
+++
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
@@ -16,17 +16,14 @@
*/
package org.apache.logging.log4j.jmx.gui;

-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
-
+import java.util.Properties;
import javax.management.InstanceNotFoundException;
import javax.management.JMException;
import javax.management.ListenerNotFoundException;
@@ -177,7 +174,12 @@ public class ClientGui extends JPanel implements
NotificationListener {

private void handleNotificationInAwtEventThread(final Notification
notif, final Object paramObject) {
if
(StatusLoggerAdminMBean.NOTIF_TYPE_MESSAGE.equals(notif.getType())) {
- final JTextArea text = statusLogTextAreaMap.get(paramObject);
+ if (!(paramObject instanceof ObjectName)) {
+ handle("Invalid notification object type", new
ClassCastException(paramObject.getClass().getName()));
+ return;
+ }
+ final ObjectName param = (ObjectName) paramObject;
+ final JTextArea text = statusLogTextAreaMap.get(param);
if (text != null) {
text.append(notif.getMessage() + '\n');
}
@@ -258,10 +260,10 @@ public class ClientGui extends JPanel implements
NotificationListener {
serviceUrl = "service:jmx:rmi:///jndi/rmi://" + args[0] +
"/jmxrmi";
}
final JMXServiceURL url = new JMXServiceURL(serviceUrl);
- final Map<String, String> paramMap = new HashMap<String, String>();
- for (final Object objKey : System.getProperties().keySet()) {
- final String key = (String) objKey;
- paramMap.put(key, System.getProperties().getProperty(key));
+ final Properties props = System.getProperties();
+ final Map<String, String> paramMap = new HashMap<String,
String>(props.size());
+ for (final String key : props.stringPropertyNames()) {
+ paramMap.put(key, props.getProperty(key));
}
final JMXConnector connector = JMXConnectorFactory.connect(url,
paramMap);
final Client client = new Client(connector);

[Matt Sicker]

My IDE settings must be messed up. Let me look into this. Thanks for
noticing, though!

Post by Gary Gregory
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
+import java.awt.*;
We do _not_ want * imports for normal imports, only for special cases like
static imports of JUnit Assert methods.
Gary
---------- Forwarded message ----------
Date: Sat, Oct 4, 2014 at 7:55 PM
Subject: [3/3] git commit: Add more type safety.
Add more type safety.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/85f586c9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/85f586c9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/85f586c9
Branch: refs/heads/master
Commit: 85f586c99514cf5bc73586d2d078fe0237581ad7
Parents: 16045e6
Authored: Sat Oct 4 18:55:28 2014 -0500
Committed: Sat Oct 4 18:55:28 2014 -0500
----------------------------------------------------------------------
.../apache/logging/log4j/jmx/gui/ClientGui.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/85f586c9/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
----------------------------------------------------------------------
diff --git
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
index 0215fb5..b36cc67 100644
---
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
+++
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
@@ -16,17 +16,14 @@
*/
package org.apache.logging.log4j.jmx.gui;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
-
+import java.util.Properties;
import javax.management.InstanceNotFoundException;
import javax.management.JMException;
import javax.management.ListenerNotFoundException;
@@ -177,7 +174,12 @@ public class ClientGui extends JPanel implements
NotificationListener {
private void handleNotificationInAwtEventThread(final Notification
notif, final Object paramObject) {
if
(StatusLoggerAdminMBean.NOTIF_TYPE_MESSAGE.equals(notif.getType())) {
- final JTextArea text = statusLogTextAreaMap.get(paramObject);
+ if (!(paramObject instanceof ObjectName)) {
+ handle("Invalid notification object type", new
ClassCastException(paramObject.getClass().getName()));
+ return;
+ }
+ final ObjectName param = (ObjectName) paramObject;
+ final JTextArea text = statusLogTextAreaMap.get(param);
if (text != null) {
text.append(notif.getMessage() + '\n');
}
@@ -258,10 +260,10 @@ public class ClientGui extends JPanel implements
NotificationListener {
serviceUrl = "service:jmx:rmi:///jndi/rmi://" + args[0] +
"/jmxrmi";
}
final JMXServiceURL url = new JMXServiceURL(serviceUrl);
- final Map<String, String> paramMap = new HashMap<String, String>();
- for (final Object objKey : System.getProperties().keySet()) {
- final String key = (String) objKey;
- paramMap.put(key, System.getProperties().getProperty(key));
+ final Properties props = System.getProperties();
+ final Map<String, String> paramMap = new HashMap<String,
String>(props.size());
+ for (final String key : props.stringPropertyNames()) {
+ paramMap.put(key, props.getProperty(key));
}
final JMXConnector connector = JMXConnectorFactory.connect(url,
paramMap);
final Client client = new Client(connector);
--
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory

[Gary Gregory]

YW!

G

Post by Matt Sicker
My IDE settings must be messed up. Let me look into this. Thanks for
noticing, though!

Post by Gary Gregory
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
+import java.awt.*;
We do _not_ want * imports for normal imports, only for special cases
like static imports of JUnit Assert methods.
Gary
---------- Forwarded message ----------
Date: Sat, Oct 4, 2014 at 7:55 PM
Subject: [3/3] git commit: Add more type safety.
Add more type safety.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/85f586c9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/85f586c9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/85f586c9
Branch: refs/heads/master
Commit: 85f586c99514cf5bc73586d2d078fe0237581ad7
Parents: 16045e6
Authored: Sat Oct 4 18:55:28 2014 -0500
Committed: Sat Oct 4 18:55:28 2014 -0500
----------------------------------------------------------------------
.../apache/logging/log4j/jmx/gui/ClientGui.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/85f586c9/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
----------------------------------------------------------------------
diff --git
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
index 0215fb5..b36cc67 100644
---
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
+++
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
@@ -16,17 +16,14 @@
*/
package org.apache.logging.log4j.jmx.gui;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
-
+import java.util.Properties;
import javax.management.InstanceNotFoundException;
import javax.management.JMException;
import javax.management.ListenerNotFoundException;
@@ -177,7 +174,12 @@ public class ClientGui extends JPanel implements
NotificationListener {
private void handleNotificationInAwtEventThread(final Notification
notif, final Object paramObject) {
if
(StatusLoggerAdminMBean.NOTIF_TYPE_MESSAGE.equals(notif.getType())) {
- final JTextArea text = statusLogTextAreaMap.get(paramObject);
+ if (!(paramObject instanceof ObjectName)) {
+ handle("Invalid notification object type", new
ClassCastException(paramObject.getClass().getName()));
+ return;
+ }
+ final ObjectName param = (ObjectName) paramObject;
+ final JTextArea text = statusLogTextAreaMap.get(param);
if (text != null) {
text.append(notif.getMessage() + '\n');
}
@@ -258,10 +260,10 @@ public class ClientGui extends JPanel implements
NotificationListener {
serviceUrl = "service:jmx:rmi:///jndi/rmi://" + args[0] +
"/jmxrmi";
}
final JMXServiceURL url = new JMXServiceURL(serviceUrl);
- final Map<String, String> paramMap = new HashMap<String, String>();
- for (final Object objKey : System.getProperties().keySet()) {
- final String key = (String) objKey;
- paramMap.put(key, System.getProperties().getProperty(key));
+ final Properties props = System.getProperties();
+ final Map<String, String> paramMap = new HashMap<String,
String>(props.size());
+ for (final String key : props.stringPropertyNames()) {
+ paramMap.put(key, props.getProperty(key));
}
final JMXConnector connector = JMXConnectorFactory.connect(url,
paramMap);
final Client client = new Client(connector);
--
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory

--

[Remko Popma]

Thanks!

Thanks!

Repository: logging-log4j2
refs/heads/master 5ae0e6c00 -> 85f586c99
Use of constants in JConsole plugin.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1ebbf54b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1ebbf54b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1ebbf54b
Branch: refs/heads/master
Commit: 1ebbf54b4d95f1b19f684521ebf1b84f86e9293c
Parents: 5ae0e6c
Authored: Sat Oct 4 18:40:42 2014 -0500
Committed: Sat Oct 4 18:40:42 2014 -0500
----------------------------------------------------------------------
.../log4j/jmx/gui/ClientEditConfigPanel.java | 3 +--
.../org/apache/logging/log4j/jmx/gui/ClientGui.java | 16 +++-------------
2 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1ebbf54b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
----------------------------------------------------------------------
diff --git
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
index 51d6468..972e0bb 100644
---
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
+++
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
@@ -128,8 +128,7 @@ public class ClientEditConfigPanel extends JPanel {
// configTextArea.setEditable(false);
configTextArea.setBackground(Color.white);
configTextArea.setForeground(Color.black);
- configTextArea.setFont(new Font("Monospaced", Font.PLAIN,
- configTextArea.getFont().getSize()));
+ configTextArea.setFont(new Font(Font.MONOSPACED, Font.PLAIN,
configTextArea.getFont().getSize()));
final JScrollPane scrollConfig = new JScrollPane(configTextArea);
locationTextField = new JTextField(LOCATION_TEXT_COLS);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1ebbf54b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
----------------------------------------------------------------------
diff --git
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
index 67a8018..0215fb5 100644
---
a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
+++
b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGui.java
@@ -40,17 +40,7 @@ import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
-import javax.swing.AbstractAction;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JToggleButton;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
+import javax.swing.*;
import javax.swing.UIManager.LookAndFeelInfo;
import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean;
@@ -142,7 +132,7 @@ public class ClientGui extends JPanel implements
NotificationListener {
result.setEditable(false);
result.setBackground(this.getBackground());
result.setForeground(Color.black);
- result.setFont(new Font("Monospaced", Font.PLAIN,
result.getFont().getSize()));
+ result.setFont(new Font(Font.MONOSPACED, Font.PLAIN,
result.getFont().getSize()));
result.setWrapStyleWord(true);
return result;
}
@@ -284,7 +274,7 @@ public class ClientGui extends JPanel implements
NotificationListener {
try {
final ClientGui gui = new ClientGui(client);
final JFrame frame = new JFrame(title);
- frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.getContentPane().add(gui, BorderLayout.CENTER);
frame.pack();
frame.setVisible(true);