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:41:16 UTC
[1/2] logging-chainsaw git commit: Replace for with for each loops
Repository: logging-chainsaw
Updated Branches:
refs/heads/master c4cfebfcb -> bafd7b676
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java b/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
index 1ac3533..5185985 100644
--- a/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
@@ -70,14 +70,14 @@ class HelpLocator {
URL findResource(String name) {
URL url = null;
- for (Iterator iter = classLoaders.iterator(); iter.hasNext();) {
- ClassLoader loader = (ClassLoader) iter.next();
- url = loader.getResource(name);
+ for (Object classLoader : classLoaders) {
+ ClassLoader loader = (ClassLoader) classLoader;
+ url = loader.getResource(name);
- if (url != null) {
- break;
+ if (url != null) {
+ break;
+ }
}
- }
return url;
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 8f463df..910a541 100644
--- a/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
+++ b/src/main/java/org/apache/log4j/chainsaw/layout/EventDetailLayout.java
@@ -239,11 +239,10 @@ public class EventDetailLayout extends Layout {
Set keySet = event.getPropertyKeySet();
Hashtable hashTable = new Hashtable();
- for (Iterator iter = keySet.iterator(); iter.hasNext();) {
- Object key = iter.next();
- Object value = event.getProperty(key.toString());
- hashTable.put(escape(key.toString()), escape(value.toString()));
- }
+ for (Object key : keySet) {
+ Object value = event.getProperty(key.toString());
+ hashTable.put(escape(key.toString()), escape(value.toString()));
+ }
return hashTable;
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java b/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java
index b96e7c9..6487d4f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java
+++ b/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java
@@ -85,19 +85,18 @@ public class PluginClassLoaderFactory {
throw new RuntimeException(e.getMessage());
}
if (strings !=null) {
- for (int i = 0; i < strings.length; i++) {
- String name = strings[i];
- File file = new File(pluginDirectory, name);
- try {
- list.add(file.toURI().toURL());
- System.out.println("Added " + file.getAbsolutePath()
- + " to Plugin class loader list");
- } catch (Exception e) {
- System.err.println("Failed to retrieve the URL for file: "
- + file.getAbsolutePath());
- throw new RuntimeException(e.getMessage());
- }
- }
+ for (String name : strings) {
+ File file = new File(pluginDirectory, name);
+ try {
+ list.add(file.toURI().toURL());
+ System.out.println("Added " + file.getAbsolutePath()
+ + " to Plugin class loader list");
+ } catch (Exception e) {
+ System.err.println("Failed to retrieve the URL for file: "
+ + file.getAbsolutePath());
+ throw new RuntimeException(e.getMessage());
+ }
+ }
}
ClassLoader parent = PluginClassLoaderFactory.class.getClassLoader();
URL[] urls = (URL[]) list.toArray(new URL[list.size()]);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 a8935a5..70ef23e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/LoadSettingsEvent.java
@@ -65,14 +65,13 @@ public class LoadSettingsEvent extends SettingsEvent {
public Collection getSettingsStartingWith(String string)
{
Collection c = new ArrayList();
-
- for (Iterator iter = properties.entrySet().iterator(); iter.hasNext(); )
- {
- Map.Entry entry = (Map.Entry) iter.next();
- if(entry.getKey().toString().startsWith(string)) {
- c.add(entry.getValue());
+
+ for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) {
+ Map.Entry entry = (Map.Entry) objectObjectEntry;
+ if (entry.getKey().toString().startsWith(string)) {
+ c.add(entry.getValue());
+ }
}
- }
return Collections.unmodifiableCollection(c);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java b/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java
index a389e88..258918f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java
@@ -75,9 +75,9 @@ public class MRUFileList{
ChangeEvent event = null;
EventListener[] eventListeners = listeners.getListeners(ChangeListener.class);
- for (int i = 0; i < eventListeners.length; i++) {
- ChangeListener listener = (ChangeListener) eventListeners[i];
- if(event==null) {
+ for (EventListener eventListener : eventListeners) {
+ ChangeListener listener = (ChangeListener) eventListener;
+ if (event == null) {
event = new ChangeEvent(MRUFileList.class);
}
listener.stateChanged(event);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 f5f91cd..4228882 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java
@@ -118,8 +118,8 @@ public final class SettingsManager {
private void loadProfileableSettings() {
EventListener[] listeners = listenerList.getListeners(SettingsListener.class);
- for (int i = 0; i < listeners.length; i++) {
- SettingsListener settingsListener = (SettingsListener) listeners[i];
+ for (EventListener listener : listeners) {
+ SettingsListener settingsListener = (SettingsListener) listener;
if (settingsListener instanceof Profileable) {
Profileable p = (Profileable) settingsListener;
@@ -187,8 +187,8 @@ public final class SettingsManager {
EventListener[] listeners = listenerList.getListeners(SettingsListener.class);
LoadSettingsEvent event = null;
- for (int i = 0; i < listeners.length; i++) {
- SettingsListener settingsListener = (SettingsListener) listeners[i];
+ for (EventListener listener : listeners) {
+ SettingsListener settingsListener = (SettingsListener) listener;
if (event == null) {
Properties loadedProperties = loadGlobalProperties();
@@ -231,8 +231,8 @@ public final class SettingsManager {
EventListener[] listeners = listenerList.getListeners(SettingsListener.class);
SaveSettingsEvent event = null;
- for (int i = 0; i < listeners.length; i++) {
- SettingsListener settingsListener = (SettingsListener) listeners[i];
+ for (EventListener listener : listeners) {
+ SettingsListener settingsListener = (SettingsListener) listener;
if (settingsListener instanceof Profileable) {
Profileable profileable = (Profileable) settingsListener;
@@ -244,8 +244,8 @@ public final class SettingsManager {
try {
os = new BufferedOutputStream(new FileOutputStream(
- new File(settingsDir,
- URLEncoder.encode(profileable.getNamespace()) + ".properties")));
+ new File(settingsDir,
+ URLEncoder.encode(profileable.getNamespace()) + ".properties")));
event.getProperties().store(os, HEADER);
} catch (Exception e) {
e.printStackTrace();
@@ -266,8 +266,8 @@ public final class SettingsManager {
EventListener[] listeners = listenerList.getListeners(SettingsListener.class);
SaveSettingsEvent event = null;
- for (int i = 0; i < listeners.length; i++) {
- SettingsListener settingsListener = (SettingsListener) listeners[i];
+ for (EventListener listener : listeners) {
+ SettingsListener settingsListener = (SettingsListener) listener;
if (!(settingsListener instanceof Profileable)) {
if (event == null) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 9837481..9da4688 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversHelper.java
@@ -137,12 +137,12 @@ public class ReceiversHelper {
PluginRegistry pluginRegistry = ((LoggerRepositoryEx) repo).getPluginRegistry();
List fullPluginList = pluginRegistry.getPlugins();
List pluginList = new ArrayList();
- for (Iterator iter = fullPluginList.iterator();iter.hasNext();) {
- Plugin thisPlugin = (Plugin)iter.next();
- if (thisPlugin instanceof Receiver) {
- pluginList.add(thisPlugin);
- }
- }
+ for (Object aFullPluginList : fullPluginList) {
+ Plugin thisPlugin = (Plugin) aFullPluginList;
+ if (thisPlugin instanceof Receiver) {
+ pluginList.add(thisPlugin);
+ }
+ }
//remove everything that isn't a receiver..otherwise, we'd create an empty config file
try {
if (pluginList.size() > 0) {
@@ -156,11 +156,11 @@ public class ReceiversHelper {
rootElement.setAttribute("xmlns:log4j", "http://jakarta.apache.org/log4j/");
rootElement.setAttribute("debug", "true");
- for (int i = 0; i < pluginList.size(); i++) {
+ for (Object aPluginList : pluginList) {
Receiver receiver;
- if (pluginList.get(i) instanceof Receiver) {
- receiver = (Receiver) pluginList.get(i);
+ if (aPluginList instanceof Receiver) {
+ receiver = (Receiver) aPluginList;
} else {
continue;
}
@@ -172,8 +172,8 @@ public class ReceiversHelper {
BeanInfo beanInfo = Introspector.getBeanInfo(receiver.getClass());
List list = new ArrayList(Arrays.asList(beanInfo.getPropertyDescriptors()));
- for (int j = 0; j < list.size(); j++) {
- PropertyDescriptor d = (PropertyDescriptor) list.get(j);
+ for (Object aList : list) {
+ PropertyDescriptor d = (PropertyDescriptor) aList;
//don't serialize the loggerRepository property for subclasses of componentbase..
//easier to change this than tweak componentbase right now..
if (d.getReadMethod().getName().equals("getLoggerRepository")) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 884adf6..150ef80 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -124,9 +124,9 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
//iterate over visual receivers and call setcontainer
Collection c = pluginRegistry.getPlugins(VisualReceiver.class);
- for (Iterator iter = c.iterator();iter.hasNext();) {
- ((VisualReceiver)iter.next()).setContainer(this);
- }
+ for (Object aC : c) {
+ ((VisualReceiver) aC).setContainer(this);
+ }
pluginRegistry.addPluginListener(new PluginListener() {
public void pluginStarted(PluginEvent e) {
@@ -357,12 +357,11 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
Collection allReceivers =
pluginRegistry.getPlugins(Receiver.class);
- for (Iterator iter = allReceivers.iterator();
- iter.hasNext();) {
- Receiver item = (Receiver) iter.next();
- item.shutdown();
- item.activateOptions();
- }
+ for (Object allReceiver : allReceivers) {
+ Receiver item = (Receiver) allReceiver;
+ item.shutdown();
+ item.activateOptions();
+ }
updateReceiverTreeInDispatchThread();
MessageCenter.getInstance().getLogger().info(
@@ -422,10 +421,10 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
List socketReceivers =
pluginRegistry.getPlugins(SocketReceiver.class);
- for (Iterator iter = socketReceivers.iterator(); iter.hasNext();) {
- SocketReceiver element = (SocketReceiver) iter.next();
- element.addSocketNodeEventListener(listener);
- }
+ for (Object socketReceiver : socketReceivers) {
+ SocketReceiver element = (SocketReceiver) socketReceiver;
+ element.addSocketNodeEventListener(listener);
+ }
}
}
@@ -489,15 +488,14 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
TreePath[] paths = receiversTree.getSelectionPaths();
Collection receivers = new ArrayList();
- for (int i = 0; i < paths.length; i++) {
- TreePath path = paths[i];
- DefaultMutableTreeNode node =
- (DefaultMutableTreeNode) path.getLastPathComponent();
+ for (TreePath path : paths) {
+ DefaultMutableTreeNode node =
+ (DefaultMutableTreeNode) path.getLastPathComponent();
- if ((node != null) && node.getUserObject() instanceof Receiver) {
- receivers.add(node.getUserObject());
+ if ((node != null) && node.getUserObject() instanceof Receiver) {
+ receivers.add(node.getUserObject());
+ }
}
- }
return (Receiver[]) receivers.toArray(new Receiver[0]);
}
@@ -580,9 +578,9 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
Receiver[] receivers = getSelectedReceivers();
if (receivers != null) {
- for (int i = 0; i < receivers.length; i++) {
- pluginRegistry.stopPlugin(receivers[i].getName());
- }
+ for (Receiver receiver : receivers) {
+ pluginRegistry.stopPlugin(receiver.getName());
+ }
}
}
}).start();
@@ -673,70 +671,70 @@ public class ReceiversPanel extends JPanel implements SettingsListener {
ReceiversHelper.getInstance().getKnownReceiverClasses();
String separatorCheck = null;
- for (Iterator iter = receiverList.iterator(); iter.hasNext();) {
- final Class toCreate = (Class) iter.next();
- Package thePackage = toCreate.getPackage();
- final String name =
- toCreate.getName().substring(thePackage.getName().length() + 1);
+ for (Object aReceiverList : receiverList) {
+ final Class toCreate = (Class) aReceiverList;
+ Package thePackage = toCreate.getPackage();
+ final String name =
+ toCreate.getName().substring(thePackage.getName().length() + 1);
- if (separatorCheck == null) {
- separatorCheck = name.substring(0, 1);
- } else {
- String current = name.substring(0, 1);
+ if (separatorCheck == null) {
+ separatorCheck = name.substring(0, 1);
+ } else {
+ String current = name.substring(0, 1);
- if (!current.equals(separatorCheck)) {
- addSeparator();
- separatorCheck = current;
- }
- }
-
- add(
- new AbstractAction("New " + name + "...") {
- public void actionPerformed(ActionEvent e) {
- Container container = SwingUtilities.getAncestorOfClass(JFrame.class, ReceiversPanel.this);
- final JDialog dialog = new JDialog((JFrame) container,"New " + toCreate.getName() + "..." ,true);
-
- try {
- final NewReceiverDialogPanel panel =
- NewReceiverDialogPanel.create(toCreate);
- dialog.getContentPane().add(panel);
- dialog.pack();
- SwingHelper.centerOnScreen(dialog);
-
- /**
- * Make the default button the ok button
- */
- dialog.getRootPane().setDefaultButton(panel.getOkPanel().getOkButton());
-
- /**
- * Use the standard Cancel metaphor
- */
- SwingHelper.configureCancelForDialog(dialog, panel.getOkPanel().getCancelButton());
-
-
- panel.getOkPanel().getOkButton().addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent e2) {
- Plugin plugin = panel.getPlugin();
- if (plugin.getName() != null && !plugin.getName().trim().equals("")) {
- dialog.dispose();
- pluginRegistry.addPlugin(plugin);
- plugin.activateOptions();
- MessageCenter.getInstance().addMessage("Plugin '" + plugin.getName() + "' started");
- } else {
- MessageCenter.getInstance().getLogger().error("Name required to create receiver");
- }
- }
- });
- dialog.setVisible(true);
- } catch (Exception e1) {
- e1.printStackTrace();
- MessageCenter.getInstance().getLogger().error(
- "Failed to create the new Receiver dialog", e1);
- }
+ if (!current.equals(separatorCheck)) {
+ addSeparator();
+ separatorCheck = current;
+ }
}
- });
- }
+
+ add(
+ new AbstractAction("New " + name + "...") {
+ public void actionPerformed(ActionEvent e) {
+ Container container = SwingUtilities.getAncestorOfClass(JFrame.class, ReceiversPanel.this);
+ final JDialog dialog = new JDialog((JFrame) container, "New " + toCreate.getName() + "...", true);
+
+ try {
+ final NewReceiverDialogPanel panel =
+ NewReceiverDialogPanel.create(toCreate);
+ dialog.getContentPane().add(panel);
+ dialog.pack();
+ SwingHelper.centerOnScreen(dialog);
+
+ /**
+ * Make the default button the ok button
+ */
+ dialog.getRootPane().setDefaultButton(panel.getOkPanel().getOkButton());
+
+ /**
+ * Use the standard Cancel metaphor
+ */
+ SwingHelper.configureCancelForDialog(dialog, panel.getOkPanel().getCancelButton());
+
+
+ panel.getOkPanel().getOkButton().addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e2) {
+ Plugin plugin = panel.getPlugin();
+ if (plugin.getName() != null && !plugin.getName().trim().equals("")) {
+ dialog.dispose();
+ pluginRegistry.addPlugin(plugin);
+ plugin.activateOptions();
+ MessageCenter.getInstance().addMessage("Plugin '" + plugin.getName() + "' started");
+ } else {
+ MessageCenter.getInstance().getLogger().error("Name required to create receiver");
+ }
+ }
+ });
+ dialog.setVisible(true);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ MessageCenter.getInstance().getLogger().error(
+ "Failed to create the new Receiver dialog", e1);
+ }
+ }
+ });
+ }
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e.getMessage());
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java
index ad2cc9f..e0d3f7e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java
@@ -81,23 +81,19 @@ public class ReceiversTreeModel extends DefaultTreeModel
if (receivers.size() == 0) {
getRootNode().add(NoReceiversNode);
} else {
- for (Iterator iter = receivers.iterator(); iter.hasNext();) {
- final Receiver item = (Receiver) iter.next();
- final DefaultMutableTreeNode receiverNode = new DefaultMutableTreeNode(item);
-
- item.addPropertyChangeListener(creatPluginPropertyChangeListener(item, receiverNode));
- if (item instanceof SocketReceiver) {
- for (
- Iterator iterator =
- ((SocketReceiver) item).getConnectedSocketDetails().iterator();
- iterator.hasNext();) {
- Object details = iterator.next();
- receiverNode.add(new DefaultMutableTreeNode(details));
- }
+ for (Object receiver : receivers) {
+ final Receiver item = (Receiver) receiver;
+ final DefaultMutableTreeNode receiverNode = new DefaultMutableTreeNode(item);
+
+ item.addPropertyChangeListener(creatPluginPropertyChangeListener(item, receiverNode));
+ if (item instanceof SocketReceiver) {
+ for (Object details : ((SocketReceiver) item).getConnectedSocketDetails()) {
+ receiverNode.add(new DefaultMutableTreeNode(details));
+ }
+ }
+
+ getRootNode().add(receiverNode);
}
-
- getRootNode().add(receiverNode);
- }
}
reload();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 895a8d2..318ea57 100644
--- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
+++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
@@ -219,8 +219,8 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
serviceNames.add(TCP_APPENDER_SERVICE_NAME);
serviceNames.add(NEW_UDP_APPENDER_SERVICE_NAME);
- for (Iterator iter = serviceNames.iterator(); iter.hasNext();) {
- String serviceName = iter.next().toString();
+ for (Object serviceName1 : serviceNames) {
+ String serviceName = serviceName1.toString();
jmDNS.addServiceListener(
serviceName,
new ZeroConfServiceListener());
@@ -339,10 +339,9 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
*/
private void deviceRemoved(String name) {
Component[] menuComponents = connectToMenu.getMenuComponents();
- for (int i = 0; i < menuComponents.length; i++) {
- Component c = menuComponents[i];
+ for (Component c : menuComponents) {
if (!(c instanceof JPopupMenu.Separator)) {
- JMenuItem item = (JMenuItem) menuComponents[i];
+ JMenuItem item = (JMenuItem) c;
if (item.getText().compareToIgnoreCase(name) == 0) {
connectToMenu.remove(item);
break;
@@ -600,10 +599,9 @@ public class ZeroConfPlugin extends GUIPluginSkeleton {
*/
private JMenuItem locateMatchingMenuItem(String name) {
Component[] menuComponents = connectToMenu.getMenuComponents();
- for (int i = 0; i < menuComponents.length; i++) {
- Component c = menuComponents[i];
+ for (Component c : menuComponents) {
if (!(c instanceof JPopupMenu.Separator)) {
- JMenuItem item = (JMenuItem) menuComponents[i];
+ JMenuItem item = (JMenuItem) c;
if (item.getText().compareToIgnoreCase(name) == 0) {
return item;
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 e87132e..bdb162f 100644
--- a/src/main/java/org/apache/log4j/db/DBAppender.java
+++ b/src/main/java/org/apache/log4j/db/DBAppender.java
@@ -298,16 +298,16 @@ public class DBAppender extends AppenderSkeleton implements UnrecognizedElementH
if (propertiesKeys.size() > 0) {
PreparedStatement insertPropertiesStatement =
connection.prepareStatement(insertPropertiesSQL);
-
- for (Iterator i = propertiesKeys.iterator(); i.hasNext();) {
- String key = (String) i.next();
+
+ for (Object propertiesKey : propertiesKeys) {
+ String key = (String) propertiesKey;
String value = event.getProperty(key);
-
+
//LogLog.info("id " + eventId + ", key " + key + ", value " + value);
insertPropertiesStatement.setInt(1, eventId);
insertPropertiesStatement.setString(2, key);
insertPropertiesStatement.setString(3, value);
-
+
if (cnxSupportsBatchUpdates) {
insertPropertiesStatement.addBatch();
} else {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/net/MulticastAppender.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/net/MulticastAppender.java b/src/main/java/org/apache/log4j/net/MulticastAppender.java
index 039224d..4b0f16a 100644
--- a/src/main/java/org/apache/log4j/net/MulticastAppender.java
+++ b/src/main/java/org/apache/log4j/net/MulticastAppender.java
@@ -23,7 +23,6 @@ import java.net.InetAddress;
import java.net.MulticastSocket;
import java.net.UnknownHostException;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.Map;
import org.apache.log4j.AppenderSkeleton;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 85058e8..ca06b70 100644
--- a/src/main/java/org/apache/log4j/net/SocketHubReceiver.java
+++ b/src/main/java/org/apache/log4j/net/SocketHubReceiver.java
@@ -319,9 +319,9 @@ extends Receiver implements SocketNodeEventListener, PortBased {
socketNode.addSocketNodeEventListener(this);
synchronized (listenerList) {
- for (Iterator iter = listenerList.iterator(); iter.hasNext();) {
+ for (Object aListenerList : listenerList) {
SocketNodeEventListener listener =
- (SocketNodeEventListener) iter.next();
+ (SocketNodeEventListener) aListenerList;
socketNode.addSocketNodeEventListener(listener);
}
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 e27c68e..a8cf374 100644
--- a/src/main/java/org/apache/log4j/net/SocketNode13.java
+++ b/src/main/java/org/apache/log4j/net/SocketNode13.java
@@ -237,9 +237,9 @@ public class SocketNode13 extends ComponentBase implements Runnable, Pauseable {
*/
private void fireSocketClosedEvent(final Exception listenerException) {
synchronized (listenerList) {
- for (Iterator iter = listenerList.iterator(); iter.hasNext();) {
+ for (Object aListenerList : listenerList) {
SocketNodeEventListener snel =
- (SocketNodeEventListener) iter.next();
+ (SocketNodeEventListener) aListenerList;
if (snel != null) {
snel.socketClosedEvent(listenerException);
}
@@ -253,9 +253,9 @@ public class SocketNode13 extends ComponentBase implements Runnable, Pauseable {
*/
private void fireSocketOpened(final String remoteInfo) {
synchronized (listenerList) {
- for (Iterator iter = listenerList.iterator(); iter.hasNext();) {
+ for (Object aListenerList : listenerList) {
SocketNodeEventListener snel =
- (SocketNodeEventListener) iter.next();
+ (SocketNodeEventListener) aListenerList;
if (snel != null) {
snel.socketOpened(remoteInfo);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 9d4aac9..78263ab 100644
--- a/src/main/java/org/apache/log4j/net/SocketReceiver.java
+++ b/src/main/java/org/apache/log4j/net/SocketReceiver.java
@@ -223,13 +223,13 @@ public class SocketReceiver extends Receiver implements Runnable, PortBased,
* Closes all the connected sockets in the List.
*/
private synchronized void closeAllAcceptedSockets() {
- for (int x = 0; x < socketList.size(); x++) {
- try {
- ((Socket) socketList.get(x)).close();
- } catch (Exception e) {
- // ignore for now
+ for (Object aSocketList : socketList) {
+ try {
+ ((Socket) aSocketList).close();
+ } catch (Exception e) {
+ // ignore for now
+ }
}
- }
// clear member variables
socketMap.clear();
@@ -289,12 +289,11 @@ public class SocketReceiver extends Receiver implements Runnable, PortBased,
SocketNode13 node = new SocketNode13(socket, this);
synchronized (listenerList) {
- for (Iterator iter = listenerList.iterator();
- iter.hasNext();) {
- SocketNodeEventListener l =
- (SocketNodeEventListener) iter.next();
- node.addSocketNodeEventListener(l);
- }
+ for (Object aListenerList : listenerList) {
+ SocketNodeEventListener l =
+ (SocketNodeEventListener) aListenerList;
+ node.addSocketNodeEventListener(l);
+ }
}
socketMap.put(socket, node);
new Thread(node).start();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 55a1c01..4fcd3d0 100644
--- a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
+++ b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
@@ -229,13 +229,13 @@ public class XMLSocketReceiver extends Receiver implements Runnable, PortBased,
* Closes all the connected sockets in the List.
*/
private synchronized void closeAllAcceptedSockets() {
- for (int x = 0; x < socketList.size(); x++) {
- try {
- ((Socket) socketList.get(x)).close();
- } catch (Exception e) {
- // ignore for now
+ for (Object aSocketList : socketList) {
+ try {
+ ((Socket) aSocketList).close();
+ } catch (Exception e) {
+ // ignore for now
+ }
}
- }
// clear member variables
socketList.clear();
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/plugins/PluginRegistry.java b/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
index d34f885..a043a18 100644
--- a/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
+++ b/src/main/java/org/apache/log4j/plugins/PluginRegistry.java
@@ -127,8 +127,8 @@ public final class PluginRegistry {
private void firePluginStarted(final Plugin plugin) {
PluginEvent e = null;
synchronized (listenerList) {
- for (Iterator iter = listenerList.iterator(); iter.hasNext();) {
- PluginListener l = (PluginListener) iter.next();
+ for (Object aListenerList : listenerList) {
+ PluginListener l = (PluginListener) aListenerList;
if (e == null) {
e = new PluginEvent(plugin);
}
@@ -146,8 +146,8 @@ public final class PluginRegistry {
private void firePluginStopped(final Plugin plugin) {
PluginEvent e = null;
synchronized (listenerList) {
- for (Iterator iter = listenerList.iterator(); iter.hasNext();) {
- PluginListener l = (PluginListener) iter.next();
+ for (Object aListenerList : listenerList) {
+ PluginListener l = (PluginListener) aListenerList;
if (e == null) {
e = new PluginEvent(plugin);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java b/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
index 4fca465..f5a3da8 100644
--- a/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
+++ b/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
@@ -57,10 +57,8 @@ public class MapRewritePolicy implements RewritePolicy {
newMsg = msg;
}
- for(Iterator iter = eventProps.entrySet().iterator();
- iter.hasNext();
- ) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Object o : eventProps.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
if (!("message".equals(entry.getKey()))) {
props.put(entry.getKey(), entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java b/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
index 535736c..2fb88ae 100644
--- a/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
+++ b/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
@@ -64,10 +64,8 @@ public class PropertyRewritePolicy implements RewritePolicy {
public LoggingEvent rewrite(final LoggingEvent source) {
if (!properties.isEmpty()) {
Map rewriteProps = new HashMap(source.getProperties());
- for(Iterator iter = properties.entrySet().iterator();
- iter.hasNext();
- ) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Object o : properties.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
if (!rewriteProps.containsKey(entry.getKey())) {
rewriteProps.put(entry.getKey(), entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java b/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
index f1a4cc5..57c746a 100644
--- a/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
+++ b/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
@@ -52,19 +52,19 @@ public class ReflectionRewritePolicy implements RewritePolicy {
PropertyDescriptor[] props = Introspector.getBeanInfo(
msg.getClass(), Object.class).getPropertyDescriptors();
if (props.length > 0) {
- for (int i=0;i<props.length;i++) {
+ for (PropertyDescriptor prop : props) {
try {
Object propertyValue =
- props[i].getReadMethod().invoke(msg,
- (Object[]) null);
- if ("message".equalsIgnoreCase(props[i].getName())) {
+ prop.getReadMethod().invoke(msg,
+ (Object[]) null);
+ if ("message".equalsIgnoreCase(prop.getName())) {
newMsg = propertyValue;
} else {
- rewriteProps.put(props[i].getName(), propertyValue);
+ rewriteProps.put(prop.getName(), propertyValue);
}
} catch (Exception e) {
LogLog.warn("Unable to evaluate property " +
- props[i].getName(), e);
+ prop.getName(), e);
}
}
return new LoggingEvent(
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 f07864c..65ad4b6 100644
--- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
+++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java
@@ -480,9 +480,9 @@ public class LogFilePatternReceiver extends Receiver {
private LoggingEvent buildEvent() {
if (currentMap.size() == 0) {
if (additionalLines.size() > 0) {
- for (Iterator iter = additionalLines.iterator();iter.hasNext();) {
- getLogger().debug("found non-matching line: " + iter.next());
- }
+ for (Object additionalLine : additionalLines) {
+ getLogger().debug("found non-matching line: " + additionalLine);
+ }
}
additionalLines.clear();
return null;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 dbd8e9d..d839483 100644
--- a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java
+++ b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java
@@ -273,8 +273,8 @@ public class LogFileXMLReceiver extends Receiver {
return;
}
- for (Iterator iter = c.iterator(); iter.hasNext();) {
- LoggingEvent evt = (LoggingEvent) iter.next();
+ for (Object aC : c) {
+ LoggingEvent evt = (LoggingEvent) aC;
if (passesExpression(evt)) {
if (evt.getProperty(Constants.HOSTNAME_KEY) != null) {
evt.setProperty(Constants.HOSTNAME_KEY, host);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/resources/org/apache/log4j/chainsaw/stylesheet.css
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/log4j/chainsaw/stylesheet.css b/src/main/resources/org/apache/log4j/chainsaw/stylesheet.css
index 2515bc5..4d2349a 100644
--- a/src/main/resources/org/apache/log4j/chainsaw/stylesheet.css
+++ b/src/main/resources/org/apache/log4j/chainsaw/stylesheet.css
@@ -16,7 +16,7 @@
*/
- BODY, TABLE, TD, {
+ BODY, TABLE, TD {
font-size: 10px;
color: #000000;
font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/test/java/org/apache/log4j/chainsaw/receivers/ReceiversHelperTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/log4j/chainsaw/receivers/ReceiversHelperTest.java b/src/test/java/org/apache/log4j/chainsaw/receivers/ReceiversHelperTest.java
index 476fae2..01a718e 100644
--- a/src/test/java/org/apache/log4j/chainsaw/receivers/ReceiversHelperTest.java
+++ b/src/test/java/org/apache/log4j/chainsaw/receivers/ReceiversHelperTest.java
@@ -62,11 +62,10 @@ public class ReceiversHelperTest extends TestCase {
VFSLogFilePatternReceiver.class,
};
- for (int i = 0; i < expectedList.length; i++) {
+ for (Class c : expectedList) {
- Class c = expectedList[i];
assertTrue("Should have found class " + c.getName(),
- list.contains(c));
+ list.contains(c));
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/test/java/org/apache/log4j/db/FullCycleDBTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/log4j/db/FullCycleDBTest.java b/src/test/java/org/apache/log4j/db/FullCycleDBTest.java
index 2fade05..b4e9223 100644
--- a/src/test/java/org/apache/log4j/db/FullCycleDBTest.java
+++ b/src/test/java/org/apache/log4j/db/FullCycleDBTest.java
@@ -295,23 +295,23 @@ public class FullCycleDBTest
Vector v = va.getVector();
Vector r = new Vector();
// remove all elements older than startTime
- for(Iterator i = v.iterator(); i.hasNext(); ) {
- LoggingEvent event = (LoggingEvent) i.next();
- if(startTime > event.getTimeStamp()) {
- System.out.println("***Removing event with timestamp "+event.getTimeStamp());
- } else {
- System.out.println("***Keeping event with timestamo"+event.getTimeStamp());
- r.add(event);
+ for (Object aV : v) {
+ LoggingEvent event = (LoggingEvent) aV;
+ if (startTime > event.getTimeStamp()) {
+ System.out.println("***Removing event with timestamp " + event.getTimeStamp());
+ } else {
+ System.out.println("***Keeping event with timestamo" + event.getTimeStamp());
+ r.add(event);
+ }
}
- }
return r;
}
void dump(Vector v) {
- for(int i = 0; i < v.size(); i++) {
- LoggingEvent le = (LoggingEvent) v.get(i);
- System.out.println("---"+le.getLevel()+" "+le.getLoggerName()+" "+le.getMessage());
- }
+ for (Object aV : v) {
+ LoggingEvent le = (LoggingEvent) aV;
+ System.out.println("---" + le.getLevel() + " " + le.getLoggerName() + " " + le.getMessage());
+ }
}
public static Test XXsuite() {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java b/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java
index f15700d..4328dc9 100644
--- a/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java
+++ b/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java
@@ -23,7 +23,6 @@ import org.apache.log4j.xml.*;
import java.io.InputStream;
import java.util.Map;
-import java.util.HashMap;
import java.util.TreeMap;
import java.util.Hashtable;
import javax.xml.parsers.*;
[2/2] logging-chainsaw git commit: Replace for with for each loops
Posted by ma...@apache.org.
Replace for with for each loops
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/bafd7b67
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/bafd7b67
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/bafd7b67
Branch: refs/heads/master
Commit: bafd7b6767a24d454371c7dc0d2c8409afbf2979
Parents: c4cfebf
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 22:41:03 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 22:41:03 2018 -0600
----------------------------------------------------------------------
.../ApplicationPreferenceModelPanel.java | 39 ++-
.../log4j/chainsaw/ChainsawAppenderHandler.java | 10 +-
.../ChainsawCyclicBufferTableModel.java | 78 +++--
.../apache/log4j/chainsaw/ChainsawSplash.java | 18 +-
.../log4j/chainsaw/ChainsawStatusBar.java | 8 +-
.../log4j/chainsaw/ChainsawToolBarAndMenus.java | 38 +--
.../chainsaw/CopyEventsToClipboardAction.java | 4 +-
.../org/apache/log4j/chainsaw/FileMenu.java | 7 +-
.../chainsaw/LogFilePatternLayoutBuilder.java | 42 +--
.../org/apache/log4j/chainsaw/LogPanel.java | 308 +++++++++----------
.../log4j/chainsaw/LogPanelPreferenceModel.java | 22 +-
.../log4j/chainsaw/LogPanelPreferencePanel.java | 101 +++---
.../java/org/apache/log4j/chainsaw/LogUI.java | 133 ++++----
.../log4j/chainsaw/LoggerNameModelSupport.java | 12 +-
.../log4j/chainsaw/LoggerNameTreePanel.java | 69 ++---
.../log4j/chainsaw/TableColorizingRenderer.java | 8 +-
.../apache/log4j/chainsaw/ThresholdSlider.java | 12 +-
.../apache/log4j/chainsaw/color/ColorPanel.java | 4 +-
.../log4j/chainsaw/dnd/FileDnDTarget.java | 12 +-
.../filter/EventTypeEntryContainer.java | 12 +-
.../apache/log4j/chainsaw/help/HelpLocator.java | 12 +-
.../chainsaw/layout/EventDetailLayout.java | 9 +-
.../plugins/PluginClassLoaderFactory.java | 25 +-
.../log4j/chainsaw/prefs/LoadSettingsEvent.java | 13 +-
.../log4j/chainsaw/prefs/MRUFileList.java | 6 +-
.../log4j/chainsaw/prefs/SettingsManager.java | 20 +-
.../chainsaw/receivers/ReceiversHelper.java | 22 +-
.../chainsaw/receivers/ReceiversPanel.java | 166 +++++-----
.../chainsaw/receivers/ReceiversTreeModel.java | 28 +-
.../log4j/chainsaw/zeroconf/ZeroConfPlugin.java | 14 +-
.../java/org/apache/log4j/db/DBAppender.java | 10 +-
.../org/apache/log4j/net/MulticastAppender.java | 1 -
.../org/apache/log4j/net/SocketHubReceiver.java | 4 +-
.../java/org/apache/log4j/net/SocketNode13.java | 8 +-
.../org/apache/log4j/net/SocketReceiver.java | 23 +-
.../org/apache/log4j/net/XMLSocketReceiver.java | 12 +-
.../apache/log4j/plugins/PluginRegistry.java | 8 +-
.../apache/log4j/rewrite/MapRewritePolicy.java | 6 +-
.../log4j/rewrite/PropertyRewritePolicy.java | 6 +-
.../log4j/rewrite/ReflectionRewritePolicy.java | 12 +-
.../log4j/varia/LogFilePatternReceiver.java | 6 +-
.../apache/log4j/xml/LogFileXMLReceiver.java | 4 +-
.../org/apache/log4j/chainsaw/stylesheet.css | 2 +-
.../chainsaw/receivers/ReceiversHelperTest.java | 5 +-
.../org/apache/log4j/db/FullCycleDBTest.java | 24 +-
.../log4j/rewrite/RewriteAppenderTest.java | 1 -
46 files changed, 662 insertions(+), 722 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
index 4ab8fc0..a1bbd5a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelPanel.java
@@ -187,13 +187,13 @@ public static void main(String[] args) {
UIManager.LookAndFeelInfo[] newLookAndFeels = new UIManager.LookAndFeelInfo[lookAndFeels.length];
boolean useNewLookAndFeels = false;
int j = 0;
- for (int i=0;i<lookAndFeels.length;i++) {
- if (lookAndFeels[i].getClassName().toLowerCase(Locale.ENGLISH).contains("nimbus")) {
- useNewLookAndFeels = true;
- } else {
- newLookAndFeels[j++] = lookAndFeels[i];
+ for (UIManager.LookAndFeelInfo lookAndFeel : lookAndFeels) {
+ if (lookAndFeel.getClassName().toLowerCase(Locale.ENGLISH).contains("nimbus")) {
+ useNewLookAndFeels = true;
+ } else {
+ newLookAndFeels[j++] = lookAndFeel;
+ }
}
- }
if (useNewLookAndFeels) {
UIManager.LookAndFeelInfo[] replacedLookAndFeels = new UIManager.LookAndFeelInfo[lookAndFeels.length - 1];
System.arraycopy(newLookAndFeels, 0, replacedLookAndFeels, 0, newLookAndFeels.length - 1);
@@ -337,20 +337,19 @@ public static void main(String[] args) {
lfPanel.setLayout(new BoxLayout(lfPanel, BoxLayout.Y_AXIS));
lfPanel.setBorder(BorderFactory.createTitledBorder(" Look & Feel "));
- for (int i = 0; i < lookAndFeels.length; i++) {
- final UIManager.LookAndFeelInfo lfInfo = lookAndFeels[i];
- final JRadioButton lfItem = new JRadioButton(" " + lfInfo.getName() + " ");
- lfItem.setName(lfInfo.getClassName());
- lfItem.addActionListener(
- new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- uncommittedPreferenceModel.setLookAndFeelClassName(
- lfInfo.getClassName());
- }
- });
- lookAndFeelGroup.add(lfItem);
- lfPanel.add(lfItem);
- }
+ for (final UIManager.LookAndFeelInfo lfInfo : lookAndFeels) {
+ final JRadioButton lfItem = new JRadioButton(" " + lfInfo.getName() + " ");
+ lfItem.setName(lfInfo.getClassName());
+ lfItem.addActionListener(
+ new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ uncommittedPreferenceModel.setLookAndFeelClassName(
+ lfInfo.getClassName());
+ }
+ });
+ lookAndFeelGroup.add(lfItem);
+ lfPanel.add(lfItem);
+ }
try {
final Class gtkLF =
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 314494a..a3c08c3 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
@@ -286,9 +286,8 @@ public class ChainsawAppenderHandler extends AppenderSkeleton {
colonIndex));
}
}
- for (Iterator itery = customExpressionRules.entrySet().iterator(); itery
- .hasNext();) {
- Map.Entry entry = (Map.Entry) itery.next();
+ for (Object o : customExpressionRules.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
Rule rule = (Rule) entry.getValue();
if (rule.evaluate(e, null)) {
eventBatch.addEvent((String) entry.getKey(), e);
@@ -333,10 +332,9 @@ public class ChainsawAppenderHandler extends AppenderSkeleton {
for (Iterator iter = eventBatch.identifierIterator(); iter.hasNext();) {
String identifier = (String) iter.next();
List eventList = null;
- for (int i = 0; i < listeners.length; i++) {
- EventBatchListener listener = listeners[i];
+ for (EventBatchListener listener : listeners) {
if ((listener.getInterestedIdentifier() == null)
- || listener.getInterestedIdentifier().equals(identifier)) {
+ || listener.getInterestedIdentifier().equals(identifier)) {
if (eventList == null) {
eventList = eventBatch.entrySet(identifier);
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 751a268..cf9aedd 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
@@ -146,8 +146,8 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
filteredList.clear();
if (ruleMediator == null) {
LoggingEventWrapper lastEvent = null;
- for (Iterator iter = unfilteredList.iterator();iter.hasNext();) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper)iter.next();
+ for (Object anUnfilteredList : unfilteredList) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) anUnfilteredList;
loggingEventWrapper.setDisplayed(true);
updateEventMillisDelta(loggingEventWrapper, lastEvent);
filteredList.add(loggingEventWrapper);
@@ -293,10 +293,10 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
filteredListSize = filteredList.size();
unfilteredListSize = unfilteredList.size();
}
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].eventCountChanged(
- filteredListSize, unfilteredListSize);
- }
+ for (EventCountListener listener : listeners) {
+ listener.eventCountChanged(
+ filteredListSize, unfilteredListSize);
+ }
}
/**
@@ -331,8 +331,8 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
if (sort) {
//reset display (used to ensure row height is updated)
LoggingEventWrapper lastEvent = null;
- for (Iterator iter = filteredList.iterator();iter.hasNext();) {
- LoggingEventWrapper e = (LoggingEventWrapper)iter.next();
+ for (Object aFilteredList : filteredList) {
+ LoggingEventWrapper e = (LoggingEventWrapper) aFilteredList;
e.setDisplayed(true);
updateEventMillisDelta(e, lastEvent);
lastEvent = e;
@@ -423,8 +423,8 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
}
}
//now remove the event from all events
- for (Iterator iter = unfilteredListCopy.iterator();iter.hasNext();) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper)iter.next();
+ for (Object anUnfilteredListCopy : unfilteredListCopy) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) anUnfilteredListCopy;
loggingEventWrapper.removeProperty(propName);
}
}
@@ -435,8 +435,8 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
synchronized(mutex) {
unfilteredListCopy = new ArrayList(unfilteredList);
}
- for (Iterator iter = unfilteredListCopy.iterator();iter.hasNext();) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) iter.next();
+ for (Object anUnfilteredListCopy : unfilteredListCopy) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) anUnfilteredListCopy;
loggingEventWrapper.evaluateSearchRule(findRule);
//return the count of visible search matches
if (loggingEventWrapper.isSearchMatch() && loggingEventWrapper.isDisplayed()) {
@@ -491,12 +491,12 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
public int getSearchMatchCount() {
int searchMatchCount = 0;
synchronized(mutex) {
- for (Iterator iter = filteredList.iterator();iter.hasNext();) {
- LoggingEventWrapper wrapper = (LoggingEventWrapper) iter.next();
- if (wrapper.isSearchMatch() && wrapper.isDisplayed()) {
- searchMatchCount++;
+ for (Object aFilteredList : filteredList) {
+ LoggingEventWrapper wrapper = (LoggingEventWrapper) aFilteredList;
+ if (wrapper.isSearchMatch() && wrapper.isDisplayed()) {
+ searchMatchCount++;
+ }
}
- }
}
return searchMatchCount;
}
@@ -602,8 +602,8 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
if (result == null) {
String lowerColName = columnNames.get(columnIndex).toString().toLowerCase(Locale.ENGLISH);
Set entrySet = event.getProperties().entrySet();
- for (Iterator iter = entrySet.iterator();iter.hasNext();) {
- Map.Entry thisEntry = (Map.Entry) iter.next();
+ for (Object anEntrySet : entrySet) {
+ Map.Entry thisEntry = (Map.Entry) anEntrySet;
if (thisEntry.getKey().toString().equalsIgnoreCase(lowerColName)) {
result = thisEntry.getValue().toString();
}
@@ -689,18 +689,18 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
/**
* If so, we should add them as columns and notify listeners.
*/
- for (Iterator iter = loggingEventWrapper.getPropertyKeySet().iterator(); iter.hasNext();) {
- String key = iter.next().toString().toUpperCase();
-
- //add all keys except the 'log4jid' key (columnNames is all-caps)
- if (!columnNames.contains(key) && !(Constants.LOG4J_ID_KEY.equalsIgnoreCase(key))) {
- columnNames.add(key);
- logger.debug("Adding col '" + key + "', columnNames=" + columnNames);
- fireNewKeyColumnAdded(
- new NewKeyEvent(
- this, columnNames.indexOf(key), key, loggingEventWrapper.getLoggingEvent().getProperty(key)));
+ for (Object o : loggingEventWrapper.getPropertyKeySet()) {
+ String key = o.toString().toUpperCase();
+
+ //add all keys except the 'log4jid' key (columnNames is all-caps)
+ if (!columnNames.contains(key) && !(Constants.LOG4J_ID_KEY.equalsIgnoreCase(key))) {
+ columnNames.add(key);
+ logger.debug("Adding col '" + key + "', columnNames=" + columnNames);
+ fireNewKeyColumnAdded(
+ new NewKeyEvent(
+ this, columnNames.indexOf(key), key, loggingEventWrapper.getLoggingEvent().getProperty(key)));
+ }
}
- }
}
}
@@ -753,10 +753,9 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
NewKeyListener[] listeners =
eventListenerList.getListeners(NewKeyListener.class);
- for (int i = 0; i < listeners.length; i++) {
- NewKeyListener listener = listeners[i];
- listener.newKeyAdded(e);
- }
+ for (NewKeyListener listener : listeners) {
+ listener.newKeyAdded(e);
+ }
}
/**
@@ -870,12 +869,11 @@ class ChainsawCyclicBufferTableModel extends AbstractTableModel
int increment = 0;
- for (Iterator iter = unfilteredList.iterator();
- iter.hasNext();) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) iter.next();
- newUnfilteredList.add(loggingEventWrapper);
- monitor.setProgress(index++);
- }
+ for (Object anUnfilteredList : unfilteredList) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) anUnfilteredList;
+ newUnfilteredList.add(loggingEventWrapper);
+ monitor.setProgress(index++);
+ }
unfilteredList = newUnfilteredList;
filteredList = newFilteredList;
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/ChainsawSplash.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawSplash.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawSplash.java
index b38ee82..4385dc7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawSplash.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawSplash.java
@@ -61,19 +61,19 @@ class ChainsawSplash extends JWindow {
Font[] allFonts =
GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
- for (int i = 0; i < allFonts.length; i++) {
- availableFontNames.add(allFonts[i].getName());
- }
+ for (Font allFont : allFonts) {
+ availableFontNames.add(allFont.getName());
+ }
- for (int i = 0; i < preferredFontNames.length; i++) {
- if (availableFontNames.contains(preferredFontNames[i])) {
- textFont = new Font(preferredFontNames[i], Font.PLAIN, 12);
+ for (String preferredFontName : preferredFontNames) {
+ if (availableFontNames.contains(preferredFontName)) {
+ textFont = new Font(preferredFontName, Font.PLAIN, 12);
- System.out.println("Using font=" + textFont.getName());
+ System.out.println("Using font=" + textFont.getName());
- break;
+ break;
+ }
}
- }
if (textFont == null) {
System.out.println("Using basic font");
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
index e30c502..d818bfd 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawStatusBar.java
@@ -131,10 +131,10 @@ public class ChainsawStatusBar extends JPanel {
pausedLabel
};
- for (int i = 0; i < toFix.length; i++) {
- toFix[i].setPreferredSize(toFix[i].getMinimumSize());
- toFix[i].setMaximumSize(toFix[i].getMinimumSize());
- }
+ for (JComponent aToFix : toFix) {
+ aToFix.setPreferredSize(aToFix.getMinimumSize());
+ aToFix.setMaximumSize(aToFix.getMinimumSize());
+ }
statusMsg.setMinimumSize(pausedLabel.getPreferredSize());
statusMsg.setToolTipText("Shows messages from Chainsaw");
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
index 57b3cf1..ae652b9 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
@@ -551,15 +551,15 @@ class ChainsawToolBarAndMenus implements ChangeListener {
ReceiversHelper.getInstance().getKnownReceiverClasses();
JMenu receiverHelp = new JMenu("Receiver JavaDoc");
- for (Iterator iter = knownReceivers.iterator(); iter.hasNext();) {
- final Class clazz = (Class) iter.next();
- receiverHelp.add(
- new AbstractAction(clazz.getName()) {
- public void actionPerformed(ActionEvent arg0) {
- HelpManager.getInstance().showHelpForClass(clazz);
- }
- });
- }
+ for (Object knownReceiver : knownReceivers) {
+ final Class clazz = (Class) knownReceiver;
+ receiverHelp.add(
+ new AbstractAction(clazz.getName()) {
+ public void actionPerformed(ActionEvent arg0) {
+ HelpManager.getInstance().showHelpForClass(clazz);
+ }
+ });
+ }
helpMenu.add(receiverHelp);
@@ -865,21 +865,21 @@ class ChainsawToolBarAndMenus implements ChangeListener {
toggleScrollToBottomMenuItem.setSelected(logPanel.isScrollToBottom());
}
- for (int i = 0; i < logPanelSpecificActions.length; i++) {
- logPanelSpecificActions[i].setEnabled(activateLogPanelActions);
- }
+ for (Action logPanelSpecificAction : logPanelSpecificActions) {
+ logPanelSpecificAction.setEnabled(activateLogPanelActions);
+ }
String currentLookAndFeelName = UIManager.getLookAndFeel().getName();
- for (Iterator iter = lookAndFeelMenus.iterator(); iter.hasNext();) {
- JRadioButtonMenuItem element = (JRadioButtonMenuItem) iter.next();
+ for (Object lookAndFeelMenu : lookAndFeelMenus) {
+ JRadioButtonMenuItem element = (JRadioButtonMenuItem) lookAndFeelMenu;
- if (element.getText().equals(currentLookAndFeelName)) {
- element.setSelected(true);
- } else {
- element.setSelected(false);
+ if (element.getText().equals(currentLookAndFeelName)) {
+ element.setSelected(true);
+ } else {
+ element.setSelected(false);
+ }
}
- }
}
private Action getFindNextColorizedEventAction() {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java b/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
index e08d710..5f1f7f7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
+++ b/src/main/java/org/apache/log4j/chainsaw/CopyEventsToClipboardAction.java
@@ -50,8 +50,8 @@ public class CopyEventsToClipboardAction extends AbstractAction {
public void actionPerformed(ActionEvent e) {
List filteredEvents = logUi.getCurrentLogPanel().getFilteredEvents();
StringBuffer writer = new StringBuffer(filteredEvents.size() * EVENTSIZE_FUDGE_FACTOR);
- for (Iterator iterator = filteredEvents.iterator(); iterator.hasNext();) {
- LoggingEvent event = ((LoggingEventWrapper) iterator.next()).getLoggingEvent();
+ for (Object filteredEvent : filteredEvents) {
+ LoggingEvent event = ((LoggingEventWrapper) filteredEvent).getLoggingEvent();
writer.append(layout.format(event));
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/FileMenu.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/FileMenu.java b/src/main/java/org/apache/log4j/chainsaw/FileMenu.java
index 7173b21..2723e97 100644
--- a/src/main/java/org/apache/log4j/chainsaw/FileMenu.java
+++ b/src/main/java/org/apache/log4j/chainsaw/FileMenu.java
@@ -156,11 +156,10 @@ class FileMenu extends JMenu {
mrulog4j.removeAll();
int counter = 1;
if (MRUFileList.log4jMRU().getMRUList().size() > 0) {
- for (Iterator iter = MRUFileList.log4jMRU().getMRUList().iterator(); iter
- .hasNext();) {
- final URL url = (URL) iter.next();
+ for (Object o : MRUFileList.log4jMRU().getMRUList()) {
+ final URL url = (URL) o;
// TODO work out the 'name', for local files it can't just be the full path
- final String name = url.getProtocol().startsWith("file")?url.getPath().substring(url.getPath().lastIndexOf('/')+1):url.getPath();
+ final String name = url.getProtocol().startsWith("file") ? url.getPath().substring(url.getPath().lastIndexOf('/') + 1) : url.getPath();
String title = (counter++) + " - " + url.toExternalForm();
JMenuItem menuItem = new JMenuItem(new AbstractAction(title) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 990ce85..1aa3d90 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogFilePatternLayoutBuilder.java
@@ -102,10 +102,10 @@ public class LogFilePatternLayoutBuilder
private static String getFormatFromConverters(List converters) {
StringBuffer buffer = new StringBuffer();
- for (Iterator iter = converters.iterator();iter.hasNext();) {
- LoggingEventPatternConverter converter = (LoggingEventPatternConverter)iter.next();
+ for (Object converter1 : converters) {
+ LoggingEventPatternConverter converter = (LoggingEventPatternConverter) converter1;
if (converter instanceof DatePatternConverter) {
- buffer.append("TIMESTAMP");
+ buffer.append("TIMESTAMP");
} else if (converter instanceof MessagePatternConverter) {
buffer.append("MESSAGE");
} else if (converter instanceof LoggerPatternConverter) {
@@ -119,7 +119,7 @@ public class LogFilePatternLayoutBuilder
} else if (converter instanceof NDCPatternConverter) {
buffer.append("NDC");
} else if (converter instanceof LiteralPatternConverter) {
- LiteralPatternConverter literal = (LiteralPatternConverter)converter;
+ LiteralPatternConverter literal = (LiteralPatternConverter) converter;
//format shouldn't normally take a null, but we're getting a literal, so passing in the buffer will work
literal.format(null, buffer);
} else if (converter instanceof SequenceNumberPatternConverter) {
@@ -140,7 +140,7 @@ public class LogFilePatternLayoutBuilder
// if (option != null && option.length() > 0) {
// buffer.append("PROP(" + option + ")");
// } else {
- buffer.append("PROP(PROPERTIES)");
+ buffer.append("PROP(PROPERTIES)");
// }
} else if (converter instanceof LineSeparatorPatternConverter) {
//done
@@ -188,24 +188,24 @@ public class LogFilePatternLayoutBuilder
}
}
}
- for (Iterator iter = appenders.entrySet().iterator();iter.hasNext();) {
- Map.Entry appenderEntry = (Map.Entry)iter.next();
- String appenderName = appenderEntry.getKey().toString();
- String appenderClassName = appenderEntry.getValue().toString();
- if (appenderClassName.toLowerCase(Locale.ENGLISH).endsWith("fileappender")) {
- String layout = props.getProperty(appenderPrefix + "." + appenderName + ".layout");
- if (layout != null && layout.trim().equals("org.apache.log4j.PatternLayout")) {
- String conversion = props.getProperty(appenderPrefix + "." + appenderName + ".layout.ConversionPattern");
- String file = props.getProperty(appenderPrefix + "." + appenderName + ".File");
- if (conversion != null && file != null) {
- Map entry = new HashMap();
- entry.put("file", file.trim());
- entry.put("conversion", conversion.trim());
- result.put(appenderName, entry);
+ for (Object o : appenders.entrySet()) {
+ Map.Entry appenderEntry = (Map.Entry) o;
+ String appenderName = appenderEntry.getKey().toString();
+ String appenderClassName = appenderEntry.getValue().toString();
+ if (appenderClassName.toLowerCase(Locale.ENGLISH).endsWith("fileappender")) {
+ String layout = props.getProperty(appenderPrefix + "." + appenderName + ".layout");
+ if (layout != null && layout.trim().equals("org.apache.log4j.PatternLayout")) {
+ String conversion = props.getProperty(appenderPrefix + "." + appenderName + ".layout.ConversionPattern");
+ String file = props.getProperty(appenderPrefix + "." + appenderName + ".File");
+ if (conversion != null && file != null) {
+ Map entry = new HashMap();
+ entry.put("file", file.trim());
+ entry.put("conversion", conversion.trim());
+ result.put(appenderName, entry);
+ }
+ }
}
- }
}
- }
/*
example:
log4j.appender.R=org.apache.log4j.RollingFileAppender
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 c7b2e84..edfde4c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
@@ -531,20 +531,19 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
while (columnModel.getColumnCount() > 0) {
columnModel.removeColumn(columnModel.getColumn(0));
}
- for (Iterator iter = preferenceModel.getVisibleColumnOrder().iterator();iter.hasNext();) {
- TableColumn c = (TableColumn)iter.next();
- if (c.getHeaderValue().toString().equalsIgnoreCase(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE))
- {
- c.setCellEditor(markerCellEditor);
- }
- columnModel.addColumn(c);
- }
+ for (Object o1 : preferenceModel.getVisibleColumnOrder()) {
+ TableColumn c = (TableColumn) o1;
+ if (c.getHeaderValue().toString().equalsIgnoreCase(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE)) {
+ c.setCellEditor(markerCellEditor);
+ }
+ columnModel.addColumn(c);
+ }
TableColumnModel searchColumnModel = searchTable.getColumnModel();
while (searchColumnModel.getColumnCount() > 0) {
searchColumnModel.removeColumn(searchColumnModel.getColumn(0));
}
- for (Iterator iter = preferenceModel.getVisibleColumnOrder().iterator();iter.hasNext();) {
- TableColumn c = (TableColumn)iter.next();
+ for (Object o : preferenceModel.getVisibleColumnOrder()) {
+ TableColumn c = (TableColumn) o;
searchColumnModel.addColumn(c);
}
}
@@ -824,8 +823,8 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
"colorrule",
new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
- for (Iterator iter = tableModel.getAllEvents().iterator();iter.hasNext();) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper)iter.next();
+ for (Object o : tableModel.getAllEvents()) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) o;
loggingEventWrapper.updateColorRuleColors(colorizer.getBackgroundColor(loggingEventWrapper.getLoggingEvent()), colorizer.getForegroundColor(loggingEventWrapper.getLoggingEvent()));
}
// no need to update searchmodel events since tablemodel and searchmodel share all events, and color rules aren't different between the two
@@ -2150,21 +2149,21 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
int addedRowCount = 0;
int searchAddedRowCount = 0;
- for (Iterator iter = events.iterator(); iter.hasNext();) {
+ for (Object event1 : events) {
//these are actual LoggingEvent instances
- LoggingEvent event = (LoggingEvent)iter.next();
+ LoggingEvent event = (LoggingEvent) event1;
//create two separate loggingEventWrappers (main table and search table), as they have different info on display state
LoggingEventWrapper loggingEventWrapper1 = new LoggingEventWrapper(event);
- //if the clearTableExpressionRule is not null, evaluate & clear the table if it matches
- if (clearTableExpressionRule != null && clearTableExpressionRule.evaluate(event, null)) {
- logger.info("clear table expression matched - clearing table - matching event msg - " + event.getMessage());
- clearEvents();
- }
+ //if the clearTableExpressionRule is not null, evaluate & clear the table if it matches
+ if (clearTableExpressionRule != null && clearTableExpressionRule.evaluate(event, null)) {
+ logger.info("clear table expression matched - clearing table - matching event msg - " + event.getMessage());
+ clearEvents();
+ }
updateOtherModels(event);
boolean isCurrentRowAdded = tableModel.isAddRow(loggingEventWrapper1);
if (isCurrentRowAdded) {
- addedRowCount++;
+ addedRowCount++;
}
rowAdded = rowAdded || isCurrentRowAdded;
@@ -2172,7 +2171,7 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
LoggingEventWrapper loggingEventWrapper2 = new LoggingEventWrapper(loggingEventWrapper1);
boolean isSearchCurrentRowAdded = searchModel.isAddRow(loggingEventWrapper2);
if (isSearchCurrentRowAdded) {
- searchAddedRowCount++;
+ searchAddedRowCount++;
}
searchRowAdded = searchRowAdded || isSearchCurrentRowAdded;
}
@@ -2253,12 +2252,11 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
//used in the future to save more data structures
if (versionNumber > 0) {
savedVector = (Vector) in.readObject();
- for(int i = 0 ; i < savedVector.size() ; i++){
- Object item = savedVector.get(i);
- //insert each row at index zero (so last row in vector will be row zero)
- filterCombo.insertItemAt(item, 0);
- findCombo.insertItemAt(item, 0);
- }
+ for (Object item : savedVector) {
+ //insert each row at index zero (so last row in vector will be row zero)
+ filterCombo.insertItemAt(item, 0);
+ findCombo.insertItemAt(item, 0);
+ }
if (versionNumber > 1) {
//update prefModel columns to include defaults
int index = 0;
@@ -2277,10 +2275,10 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
columnModel.removeColumn(columnModel.getColumn(0));
}
//add visible column order columns
- for (Iterator iter = preferenceModel.getVisibleColumnOrder().iterator();iter.hasNext();) {
- TableColumn col = (TableColumn)iter.next();
- columnModel.addColumn(col);
- }
+ for (Object o1 : preferenceModel.getVisibleColumnOrder()) {
+ TableColumn col = (TableColumn) o1;
+ columnModel.addColumn(col);
+ }
TableColumnModel searchColumnModel = searchTable.getColumnModel();
//remove previous columns
@@ -2288,9 +2286,9 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
searchColumnModel.removeColumn(searchColumnModel.getColumn(0));
}
//add visible column order columns
- for (Iterator iter = preferenceModel.getVisibleColumnOrder().iterator();iter.hasNext();) {
- TableColumn col = (TableColumn)iter.next();
- searchColumnModel.addColumn(col);
+ for (Object o : preferenceModel.getVisibleColumnOrder()) {
+ TableColumn col = (TableColumn) o;
+ searchColumnModel.addColumn(col);
}
preferenceModel.apply(storedPrefs);
@@ -3176,15 +3174,15 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
preferenceModel.setWrapMessage(event.asBoolean("wrapMessage"));
preferenceModel.setSearchResultsVisible(event.asBoolean("searchResultsVisible"));
//re-add columns to the table in the order provided from the list
- for (Iterator iter = sortedColumnList.iterator(); iter.hasNext();) {
- TableColumn element = (TableColumn) iter.next();
+ for (Object aSortedColumnList : sortedColumnList) {
+ TableColumn element = (TableColumn) aSortedColumnList;
if (preferenceModel.addColumn(element)) {
- if (!applicationPreferenceModel.isDefaultColumnsSet() || applicationPreferenceModel.isDefaultColumnsSet() &&
- applicationPreferenceModel.getDefaultColumnNames().contains(element.getHeaderValue())) {
- table.addColumn(element);
- searchTable.addColumn(element);
- preferenceModel.setColumnVisible(element.getHeaderValue().toString(), true);
- }
+ if (!applicationPreferenceModel.isDefaultColumnsSet() || applicationPreferenceModel.isDefaultColumnsSet() &&
+ applicationPreferenceModel.getDefaultColumnNames().contains(element.getHeaderValue())) {
+ table.addColumn(element);
+ searchTable.addColumn(element);
+ preferenceModel.setColumnVisible(element.getHeaderValue().toString(), true);
+ }
}
}
@@ -3741,9 +3739,9 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
StringBuffer buf = new StringBuffer();
buf.append(loggingEventWrapper.getLoggingEvent().getMessage());
buf.append("\n");
- for (int i = 0; i < ti.length; i++) {
- buf.append(ti[i]).append("\n ");
- }
+ for (String aTi : ti) {
+ buf.append(aTi).append("\n ");
+ }
detailArea.setText(buf.toString());
SwingHelper.invokeOnEDT(new Runnable() {
@@ -3798,9 +3796,9 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
cellEditorListenersCopy = new HashSet(cellEditorListeners);
}
- for (Iterator iter = cellEditorListenersCopy.iterator();iter.hasNext();) {
- ((CellEditorListener)iter.next()).editingStopped(event);
- }
+ for (Object aCellEditorListenersCopy : cellEditorListenersCopy) {
+ ((CellEditorListener) aCellEditorListenersCopy).editingStopped(event);
+ }
currentLoggingEventWrapper = null;
currentTable = null;
@@ -3815,9 +3813,9 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
}
ChangeEvent event = new ChangeEvent(currentTable);
- for (Iterator iter = cellEditorListenersCopy.iterator();iter.hasNext();) {
- ((CellEditorListener)iter.next()).editingCanceled(event);
- }
+ for (Object aCellEditorListenersCopy : cellEditorListenersCopy) {
+ ((CellEditorListener) aCellEditorListenersCopy).editingCanceled(event);
+ }
currentLoggingEventWrapper = null;
currentTable = null;
}
@@ -3877,15 +3875,15 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
primaryList.clear();
int i=0;
- for (Iterator iter = tableModel.getFilteredEvents().iterator();iter.hasNext();) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) iter.next();
- ThumbnailLoggingEventWrapper wrapper = new ThumbnailLoggingEventWrapper(i, loggingEventWrapper);
- i++;
- //only add if there is a color defined
- if (primaryMatches(wrapper)) {
- primaryList.add(wrapper);
- }
+ for (Object o : tableModel.getFilteredEvents()) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) o;
+ ThumbnailLoggingEventWrapper wrapper = new ThumbnailLoggingEventWrapper(i, loggingEventWrapper);
+ i++;
+ //only add if there is a color defined
+ if (primaryMatches(wrapper)) {
+ primaryList.add(wrapper);
}
+ }
revalidate();
repaint();
}
@@ -3906,27 +3904,27 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
int eventHeight = minHeight;
//draw all events
- for (Iterator iter = primaryList.iterator();iter.hasNext();) {
- ThumbnailLoggingEventWrapper wrapper = (ThumbnailLoggingEventWrapper)iter.next();
- if (primaryMatches(wrapper)) {
- float ratio = (wrapper.rowNum / (float)rowCount);
- // System.out.println("error - ratio: " + ratio + ", component height: " + componentHeight);
- int verticalLocation = (int) (componentHeight * ratio);
-
- int startX = 1;
- int width = getWidth() - (startX * 2);
- //max out at 50, min 2...
- String millisDelta = wrapper.loggingEventWrapper.getLoggingEvent().getProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
- long millisDeltaLong = Long.parseLong(millisDelta);
- long delta = Math.min(ChainsawConstants.MILLIS_DELTA_RENDERING_HEIGHT_MAX, Math.max(0, (long) (millisDeltaLong * ChainsawConstants.MILLIS_DELTA_RENDERING_FACTOR)));
- float widthMaxMillisDeltaRenderRatio = ((float)width / ChainsawConstants.MILLIS_DELTA_RENDERING_HEIGHT_MAX);
- int widthToUse = Math.max(2, (int)(delta * widthMaxMillisDeltaRenderRatio));
- eventHeight = Math.min(maxEventHeight, eventHeight + 3);
+ for (Object aPrimaryList : primaryList) {
+ ThumbnailLoggingEventWrapper wrapper = (ThumbnailLoggingEventWrapper) aPrimaryList;
+ if (primaryMatches(wrapper)) {
+ float ratio = (wrapper.rowNum / (float) rowCount);
+ // System.out.println("error - ratio: " + ratio + ", component height: " + componentHeight);
+ int verticalLocation = (int) (componentHeight * ratio);
+
+ int startX = 1;
+ int width = getWidth() - (startX * 2);
+ //max out at 50, min 2...
+ String millisDelta = wrapper.loggingEventWrapper.getLoggingEvent().getProperty(ChainsawConstants.MILLIS_DELTA_COL_NAME_LOWERCASE);
+ long millisDeltaLong = Long.parseLong(millisDelta);
+ long delta = Math.min(ChainsawConstants.MILLIS_DELTA_RENDERING_HEIGHT_MAX, Math.max(0, (long) (millisDeltaLong * ChainsawConstants.MILLIS_DELTA_RENDERING_FACTOR)));
+ float widthMaxMillisDeltaRenderRatio = ((float) width / ChainsawConstants.MILLIS_DELTA_RENDERING_HEIGHT_MAX);
+ int widthToUse = Math.max(2, (int) (delta * widthMaxMillisDeltaRenderRatio));
+ eventHeight = Math.min(maxEventHeight, eventHeight + 3);
// eventHeight = maxEventHeight;
- drawEvent(applicationPreferenceModel.getDeltaColor(), (verticalLocation - eventHeight + 1), eventHeight, g, startX, widthToUse);
- // System.out.println("painting error - rownum: " + wrapper.rowNum + ", location: " + verticalLocation + ", height: " + eventHeight + ", component height: " + componentHeight + ", row count: " + rowCount);
- }
+ drawEvent(applicationPreferenceModel.getDeltaColor(), (verticalLocation - eventHeight + 1), eventHeight, g, startX, widthToUse);
+ // System.out.println("painting error - rownum: " + wrapper.rowNum + ", location: " + verticalLocation + ", height: " + eventHeight + ", component height: " + componentHeight + ", row count: " + rowCount);
}
+ }
}
}
@@ -3950,18 +3948,18 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
primaryList.clear();
int i=0;
- for (Iterator iter = tableModel.getFilteredEvents().iterator();iter.hasNext();) {
- LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) iter.next();
- ThumbnailLoggingEventWrapper wrapper = new ThumbnailLoggingEventWrapper(i, loggingEventWrapper);
- if (secondaryMatches(wrapper)) {
- secondaryList.add(wrapper);
- }
- i++;
- //only add if there is a color defined
- if (primaryMatches(wrapper)) {
- primaryList.add(wrapper);
- }
+ for (Object o : tableModel.getFilteredEvents()) {
+ LoggingEventWrapper loggingEventWrapper = (LoggingEventWrapper) o;
+ ThumbnailLoggingEventWrapper wrapper = new ThumbnailLoggingEventWrapper(i, loggingEventWrapper);
+ if (secondaryMatches(wrapper)) {
+ secondaryList.add(wrapper);
}
+ i++;
+ //only add if there is a color defined
+ if (primaryMatches(wrapper)) {
+ primaryList.add(wrapper);
+ }
+ }
revalidate();
repaint();
}
@@ -3982,60 +3980,60 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
int eventHeight = minHeight;
//draw all non error/warning/marker events
- for (Iterator iter = primaryList.iterator();iter.hasNext();) {
- ThumbnailLoggingEventWrapper wrapper = (ThumbnailLoggingEventWrapper)iter.next();
- if (!wrapper.loggingEventWrapper.getColorRuleBackground().equals(ChainsawConstants.COLOR_DEFAULT_BACKGROUND)) {
- if (wrapper.loggingEventWrapper.getLoggingEvent().getLevel().toInt() < Level.WARN.toInt() && wrapper.loggingEventWrapper.getLoggingEvent().getProperty(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE) == null) {
- float ratio = (wrapper.rowNum / (float)rowCount);
- // System.out.println("error - ratio: " + ratio + ", component height: " + componentHeight);
- int verticalLocation = (int) (componentHeight * ratio);
-
- int startX = 1;
- int width = getWidth() - (startX * 2);
-
- drawEvent(wrapper.loggingEventWrapper.getColorRuleBackground(), verticalLocation, eventHeight, g, startX, width);
- // System.out.println("painting error - rownum: " + wrapper.rowNum + ", location: " + verticalLocation + ", height: " + eventHeight + ", component height: " + componentHeight + ", row count: " + rowCount);
- }
- }
+ for (Object aPrimaryList1 : primaryList) {
+ ThumbnailLoggingEventWrapper wrapper = (ThumbnailLoggingEventWrapper) aPrimaryList1;
+ if (!wrapper.loggingEventWrapper.getColorRuleBackground().equals(ChainsawConstants.COLOR_DEFAULT_BACKGROUND)) {
+ if (wrapper.loggingEventWrapper.getLoggingEvent().getLevel().toInt() < Level.WARN.toInt() && wrapper.loggingEventWrapper.getLoggingEvent().getProperty(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE) == null) {
+ float ratio = (wrapper.rowNum / (float) rowCount);
+ // System.out.println("error - ratio: " + ratio + ", component height: " + componentHeight);
+ int verticalLocation = (int) (componentHeight * ratio);
+
+ int startX = 1;
+ int width = getWidth() - (startX * 2);
+
+ drawEvent(wrapper.loggingEventWrapper.getColorRuleBackground(), verticalLocation, eventHeight, g, startX, width);
+ // System.out.println("painting error - rownum: " + wrapper.rowNum + ", location: " + verticalLocation + ", height: " + eventHeight + ", component height: " + componentHeight + ", row count: " + rowCount);
+ }
}
+ }
//draw warnings, error, fatal & markers last (full width)
- for (Iterator iter = primaryList.iterator();iter.hasNext();) {
- ThumbnailLoggingEventWrapper wrapper = (ThumbnailLoggingEventWrapper)iter.next();
- if (!wrapper.loggingEventWrapper.getColorRuleBackground().equals(ChainsawConstants.COLOR_DEFAULT_BACKGROUND)) {
- if (wrapper.loggingEventWrapper.getLoggingEvent().getLevel().toInt() >= Level.WARN.toInt() || wrapper.loggingEventWrapper.getLoggingEvent().getProperty(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE) != null) {
- float ratio = (wrapper.rowNum / (float)rowCount);
- // System.out.println("error - ratio: " + ratio + ", component height: " + componentHeight);
- int verticalLocation = (int) (componentHeight * ratio);
-
- int startX = 1;
- int width = getWidth() - (startX * 2);
- //narrow the color a bit if level is less than warn
- //make warnings, errors a little taller
-
- eventHeight = Math.min(maxEventHeight, eventHeight + 3);
+ for (Object aPrimaryList : primaryList) {
+ ThumbnailLoggingEventWrapper wrapper = (ThumbnailLoggingEventWrapper) aPrimaryList;
+ if (!wrapper.loggingEventWrapper.getColorRuleBackground().equals(ChainsawConstants.COLOR_DEFAULT_BACKGROUND)) {
+ if (wrapper.loggingEventWrapper.getLoggingEvent().getLevel().toInt() >= Level.WARN.toInt() || wrapper.loggingEventWrapper.getLoggingEvent().getProperty(ChainsawConstants.LOG4J_MARKER_COL_NAME_LOWERCASE) != null) {
+ float ratio = (wrapper.rowNum / (float) rowCount);
+ // System.out.println("error - ratio: " + ratio + ", component height: " + componentHeight);
+ int verticalLocation = (int) (componentHeight * ratio);
+
+ int startX = 1;
+ int width = getWidth() - (startX * 2);
+ //narrow the color a bit if level is less than warn
+ //make warnings, errors a little taller
+
+ eventHeight = Math.min(maxEventHeight, eventHeight + 3);
// eventHeight = maxEventHeight;
- drawEvent(wrapper.loggingEventWrapper.getColorRuleBackground(), (verticalLocation - eventHeight + 1), eventHeight, g, startX, width);
- // System.out.println("painting error - rownum: " + wrapper.rowNum + ", location: " + verticalLocation + ", height: " + eventHeight + ", component height: " + componentHeight + ", row count: " + rowCount);
- }
- }
+ drawEvent(wrapper.loggingEventWrapper.getColorRuleBackground(), (verticalLocation - eventHeight + 1), eventHeight, g, startX, width);
+ // System.out.println("painting error - rownum: " + wrapper.rowNum + ", location: " + verticalLocation + ", height: " + eventHeight + ", component height: " + componentHeight + ", row count: " + rowCount);
+ }
}
+ }
- for (Iterator iter = secondaryList.iterator();iter.hasNext();) {
- ThumbnailLoggingEventWrapper wrapper = (ThumbnailLoggingEventWrapper)iter.next();
- float ratio = (wrapper.rowNum / (float)rowCount);
+ for (Object aSecondaryList : secondaryList) {
+ ThumbnailLoggingEventWrapper wrapper = (ThumbnailLoggingEventWrapper) aSecondaryList;
+ float ratio = (wrapper.rowNum / (float) rowCount);
// System.out.println("warning - ratio: " + ratio + ", component height: " + componentHeight);
- int verticalLocation = (int) (componentHeight * ratio);
+ int verticalLocation = (int) (componentHeight * ratio);
- int startX = 1;
- int width = getWidth() - (startX * 2);
- width = (width / 2);
+ int startX = 1;
+ int width = getWidth() - (startX * 2);
+ width = (width / 2);
- //use black for search indicator in the 'gutter'
- drawEvent(Color.BLACK, verticalLocation, eventHeight, g, startX, width);
+ //use black for search indicator in the 'gutter'
+ drawEvent(Color.BLACK, verticalLocation, eventHeight, g, startX, width);
// System.out.println("painting warning - rownum: " + wrapper.rowNum + ", location: " + verticalLocation + ", height: " + eventHeight + ", component height: " + componentHeight + ", row count: " + rowCount);
- }
+ }
}
}
@@ -4211,22 +4209,22 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
private ThumbnailLoggingEventWrapper getClosestRow(int rowToSelect) {
ThumbnailLoggingEventWrapper closestRow = null;
int rowDelta = Integer.MAX_VALUE;
- for (Iterator iter = secondaryList.iterator();iter.hasNext();) {
- ThumbnailLoggingEventWrapper event = (ThumbnailLoggingEventWrapper) iter.next();
- int newRowDelta = Math.abs(rowToSelect - event.rowNum);
- if (newRowDelta < rowDelta) {
- closestRow = event;
- rowDelta = newRowDelta;
- }
+ for (Object aSecondaryList : secondaryList) {
+ ThumbnailLoggingEventWrapper event = (ThumbnailLoggingEventWrapper) aSecondaryList;
+ int newRowDelta = Math.abs(rowToSelect - event.rowNum);
+ if (newRowDelta < rowDelta) {
+ closestRow = event;
+ rowDelta = newRowDelta;
}
- for (Iterator iter = primaryList.iterator();iter.hasNext();) {
- ThumbnailLoggingEventWrapper event = (ThumbnailLoggingEventWrapper) iter.next();
- int newRowDelta = Math.abs(rowToSelect - event.rowNum);
- if (newRowDelta < rowDelta) {
- closestRow = event;
- rowDelta = newRowDelta;
- }
+ }
+ for (Object aPrimaryList : primaryList) {
+ ThumbnailLoggingEventWrapper event = (ThumbnailLoggingEventWrapper) aPrimaryList;
+ int newRowDelta = Math.abs(rowToSelect - event.rowNum);
+ if (newRowDelta < rowDelta) {
+ closestRow = event;
+ rowDelta = newRowDelta;
}
+ }
return closestRow;
}
@@ -4301,9 +4299,9 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
public Vector getModelData() {
//reverse the model order, because it will be un-reversed when we reload it from saved settings
Vector vector = new Vector();
- for (Iterator iter = allEntries.iterator();iter.hasNext();) {
- vector.insertElementAt(iter.next(), 0);
- }
+ for (Object allEntry : allEntries) {
+ vector.insertElementAt(allEntry, 0);
+ }
return vector;
}
@@ -4317,12 +4315,12 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi
bypassFiltering = true;
model.removeAllElements();
List entriesCopy = new ArrayList(allEntries);
- for (Iterator iter = entriesCopy.iterator();iter.hasNext();) {
- String thisEntry = iter.next().toString();
- if (thisEntry.toLowerCase(Locale.ENGLISH).contains(textToMatch.toLowerCase())) {
- model.addElement(thisEntry);
- }
- }
+ for (Object anEntriesCopy : entriesCopy) {
+ String thisEntry = anEntriesCopy.toString();
+ if (thisEntry.toLowerCase(Locale.ENGLISH).contains(textToMatch.toLowerCase())) {
+ model.addElement(thisEntry);
+ }
+ }
bypassFiltering = false;
//TODO: on no-match, don't filter at all (show the popup?)
if (displayedEntries.size() > 0 && !textToMatch.equals("")) {
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 a1fdec6..405f31e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferenceModel.java
@@ -51,13 +51,13 @@ public class LogPanelPreferenceModel implements Serializable{
Properties properties = SettingsManager.getInstance().getDefaultSettings();
- for (Iterator iter = properties.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) {
+ Map.Entry entry = (Map.Entry) objectObjectEntry;
- if (entry.getKey().toString().startsWith("DateFormat")) {
- list.add(entry.getValue());
+ if (entry.getKey().toString().startsWith("DateFormat")) {
+ list.add(entry.getValue());
+ }
}
- }
DATE_FORMATS = Collections.unmodifiableCollection(list);
}
@@ -133,13 +133,13 @@ public class LogPanelPreferenceModel implements Serializable{
}
private TableColumn findColumnByHeader(List list, String header) {
- for (Iterator iter = list.iterator();iter.hasNext();) {
- TableColumn c = (TableColumn)iter.next();
+ for (Object aList : list) {
+ TableColumn c = (TableColumn) aList;
//columns may have changed - header may not exist
- if (c != null && c.getHeaderValue() != null && c.getHeaderValue().equals(header)) {
- return c;
- }
- }
+ if (c != null && c.getHeaderValue() != null && c.getHeaderValue().equals(header)) {
+ return c;
+ }
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
index 2beba05..6b37e46 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogPanelPreferencePanel.java
@@ -177,22 +177,19 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
final JList columnList = new JList();
columnList.setVisibleRowCount(17);
- for (
- Iterator iter = preferenceModel.getColumns().iterator();
- iter.hasNext();)
- {
- TableColumn col = (TableColumn)iter.next();
- Enumeration enumeration = columnListModel.elements();
- boolean found = false;
- while (enumeration.hasMoreElements()) {
- TableColumn thisCol = (TableColumn) enumeration.nextElement();
- if (thisCol.getHeaderValue().equals(col.getHeaderValue())) {
- found = true;
- }
+ for (Object o : preferenceModel.getColumns()) {
+ TableColumn col = (TableColumn) o;
+ Enumeration enumeration = columnListModel.elements();
+ boolean found = false;
+ while (enumeration.hasMoreElements()) {
+ TableColumn thisCol = (TableColumn) enumeration.nextElement();
+ if (thisCol.getHeaderValue().equals(col.getHeaderValue())) {
+ found = true;
}
- if (!found) {
- columnListModel.addElement(col);
- }
+ }
+ if (!found) {
+ columnListModel.addElement(col);
+ }
}
columnList.setModel(columnListModel);
@@ -290,36 +287,29 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
bgDateFormat.add(rdISO);
dateFormatPanel.add(rdISO);
- for (
- Iterator iter = LogPanelPreferenceModel.DATE_FORMATS.iterator();
- iter.hasNext();)
- {
- final String format = (String) iter.next();
+ for (Object DATE_FORMAT : LogPanelPreferenceModel.DATE_FORMATS) {
+ final String format = (String) DATE_FORMAT;
final JRadioButton rdFormat = new JRadioButton(format);
rdFormat.setHorizontalTextPosition(SwingConstants.RIGHT);
- rdFormat.setAlignmentX(Component.LEFT_ALIGNMENT);
+ rdFormat.setAlignmentX(Component.LEFT_ALIGNMENT);
- rdFormat.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- preferenceModel.setDateFormatPattern(format);
- customFormatText.setEnabled(rdCustom.isSelected());
- rdLast = rdFormat;
- }
- });
+ rdFormat.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ preferenceModel.setDateFormatPattern(format);
+ customFormatText.setEnabled(rdCustom.isSelected());
+ rdLast = rdFormat;
+ }
+ });
//update based on external changes to dateformatpattern (column context
//menu)
preferenceModel.addPropertyChangeListener(
- "dateFormatPattern", new PropertyChangeListener()
- {
- public void propertyChange(PropertyChangeEvent evt)
- {
- rdFormat.setSelected(
- preferenceModel.getDateFormatPattern().equals(format));
- rdLast = rdFormat;
- }
- });
+ "dateFormatPattern", new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ rdFormat.setSelected(
+ preferenceModel.getDateFormatPattern().equals(format));
+ rdLast = rdFormat;
+ }
+ });
dateFormatPanel.add(rdFormat);
bgDateFormat.add(rdFormat);
@@ -792,24 +782,21 @@ public class LogPanelPreferencePanel extends AbstractPreferencePanel
preferenceModel.addPropertyChangeListener("columns", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
List cols = (List)evt.getNewValue();
- for (
- Iterator iter = cols.iterator();
- iter.hasNext();)
- {
- TableColumn col = (TableColumn) iter.next();
- Enumeration enumeration = columnListModel.elements();
- boolean found = false;
- while (enumeration.hasMoreElements()) {
- TableColumn thisCol = (TableColumn) enumeration.nextElement();
- if (thisCol.getHeaderValue().equals(col.getHeaderValue())) {
- found = true;
- }
- }
- if (!found) {
- columnListModel.addElement(col);
- columnListModel.fireContentsChanged();
- }
- }
+ for (Object col1 : cols) {
+ TableColumn col = (TableColumn) col1;
+ Enumeration enumeration = columnListModel.elements();
+ boolean found = false;
+ while (enumeration.hasMoreElements()) {
+ TableColumn thisCol = (TableColumn) enumeration.nextElement();
+ if (thisCol.getHeaderValue().equals(col.getHeaderValue())) {
+ found = true;
+ }
+ }
+ if (!found) {
+ columnListModel.addElement(col);
+ columnListModel.fireContentsChanged();
+ }
+ }
}});
preferenceModel.addPropertyChangeListener(
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 538cae5..3403bc0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -563,8 +563,8 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
public void run() {
logger.debug("Loading files: " + fileList);
- for (Iterator iter = fileList.iterator(); iter.hasNext();) {
- File file = (File) iter.next();
+ for (Object aFileList : fileList) {
+ File file = (File) aFileList;
final Decoder decoder = new XMLDecoder();
try {
getStatusBar().setMessage("Loading " + file.getAbsolutePath() + "...");
@@ -1003,31 +1003,30 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
Action showHiddenTabsAction =
new AbstractAction("Show All Hidden") {
public void actionPerformed(ActionEvent e) {
- for (Iterator iter = getPanels().entrySet().iterator();
- iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- Boolean docked = (Boolean)entry.getValue();
- if (docked.booleanValue()) {
- String identifier = (String) entry.getKey();
- int count = getTabbedPane().getTabCount();
- boolean found = false;
-
- for (int i = 0; i < count; i++) {
- String name = getTabbedPane().getTitleAt(i);
-
- if (name.equals(identifier)) {
- found = true;
-
- break;
- }
- }
-
- if (!found) {
- displayPanel(identifier, true);
- tbms.stateChange();
- }
- }
- }
+ for (Object o : getPanels().entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
+ Boolean docked = (Boolean) entry.getValue();
+ if (docked.booleanValue()) {
+ String identifier = (String) entry.getKey();
+ int count = getTabbedPane().getTabCount();
+ boolean found = false;
+
+ for (int i = 0; i < count; i++) {
+ String name = getTabbedPane().getTitleAt(i);
+
+ if (name.equals(identifier)) {
+ found = true;
+
+ break;
+ }
+ }
+
+ if (!found) {
+ displayPanel(identifier, true);
+ tbms.stateChange();
+ }
+ }
+ }
}
};
@@ -1139,9 +1138,9 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
PluginRegistry pluginRegistry = ((LoggerRepositoryEx) repo).getPluginRegistry();
List list = pluginRegistry.getPlugins(Generator.class);
- for (Iterator iter = list.iterator(); iter.hasNext();) {
- Plugin plugin = (Plugin) iter.next();
- pluginRegistry.stopPlugin(plugin.getName());
+ for (Object aList : list) {
+ Plugin plugin = (Plugin) aList;
+ pluginRegistry.stopPlugin(plugin.getName());
}
}
}
@@ -1450,13 +1449,13 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
applicationPreferenceModel.setShowNoReceiverWarning(!receiverConfigurationPanel.isDontWarnMeAgain());
//remove existing plugins
List plugins = pluginRegistry.getPlugins();
- for (Iterator iter = plugins.iterator();iter.hasNext();) {
- Plugin plugin = (Plugin)iter.next();
- //don't stop ZeroConfPlugin if it is registered
- if (!plugin.getName().toLowerCase(Locale.ENGLISH).contains("zeroconf")) {
- pluginRegistry.stopPlugin(plugin.getName());
- }
- }
+ for (Object plugin1 : plugins) {
+ Plugin plugin = (Plugin) plugin1;
+ //don't stop ZeroConfPlugin if it is registered
+ if (!plugin.getName().toLowerCase(Locale.ENGLISH).contains("zeroconf")) {
+ pluginRegistry.stopPlugin(plugin.getName());
+ }
+ }
URL configURL = null;
if (receiverConfigurationPanel.getModel().isNetworkReceiverMode()) {
@@ -1489,34 +1488,34 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
if (log4jConfigFile != null) {
try {
Map entries = LogFilePatternLayoutBuilder.getAppenderConfiguration(log4jConfigFile);
- for (Iterator iter = entries.entrySet().iterator();iter.hasNext();) {
- try {
- Map.Entry entry = (Map.Entry)iter.next();
- String name = (String) entry.getKey();
- Map values = (Map) entry.getValue();
- //values: conversion, file
- String conversionPattern = values.get("conversion").toString();
- File file = new File(values.get("file").toString());
- URL fileURL = file.toURI().toURL();
- String timestampFormat = LogFilePatternLayoutBuilder.getTimeStampFormat(conversionPattern);
- String receiverPattern = LogFilePatternLayoutBuilder.getLogFormatFromPatternLayout(conversionPattern);
- VFSLogFilePatternReceiver fileReceiver = new VFSLogFilePatternReceiver();
- fileReceiver.setName(name);
- fileReceiver.setAutoReconnect(true);
- fileReceiver.setContainer(LogUI.this);
- fileReceiver.setAppendNonMatches(true);
- fileReceiver.setFileURL(fileURL.toURI().toString());
- fileReceiver.setTailing(true);
- fileReceiver.setLogFormat(receiverPattern);
- fileReceiver.setTimestampFormat(timestampFormat);
- fileReceiver.setThreshold(Level.TRACE);
- pluginRegistry.addPlugin(fileReceiver);
- fileReceiver.activateOptions();
- receiversPanel.updateReceiverTreeInDispatchThread();
- } catch (URISyntaxException e1) {
- e1.printStackTrace();
+ for (Object o : entries.entrySet()) {
+ try {
+ Map.Entry entry = (Map.Entry) o;
+ String name = (String) entry.getKey();
+ Map values = (Map) entry.getValue();
+ //values: conversion, file
+ String conversionPattern = values.get("conversion").toString();
+ File file = new File(values.get("file").toString());
+ URL fileURL = file.toURI().toURL();
+ String timestampFormat = LogFilePatternLayoutBuilder.getTimeStampFormat(conversionPattern);
+ String receiverPattern = LogFilePatternLayoutBuilder.getLogFormatFromPatternLayout(conversionPattern);
+ VFSLogFilePatternReceiver fileReceiver = new VFSLogFilePatternReceiver();
+ fileReceiver.setName(name);
+ fileReceiver.setAutoReconnect(true);
+ fileReceiver.setContainer(LogUI.this);
+ fileReceiver.setAppendNonMatches(true);
+ fileReceiver.setFileURL(fileURL.toURI().toString());
+ fileReceiver.setTailing(true);
+ fileReceiver.setLogFormat(receiverPattern);
+ fileReceiver.setTimestampFormat(timestampFormat);
+ fileReceiver.setThreshold(Level.TRACE);
+ pluginRegistry.addPlugin(fileReceiver);
+ fileReceiver.activateOptions();
+ receiversPanel.updateReceiverTreeInDispatchThread();
+ } catch (URISyntaxException e1) {
+ e1.printStackTrace();
+ }
}
- }
} catch (IOException e1) {
e1.printStackTrace();
}
@@ -1774,9 +1773,9 @@ public class LogUI extends JFrame implements ChainsawViewer, SettingsListener {
shutdownListenerList.getListeners(
ShutdownListener.class);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].shuttingDown();
- }
+ for (ShutdownListener listener : listeners) {
+ listener.shuttingDown();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 26e2f34..5d682d4 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameModelSupport.java
@@ -63,11 +63,9 @@ public class LoggerNameModelSupport implements LoggerNameModel {
loggerNameSet.clear();
LoggerNameListener[] eventListeners = listenerList.getListeners(LoggerNameListener.class);
- for (int i = 0; i < eventListeners.length; i++)
- {
- LoggerNameListener listener = eventListeners[i];
- listener.reset();
- }
+ for (LoggerNameListener listener : eventListeners) {
+ listener.reset();
+ }
}
/**
@@ -79,9 +77,7 @@ public class LoggerNameModelSupport implements LoggerNameModel {
{
LoggerNameListener[] eventListeners = listenerList.getListeners(LoggerNameListener.class);
- for (int i = 0; i < eventListeners.length; i++)
- {
- LoggerNameListener listener = eventListeners[i];
+ for (LoggerNameListener listener : eventListeners) {
listener.loggerNameAdded(loggerName);
}
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 9d73a5c..53b0a7a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
@@ -564,10 +564,10 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
}
private boolean isHiddenLogger(String loggerName) {
- for (Iterator iter = hiddenSet.iterator();iter.hasNext();) {
- String hiddenLoggerEntry = iter.next().toString();
+ for (Object aHiddenSet : hiddenSet) {
+ String hiddenLoggerEntry = aHiddenSet.toString();
if (loggerName.startsWith(hiddenLoggerEntry + ".") || loggerName.endsWith(hiddenLoggerEntry)) {
- return true;
+ return true;
}
}
return false;
@@ -695,22 +695,18 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
logger.debug("Collapsing all children of selected node");
- for (int i = 0; i < paths.length; i++)
- {
- TreePath path = paths[i];
+ for (TreePath path : paths) {
DefaultMutableTreeNode node =
- (DefaultMutableTreeNode) path.getLastPathComponent();
+ (DefaultMutableTreeNode) path.getLastPathComponent();
Enumeration enumeration = node.depthFirstEnumeration();
- while (enumeration.hasMoreElements())
- {
+ while (enumeration.hasMoreElements()) {
DefaultMutableTreeNode child =
- (DefaultMutableTreeNode) enumeration.nextElement();
+ (DefaultMutableTreeNode) enumeration.nextElement();
- if ((child.getParent() != null) && (child != node))
- {
+ if ((child.getParent() != null) && (child != node)) {
TreeNode[] nodes =
- ((DefaultMutableTreeNode) child.getParent()).getPath();
+ ((DefaultMutableTreeNode) child.getParent()).getPath();
TreePath treePath = new TreePath(nodes);
logTree.collapsePath(treePath);
@@ -1246,10 +1242,7 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
logger.debug("Expanding all children of selected node");
- for (int i = 0; i < paths.length; i++)
- {
- TreePath path = paths[i];
-
+ for (TreePath path : paths) {
/**
* TODO this is commented out, right now it expands all nodes including the root, so if there is a large tree..... look out.
*/
@@ -1265,22 +1258,20 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
// }
DefaultMutableTreeNode treeNode =
- (DefaultMutableTreeNode) path.getLastPathComponent();
+ (DefaultMutableTreeNode) path.getLastPathComponent();
Enumeration depthEnum = treeNode.depthFirstEnumeration();
- if (!depthEnum.hasMoreElements())
- {
+ if (!depthEnum.hasMoreElements()) {
break;
}
List depths = new ArrayList();
- while (depthEnum.hasMoreElements())
- {
+ while (depthEnum.hasMoreElements()) {
depths.add(
- new Integer(
- ((DefaultMutableTreeNode) depthEnum.nextElement()).getDepth()));
+ new Integer(
+ ((DefaultMutableTreeNode) depthEnum.nextElement()).getDepth()));
}
Collections.sort(depths);
@@ -1288,22 +1279,19 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
int maxDepth = ((Integer) depths.get(0)).intValue();
- if (maxDepth > WARN_DEPTH)
- {
+ if (maxDepth > WARN_DEPTH) {
logger.warn("Should warn user, depth=" + maxDepth);
}
depthEnum = treeNode.depthFirstEnumeration();
- while (depthEnum.hasMoreElements())
- {
+ while (depthEnum.hasMoreElements()) {
DefaultMutableTreeNode node =
- (DefaultMutableTreeNode) depthEnum.nextElement();
+ (DefaultMutableTreeNode) depthEnum.nextElement();
- if (node.isLeaf() && node.getParent() != null)
- {
+ if (node.isLeaf() && node.getParent() != null) {
TreeNode[] nodes =
- ((DefaultMutableTreeNode) node.getParent()).getPath();
+ ((DefaultMutableTreeNode) node.getParent()).getPath();
TreePath treePath = new TreePath(nodes);
logger.debug("Expanding path:" + treePath);
@@ -1320,14 +1308,12 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
listenerList.getListeners(ChangeListener.class);
ChangeEvent e = null;
- for (int i = 0; i < listeners.length; i++)
- {
- if (e == null)
- {
+ for (ChangeListener listener : listeners) {
+ if (e == null) {
e = new ChangeEvent(this);
}
- listeners[i].stateChanged(e);
+ listener.stateChanged(e);
}
}
@@ -1524,11 +1510,10 @@ final class LoggerNameTreePanel extends JPanel implements LoggerNameListener
List sortedIgnoreList = new ArrayList(hiddenSet);
Collections.sort(sortedIgnoreList);
- for (Iterator iter = sortedIgnoreList.iterator(); iter.hasNext();)
- {
- String string = (String) iter.next();
- model.addElement(string);
- }
+ for (Object aSortedIgnoreList : sortedIgnoreList) {
+ String string = (String) aSortedIgnoreList;
+ model.addElement(string);
+ }
// ignoreList.setModel(model);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
index 5d83d02..5f6c1ff 100644
--- a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
@@ -398,8 +398,8 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer {
String headerName = tableColumn.getHeaderValue().toString().toLowerCase();
String thisProp = null;
//find the property in the property set...case-sensitive
- for (Iterator iter = propertySet.iterator();iter.hasNext();) {
- String entry = iter.next().toString();
+ for (Object aPropertySet : propertySet) {
+ String entry = aPropertySet.toString();
if (entry.equalsIgnoreCase(headerName)) {
thisProp = entry;
break;
@@ -652,8 +652,8 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer {
public void setHighlightAttributes(Object matchSet, StyledDocument styledDocument) {
if (matchSet instanceof Set) {
Set thisSet = (Set)matchSet;
- for (Iterator iter = thisSet.iterator();iter.hasNext();) {
- String thisEntry = iter.next().toString();
+ for (Object aThisSet : thisSet) {
+ String thisEntry = aThisSet.toString();
bold(thisEntry, styledDocument);
}
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java b/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
index dce7e99..0ae8189 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ThresholdSlider.java
@@ -74,13 +74,13 @@ final class ThresholdSlider extends JSlider {
Hashtable labelMap = new Hashtable();
- for (Iterator iter = priorityList.iterator(); iter.hasNext();) {
- Level item = (Level) iter.next();
- labelMap.put(
- new Integer(priorityList.indexOf(item)), new JLabel(item.toString()));
+ for (Object aPriorityList : priorityList) {
+ Level item = (Level) aPriorityList;
+ labelMap.put(
+ new Integer(priorityList.indexOf(item)), new JLabel(item.toString()));
- // System.out.println("creating levels for :: " + item.toInt() + "," + item.toString());
- }
+ // System.out.println("creating levels for :: " + item.toInt() + "," + item.toString());
+ }
setOrientation(SwingConstants.VERTICAL);
setInverted(true);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
index 4044962..97f74ba 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
@@ -307,8 +307,8 @@ public class ColorPanel extends JPanel
if (logPanelColorizersModel.getIndexOf(noTab) == -1) {
logPanelColorizersModel.addElement(noTab);
}
- for (Iterator iter = allLogPanelColorizers.entrySet().iterator();iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
+ for (Object o : allLogPanelColorizers.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
if (!entry.getValue().equals(currentLogPanelColorizer) && (logPanelColorizersModel.getIndexOf(entry.getKey()) == -1)) {
logPanelColorizersModel.addElement(entry.getKey());
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/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 b1461fb..d1c00d0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java
+++ b/src/main/java/org/apache/log4j/chainsaw/dnd/FileDnDTarget.java
@@ -154,12 +154,12 @@ public class FileDnDTarget implements DropTargetListener{
private boolean isDragOk(DropTargetDragEvent e) {
DataFlavor[] flavors = new DataFlavor[] { DataFlavor.javaFileListFlavor };
DataFlavor chosen = null;
- for (int i = 0; i < flavors.length; i++) {
- if (e.isDataFlavorSupported(flavors[i])) {
- chosen = flavors[i];
- break;
- }
- }
+ for (DataFlavor flavor : flavors) {
+ if (e.isDataFlavorSupported(flavor)) {
+ chosen = flavor;
+ break;
+ }
+ }
/*
* the src does not support any of the StringTransferable flavors
*/
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/bafd7b67/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java b/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
index 398f8f1..505fb15 100644
--- a/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
@@ -143,11 +143,11 @@ public class EventTypeEntryContainer {
if(properties == null) {
return;
}
- for (Iterator iter = properties.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry)iter.next();
- if (!(propListModel.contains(entry.getKey()))) {
- propListModel.addElement(entry.getKey());
- }
- }
+ for (Object o : properties.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
+ if (!(propListModel.contains(entry.getKey()))) {
+ propListModel.addElement(entry.getKey());
+ }
+ }
}
}