scolebourne 2004/04/09 03:46:32
Modified: collections/src/test/org/apache/commons/collections/map
TestUnmodifiableMap.java
TestUnmodifiableSortedMap.java
TestUnmodifiableOrderedMap.java
collections/src/java/org/apache/commons/collections/map
UnmodifiableOrderedMap.java
UnmodifiableSortedMap.java
Added: collections/data/test
UnmodifiableOrderedMap.fullCollection.version3.1.obj
UnmodifiableOrderedMap.emptyCollection.version3.1.obj
UnmodifiableSortedMap.emptyCollection.version3.1.obj
UnmodifiableSortedMap.fullCollection.version3.1.obj
Log:
Make unmodifiable maps Serializable [18815]
Revision Changes Path
1.1
jakarta-commons/collections/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj
<<Binary file>>
1.1
jakarta-commons/collections/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj
<<Binary file>>
1.1
jakarta-commons/collections/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj
<<Binary file>>
1.1
jakarta-commons/collections/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj
<<Binary file>>
1.10 +11 -11
jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
Index: TestUnmodifiableMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TestUnmodifiableMap.java 9 Apr 2004 10:32:25 -0000 1.9
+++ TestUnmodifiableMap.java 9 Apr 2004 10:46:32 -0000 1.10
@@ -91,14 +91,14 @@
return "3.1";
}
- public void testCreate() throws Exception {
- resetEmpty();
- writeExternalFormToDisk(
- (java.io.Serializable) map,
-
"D:/dev/collections/data/test/UnmodifiableMap.emptyCollection.version3.1.obj");
- resetFull();
- writeExternalFormToDisk(
- (java.io.Serializable) map,
-
"D:/dev/collections/data/test/UnmodifiableMap.fullCollection.version3.1.obj");
- }
+// public void testCreate() throws Exception {
+// resetEmpty();
+// writeExternalFormToDisk(
+// (java.io.Serializable) map,
+//
"D:/dev/collections/data/test/UnmodifiableMap.emptyCollection.version3.1.obj");
+// resetFull();
+// writeExternalFormToDisk(
+// (java.io.Serializable) map,
+//
"D:/dev/collections/data/test/UnmodifiableMap.fullCollection.version3.1.obj");
+// }
}
1.4 +15 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
Index: TestUnmodifiableSortedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestUnmodifiableSortedMap.java 18 Feb 2004 01:20:37 -0000 1.3
+++ TestUnmodifiableSortedMap.java 9 Apr 2004 10:46:32 -0000 1.4
@@ -88,4 +88,18 @@
} catch (IllegalArgumentException ex) {}
}
+ public String getCompatibilityVersion() {
+ return "3.1";
+ }
+
+// public void testCreate() throws Exception {
+// resetEmpty();
+// writeExternalFormToDisk(
+// (java.io.Serializable) map,
+//
"D:/dev/collections/data/test/UnmodifiableSortedMap.emptyCollection.version3.1.obj");
+// resetFull();
+// writeExternalFormToDisk(
+// (java.io.Serializable) map,
+//
"D:/dev/collections/data/test/UnmodifiableSortedMap.fullCollection.version3.1.obj");
+// }
}
1.5 +15 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
Index: TestUnmodifiableOrderedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestUnmodifiableOrderedMap.java 18 Feb 2004 01:20:38 -0000 1.4
+++ TestUnmodifiableOrderedMap.java 9 Apr 2004 10:46:32 -0000 1.5
@@ -88,4 +88,18 @@
} catch (IllegalArgumentException ex) {}
}
+ public String getCompatibilityVersion() {
+ return "3.1";
+ }
+
+// public void testCreate() throws Exception {
+// resetEmpty();
+// writeExternalFormToDisk(
+// (java.io.Serializable) map,
+//
"D:/dev/collections/data/test/UnmodifiableOrderedMap.emptyCollection.version3.1.obj");
+// resetFull();
+// writeExternalFormToDisk(
+// (java.io.Serializable) map,
+//
"D:/dev/collections/data/test/UnmodifiableOrderedMap.fullCollection.version3.1.obj");
+// }
}
1.8 +38 -2
jakarta-commons/collections/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
Index: UnmodifiableOrderedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UnmodifiableOrderedMap.java 18 Feb 2004 01:13:19 -0000 1.7
+++ UnmodifiableOrderedMap.java 9 Apr 2004 10:46:32 -0000 1.8
@@ -15,6 +15,10 @@
*/
package org.apache.commons.collections.map;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
@@ -30,6 +34,8 @@
/**
* Decorates another <code>OrderedMap</code> to ensure it can't be altered.
+ * <p>
+ * This class is Serializable from Commons Collections 3.1.
*
* @since Commons Collections 3.0
* @version $Revision$ $Date$
@@ -37,7 +43,11 @@
* @author Stephen Colebourne
*/
public final class UnmodifiableOrderedMap
- extends AbstractOrderedMapDecorator implements Unmodifiable {
+ extends AbstractOrderedMapDecorator
+ implements Unmodifiable, Serializable {
+
+ /** Serialization version */
+ private static final long serialVersionUID = 8136428161720526266L;
/**
* Factory method to create an unmodifiable sorted map.
@@ -61,6 +71,32 @@
*/
private UnmodifiableOrderedMap(OrderedMap map) {
super(map);
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Write the map out using a custom routine.
+ *
+ * @param out the output stream
+ * @throws IOException
+ * @since Commons Collections 3.1
+ */
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ out.defaultWriteObject();
+ out.writeObject(map);
+ }
+
+ /**
+ * Read the map in using a custom routine.
+ *
+ * @param in the input stream
+ * @throws IOException
+ * @throws ClassNotFoundException
+ * @since Commons Collections 3.1
+ */
+ private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
+ in.defaultReadObject();
+ map = (Map) in.readObject();
}
//-----------------------------------------------------------------------
1.7 +38 -2
jakarta-commons/collections/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
Index: UnmodifiableSortedMap.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UnmodifiableSortedMap.java 18 Feb 2004 01:13:19 -0000 1.6
+++ UnmodifiableSortedMap.java 9 Apr 2004 10:46:32 -0000 1.7
@@ -15,6 +15,10 @@
*/
package org.apache.commons.collections.map;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.util.Collection;
import java.util.Comparator;
import java.util.Map;
@@ -27,6 +31,8 @@
/**
* Decorates another <code>SortedMap</code> to ensure it can't be altered.
+ * <p>
+ * This class is Serializable from Commons Collections 3.1.
*
* @since Commons Collections 3.0
* @version $Revision$ $Date$
@@ -34,7 +40,11 @@
* @author Stephen Colebourne
*/
public final class UnmodifiableSortedMap
- extends AbstractSortedMapDecorator implements Unmodifiable {
+ extends AbstractSortedMapDecorator
+ implements Unmodifiable, Serializable {
+
+ /** Serialization version */
+ private static final long serialVersionUID = 5805344239827376360L;
/**
* Factory method to create an unmodifiable sorted map.
@@ -58,6 +68,32 @@
*/
private UnmodifiableSortedMap(SortedMap map) {
super(map);
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Write the map out using a custom routine.
+ *
+ * @param out the output stream
+ * @throws IOException
+ * @since Commons Collections 3.1
+ */
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ out.defaultWriteObject();
+ out.writeObject(map);
+ }
+
+ /**
+ * Read the map in using a custom routine.
+ *
+ * @param in the input stream
+ * @throws IOException
+ * @throws ClassNotFoundException
+ * @since Commons Collections 3.1
+ */
+ private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
+ in.defaultReadObject();
+ map = (Map) in.readObject();
}
//-----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
