Index: modules/swing/src/test/api/java/common/javax/swing/JTreeTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/JTreeTest.java (revision 464841) +++ modules/swing/src/test/api/java/common/javax/swing/JTreeTest.java (working copy) @@ -59,7 +59,7 @@ import javax.swing.tree.TreeSelectionModel; import javax.swing.tree.VariableHeightLayoutCache; -public class JTreeTest extends BasicSwingTestCase { +public class JTreeTest extends SwingTestCase { protected JTree tree; @@ -316,7 +316,7 @@ } public void testJTreeVector() { - Vector nodes = new Vector(); + Vector nodes = new Vector(); nodes.add("node1"); nodes.add("node2"); nodes.add("node3"); @@ -360,7 +360,7 @@ } public void testJTreeHashtable() { - Hashtable nodes = new Hashtable(); + Hashtable nodes = new Hashtable(); nodes.put("node1", "node1"); nodes.put("node2", "node2"); nodes.put("node3", "node3"); @@ -716,22 +716,22 @@ public void testCreateTreeModel() { Object obj1 = new Object[] {"node1", "node2", "node3"}; - Vector obj2 = new Vector(); + Vector obj2 = new Vector(); obj2.add("node1"); obj2.add("node2"); obj2.add("node3"); - Hashtable obj3 = new Hashtable(); + Hashtable obj3 = new Hashtable(); obj3.put("node1", "value1"); obj3.put("node2", "value3"); obj3.put("node3", "value3"); Object obj4 = "object"; - List obj5 = new ArrayList(); + List obj5 = new ArrayList(); obj5.add("node1"); obj5.add("node2"); obj5.add("node3"); Object obj6 = new int[] {1, 2, 3}; - Vector obj7 = new Vector(); - Vector obj71 = new Vector(); + Vector obj7 = new Vector(); + Vector obj71 = new Vector(); obj71.add("node1"); obj71.add("node2"); obj7.add(obj71); @@ -2452,10 +2452,10 @@ } - private void checkInEnumeration(final Enumeration e, final Object[] expected) { + private void checkInEnumeration(final Enumeration e, final Object[] expected) { assertNotNull(e); - List actual = new LinkedList(); + List actual = new LinkedList(); while(e.hasMoreElements()) { actual.add(e.nextElement()); } @@ -2490,11 +2490,11 @@ } } - private Enumeration createTestEnumeration(final Object[] base) { - return new Enumeration() { + private Enumeration createTestEnumeration(final TreePath[] base) { + return new Enumeration() { private int index; - public Object nextElement() { + public TreePath nextElement() { return base[index++]; }