j3dcore: annotate lists in SetLiveState related to OrderedGroupRetained

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

2 files changed, 11 insertions, 11 deletions

diff --git a/src/classes/share/javax/media/j3d/GroupRetained.java b/src/classes/share/javax/media/j3d/GroupRetained.java
index db0c1a8..1b3b387 100644
--- a/src/classes/share/javax/media/j3d/GroupRetained.java
+++ b/src/classes/share/javax/media/j3d/GroupRetained.java
@@ -1723,11 +1723,11 @@ synchronized void setAltAppScope() {
 
 	    if (this instanceof OrderedGroupRetained && linkNode == null) {
                 // set this regardless of refCount
-		s.ogList.add(this);
+		OrderedGroupRetained og = (OrderedGroupRetained)this;
+		s.ogList.add(og);
 		s.ogChildIdList.add(new Integer(childIndex));
-		s.ogCIOList.add(this);
+		s.ogCIOList.add(og);
 		int[] newArr = null;
-		OrderedGroupRetained og = (OrderedGroupRetained)this;
 		if(og.userChildIndexOrder != null) {
 		    newArr = new int[og.userChildIndexOrder.length];
 		    System.arraycopy(og.userChildIndexOrder, 0, newArr,
@@ -2710,7 +2710,7 @@ synchronized void setAltAppScope() {
 		if ((refCount+1) == s.refCount) {
 		    //only need to do it once if in shared group. Add
 		    //all the children to the list of OG_REMOVED message
-		    s.ogList.add(this);
+		    s.ogList.add(og);
 		    s.ogChildIdList.add(new Integer(i));
 		}
 			s.orderedPaths = og.childrenOrderedPaths.get(i);
diff --git a/src/classes/share/javax/media/j3d/SetLiveState.java b/src/classes/share/javax/media/j3d/SetLiveState.java
index 11b2cfa..24ee2af 100644
--- a/src/classes/share/javax/media/j3d/SetLiveState.java
+++ b/src/classes/share/javax/media/j3d/SetLiveState.java
@@ -109,13 +109,13 @@ ArrayList<ArrayList<AlternateAppearanceRetained>> altAppearances = null;
 
 ArrayList<OrderedPath> orderedPaths = null;
 
-    ArrayList ogList = new ArrayList(5);
-    ArrayList ogChildIdList = new ArrayList(5);
-    ArrayList ogOrderedIdList = new ArrayList(5);
-    // ogCIOList contains a list of OG with affected child index order.
-    ArrayList ogCIOList =  new ArrayList(5);
-    // ogCIOTableList contains a list of affected child index order.
-    ArrayList ogCIOTableList = new ArrayList(5);
+ArrayList<OrderedGroupRetained> ogList = new ArrayList<OrderedGroupRetained>(5);
+ArrayList<Integer> ogChildIdList = new ArrayList<Integer>(5);
+ArrayList<Integer> ogOrderedIdList = new ArrayList<Integer>(5);
+// ogCIOList contains a list of OG with affected child index order.
+ArrayList<OrderedGroupRetained> ogCIOList = new ArrayList<OrderedGroupRetained>(5);
+// ogCIOTableList contains a list of affected child index order.
+ArrayList<int[]> ogCIOTableList = new ArrayList<int[]>(5);
 
 /**
  * List of BranchGroup from this node to the root of tree This is used by