vgritsenko 02/04/21 10:29:50
Modified: src/java/org/apache/cocoon/caching
AggregatedCacheValidity.java
CompositeCacheValidity.java
DeltaTimeCacheValidity.java
IncludeCacheValidity.java NOPCacheValidity.java
ParametersCacheValidity.java
SourceCacheValidity.java
TimeStampCacheValidity.java
Log:
add toString() to source cache validity, unify all others.
Revision Changes Path
1.7 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/caching/AggregatedCacheValidity.java
Index: AggregatedCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/AggregatedCacheValidity.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AggregatedCacheValidity.java 22 Feb 2002 07:03:49 -0000 1.6
+++ AggregatedCacheValidity.java 21 Apr 2002 17:29:50 -0000 1.7
@@ -60,7 +60,7 @@
* aggregated objects is not limited.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Id: AggregatedCacheValidity.java,v 1.6 2002/02/22 07:03:49
cziegeler Exp $
+ * @version CVS $Id: AggregatedCacheValidity.java,v 1.7 2002/04/21 17:29:50
vgritsenko Exp $
*/
public final class AggregatedCacheValidity
implements CacheValidity {
@@ -96,11 +96,12 @@
}
public String toString() {
- StringBuffer b = new StringBuffer("AggregatedCacheValidity ");
+ StringBuffer b = new StringBuffer("Aggregated Validity[");
for(Iterator i = a.iterator(); i.hasNext();) {
b.append(i.next());
if(i.hasNext()) b.append(':');
}
+ b.append(']');
return b.toString();
}
}
1.7 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/caching/CompositeCacheValidity.java
Index: CompositeCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/CompositeCacheValidity.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompositeCacheValidity.java 22 Feb 2002 07:03:49 -0000 1.6
+++ CompositeCacheValidity.java 21 Apr 2002 17:29:50 -0000 1.7
@@ -58,7 +58,7 @@
* aggregated objects is limited.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Id: CompositeCacheValidity.java,v 1.6 2002/02/22 07:03:49
cziegeler Exp $
+ * @version CVS $Id: CompositeCacheValidity.java,v 1.7 2002/04/21 17:29:50
vgritsenko Exp $
*/
public final class CompositeCacheValidity
implements CacheValidity {
@@ -91,6 +91,6 @@
}
public String toString() {
- return new StringBuffer("CompositeCacheValidity:
").append(v1).append(":").append(v2).toString();
+ return "Composite Validity[" + v1 + ':' + v2 + ']';
}
}
1.8 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/caching/DeltaTimeCacheValidity.java
Index: DeltaTimeCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/DeltaTimeCacheValidity.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DeltaTimeCacheValidity.java 1 Mar 2002 14:30:36 -0000 1.7
+++ DeltaTimeCacheValidity.java 21 Apr 2002 17:29:50 -0000 1.8
@@ -57,7 +57,7 @@
* A validation object that remains valid for a specified amount of time.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Michael Homeijer</a>
- * @version CVS $Id: DeltaTimeCacheValidity.java,v 1.7 2002/03/01 14:30:36
vgritsenko Exp $
+ * @version CVS $Id: DeltaTimeCacheValidity.java,v 1.8 2002/04/21 17:29:50
vgritsenko Exp $
*/
public final class DeltaTimeCacheValidity implements CacheValidity {
@@ -100,6 +100,6 @@
}
public String toString() {
- return "DeltaTimeCacheValidity: " + this.cachedDateTime + "(+" +
this.timeInCache + "ms)";
+ return "Delta Validity[" + this.cachedDateTime + '+' + this.timeInCache +
"ms]";
}
}
1.7 +7 -7
xml-cocoon2/src/java/org/apache/cocoon/caching/IncludeCacheValidity.java
Index: IncludeCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/IncludeCacheValidity.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IncludeCacheValidity.java 22 Feb 2002 07:03:49 -0000 1.6
+++ IncludeCacheValidity.java 21 Apr 2002 17:29:50 -0000 1.7
@@ -62,7 +62,7 @@
* A validation object used in CachingCIncludeTransformer
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Maciek Kaminski</a>
- * @version CVS $Id: IncludeCacheValidity.java,v 1.6 2002/02/22 07:03:49 cziegeler
Exp $
+ * @version CVS $Id: IncludeCacheValidity.java,v 1.7 2002/04/21 17:29:50 vgritsenko
Exp $
*/
public final class IncludeCacheValidity implements CacheValidity {
@@ -119,16 +119,16 @@
}
public String toString() {
- StringBuffer b = new StringBuffer("IncludeCacheValidity: " );
+ StringBuffer b = new StringBuffer("Include Validity[");
for(Iterator i = sources.iterator(), j = timeStamps.iterator();
i.hasNext();) {
- b.append("[");
+ b.append('{');
b.append(i.next());
- b.append(" - ");
+ b.append(':');
b.append(j.next());
- b.append("]");
- if(i.hasNext()) b.append(", ");
+ b.append('}');
+ if(i.hasNext()) b.append(':');
}
+ b.append(']');
return b.toString();
}
}
-
1.7 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/caching/NOPCacheValidity.java
Index: NOPCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/NOPCacheValidity.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NOPCacheValidity.java 22 Feb 2002 07:03:49 -0000 1.6
+++ NOPCacheValidity.java 21 Apr 2002 17:29:50 -0000 1.7
@@ -55,7 +55,7 @@
* This might be the most used CacheValidity object for serializers.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: NOPCacheValidity.java,v 1.6 2002/02/22 07:03:49 cziegeler Exp $
+ * @version CVS $Id: NOPCacheValidity.java,v 1.7 2002/04/21 17:29:50 vgritsenko Exp
$
*/
public final class NOPCacheValidity
implements CacheValidity {
@@ -67,7 +67,6 @@
}
public String toString() {
- return "NOPCacheValidity";
+ return "NOP Validity";
}
-
}
1.7 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/caching/ParametersCacheValidity.java
Index: ParametersCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/ParametersCacheValidity.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ParametersCacheValidity.java 22 Feb 2002 07:03:49 -0000 1.6
+++ ParametersCacheValidity.java 21 Apr 2002 17:29:50 -0000 1.7
@@ -56,7 +56,7 @@
* A validation object using a set of key/value pairs contained in a
<code>Map</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Id: ParametersCacheValidity.java,v 1.6 2002/02/22 07:03:49
cziegeler Exp $
+ * @version CVS $Id: ParametersCacheValidity.java,v 1.7 2002/04/21 17:29:50
vgritsenko Exp $
*/
public final class ParametersCacheValidity
implements CacheValidity {
@@ -82,7 +82,6 @@
}
public String toString() {
- return "ParametersCacheValidity: " + this.map;
+ return "Parameters Validity[" + this.map + ']';
}
-
}
1.3 +4 -1
xml-cocoon2/src/java/org/apache/cocoon/caching/SourceCacheValidity.java
Index: SourceCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/SourceCacheValidity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceCacheValidity.java 19 Apr 2002 11:02:57 -0000 1.2
+++ SourceCacheValidity.java 21 Apr 2002 17:29:50 -0000 1.3
@@ -57,7 +57,7 @@
* <code>SourceValidity</code> object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SourceCacheValidity.java,v 1.2 2002/04/19 11:02:57 cziegeler
Exp $
+ * @version CVS $Id: SourceCacheValidity.java,v 1.3 2002/04/21 17:29:50 vgritsenko
Exp $
*/
public final class SourceCacheValidity
implements CacheValidity {
@@ -91,4 +91,7 @@
return this.sourceValidity;
}
+ public String toString() {
+ return "Source Validity[" + this.sourceValidity + ']';
+ }
}
1.6 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/caching/TimeStampCacheValidity.java
Index: TimeStampCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/TimeStampCacheValidity.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TimeStampCacheValidity.java 22 Feb 2002 07:03:49 -0000 1.5
+++ TimeStampCacheValidity.java 21 Apr 2002 17:29:50 -0000 1.6
@@ -55,7 +55,7 @@
* This is might be the most used CacheValidity object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: TimeStampCacheValidity.java,v 1.5 2002/02/22 07:03:49
cziegeler Exp $
+ * @version CVS $Id: TimeStampCacheValidity.java,v 1.6 2002/04/21 17:29:50
vgritsenko Exp $
*/
public final class TimeStampCacheValidity
implements CacheValidity {
@@ -78,7 +78,6 @@
}
public String toString() {
- return "TimeStampCacheValidity: " + this.timeStamp;
+ return "TimeStamp Validity[" + this.timeStamp + ']';
}
-
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
