j3dcore: annotate list of dirty transformgroups

Signed-off-by: Harvey Harrison <[email protected]>

3 files changed, 7 insertions, 8 deletions

diff --git a/src/classes/share/javax/media/j3d/SharedGroupRetained.java b/src/classes/share/javax/media/j3d/SharedGroupRetained.java
index 20f6925..81b6d08 100644
--- a/src/classes/share/javax/media/j3d/SharedGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/SharedGroupRetained.java
@@ -527,7 +527,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
     }
 
     void updateChildLocalToVworld(HashKey key, int index,
-                                        ArrayList dirtyTransformGroups,
+                                  ArrayList<TransformGroupRetained> dirtyTransformGroups,
                                         ArrayList keySet,
 		                        UpdateTargets targets,
                                         ArrayList blUsers) {
diff --git a/src/classes/share/javax/media/j3d/TransformGroupRetained.java b/src/classes/share/javax/media/j3d/TransformGroupRetained.java
index 980f00b..7709cac 100644
--- a/src/classes/share/javax/media/j3d/TransformGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/TransformGroupRetained.java
@@ -830,7 +830,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
 
     }
 
-    void processChildLocalToVworld(ArrayList dirtyTransformGroups,
+    void processChildLocalToVworld(ArrayList<TransformGroupRetained> dirtyTransformGroups,
                                                 ArrayList keySet,
 						UpdateTargets targets,
 						ArrayList blUsers) {
@@ -863,7 +863,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
 
     // for shared case
     void updateChildLocalToVworld(HashKey key, int index,
-				  ArrayList dirtyTransformGroups,
+				  ArrayList<TransformGroupRetained> dirtyTransformGroups,
 				  ArrayList keySet,
 				  UpdateTargets targets,
 				  ArrayList blUsers) {
@@ -943,7 +943,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
     }
 
     // for non-shared case
-    void updateChildLocalToVworld(ArrayList dirtyTransformGroups,
+    void updateChildLocalToVworld(ArrayList<TransformGroupRetained> dirtyTransformGroups,
                                   ArrayList keySet,
 				  UpdateTargets targets,
 				  ArrayList blUsers) {
diff --git a/src/classes/share/javax/media/j3d/TransformStructure.java b/src/classes/share/javax/media/j3d/TransformStructure.java
index 09c8909..8df7fa9 100644
--- a/src/classes/share/javax/media/j3d/TransformStructure.java
+++ b/src/classes/share/javax/media/j3d/TransformStructure.java
@@ -57,8 +57,8 @@ class TransformStructure extends J3dStructure implements ObjectUpdate {
      */
     private ArrayList collisionObjectList = new ArrayList();
 
-    // List of dirty TransformGroups
-    private ArrayList dirtyTransformGroups = new ArrayList();
+// List of dirty TransformGroups
+private ArrayList<TransformGroupRetained> dirtyTransformGroups = new ArrayList<TransformGroupRetained>();
 
     // Associated Keys with the dirtyNodeGroup
     private ArrayList keySet = new ArrayList();
@@ -372,7 +372,6 @@ class TransformStructure extends J3dStructure implements ObjectUpdate {
 
     void processLastLocalToVworld() {
 	int i, j, k;
-	TransformGroupRetained tg;
 	HashKey key;
 
 
@@ -383,7 +382,7 @@ class TransformStructure extends J3dStructure implements ObjectUpdate {
 	}
 
 	for (i=0, k=0; i < dTGSize; i++) {
-	    tg  = (TransformGroupRetained)dirtyTransformGroups.get(i);
+		TransformGroupRetained tg  = dirtyTransformGroups.get(i);
 	    // Check if the transformGroup is still alive
 
 	    // XXXX: This is a hack, should be fixed after EA