From 850d3c7613ab2c532e794d73cb110e7b0341a222 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Mon, 1 Jul 2013 07:52:19 -0700
Subject: j3dcore: annotate the changeViewGroup list in SetLiveState

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 src/classes/share/javax/media/j3d/GroupRetained.java              | 4 ++--
 .../share/javax/media/j3d/RenderingEnvironmentStructure.java      | 8 ++++----
 src/classes/share/javax/media/j3d/SetLiveState.java               | 2 +-
 src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/classes/share/javax/media/j3d/GroupRetained.java b/src/classes/share/javax/media/j3d/GroupRetained.java
index edde74f..41aa477 100644
--- a/src/classes/share/javax/media/j3d/GroupRetained.java
+++ b/src/classes/share/javax/media/j3d/GroupRetained.java
@@ -1552,7 +1552,7 @@ synchronized void setAltAppScope() {
 
 	    if (s.inViewSpecificGroup &&
 		(s.changedViewGroup == null)) {
-		s.changedViewGroup = new ArrayList();
+		s.changedViewGroup = new ArrayList<ViewSpecificGroupRetained>();
 		s.changedViewList = new ArrayList();
 		s.keyList = new int[10];
 		s.viewScopedNodeList = new ArrayList<NodeRetained>();
@@ -1714,7 +1714,7 @@ synchronized void setAltAppScope() {
             // Issue 312: Allocate data structures if we are in a ViewSpecificGroup
 	    if (s.inViewSpecificGroup &&
 		(s.changedViewGroup == null)) {
-		s.changedViewGroup = new ArrayList();
+		s.changedViewGroup = new ArrayList<ViewSpecificGroupRetained>();
 		s.changedViewList = new ArrayList();
 		s.keyList = new int[10];
 		s.viewScopedNodeList = new ArrayList<NodeRetained>();
diff --git a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
index 078c293..99f5096 100644
--- a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
+++ b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
@@ -1399,12 +1399,12 @@ int processAltApps(ArrayList<AlternateAppearanceRetained> globalAltApps, RenderA
     void initViewSpecificInfo(J3dMessage m) {
 	int[] keys = (int[])m.args[2];
 	ArrayList vlists = (ArrayList)m.args[1];
-	ArrayList vsgs = (ArrayList)m.args[0];
+	ArrayList<ViewSpecificGroupRetained> vsgs = (ArrayList<ViewSpecificGroupRetained>)m.args[0];
 	if (vsgs != null) {
 	    //	    System.err.println("===> non null Vsg");
 	    int size = vsgs.size();
 	    for (int i = 0; i < size; i++) {
-		ViewSpecificGroupRetained v = (ViewSpecificGroupRetained)vsgs.get(i);
+		ViewSpecificGroupRetained v = vsgs.get(i);
 		ArrayList l = (ArrayList)vlists.get(i);
 		int index = keys[i];
 		//		System.err.println("v = "+v+" index = "+index+" l = "+l);
@@ -1420,11 +1420,11 @@ int processAltApps(ArrayList<AlternateAppearanceRetained> globalAltApps, RenderA
 
     void clearViewSpecificInfo(J3dMessage m) {
 	int[] keys = (int[])m.args[1];
-	ArrayList vsgs = (ArrayList)m.args[0];
+	ArrayList<ViewSpecificGroupRetained> vsgs = (ArrayList<ViewSpecificGroupRetained>)m.args[0];
 	if (vsgs != null) {
 	    int size = vsgs.size();
 	    for (int i = 0; i < size; i++) {
-		ViewSpecificGroupRetained v = (ViewSpecificGroupRetained)vsgs.get(i);
+		ViewSpecificGroupRetained v = vsgs.get(i);
 		int index = keys[i];
 			if (index == -1) {
 				int csize = v.cachedViewList.size();
diff --git a/src/classes/share/javax/media/j3d/SetLiveState.java b/src/classes/share/javax/media/j3d/SetLiveState.java
index f7f5d1f..23dec9c 100644
--- a/src/classes/share/javax/media/j3d/SetLiveState.java
+++ b/src/classes/share/javax/media/j3d/SetLiveState.java
@@ -99,7 +99,7 @@ ArrayList<ArrayList<AlternateAppearanceRetained>> altAppearances = null;
 // viewList for this node, if inSharedGroup is
 // false then only viewList(0) is valid
 ArrayList<ArrayList<View>> viewLists = null;
-    ArrayList changedViewGroup = null;
+ArrayList<ViewSpecificGroupRetained> changedViewGroup = null;
     ArrayList changedViewList = null;
     int[] keyList = null;
 
diff --git a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java
index fc42d0b..f7bc046 100644
--- a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java
@@ -538,7 +538,7 @@ Enumeration<View> getAllViews() {
 	s.inViewSpecificGroup = true;
 	ArrayList<ArrayList<View>> savedViewList = s.viewLists;
 	if (s.changedViewGroup == null) {
-	    s.changedViewGroup = new ArrayList();
+	    s.changedViewGroup = new ArrayList<ViewSpecificGroupRetained>();
 	    s.changedViewList = new ArrayList();
 	    s.keyList = new int[10];
 	    s.viewScopedNodeList = new ArrayList<NodeRetained>();
@@ -552,7 +552,7 @@ Enumeration<View> getAllViews() {
     void clearLive(SetLiveState s) {
 	ArrayList<ArrayList<View>> savedViewList = s.viewLists;
 	if (s.changedViewGroup == null) {
-	    s.changedViewGroup = new ArrayList();
+	    s.changedViewGroup = new ArrayList<ViewSpecificGroupRetained>();
 	    s.changedViewList = new ArrayList();
 	    s.keyList = new int[10];
 	    s.viewScopedNodeList = new ArrayList<NodeRetained>();
-- 
cgit v1.2.3