Author: sebb
Date: Mon Aug 17 22:06:31 2009
New Revision: 805172
URL: http://svn.apache.org/viewvc?rev=805172&view=rev
Log:
Generify - stage 1
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=805172&r1=805171&r2=805172&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
Mon Aug 17 22:06:31 2009
@@ -58,19 +58,19 @@
// Used for the RuntimeException to short-circuit the traversal
private static final String FOUND = "found"; // $NON-NLS-1$
- protected final Map data;
+ protected final Map<Object, HashTree> data;
/**
* Creates an empty new HashTree.
*/
public HashTree() {
- data = new HashMap();
+ data = new HashMap<Object, HashTree>();
}
/**
* Allow subclasses to provide their own Map.
*/
- protected HashTree(Map _map) {
+ protected HashTree(Map<Object, HashTree> _map) {
data = _map;
}
@@ -80,7 +80,7 @@
* @param key
*/
public HashTree(Object key) {
- data = new HashMap();
+ data = new HashMap<Object, HashTree>();
data.put(key, new HashTree());
}
@@ -176,7 +176,7 @@
* @param newTree
*/
public void add(HashTree newTree) {
- Iterator iter = newTree.list().iterator();
+ Iterator<?> iter = newTree.list().iterator();
while (iter.hasNext()) {
Object item = iter.next();
add(item);
@@ -192,8 +192,8 @@
* a collection of objects to be added to the created HashTree.
*/
public HashTree(Collection keys) {
- data = new HashMap();
- Iterator it = keys.iterator();
+ data = new HashMap<Object, HashTree>();
+ Iterator<?> it = keys.iterator();
while (it.hasNext()) {
data.put(it.next(), new HashTree());
}
@@ -204,7 +204,7 @@
* top-level nodes in the tree.
*/
public HashTree(Object[] keys) {
- data = new HashMap();
+ data = new HashMap<Object, HashTree>();
for (int x = 0; x < keys.length; x++) {
data.put(keys[x], new HashTree());
}
@@ -414,7 +414,7 @@
* Collection of Keys to be added to HashTree.
*/
public void add(Collection keys) {
- Iterator it = keys.iterator();
+ Iterator<?> it = keys.iterator();
while (it.hasNext()) {
add(it.next());
}
@@ -557,7 +557,7 @@
protected HashTree addTreePath(Collection treePath) {
HashTree tree = this;
- Iterator iter = treePath.iterator();
+ Iterator<?> iter = treePath.iterator();
while (iter.hasNext()) {
Object temp = iter.next();
tree.add(temp);
@@ -573,7 +573,7 @@
* Key used to find appropriate HashTree()
*/
public HashTree getTree(Object key) {
- return (HashTree) data.get(key);
+ return data.get(key);
}
/**
@@ -614,7 +614,7 @@
}
protected void cloneTree(HashTree newTree) {
- Iterator iter = list().iterator();
+ Iterator<?> iter = list().iterator();
while (iter.hasNext()) {
Object key = iter.next();
newTree.set(key, (HashTree) getTree(key).clone());
@@ -659,7 +659,7 @@
*
* @return HashTree
*/
- protected HashTree createNewTree(Collection values) {
+ protected HashTree createNewTree(Collection<?> values) {
return new HashTree(values);
}
@@ -697,11 +697,11 @@
* @return Set of all keys in found HashTree.
*/
public Collection list(Object key) {
- HashTree temp = (HashTree) data.get(key);
+ HashTree temp = data.get(key);
if (temp != null) {
return temp.list();
}
- return new LinkedList();
+ return new LinkedList(); // should we use: new HashTree().list()
}
/**
@@ -747,7 +747,7 @@
if (tree != null) {
return tree.list();
}
- return new LinkedList();
+ return new LinkedList(); // should we use: new HashTree().list()
}
/**
@@ -825,7 +825,7 @@
protected HashTree getTreePath(Collection treePath) {
HashTree tree = this;
- Iterator iter = treePath.iterator();
+ Iterator<?> iter = treePath.iterator();
while (iter.hasNext()) {
if (tree == null) {
return null;
@@ -963,7 +963,7 @@
* @see HashTreeTraverser
*/
public void traverse(HashTreeTraverser visitor) {
- Iterator iter = list().iterator();
+ Iterator<?> iter = list().iterator();
while (iter.hasNext()) {
Object item = iter.next();
visitor.addNode(item, getTree(item));
@@ -980,7 +980,7 @@
if (list().size() == 0) {
visitor.processPath();
} else {
- Iterator iter = list().iterator();
+ Iterator<?> iter = list().iterator();
while (iter.hasNext()) {
Object item = iter.next();
final HashTree treeItem = getTree(item);
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=805172&r1=805171&r2=805172&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
Mon Aug 17 22:06:31 2009
@@ -39,31 +39,22 @@
* @see HashTree
*/
public class ListedHashTree extends HashTree implements Serializable,
Cloneable {
- private List order;
+ private final List<Object> order;
public ListedHashTree() {
super();
- order = new LinkedList();
- }
-
- @Override
- public Object clone() {
- ListedHashTree newTree = new ListedHashTree();
- cloneTree(newTree);
- return newTree;
+ order = new LinkedList<Object>();
}
public ListedHashTree(Object key) {
- super();
- order = new LinkedList();
+ this();
data.put(key, new ListedHashTree());
order.add(key);
}
- public ListedHashTree(Collection keys) {
- super();
- order = new LinkedList();
- Iterator it = keys.iterator();
+ public ListedHashTree(Collection<?> keys) {
+ this();
+ Iterator<?> it = keys.iterator();
while (it.hasNext()) {
Object temp = it.next();
data.put(temp, new ListedHashTree());
@@ -72,14 +63,22 @@
}
public ListedHashTree(Object[] keys) {
- super();
- order = new LinkedList();
+ this();
for (int x = 0; x < keys.length; x++) {
data.put(keys[x], new ListedHashTree());
order.add(keys[x]);
}
}
+ /** {...@inheritdoc} */
+ @Override
+ public Object clone() {
+ ListedHashTree newTree = new ListedHashTree();
+ cloneTree(newTree);
+ return newTree;
+ }
+
+ /** {...@inheritdoc} */
@Override
public void set(Object key, Object value) {
if (!data.containsKey(key)) {
@@ -88,6 +87,7 @@
super.set(key, value);
}
+ /** {...@inheritdoc} */
@Override
public void set(Object key, HashTree t) {
if (!data.containsKey(key)) {
@@ -96,6 +96,7 @@
super.set(key, t);
}
+ /** {...@inheritdoc} */
@Override
public void set(Object key, Object[] values) {
if (!data.containsKey(key)) {
@@ -104,6 +105,7 @@
super.set(key, values);
}
+ /** {...@inheritdoc} */
@Override
public void set(Object key, Collection values) {
if (!data.containsKey(key)) {
@@ -112,6 +114,7 @@
super.set(key, values);
}
+ /** {...@inheritdoc} */
@Override
public void replace(Object currentKey, Object newKey) {
HashTree tree = getTree(currentKey);
@@ -120,21 +123,25 @@
order.set(order.indexOf(currentKey), newKey);
}
+ /** {...@inheritdoc} */
@Override
public HashTree createNewTree() {
return new ListedHashTree();
}
+ /** {...@inheritdoc} */
@Override
public HashTree createNewTree(Object key) {
return new ListedHashTree(key);
}
+ /** {...@inheritdoc} */
@Override
public HashTree createNewTree(Collection values) {
return new ListedHashTree(values);
}
+ /** {...@inheritdoc} */
@Override
public HashTree add(Object key) {
if (!data.containsKey(key)) {
@@ -146,22 +153,26 @@
return getTree(key);
}
+ /** {...@inheritdoc} */
@Override
public Collection list() {
return order;
}
+ /** {...@inheritdoc} */
@Override
public Object remove(Object key) {
order.remove(key);
return data.remove(key);
}
+ /** {...@inheritdoc} */
@Override
public Object[] getArray() {
return order.toArray();
}
+ /** {...@inheritdoc} */
// Make sure the hashCode depends on the order as well
@Override
public int hashCode() {
@@ -171,6 +182,7 @@
return hc;
}
+ /** {...@inheritdoc} */
@Override
public boolean equals(Object o) {
if (!(o instanceof ListedHashTree)) {
@@ -213,11 +225,13 @@
// return flag;
}
+ /** {...@inheritdoc} */
@Override
public Set keySet() {
return data.keySet();
}
+ /** {...@inheritdoc} */
@Override
public int size() {
return data.size();
@@ -231,11 +245,7 @@
oos.defaultWriteObject();
}
- /*
- * (non-Javadoc)
- *
- * @see java.util.Map#clear()
- */
+ /** {...@inheritdoc} */
@Override
public void clear() {
super.clear();
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=805172&r1=805171&r2=805172&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
Mon Aug 17 22:06:31 2009
@@ -39,12 +39,12 @@
private static final long serialVersionUID = 233L;
public SortedHashTree() {
- super(new TreeMap()); // equivalent to new TreeMap((Comparator)null);
+ super(new TreeMap<Object, HashTree>()); // equivalent to new
TreeMap((Comparator)null);
}
// non-null Comparators don't appear to be used at present
public SortedHashTree(Comparator comper) {
- super(new TreeMap(comper));
+ super(new TreeMap<Object, HashTree>(comper));
}
public SortedHashTree(Object key) {
@@ -59,7 +59,7 @@
public SortedHashTree(Collection keys) {
this();
- Iterator it = keys.iterator();
+ Iterator<?> it = keys.iterator();
while (it.hasNext()) {
data.put(it.next(), new SortedHashTree());
}
@@ -67,7 +67,7 @@
public SortedHashTree(Collection keys, Comparator comper) {
this(comper);
- Iterator it = keys.iterator();
+ Iterator<?> it = keys.iterator();
while (it.hasNext()) {
data.put(it.next(), new SortedHashTree(comper));
}
@@ -87,21 +87,24 @@
}
}
+ /** {...@inheritdoc} */
@Override
protected HashTree createNewTree() {
- Comparator comparator = ((TreeMap)data).comparator();
+ Comparator<?> comparator = ((TreeMap<?,?>)data).comparator();
return new SortedHashTree(comparator);
}
+ /** {...@inheritdoc} */
@Override
protected HashTree createNewTree(Object key) {
- Comparator comparator = ((TreeMap)data).comparator();
+ Comparator<?> comparator = ((TreeMap<?,?>)data).comparator();
return new SortedHashTree(key, comparator);
}
+ /** {...@inheritdoc} */
@Override
- protected HashTree createNewTree(Collection values) {
- Comparator comparator = ((TreeMap)data).comparator();
+ protected HashTree createNewTree(Collection<?> values) {
+ Comparator<?> comparator = ((TreeMap<?,?>)data).comparator();
return new SortedHashTree(values, comparator);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
