summaryrefslogtreecommitdiff
path: root/javax/swing/tree
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2005-10-12 21:28:08 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2005-10-12 21:28:08 +0000
commit837db4d5cfec5e5f9a55312cfd28dc2ad5c8531b (patch)
treeb38566de3b1f754704669252b08dac3dc4fd7b4c /javax/swing/tree
parent0630e8358826008222293c316fe9a7068fa2207d (diff)
downloadclasspath-837db4d5cfec5e5f9a55312cfd28dc2ad5c8531b.tar.gz
2005-10-12 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/awt/datatransfer/DataFlavor.java: (DataFlavor(Class<?>,String,String): Genericized. * java/awt/dnd/DragGestureEvent.java: (DragGestureEvent(DragGestureRecognizer,int,Point, List<? extends InputEvent>)): Likewise. (iterator()): Likewise. * java/awt/dnd/DragSource.java: (createDragGestureRecognizer(Class<T>,Component,int, DragGestureListener)): Likewise. * java/awt/dnd/DropTargetContext.java: (getCurrentDataFlavorsAsList()): Likewise. * java/awt/dnd/DropTargetDragEvent.java: (getCurrentDataFlavorsAsList()): Likewise. * java/awt/dnd/DropTargetDropEvent.java: (getCurrentDataFlavorsAsList()): Likewise. * java/awt/font/TextLayout.java: (TextLayout(String,Map<? extends AttributedCharacterIterator.Attribute>, FontRenderContext)): Likewise. * java/awt/image/BufferedImage.java: (BufferedImage(ColorModel,WritableRaster,boolean,Hashtable<?,?>)): Likewise. * java/awt/image/ImageConsumer.java: (setProperties(Hashtable<?,?>)): Likewise. * java/awt/image/MemoryImageSource.java: (MemoryImageSource(int,int,ColorModel,byte[],int,int,Hashtable<?,?>)): Likewise. (MemoryImageSource(int,int,ColorModel,int[],int,int,Hashtable<?,?>)): Likewise. * java/awt/image/RenderedImage.java: (getSources()): Likewise. * java/awt/image/renderable/ParameterBlock.java: (sources): Likewise. (parameters): Likewise. (ParameterBlock()): Likewise. (ParameterBlock(Vector<Object>)): Likewise. (ParameterBlock(Vector<Object>,Vector<Object>)): Likewise. (clone()): Added casts to handle new Vector type. (getSources()): Genericized. (setSources(Vector<Object>)): Likewise. (getParameters()): Likewise. (setParameters(Vector<Object>)): Likewise. * java/awt/image/renderable/RenderableImage.java: (getSources()): Likewise. * javax/swing/tree/DefaultMutableTreeNode.java: (children): Likewise. (getSharedAncestor(DefaultMutableTreeNode)): Likewise. (getDepth()): Likewise. (pathFromAncestorEnumeration(TreeNode)): Likewise. (PostOrderEnumeration)): Likewise. * javax/swing/undo/CompoundEdit.java: (edits): Likewise. (CompoundEdit()): Likewise. (undo()): Likewise. (redo()): Likewise. (lastEdit()): Likewise. (die()): Likewise. (isSignificant()): Likewise. * javax/swing/undo/UndoableEditSupport.java: (listeners): Likewise. (getUndoableEditListeners()): Likewise. * lib/Makefile.am: Turn off listing unused imports (at least for now). * org/omg/CosNaming/_NamingContextExtImplBase.java: (_methods): Likewise. * org/omg/CosNaming/_NamingContextImplBase.java: (methods): Likewise. * vm/reference/java/lang/reflect/Method.java: (getTypeParameters()): Corrected return type.
Diffstat (limited to 'javax/swing/tree')
-rw-r--r--javax/swing/tree/DefaultMutableTreeNode.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/javax/swing/tree/DefaultMutableTreeNode.java b/javax/swing/tree/DefaultMutableTreeNode.java
index e709e2a04..4a7da7d82 100644
--- a/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/javax/swing/tree/DefaultMutableTreeNode.java
@@ -78,7 +78,7 @@ public class DefaultMutableTreeNode
/**
* children
*/
- protected Vector children = new Vector();
+ protected Vector<MutableTreeNode> children = new Vector<MutableTreeNode>();
/**
* userObject
@@ -422,7 +422,7 @@ public class DefaultMutableTreeNode
public TreeNode getSharedAncestor(DefaultMutableTreeNode node)
{
TreeNode current = this;
- ArrayList list = new ArrayList();
+ ArrayList<TreeNode> list = new ArrayList<TreeNode>();
while (current != null)
{
@@ -469,7 +469,7 @@ public class DefaultMutableTreeNode
|| children.size() == 0)
return 0;
- Stack stack = new Stack();
+ Stack<Integer> stack = new Stack<Integer>();
stack.push(new Integer(0));
TreeNode node = getChildAt(0);
int depth = 0;
@@ -707,7 +707,7 @@ public class DefaultMutableTreeNode
throw new IllegalArgumentException();
TreeNode parent = this;
- Vector nodes = new Vector();
+ Vector<TreeNode> nodes = new Vector<TreeNode>();
nodes.add(this);
while (parent != node && parent != null)
@@ -1058,7 +1058,7 @@ public class DefaultMutableTreeNode
static class PostorderEnumeration implements Enumeration
{
- Stack nodes = new Stack();
+ Stack<TreeNode> nodes = new Stack<TreeNode>();
Stack childrenEnums = new Stack();
PostorderEnumeration(TreeNode node)