Author: sebb
Date: Fri Nov 20 17:21:43 2009
New Revision: 882647
URL: http://svn.apache.org/viewvc?rev=882647&view=rev
Log:
Some generics tidyup
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=882647&r1=882646&r2=882647&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:21:43 2009
@@ -191,7 +191,7 @@
* @param keys
* a collection of objects to be added to the created HashTree.
*/
- public HashTree(Collection keys) {
+ public HashTree(Collection<?> keys) {
data = new HashMap<Object, HashTree>();
Iterator<?> it = keys.iterator();
while (it.hasNext()) {
@@ -286,7 +286,7 @@
* Collection of objects to be added as keys in the secondary
* node
*/
- public void set(Object key, Collection values) {
+ public void set(Object key, Collection<?> values) {
data.put(key, createNewTree(values));
}
@@ -324,7 +324,7 @@
* @param values
* Collection of values to be added as keys to bottom-most node
*/
- public void set(Object[] treePath, Collection values) {
+ public void set(Object[] treePath, Collection<?> values) {
if (treePath != null) {
set(Arrays.asList(treePath), values);
}
@@ -356,7 +356,7 @@
* @param values
* Collection of objects to set as nodes.
*/
- public void set(Collection values) {
+ public void set(Collection<?> values) {
clear();
this.add(values);
}
@@ -375,7 +375,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);
}
@@ -413,7 +413,7 @@
* @param keys
* Collection of Keys to be added to HashTree.
*/
- public void add(Collection keys) {
+ public void add(Collection<?> keys) {
Iterator<?> it = keys.iterator();
while (it.hasNext()) {
add(it.next());
@@ -459,7 +459,7 @@
* Collection of objects to be added as keys in the secondary
* node
*/
- public void add(Object key, Collection values) {
+ public void add(Object key, Collection<?> values) {
add(key);
getTree(key).add(values);
}
@@ -494,7 +494,7 @@
* @param values
* collection of values to be added as keys to bottom-most node
*/
- public void add(Object[] treePath, Collection values) {
+ public void add(Object[] treePath, Collection<?> values) {
if (treePath != null) {
add(Arrays.asList(treePath), values);
}
@@ -550,7 +550,7 @@
* @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);
}
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=882647&r1=882646&r2=882647&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 Nov 20 17:21:43 2009
@@ -107,7 +107,7 @@
/** {@inheritDoc} */
@Override
- public void set(Object key, Collection values) {
+ public void set(Object key, Collection<?> values) {
if (!data.containsKey(key)) {
order.add(key);
}
@@ -137,7 +137,7 @@
/** {@inheritDoc} */
@Override
- public HashTree createNewTree(Collection values) {
+ public HashTree createNewTree(Collection<?> values) {
return new ListedHashTree(values);
}
@@ -155,7 +155,7 @@
/** {@inheritDoc} */
@Override
- public Collection list() {
+ public Collection<Object> list() {
return order;
}
@@ -227,7 +227,7 @@
/** {@inheritDoc} */
@Override
- public Set keySet() {
+ public Set<Object> keySet() {
return data.keySet();
}
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=882647&r1=882646&r2=882647&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 Nov 20 17:21:43 2009
@@ -43,7 +43,7 @@
}
// non-null Comparators don't appear to be used at present
- public SortedHashTree(Comparator comper) {
+ public SortedHashTree(Comparator<? super Object> comper) {
super(new TreeMap<Object, HashTree>(comper));
}
@@ -52,12 +52,12 @@
data.put(key, new SortedHashTree());
}
- public SortedHashTree(Object key, Comparator comper) {
+ public SortedHashTree(Object key, Comparator<? super Object> comper) {
this(comper);
data.put(key, new SortedHashTree(comper));
}
- public SortedHashTree(Collection keys) {
+ public SortedHashTree(Collection<?> keys) {
this();
Iterator<?> it = keys.iterator();
while (it.hasNext()) {
@@ -65,7 +65,7 @@
}
}
- public SortedHashTree(Collection keys, Comparator comper) {
+ public SortedHashTree(Collection<?> keys, Comparator<? super Object> comper) {
this(comper);
Iterator<?> it = keys.iterator();
while (it.hasNext()) {
@@ -80,7 +80,7 @@
}
}
- public SortedHashTree(Object[] keys, Comparator comper) {
+ public SortedHashTree(Object[] keys, Comparator<? super Object> comper) {
this(comper);
for (int x = 0; x < keys.length; x++) {
data.put(keys[x], new SortedHashTree(comper));
@@ -90,21 +90,21 @@
/** {@inheritDoc} */
@Override
protected HashTree createNewTree() {
- Comparator<?> comparator = ((TreeMap<?,?>)data).comparator();
+ Comparator<? super Object> comparator = ((TreeMap<Object, HashTree>)data).comparator();
return new SortedHashTree(comparator);
}
/** {@inheritDoc} */
@Override
protected HashTree createNewTree(Object key) {
- Comparator<?> comparator = ((TreeMap<?,?>)data).comparator();
+ Comparator<? super Object> comparator = ((TreeMap<Object, HashTree>) data).comparator();
return new SortedHashTree(key, comparator);
}
/** {@inheritDoc} */
@Override
protected HashTree createNewTree(Collection<?> values) {
- Comparator<?> comparator = ((TreeMap<?,?>)data).comparator();
+ Comparator<? super Object> comparator = ((TreeMap<Object, HashTree>)data).comparator();
return new SortedHashTree(values, comparator);
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.