psmith 2003/08/31 19:03:03
Modified: src/java/org/apache/log4j/chainsaw
ChainsawCyclicBufferTableModel.java
EventContainer.java
Log:
EventContainer now extends the LoggerNameModel interface
and simply delegates it to the support class.
Revision Changes Path
1.2 +60 -0
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java
Index: ChainsawCyclicBufferTableModel.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawCyclicBufferTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChainsawCyclicBufferTableModel.java 25 Jun 2003 04:05:21 -0000 1.1
+++ ChainsawCyclicBufferTableModel.java 1 Sep 2003 02:03:03 -0000 1.2
@@ -59,6 +59,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Hashtable;
import java.util.Iterator;
@@ -101,9 +102,68 @@
private boolean sortEnabled = false;
protected final Object syncLock = new Object();
+ private LoggerNameModel loggerNameModelDelegate = new LoggerNameModelSupport();
+
//because we may be using a cyclic buffer, if an ID is not provided in the
property,
//use and increment this row counter as the ID for each received row
int uniqueRow;
+
+ /**
+ * @param l
+ */
+ public void removeLoggerNameListener(LoggerNameListener l)
+ {
+ loggerNameModelDelegate.removeLoggerNameListener(l);
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ public int hashCode()
+ {
+ return loggerNameModelDelegate.hashCode();
+ }
+
+ /**
+ * @param loggerName
+ * @return
+ */
+ public boolean addLoggerName(String loggerName)
+ {
+ return loggerNameModelDelegate.addLoggerName(loggerName);
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ public String toString()
+ {
+ return loggerNameModelDelegate.toString();
+ }
+
+ /**
+ * @param l
+ */
+ public void addLoggerNameListener(LoggerNameListener l)
+ {
+ loggerNameModelDelegate.addLoggerNameListener(l);
+ }
+
+ /**
+ * @return
+ */
+ public Collection getLoggerNames()
+ {
+ return loggerNameModelDelegate.getLoggerNames();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ public boolean equals(Object obj)
+ {
+ return loggerNameModelDelegate.equals(obj);
+ }
public ChainsawCyclicBufferTableModel(boolean isCyclic, int bufferSize) {
this.cyclic = isCyclic;
1.3 +1 -1
jakarta-log4j/src/java/org/apache/log4j/chainsaw/EventContainer.java
Index: EventContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/EventContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EventContainer.java 23 Aug 2003 16:00:52 -0000 1.2
+++ EventContainer.java 1 Sep 2003 02:03:03 -0000 1.3
@@ -60,7 +60,7 @@
* @author Scott Deboy <[EMAIL PROTECTED]>
*
*/
-public interface EventContainer extends SortTableModel, FilterChangedListener {
+public interface EventContainer extends SortTableModel, FilterChangedListener,
LoggerNameModel {
/**
* Adds an EventCountListener, to be notified when the # of events changes
* @param listener
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
