diff options
17 files changed, 23 insertions, 25 deletions
diff --git a/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java b/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java index df76f82..58ccbc3 100644 --- a/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java +++ b/src/classes/share/javax/media/j3d/AlternateAppearanceRetained.java @@ -588,7 +588,7 @@ class AlternateAppearanceRetained extends LeafRetained { s.switchTargets[0] != null) { s.switchTargets[0].addNode(mirrorAltApp, Targets.ENV_TARGETS); } - mirrorAltApp.switchState = (SwitchState)s.switchStates.get(0); + mirrorAltApp.switchState = s.switchStates.get(0); s.notifyThreads |= J3dThread.UPDATE_RENDERING_ENVIRONMENT| J3dThread.UPDATE_RENDER; diff --git a/src/classes/share/javax/media/j3d/BackgroundRetained.java b/src/classes/share/javax/media/j3d/BackgroundRetained.java index 947f63a..7337a99 100644 --- a/src/classes/share/javax/media/j3d/BackgroundRetained.java +++ b/src/classes/share/javax/media/j3d/BackgroundRetained.java @@ -575,7 +575,7 @@ GeometryAtom[] bgGeometryAtoms = null; if (s.switchTargets != null && s.switchTargets[0] != null) { s.switchTargets[0].addNode(this, Targets.ENV_TARGETS); } - switchState = (SwitchState)s.switchStates.get(0); + switchState = s.switchStates.get(0); // Initialize some mirror values if (boundingLeaf != null) { diff --git a/src/classes/share/javax/media/j3d/BehaviorRetained.java b/src/classes/share/javax/media/j3d/BehaviorRetained.java index 4c6c1c4..d94a95b 100644 --- a/src/classes/share/javax/media/j3d/BehaviorRetained.java +++ b/src/classes/share/javax/media/j3d/BehaviorRetained.java @@ -306,7 +306,7 @@ class BehaviorRetained extends LeafRetained { s.switchTargets[0] != null) { s.switchTargets[0].addNode(this, Targets.BEH_TARGETS); } - switchState = (SwitchState)s.switchStates.get(0); + switchState = s.switchStates.get(0); if (boundingLeaf != null) { boundingLeaf.mirrorBoundingLeaf.addUser(this); diff --git a/src/classes/share/javax/media/j3d/BoundingLeafRetained.java b/src/classes/share/javax/media/j3d/BoundingLeafRetained.java index bd7ec71..4e8b85e 100644 --- a/src/classes/share/javax/media/j3d/BoundingLeafRetained.java +++ b/src/classes/share/javax/media/j3d/BoundingLeafRetained.java @@ -162,7 +162,7 @@ class BoundingLeafRetained extends LeafRetained { s.switchTargets[0].addNode(mirrorBoundingLeaf, Targets.BLN_TARGETS); } - mirrorBoundingLeaf.switchState = (SwitchState)s.switchStates.get(0); + mirrorBoundingLeaf.switchState = s.switchStates.get(0); super.markAsLive(); } diff --git a/src/classes/share/javax/media/j3d/ClipRetained.java b/src/classes/share/javax/media/j3d/ClipRetained.java index e637858..a94f327 100644 --- a/src/classes/share/javax/media/j3d/ClipRetained.java +++ b/src/classes/share/javax/media/j3d/ClipRetained.java @@ -237,7 +237,7 @@ class ClipRetained extends LeafRetained { s.switchTargets[0] != null) { s.switchTargets[0].addNode(this, Targets.ENV_TARGETS); } - switchState = (SwitchState)s.switchStates.get(0); + switchState = s.switchStates.get(0); // add this node to the transform target if (s.transformTargets != null && s.transformTargets[0] != null) { diff --git a/src/classes/share/javax/media/j3d/FogRetained.java b/src/classes/share/javax/media/j3d/FogRetained.java index 037139c..f9626bb 100644 --- a/src/classes/share/javax/media/j3d/FogRetained.java +++ b/src/classes/share/javax/media/j3d/FogRetained.java @@ -627,7 +627,7 @@ abstract class FogRetained extends LeafRetained{ s.switchTargets[0] != null) { s.switchTargets[0].addNode(mirrorFog, Targets.ENV_TARGETS); } - mirrorFog.switchState = (SwitchState)s.switchStates.get(0); + mirrorFog.switchState = s.switchStates.get(0); s.notifyThreads |= J3dThread.UPDATE_RENDERING_ENVIRONMENT| J3dThread.UPDATE_RENDER; diff --git a/src/classes/share/javax/media/j3d/GroupRetained.java b/src/classes/share/javax/media/j3d/GroupRetained.java index 73ef7c4..b2cd9c7 100644 --- a/src/classes/share/javax/media/j3d/GroupRetained.java +++ b/src/classes/share/javax/media/j3d/GroupRetained.java @@ -2016,7 +2016,7 @@ synchronized void setAltAppScope() { TargetsInterface.SWITCH_TARGETS, parentSwitchLinkChildIndex); } else { - s.switchStates = new ArrayList(1); + s.switchStates = new ArrayList<SwitchState>(1); s.switchStates.add(new SwitchState(false)); } } diff --git a/src/classes/share/javax/media/j3d/LightRetained.java b/src/classes/share/javax/media/j3d/LightRetained.java index 2438f67..2a55a11 100644 --- a/src/classes/share/javax/media/j3d/LightRetained.java +++ b/src/classes/share/javax/media/j3d/LightRetained.java @@ -821,7 +821,7 @@ abstract class LightRetained extends LeafRetained { s.switchTargets[i] != null) { s.switchTargets[i].addNode(ml, Targets.ENV_TARGETS); } - ml.switchState = (SwitchState)s.switchStates.get(j); + ml.switchState = s.switchStates.get(j); } } else { @@ -853,7 +853,7 @@ abstract class LightRetained extends LeafRetained { s.switchTargets[0] != null) { s.switchTargets[0].addNode(ml, Targets.ENV_TARGETS); } - ml.switchState = (SwitchState)s.switchStates.get(0); + ml.switchState = s.switchStates.get(0); } s.notifyThreads |= J3dThread.UPDATE_RENDERING_ENVIRONMENT| J3dThread.UPDATE_RENDER; diff --git a/src/classes/share/javax/media/j3d/ModelClipRetained.java b/src/classes/share/javax/media/j3d/ModelClipRetained.java index a7621e6..94c554d 100644 --- a/src/classes/share/javax/media/j3d/ModelClipRetained.java +++ b/src/classes/share/javax/media/j3d/ModelClipRetained.java @@ -850,7 +850,7 @@ class ModelClipRetained extends LeafRetained { s.switchTargets[0] != null) { s.switchTargets[0].addNode(mirrorModelClip, Targets.ENV_TARGETS); } - mirrorModelClip.switchState = (SwitchState)s.switchStates.get(0); + mirrorModelClip.switchState = s.switchStates.get(0); // add this model clip to the transform target if (s.transformTargets != null && s.transformTargets[0] != null) { diff --git a/src/classes/share/javax/media/j3d/MorphRetained.java b/src/classes/share/javax/media/j3d/MorphRetained.java index 618d5ee..5da01a4 100644 --- a/src/classes/share/javax/media/j3d/MorphRetained.java +++ b/src/classes/share/javax/media/j3d/MorphRetained.java @@ -1359,7 +1359,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater { shape.closestSwitchParent = s.closestSwitchParents[i]; shape.closestSwitchIndex = s.closestSwitchIndices[i]; } - shape.switchState = (SwitchState)s.switchStates.get(j); + shape.switchState = s.switchStates.get(j); } } else { @@ -1437,7 +1437,7 @@ class MorphRetained extends LeafRetained implements GeometryUpdater { shape.closestSwitchParent = s.closestSwitchParents[0]; shape.closestSwitchIndex = s.closestSwitchIndices[0]; } - shape.switchState = (SwitchState)s.switchStates.get(0); + shape.switchState = s.switchStates.get(0); } if (appearance != null) { synchronized(appearance.liveStateLock) { diff --git a/src/classes/share/javax/media/j3d/Shape3DRetained.java b/src/classes/share/javax/media/j3d/Shape3DRetained.java index 5c06447..f3bf275 100644 --- a/src/classes/share/javax/media/j3d/Shape3DRetained.java +++ b/src/classes/share/javax/media/j3d/Shape3DRetained.java @@ -1017,7 +1017,7 @@ class Shape3DRetained extends LeafRetained { shape.closestSwitchParent = s.closestSwitchParents[i]; shape.closestSwitchIndex = s.closestSwitchIndices[i]; } - shape.switchState = (SwitchState)s.switchStates.get(j); + shape.switchState = s.switchStates.get(j); // Add any scoped lights to the mirror shape if (s.lights != null) { @@ -1133,7 +1133,7 @@ class Shape3DRetained extends LeafRetained { shape.closestSwitchParent = s.closestSwitchParents[0]; shape.closestSwitchIndex = s.closestSwitchIndices[0]; } - shape.switchState = (SwitchState)s.switchStates.get(0); + shape.switchState = s.switchStates.get(0); } for (k = 0; k < msList.size(); k++) { diff --git a/src/classes/share/javax/media/j3d/SharedGroupRetained.java b/src/classes/share/javax/media/j3d/SharedGroupRetained.java index 0c42918..123339c 100644 --- a/src/classes/share/javax/media/j3d/SharedGroupRetained.java +++ b/src/classes/share/javax/media/j3d/SharedGroupRetained.java @@ -280,7 +280,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1); SharedGroupRetained savedLastSharedGroup = s.lastSharedGroup; Targets[] savedSwitchTargets = s.switchTargets; - ArrayList savedSwitchStates = s.switchStates; + ArrayList<SwitchState> savedSwitchStates = s.switchStates; ArrayList savedChildSwitchLinks = s.childSwitchLinks; GroupRetained savedParentSwitchLink = s.parentSwitchLink; ArrayList savedChildTransformLinks = s.childTransformLinks; diff --git a/src/classes/share/javax/media/j3d/SoundRetained.java b/src/classes/share/javax/media/j3d/SoundRetained.java index a30b2a6..7c595cd 100644 --- a/src/classes/share/javax/media/j3d/SoundRetained.java +++ b/src/classes/share/javax/media/j3d/SoundRetained.java @@ -1107,7 +1107,7 @@ abstract class SoundRetained extends LeafRetained if (s.switchTargets != null && s.switchTargets[i] != null) { s.switchTargets[i].addNode(ms, Targets.SND_TARGETS); } - ms.switchState = (SwitchState)s.switchStates.get(j); + ms.switchState = s.switchStates.get(j); if (s.transformTargets != null && s.transformTargets[i] != null) { s.transformTargets[i].addNode(ms, Targets.SND_TARGETS); @@ -1133,7 +1133,7 @@ abstract class SoundRetained extends LeafRetained if (s.switchTargets != null && s.switchTargets[0] != null) { s.switchTargets[0].addNode(ms, Targets.SND_TARGETS); } - ms.switchState = (SwitchState)s.switchStates.get(0); + ms.switchState = s.switchStates.get(0); if (s.transformTargets != null && s.transformTargets[0] != null) { s.transformTargets[0].addNode(ms, Targets.SND_TARGETS); diff --git a/src/classes/share/javax/media/j3d/SoundscapeRetained.java b/src/classes/share/javax/media/j3d/SoundscapeRetained.java index 649a453..f55fd9e 100644 --- a/src/classes/share/javax/media/j3d/SoundscapeRetained.java +++ b/src/classes/share/javax/media/j3d/SoundscapeRetained.java @@ -386,7 +386,7 @@ class SoundscapeRetained extends LeafRetained s.switchTargets[0] != null) { s.switchTargets[0].addNode(this, Targets.SND_TARGETS); } - switchState = (SwitchState)s.switchStates.get(0); + switchState = s.switchStates.get(0); s.notifyThreads |= (J3dThread.UPDATE_SOUND | J3dThread.SOUND_SCHEDULER); diff --git a/src/classes/share/javax/media/j3d/SwitchRetained.java b/src/classes/share/javax/media/j3d/SwitchRetained.java index e434048..36229f3 100644 --- a/src/classes/share/javax/media/j3d/SwitchRetained.java +++ b/src/classes/share/javax/media/j3d/SwitchRetained.java @@ -347,7 +347,7 @@ class SwitchRetained extends GroupRetained implements TargetsInterface // save setLiveState Targets[] savedSwitchTargets = s.switchTargets; - ArrayList savedSwitchStates = s.switchStates; + ArrayList<SwitchState> savedSwitchStates = s.switchStates; SwitchRetained[] savedClosestSwitchParents = s.closestSwitchParents; int[] savedClosestSwitchIndices = s.closestSwitchIndices; ArrayList savedChildSwitchLinks = s.childSwitchLinks; @@ -847,13 +847,12 @@ class SwitchRetained extends GroupRetained implements TargetsInterface SwitchState switchState; if (! inSharedGroup) { cachedTargets = s.switchTargets[0].snapShotInit(); - switchState = (SwitchState) s.switchStates.get(0); + switchState = s.switchStates.get(0); switchState.cachedTargets = cachedTargets; } else { for(int i=0; i<numPaths; i++) { cachedTargets = s.switchTargets[i].snapShotInit(); - switchState = (SwitchState)s.switchStates.get( - s.hashkeyIndex[i]); + switchState = s.switchStates.get(s.hashkeyIndex[i]); switchState.cachedTargets = cachedTargets; } } diff --git a/src/classes/share/javax/media/j3d/TransformGroupRetained.java b/src/classes/share/javax/media/j3d/TransformGroupRetained.java index 7dcbfc6..589269f 100644 --- a/src/classes/share/javax/media/j3d/TransformGroupRetained.java +++ b/src/classes/share/javax/media/j3d/TransformGroupRetained.java @@ -361,8 +361,7 @@ class TransformGroupRetained extends GroupRetained implements TargetsInterface void setAuxData(SetLiveState s, int index, int hkIndex) { super.setAuxData(s, index, hkIndex); perPathData[hkIndex] = new TransformGroupData(); - perPathData[hkIndex].switchState = - (SwitchState)s.switchStates.get(hkIndex); + perPathData[hkIndex].switchState = s.switchStates.get(hkIndex); } diff --git a/src/classes/share/javax/media/j3d/ViewPlatformRetained.java b/src/classes/share/javax/media/j3d/ViewPlatformRetained.java index 2b69a05..188df93 100644 --- a/src/classes/share/javax/media/j3d/ViewPlatformRetained.java +++ b/src/classes/share/javax/media/j3d/ViewPlatformRetained.java @@ -318,7 +318,7 @@ void removeView(View v) { s.switchTargets[0] != null) { s.switchTargets[0].addNode(this, Targets.VPF_TARGETS); } - switchState = (SwitchState)s.switchStates.get(0); + switchState = s.switchStates.get(0); s.nodeList.add(this); s.notifyThreads |= (J3dThread.UPDATE_BEHAVIOR); super.markAsLive(); |