You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2004/04/08 01:17:25 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/map TestListOrderedMap.java
scolebourne 2004/04/07 16:17:25
Modified: collections RELEASE-NOTES.html
collections/src/java/org/apache/commons/collections/map
ListOrderedMap.java
collections/src/test/org/apache/commons/collections/map
TestListOrderedMap.java
Added: collections/data/test
ListOrderedMap.fullCollection.version3.1.obj
ListOrderedMap.emptyCollection.version3.1.obj
Log:
Make ListOrderedMap Serializable [18815]
Revision Changes Path
1.1 jakarta-commons/collections/data/test/ListOrderedMap.fullCollection.version3.1.obj
<<Binary file>>
1.1 jakarta-commons/collections/data/test/ListOrderedMap.emptyCollection.version3.1.obj
<<Binary file>>
1.28 +1 -0 jakarta-commons/collections/RELEASE-NOTES.html
Index: RELEASE-NOTES.html
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/RELEASE-NOTES.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- RELEASE-NOTES.html 7 Apr 2004 23:05:37 -0000 1.27
+++ RELEASE-NOTES.html 7 Apr 2004 23:17:25 -0000 1.28
@@ -37,6 +37,7 @@
<li>FixedSizeSortedMap - Make Serializable [18815]</li>
<li>LazyMap - Make Serializable [18815]</li>
<li>LazySortedMap - Make Serializable [18815]</li>
+<li>ListOrderedMap - Make Serializable [18815]</li>
<li>MultiKey - Add getKey(index) and size() methods and make constructor public</li>
<li>MultiHashMap - Add five methods to improve the API</li>
<li>AbstractHashedMap,AbstractLinkedMap - Add methods to access entry methods when protected scope blocks</li>
1.14 +27 -2 jakarta-commons/collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java
Index: ListOrderedMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ListOrderedMap.java 1 Apr 2004 22:18:12 -0000 1.13
+++ ListOrderedMap.java 7 Apr 2004 23:17:25 -0000 1.14
@@ -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.AbstractCollection;
import java.util.AbstractSet;
import java.util.ArrayList;
@@ -54,7 +58,11 @@
* @author Stephen Colebourne
*/
public class ListOrderedMap
- extends AbstractMapDecorator implements OrderedMap {
+ extends AbstractMapDecorator
+ implements OrderedMap, Serializable {
+
+ /** Serialization version */
+ private static final long serialVersionUID = 2728177751851003750L;
/** Internal list to hold the sequence of objects */
protected final List insertOrder = new ArrayList();
@@ -81,6 +89,23 @@
protected ListOrderedMap(Map map) {
super(map);
insertOrder.addAll(getMap().keySet());
+ }
+
+ //-----------------------------------------------------------------------
+ /**
+ * Write the map out using a custom routine.
+ */
+ private void writeObject(ObjectOutputStream out) throws IOException {
+ out.defaultWriteObject();
+ out.writeObject(map);
+ }
+
+ /**
+ * Read the map in using a custom routine.
+ */
+ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+ in.defaultReadObject();
+ map = (Map) in.readObject();
}
// Implement OrderedMap
1.9 +15 -1 jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
Index: TestListOrderedMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestListOrderedMap.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestListOrderedMap.java 18 Feb 2004 01:20:38 -0000 1.8
+++ TestListOrderedMap.java 7 Apr 2004 23:17:25 -0000 1.9
@@ -191,4 +191,18 @@
}
+ public String getCompatibilityVersion() {
+ return "3.1";
+ }
+
+// public void testCreate() throws Exception {
+// resetEmpty();
+// writeExternalFormToDisk(
+// (java.io.Serializable) map,
+// "D:/dev/collections/data/test/ListOrderedMap.emptyCollection.version3.1.obj");
+// resetFull();
+// writeExternalFormToDisk(
+// (java.io.Serializable) map,
+// "D:/dev/collections/data/test/ListOrderedMap.fullCollection.version3.1.obj");
+// }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org