Author: sebb Date: Fri Sep 19 13:54:13 2008 New Revision: 697238 URL: http://svn.apache.org/viewvc?rev=697238&view=rev Log: Remove/rename unused clone() methods
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.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=697238&r1=697237&r2=697238&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 13:54:13 2008 @@ -598,7 +598,7 @@ * contents of the tree are not cloned). * */ - public Object clone() { + private HashTree localclone() { HashTree newTree = new HashTree(); cloneTree(newTree); return newTree; @@ -608,7 +608,7 @@ Iterator iter = list().iterator(); while (iter.hasNext()) { Object key = iter.next(); - newTree.set(key, (HashTree) getTree(key).clone()); + newTree.set(key, getTree(key).localclone()); } } 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=697238&r1=697237&r2=697238&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 13:54:13 2008 @@ -21,9 +21,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.Comparator; -import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import java.util.TreeMap; // NOTUSED import org.apache.jorphan.logging.LoggingManager; @@ -42,6 +40,9 @@ */ public class SortedHashTree extends HashTree implements Serializable { // NOTUSED private static Logger log = LoggingManager.getLoggerForClass(); + + private static final long serialVersionUID = 233L; + protected transient Comparator comparator; public SortedHashTree() { @@ -120,16 +121,17 @@ } } - public Object clone() { - HashTree newTree = null; - if (comparator == null) { - newTree = new SortedHashTree(); - } else { - newTree = new SortedHashTree(comparator); - } - newTree.data = (Map) ((HashMap) data).clone(); - return newTree; - } +// Does not seem to be used (and class does not implement Cloneable) +// public Object clone() { +// HashTree newTree = null; +// if (comparator == null) { +// newTree = new SortedHashTree(); +// } else { +// newTree = new SortedHashTree(comparator); +// } +// newTree.data = (Map) ((HashMap) data).clone(); +// return newTree; +// } /** * @param comparator --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]