svn commit: r697318 - in /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections: HashTree.java ListedHashTree.java SortedHashTree.java

[sebb]

Author: sebb
Date: Fri Sep 19 20:03:24 2008
New Revision: 697318

URL: http://svn.apache.org/viewvc?rev=697318&view=rev
Log:
Ensure subclasses can create their own versions of the (now) final parent Map

Modified:
    
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
    
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
    
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java

Modified: 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=697318&r1=697317&r2=697318&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java 
(original)
+++ 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java 
Fri Sep 19 20:03:24 2008
@@ -24,6 +24,7 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -69,6 +70,13 @@
     }
 
     /**
+     * Allow subclasses to provide their own Map.
+     */
+    protected HashTree(Map _map) {
+        data = _map;
+    }
+
+    /**
      * Creates a new HashTree and adds the given object as a top-level node.
      *
      * @param key

Modified: 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java?rev=697318&r1=697317&r2=697318&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
 (original)
+++ 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
 Fri Sep 19 20:03:24 2008
@@ -23,7 +23,6 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -43,7 +42,7 @@
     private List order;
 
     public ListedHashTree() {
-        data = new HashMap();
+        super();
         order = new LinkedList();
     }
 
@@ -54,14 +53,14 @@
     }
 
     public ListedHashTree(Object key) {
-        data = new HashMap();
+        super();
         order = new LinkedList();
         data.put(key, new ListedHashTree());
         order.add(key);
     }
 
     public ListedHashTree(Collection keys) {
-        data = new HashMap();
+        super();
         order = new LinkedList();
         Iterator it = keys.iterator();
         while (it.hasNext()) {
@@ -72,7 +71,7 @@
     }
 
     public ListedHashTree(Object[] keys) {
-        data = new HashMap();
+        super();
         order = new LinkedList();
         for (int x = 0; x < keys.length; x++) {
             data.put(keys[x], new ListedHashTree());

Modified: 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java?rev=697318&r1=697317&r2=697318&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
 (original)
+++ 
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
 Fri Sep 19 20:03:24 2008
@@ -46,27 +46,27 @@
     protected transient Comparator comparator;
 
     public SortedHashTree() {
-        data = new TreeMap();
+        super(new TreeMap());
     }
 
     public SortedHashTree(Comparator comper) {
+        super(new TreeMap(comper));
         comparator = comper;
-        data = new TreeMap(comparator);
     }
 
     public SortedHashTree(Object key) {
-        data = new TreeMap();
+        super(new TreeMap());
         data.put(key, new SortedHashTree());
     }
 
     public SortedHashTree(Object key, Comparator comper) {
+        super(new TreeMap(comper));
         comparator = comper;
-        data = new TreeMap(comparator);
         data.put(key, new SortedHashTree(comparator));
     }
 
     public SortedHashTree(Collection keys) {
-        data = new TreeMap();
+        super(new TreeMap());
         Iterator it = keys.iterator();
         while (it.hasNext()) {
             data.put(it.next(), new SortedHashTree());
@@ -74,8 +74,8 @@
     }
 
     public SortedHashTree(Collection keys, Comparator comper) {
+        super(new TreeMap(comper));
         comparator = comper;
-        data = new TreeMap(comparator);
         Iterator it = keys.iterator();
         while (it.hasNext()) {
             data.put(it.next(), new SortedHashTree(comparator));
@@ -83,15 +83,15 @@
     }
 
     public SortedHashTree(Object[] keys) {
-        data = new TreeMap();
+        super(new TreeMap());
         for (int x = 0; x < keys.length; x++) {
             data.put(keys[x], new SortedHashTree());
         }
     }
 
     public SortedHashTree(Object[] keys, Comparator comper) {
+        super(new TreeMap(comper));
         comparator = comper;
-        data = new TreeMap(comparator);
         for (int x = 0; x < keys.length; x++) {
             data.put(keys[x], new SortedHashTree(comparator));
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]