Java5 update - convert to using generics for collections

Change-Id: I384cb006beee280922564c9277025843a1bda74a

1 files changed, 12 insertions, 12 deletions

diff --git a/toolkit/test/accessibility/AccessibilityTreeModel.java b/toolkit/test/accessibility/AccessibilityTreeModel.java
index fd4d961833cb..12ff8a6195d7 100644
--- a/toolkit/test/accessibility/AccessibilityTreeModel.java
+++ b/toolkit/test/accessibility/AccessibilityTreeModel.java
@@ -100,7 +100,7 @@ public class AccessibilityTreeModel
                     {
                         if (maCanvas != null)
                             maCanvas.removeNode (aNode);
-                        removeAccListener ((AccTreeNode)aNode);
+                        removeAccListener (aNode);
                     }
                 });
             maNodeMap.Clear ();
@@ -294,7 +294,7 @@ public class AccessibilityTreeModel
      */
     protected Object[] createPath (AccessibleTreeNode aNode)
     {
-        Vector aPath = new Vector();
+        Vector<AccessibleTreeNode> aPath = new Vector<AccessibleTreeNode>();
         aNode.createPath (aPath);
         return aPath.toArray();
     }
@@ -310,7 +310,7 @@ public class AccessibilityTreeModel
     {
         for(int i = 0; i < maTMListeners.size(); i++)
         {
-            ((TreeModelListener)maTMListeners.get(i)).treeNodesChanged(e);
+            maTMListeners.get(i).treeNodesChanged(e);
         }
     }
 
@@ -318,7 +318,7 @@ public class AccessibilityTreeModel
     {
         for(int i = 0; i < maTMListeners.size(); i++)
         {
-            ((TreeModelListener)maTMListeners.get(i)).treeNodesInserted(e);
+            maTMListeners.get(i).treeNodesInserted(e);
         }
     }
 
@@ -326,7 +326,7 @@ public class AccessibilityTreeModel
     {
         for(int i = 0; i < maTMListeners.size(); i++)
         {
-            ((TreeModelListener)maTMListeners.get(i)).treeNodesRemoved(e);
+            maTMListeners.get(i).treeNodesRemoved(e);
         }
     }
 
@@ -334,7 +334,7 @@ public class AccessibilityTreeModel
     {
         for(int i = 0; i < maTMListeners.size(); i++)
         {
-            ((TreeModelListener)maTMListeners.get(i)).treeStructureChanged(e);
+            maTMListeners.get(i).treeStructureChanged(e);
         }
     }
 
@@ -393,7 +393,7 @@ public class AccessibilityTreeModel
     /** Create a TreeModelEvent that indicates changes at those children of
         the specified node with the specified indices.
     */
-    protected TreeModelEvent createChangeEvent (AccTreeNode aNode, Vector aChildIndices)
+    protected TreeModelEvent createChangeEvent (AccTreeNode aNode, Vector<Integer> aChildIndices)
     {
         // Build a list of child objects that are indicated by the given indices.
         int nCount = aChildIndices.size();
@@ -401,7 +401,7 @@ public class AccessibilityTreeModel
         int nChildIndices[] = new int[nCount];
         for (int i=0; i<nCount; i++)
         {
-            int nIndex = ((Integer)aChildIndices.elementAt(i)).intValue();
+            int nIndex = aChildIndices.elementAt(i).intValue();
             aChildObjects[i] = aNode.getChild (nIndex);
             nChildIndices[i] = nIndex;
         }
@@ -424,7 +424,7 @@ public class AccessibilityTreeModel
         {
             for(int i = 0; i < maTMListeners.size(); i++)
             {
-                fire( (TreeModelListener)maTMListeners.get(i) );
+                fire( maTMListeners.get(i) );
             }
         }
 
@@ -436,7 +436,7 @@ public class AccessibilityTreeModel
     protected XAccessibleEventBroadcaster getBroadcaster (Object aObject)
     {
         if (aObject instanceof AccTreeNode)
-            return (XAccessibleEventBroadcaster) UnoRuntime.queryInterface (
+            return UnoRuntime.queryInterface (
                 XAccessibleEventBroadcaster.class, ((AccTreeNode)aObject).getContext());
         else
             return null;
@@ -485,7 +485,7 @@ public class AccessibilityTreeModel
         xSource.
     */
     public AccTreeNode updateNode (XAccessibleContext xSource,
-        java.lang.Class class1, java.lang.Class class2)
+        java.lang.Class class1, java.lang.Class<AccessibleExtendedComponentHandler> class2)
     {
         AccessibleTreeNode aTreeNode = maNodeMap.GetNode (xSource);
         AccTreeNode aNode = null;
@@ -495,7 +495,7 @@ public class AccessibilityTreeModel
         {
             aNode = (AccTreeNode) aTreeNode;
             // Get list of affected children.
-            Vector aChildIndices = (aNode).updateChildren (
+            Vector<Integer> aChildIndices = (aNode).updateChildren (
                 class1, class2);
             // Fire events that these children may have changed.
             fireTreeNodesChanged (