svn commit: r882651 - /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java

Author: sebb
Date: Fri Nov 20 17:36:11 2009
New Revision: 882651

URL: http://svn.apache.org/viewvc?rev=882651&view=rev
Log:
Some generics tidyup

Modified:
    jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.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=882651&r1=882650&r2=882651&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 Nov 20 17:36:11 2009
@@ -26,7 +26,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
@@ -105,7 +104,7 @@
      *
      * @see java.util.Map#entrySet()
      */
-    public Set entrySet() {
+    public Set<?> entrySet() {
         return data.entrySet();
     }
 
@@ -151,7 +150,7 @@
      *
      * @see java.util.Map#values()
      */
-    public Collection values() {
+    public Collection<HashTree> values() {
         return data.values();
     }
 
@@ -344,7 +343,7 @@
      * @param values
      *            array of values to be added as keys to bottom-most node
      */
-    public void set(Collection treePath, Object[] values) {
+    public void set(Collection<?> treePath, Object[] values) {
         HashTree tree = addTreePath(treePath);
         tree.set(Arrays.asList(values));
     }
@@ -375,7 +374,7 @@
      * @param values
      *            collection of values to be added as keys to bottom-most node
      */
-    public void set(Collection treePath, Collection<?> values) {
+    public void set(Collection<?> treePath, Collection<?> values) {
         HashTree tree = addTreePath(treePath);
         tree.set(values);
     }
@@ -516,7 +515,7 @@
      * @param values
      *            array of values to be added as keys to bottom-most node
      */
-    public void add(Collection treePath, Object[] values) {
+    public void add(Collection<?> treePath, Object[] values) {
         HashTree tree = addTreePath(treePath);
         tree.add(Arrays.asList(values));
     }
@@ -533,7 +532,7 @@
      * @param value
      *            Object to add as a node to bottom-most node
      */
-    public HashTree add(Collection treePath, Object value) {
+    public HashTree add(Collection<?> treePath, Object value) {
         HashTree tree = addTreePath(treePath);
         return tree.add(value);
     }
@@ -550,12 +549,12 @@
      * @param values
      *            Collection of values to be added as keys to bottom-most node
      */
-    public void add(Collection treePath, Collection<?> values) {
+    public void add(Collection<?> treePath, Collection<?> values) {
         HashTree tree = addTreePath(treePath);
         tree.add(values);
     }
 
-    protected HashTree addTreePath(Collection treePath) {
+    protected HashTree addTreePath(Collection<?> treePath) {
         HashTree tree = this;
         Iterator<?> iter = treePath.iterator();
         while (iter.hasNext()) {
@@ -671,7 +670,7 @@
      *            Collection of keys
      * @return HashTree at the end of the recursion
      */
-    public HashTree getTree(Collection treePath) {
+    public HashTree getTree(Collection<?> treePath) {
         return getTreePath(treePath);
     }
 
@@ -701,7 +700,7 @@
         if (temp != null) {
             return temp.list();
         }
-        return new LinkedList(); // should we use: new HashTree().list()
+        return new HashTree().list();
     }
 
     /**
@@ -742,12 +741,12 @@
      *            List of keys used to recurse into HashTree structure
      * @return Set of all keys found in end HashTree
      */
-    public Collection list(Collection treePath) {
+    public Collection list(Collection<?> treePath) {
         HashTree tree = getTreePath(treePath);
         if (tree != null) {
             return tree.list();
         }
-        return new LinkedList(); // should we use: new HashTree().list()
+        return new HashTree().list();
     }
 
     /**
@@ -818,12 +817,12 @@
      *            list of keys used to recurse into HashTree structure
      * @return array of all keys found in end HashTree
      */
-    public Object[] getArray(Collection treePath) {
+    public Object[] getArray(Collection<?> treePath) {
         HashTree tree = getTreePath(treePath);
         return (tree != null) ? tree.getArray() : null;
     }
 
-    protected HashTree getTreePath(Collection treePath) {
+    protected HashTree getTreePath(Collection<?> treePath) {
         HashTree tree = this;
         Iterator<?> iter = treePath.iterator();
         while (iter.hasNext()) {