diff options
| author | Harvey Harrison <[email protected]> | 2013-07-01 07:56:25 -0700 |
|---|---|---|
| committer | Harvey Harrison <[email protected]> | 2013-07-01 07:56:25 -0700 |
| commit | 9dc974b38188447a943c20511a6f9f6157552df9 (patch) | |
| tree | 6d8e682c70e2e4749755a04882bc6531f386ded5 /src/classes/share | |
| parent | 850d3c7613ab2c532e794d73cb110e7b0341a222 (diff) | |
j3dcore: annotate the changeViewList in SetLiveState
Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src/classes/share')
4 files changed, 7 insertions, 7 deletions
diff --git a/src/classes/share/javax/media/j3d/GroupRetained.java b/src/classes/share/javax/media/j3d/GroupRetained.java index 41aa477..971fa15 100644 --- a/src/classes/share/javax/media/j3d/GroupRetained.java +++ b/src/classes/share/javax/media/j3d/GroupRetained.java @@ -1553,7 +1553,7 @@ synchronized void setAltAppScope() { if (s.inViewSpecificGroup && (s.changedViewGroup == null)) { s.changedViewGroup = new ArrayList<ViewSpecificGroupRetained>(); - s.changedViewList = new ArrayList(); + s.changedViewList = new ArrayList<ArrayList<View>>(); s.keyList = new int[10]; s.viewScopedNodeList = new ArrayList<NodeRetained>(); s.scopedNodesViewList = new ArrayList<ArrayList<View>>(); @@ -1715,7 +1715,7 @@ synchronized void setAltAppScope() { if (s.inViewSpecificGroup && (s.changedViewGroup == null)) { s.changedViewGroup = new ArrayList<ViewSpecificGroupRetained>(); - s.changedViewList = new ArrayList(); + s.changedViewList = new ArrayList<ArrayList<View>>(); s.keyList = new int[10]; s.viewScopedNodeList = new ArrayList<NodeRetained>(); s.scopedNodesViewList = new ArrayList<ArrayList<View>>(); diff --git a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java index 99f5096..703df5a 100644 --- a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java +++ b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java @@ -1398,14 +1398,14 @@ int processAltApps(ArrayList<AlternateAppearanceRetained> globalAltApps, RenderA void initViewSpecificInfo(J3dMessage m) { int[] keys = (int[])m.args[2]; - ArrayList vlists = (ArrayList)m.args[1]; + ArrayList<ArrayList<View>> vlists = (ArrayList<ArrayList<View>>)m.args[1]; 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 = vsgs.get(i); - ArrayList l = (ArrayList)vlists.get(i); + ArrayList<View> l = vlists.get(i); int index = keys[i]; // System.err.println("v = "+v+" index = "+index+" l = "+l); v.cachedViewList.add(index, l); diff --git a/src/classes/share/javax/media/j3d/SetLiveState.java b/src/classes/share/javax/media/j3d/SetLiveState.java index 23dec9c..ac6fd92 100644 --- a/src/classes/share/javax/media/j3d/SetLiveState.java +++ b/src/classes/share/javax/media/j3d/SetLiveState.java @@ -100,7 +100,7 @@ ArrayList<ArrayList<AlternateAppearanceRetained>> altAppearances = null; // false then only viewList(0) is valid ArrayList<ArrayList<View>> viewLists = null; ArrayList<ViewSpecificGroupRetained> changedViewGroup = null; - ArrayList changedViewList = null; +ArrayList<ArrayList<View>> 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 f7bc046..d1a3115 100644 --- a/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java +++ b/src/classes/share/javax/media/j3d/ViewSpecificGroupRetained.java @@ -539,7 +539,7 @@ Enumeration<View> getAllViews() { ArrayList<ArrayList<View>> savedViewList = s.viewLists; if (s.changedViewGroup == null) { s.changedViewGroup = new ArrayList<ViewSpecificGroupRetained>(); - s.changedViewList = new ArrayList(); + s.changedViewList = new ArrayList<ArrayList<View>>(); s.keyList = new int[10]; s.viewScopedNodeList = new ArrayList<NodeRetained>(); s.scopedNodesViewList = new ArrayList<ArrayList<View>>(); @@ -553,7 +553,7 @@ Enumeration<View> getAllViews() { ArrayList<ArrayList<View>> savedViewList = s.viewLists; if (s.changedViewGroup == null) { s.changedViewGroup = new ArrayList<ViewSpecificGroupRetained>(); - s.changedViewList = new ArrayList(); + s.changedViewList = new ArrayList<ArrayList<View>>(); s.keyList = new int[10]; s.viewScopedNodeList = new ArrayList<NodeRetained>(); s.scopedNodesViewList = new ArrayList<ArrayList<View>>(); |