j3dcore: annotate the childTransformLink lists

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

4 files changed, 16 insertions, 20 deletions

diff --git a/src/classes/share/javax/media/j3d/LinkRetained.java b/src/classes/share/javax/media/j3d/LinkRetained.java
index aa554ed..cdf4c8c 100644
--- a/src/classes/share/javax/media/j3d/LinkRetained.java
+++ b/src/classes/share/javax/media/j3d/LinkRetained.java
@@ -246,7 +246,7 @@ class LinkRetained extends LeafRetained {
 	    // either not in sharedGroup or last instance in sharedGroup
             // remove this node from parentTransformLink's childTransformLink
             if (parentTransformLink != null) {
-                ArrayList obj;
+                ArrayList<NodeRetained> obj;
                 if (parentTransformLink instanceof TransformGroupRetained) {
                     obj = ((TransformGroupRetained)
                         parentTransformLink).childTransformLinks;
diff --git a/src/classes/share/javax/media/j3d/SetLiveState.java b/src/classes/share/javax/media/j3d/SetLiveState.java
index ac6fd92..892b9fb 100644
--- a/src/classes/share/javax/media/j3d/SetLiveState.java
+++ b/src/classes/share/javax/media/j3d/SetLiveState.java
@@ -150,9 +150,9 @@ ArrayList<BranchGroupRetained[]> parentBranchGroupPaths = null;
     // behavior nodes
     ArrayList behaviorNodes = new ArrayList(1);
 
-    // The current list of child transform group nodes or link nodes
-    // under a transform group
-    ArrayList childTransformLinks = null;
+// The current list of child transform group nodes or link nodes
+// under a transform group
+ArrayList<NodeRetained> childTransformLinks = null;
 
     // closest parent which is a TransformGroupRetained or sharedGroupRetained
     GroupRetained parentTransformLink = null;
diff --git a/src/classes/share/javax/media/j3d/SharedGroupRetained.java b/src/classes/share/javax/media/j3d/SharedGroupRetained.java
index 75f29a4..2de2bde 100644
--- a/src/classes/share/javax/media/j3d/SharedGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/SharedGroupRetained.java
@@ -49,9 +49,9 @@ class SharedGroupRetained extends GroupRetained implements TargetsInterface {
                           1 << NodeRetained.BOUNDINGLEAF;
     */
 
-    // The current list of child transform group nodes or link nodes
-    // under a transform group
-    ArrayList childTransformLinks = new ArrayList(1);
+// The current list of child transform group nodes or link nodes
+// under a transform group
+ArrayList<NodeRetained> childTransformLinks = new ArrayList<NodeRetained>(1);
 
     // key which identifies a unique path from a
     // locale to this transform group
@@ -286,7 +286,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
 	ArrayList<SwitchState> savedSwitchStates = s.switchStates;
         ArrayList savedChildSwitchLinks = s.childSwitchLinks;
         GroupRetained savedParentSwitchLink = s.parentSwitchLink;
-        ArrayList savedChildTransformLinks = s.childTransformLinks;
+        ArrayList<NodeRetained> savedChildTransformLinks = s.childTransformLinks;
         GroupRetained savedParentTransformLink = s.parentTransformLink;
         int[] savedHashkeyIndex = s.hashkeyIndex;
 
diff --git a/src/classes/share/javax/media/j3d/TransformGroupRetained.java b/src/classes/share/javax/media/j3d/TransformGroupRetained.java
index b397b7a..e7d404d 100644
--- a/src/classes/share/javax/media/j3d/TransformGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/TransformGroupRetained.java
@@ -79,9 +79,9 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
      */
     WakeupIndexedList transformChange = null;
 
-    // The current list of child transform group nodes or link nodes
-    // under a transform group
-    ArrayList childTransformLinks = new ArrayList(1);
+// The current list of child transform group nodes or link nodes
+// under a transform group
+ArrayList<NodeRetained> childTransformLinks = new ArrayList<NodeRetained>(1);
 
     // working area while compile
     boolean needNormalsTransform = false; // true if normals transformation
@@ -560,7 +560,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
       currentTransform.set(trans);
 
 
-      ArrayList savedChildTransformLinks = s.childTransformLinks;
+      ArrayList<NodeRetained> savedChildTransformLinks = s.childTransformLinks;
       GroupRetained savedParentTransformLink = s.parentTransformLink;
       Transform3D[][] oldCurrentList = s.currentTransforms;
       int[][] oldCurrentIndexList = s.currentTransformsIndex;
@@ -651,7 +651,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
 
 
                 if (parentTransformLink != null) {
-                    ArrayList obj;
+                    ArrayList<NodeRetained> obj;
                     if (parentTransformLink
                         instanceof TransformGroupRetained) {
                         obj = ((TransformGroupRetained)
@@ -880,7 +880,6 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
 				  ArrayList blUsers) {
 
 	int i, j;
-	Object obj;
 	Transform3D lToVw, childLToVw;
 	TransformGroupRetained tg;
 	LinkRetained ln;
@@ -917,7 +916,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
 		// transformLink may contain link nodes
 		synchronized(childTransformLinks) {
 		    for (i=0; i<childTransformLinks.size(); i++) {
-			obj = childTransformLinks.get(i);
+			NodeRetained obj = childTransformLinks.get(i);
 
 			if (obj instanceof TransformGroupRetained) {
 			    tg = (TransformGroupRetained)obj;
@@ -959,7 +958,6 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
 				  UpdateTargets targets,
 				  ArrayList blUsers) {
 	int i, j;
-	Object obj;
 	Transform3D lToVw, childLToVw;
 	TransformGroupRetained tg;
         LinkRetained ln;
@@ -995,7 +993,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
 		// and link nodes
 		synchronized(childTransformLinks) {
 		    for (i=0; i<childTransformLinks.size(); i++) {
-			obj = childTransformLinks.get(i);
+			NodeRetained obj = childTransformLinks.get(i);
 
 			if (obj instanceof TransformGroupRetained) {
 			    tg = (TransformGroupRetained)obj;
@@ -1159,10 +1157,8 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface
 
             int numLinks = childTransformLinks.size();
             TargetsInterface childLink;
- 	    NodeRetained node;
             for(int i=0; i<numLinks; i++) {
-
-                node = (NodeRetained)childTransformLinks.get(i);
+            	NodeRetained node = childTransformLinks.get(i);
     	        if (node.nodeType == NodeRetained.LINK) {
 		    childLink = (TargetsInterface)
 				((LinkRetained)node).sharedGroup;