psmith 2003/09/01 23:26:48
Modified: src/java/org/apache/log4j/chainsaw ChainsawEventBatch.java
Added: src/java/org/apache/log4j/chainsaw
ChainsawEventBatchEntry.java
Log:
Factored out the Entry static inner class into it's own class
for ease of use.
Revision Changes Path
1.2 +12 -35
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawEventBatch.java
Index: ChainsawEventBatch.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawEventBatch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChainsawEventBatch.java 25 Jun 2003 04:05:21 -0000 1.1
+++ ChainsawEventBatch.java 2 Sep 2003 06:26:48 -0000 1.2
@@ -83,52 +83,29 @@
} else {
events = (List) identEventMap.get(ident);
}
-
- events.add(new Entry(ident, eventType, convertedEventVector));
+
+ events.add(
+ new ChainsawEventBatchEntry(ident, eventType, convertedEventVector));
}
-
+
/**
* Returns an iterator of Identifier strings that this payload contains.
- *
+ *
* The values returned from this iterator can be used to query the
- *
- * @return Iterator
+ *
+ * @return Iterator
*/
Iterator identifierIterator() {
- return identEventMap.keySet().iterator();
+ return identEventMap.keySet().iterator();
}
-
+
/**
- * Returns a Collection of ChainsawEventBatch.Entry objects that
+ * Returns a Collection of ChainsawEventBatchEntry objects that
* are bound to the identifier
* @param identifier
- * @return Collection of ChainsawEventBatch.Entry instances
+ * @return Collection of ChainsawEventBatchEntry instances
*/
List entrySet(String identifier) {
- return (List)identEventMap.get(identifier);
- }
-
- static class Entry {
- private String eventType;
- private Vector eventVector;
- private String identifier;
-
- Entry(String identifier, String eventType, Vector eventVector) {
- this.identifier = identifier;
- this.eventType = eventType;
- this.eventVector = eventVector;
- }
-
- String getEventType() {
- return eventType;
- }
-
- Vector getEventVector() {
- return eventVector;
- }
-
- public String getIdentifier() {
- return identifier;
- }
+ return (List) identEventMap.get(identifier);
}
}
1.1
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawEventBatchEntry.java
Index: ChainsawEventBatchEntry.java
===================================================================
/*
* ============================================================================
* The Apache Software License, Version 1.1
* ============================================================================
*
* Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear.
*
* 4. The names "log4j" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior
* written permission. For written permission, please contact
* [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache", nor may
* "Apache" appear in their name, without prior written permission of the
* Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
* DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation. For more information on the
* Apache Software Foundation, please see <http://www.apache.org/>.
*
*/
/*
* Created on 2/09/2003
*
* To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.apache.log4j.chainsaw;
import java.util.Vector;
/**
* A simple container of Events, mapped to an identifier
* @author Paul Smith <[EMAIL PROTECTED]>
*
*/
class ChainsawEventBatchEntry {
private String eventType;
private Vector eventVector;
private String identifier;
ChainsawEventBatchEntry(
String identifier, String eventType, Vector eventVector) {
this.identifier = identifier;
this.eventType = eventType;
this.eventVector = eventVector;
}
String getEventType() {
return eventType;
}
Vector getEventVector() {
return eventVector;
}
public String getIdentifier() {
return identifier;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
