You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ps...@apache.org on 2003/05/01 01:01:59 UTC
cvs commit: jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw ColorDisplaySelector.java LogUI.java
psmith 2003/04/30 16:01:58
Modified: src/java/org/apache/log4j/chainsaw ColorDisplaySelector.java
LogUI.java
Log:
Modified to use the base interfaces for the collection classes to minimise
dependencies on specific implementations
Revision Changes Path
1.2 +12 -11 jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ColorDisplaySelector.java
Index: ColorDisplaySelector.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ColorDisplaySelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ColorDisplaySelector.java 28 Apr 2003 05:44:31 -0000 1.1
+++ ColorDisplaySelector.java 30 Apr 2003 23:01:58 -0000 1.2
@@ -77,6 +77,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
@@ -130,13 +131,13 @@
private Map buttonMap = new HashMap();
private String applyColorUpdateColumn;
private String applyDisplayUpdateColumn;
- private ArrayList levelList;
- private HashMap levelMap = new HashMap();
- private HashMap globalLevelMap = new HashMap();
- private HashMap selectedColorMap = new HashMap();
- private HashMap selectedDisplayMap = new HashMap();
- private HashMap displayDisplayMap;
- private HashMap colorDisplayMap;
+ private List levelList;
+ private Map levelMap = new HashMap();
+ private Map globalLevelMap = new HashMap();
+ private Map selectedColorMap = new HashMap();
+ private Map selectedDisplayMap = new HashMap();
+ private Map displayDisplayMap;
+ private Map colorDisplayMap;
private Map columnEntryMap;
private String title;
@@ -145,10 +146,10 @@
* actions to relevant buttons/menus.
*/
public ColorDisplaySelector(
- final String title, HashMap columnEntryMap, final ColorFilter colorFilter,
- final DisplayFilter displayFilter, final HashMap colorDisplayMap,
- final HashMap displayDisplayMap, final ArrayList columnNames,
- final ArrayList filterableColumns, final ArrayList levelList) {
+ final String title, Map columnEntryMap, final ColorFilter colorFilter,
+ final DisplayFilter displayFilter, final Map colorDisplayMap,
+ final Map displayDisplayMap, final List columnNames,
+ final List filterableColumns, final List levelList) {
super(title + " - Select color and display filters");
this.title = title;
1.7 +14 -17 jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/LogUI.java
Index: LogUI.java
===================================================================
RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogUI.java 30 Apr 2003 17:46:51 -0000 1.6
+++ LogUI.java 30 Apr 2003 23:01:58 -0000 1.7
@@ -49,10 +49,6 @@
package org.apache.log4j.chainsaw;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.chainsaw.ChainsawAppender;
-import org.apache.log4j.chainsaw.ChainsawViewer;
-
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Font;
@@ -68,17 +64,16 @@
import java.awt.event.MouseMotionAdapter;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
@@ -116,6 +111,8 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableModel;
+import org.apache.log4j.LogManager;
+
/**
* The main entry point for Chainsaw, this class represents the first frame
@@ -163,17 +160,17 @@
private static final String GLOBAL_MATCH = "*";
private static final String DETAIL_CONTENT_TYPE = "text/html";
private JTabbedPane tabbedPane;
- private final HashMap tableModelMap = new HashMap();
- private final HashMap tableMap = new HashMap();
- private final ArrayList names = new ArrayList();
- private final Vector pausedList = new Vector();
- private final ArrayList levelList = new ArrayList();
- private final ArrayList filterableColumns = new ArrayList();
- private final HashMap entryMap = new HashMap();
- private final HashMap panelMap = new HashMap();
- private final HashMap lostMap = new HashMap();
- private final HashMap scrollMap = new HashMap();
- private final HashMap eventBorderMap = new HashMap();
+ private final Map tableModelMap = new HashMap();
+ private final Map tableMap = new HashMap();
+ private final List names = new ArrayList();
+ private final List pausedList = new Vector();
+ private final List levelList = new ArrayList();
+ private final List filterableColumns = new ArrayList();
+ private final Map entryMap = new HashMap();
+ private final Map panelMap = new HashMap();
+ private final Map lostMap = new HashMap();
+ private final Map scrollMap = new HashMap();
+ private final Map eventBorderMap = new HashMap();
ChainsawAppenderHandler handler;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org