From 4f125d0759fc2a95481c862499ed39a9ae1f0e54 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Mon, 1 Jul 2013 12:57:25 -0700 Subject: j3dcore: remove unnecessary casts to WakeupCriterion Signed-off-by: Harvey Harrison --- src/classes/share/javax/media/j3d/ColorInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/PositionInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/PositionPathInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/RotPosPathInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/RotationInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/RotationPathInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/ScaleInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/SwitchValueInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/TransformInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/TransparencyInterpolator.java | 3 +-- src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java | 2 +- 12 files changed, 12 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/classes/share/javax/media/j3d/ColorInterpolator.java b/src/classes/share/javax/media/j3d/ColorInterpolator.java index 5a339c2..6ceb236 100644 --- a/src/classes/share/javax/media/j3d/ColorInterpolator.java +++ b/src/classes/share/javax/media/j3d/ColorInterpolator.java @@ -60,8 +60,7 @@ public class ColorInterpolator extends Interpolator { // detect alpha value change. private float prevAlphaValue = Float.NaN; private int prevColorTarget = -1; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, no parameter constructor used by cloneNode ColorInterpolator() { diff --git a/src/classes/share/javax/media/j3d/PositionInterpolator.java b/src/classes/share/javax/media/j3d/PositionInterpolator.java index 89c68a0..c0cf8d2 100644 --- a/src/classes/share/javax/media/j3d/PositionInterpolator.java +++ b/src/classes/share/javax/media/j3d/PositionInterpolator.java @@ -52,8 +52,7 @@ public class PositionInterpolator extends TransformInterpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode PositionInterpolator() { diff --git a/src/classes/share/javax/media/j3d/PositionPathInterpolator.java b/src/classes/share/javax/media/j3d/PositionPathInterpolator.java index 67483b6..e1e85df 100644 --- a/src/classes/share/javax/media/j3d/PositionPathInterpolator.java +++ b/src/classes/share/javax/media/j3d/PositionPathInterpolator.java @@ -55,8 +55,7 @@ public class PositionPathInterpolator extends PathInterpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode PositionPathInterpolator() { diff --git a/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java b/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java index 9549eb0..68caac5 100644 --- a/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java +++ b/src/classes/share/javax/media/j3d/RotPosPathInterpolator.java @@ -59,8 +59,7 @@ public class RotPosPathInterpolator extends PathInterpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode RotPosPathInterpolator() { diff --git a/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java b/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java index 50e15fd..74238e3 100644 --- a/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java +++ b/src/classes/share/javax/media/j3d/RotPosScalePathInterpolator.java @@ -65,8 +65,7 @@ public class RotPosScalePathInterpolator extends PathInterpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode RotPosScalePathInterpolator() { diff --git a/src/classes/share/javax/media/j3d/RotationInterpolator.java b/src/classes/share/javax/media/j3d/RotationInterpolator.java index a1efb96..beee025 100644 --- a/src/classes/share/javax/media/j3d/RotationInterpolator.java +++ b/src/classes/share/javax/media/j3d/RotationInterpolator.java @@ -47,8 +47,7 @@ public class RotationInterpolator extends TransformInterpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode RotationInterpolator() { diff --git a/src/classes/share/javax/media/j3d/RotationPathInterpolator.java b/src/classes/share/javax/media/j3d/RotationPathInterpolator.java index cfb8093..fa8a154 100644 --- a/src/classes/share/javax/media/j3d/RotationPathInterpolator.java +++ b/src/classes/share/javax/media/j3d/RotationPathInterpolator.java @@ -55,8 +55,7 @@ public class RotationPathInterpolator extends PathInterpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode RotationPathInterpolator() { } diff --git a/src/classes/share/javax/media/j3d/ScaleInterpolator.java b/src/classes/share/javax/media/j3d/ScaleInterpolator.java index 5446552..ab85e9c 100644 --- a/src/classes/share/javax/media/j3d/ScaleInterpolator.java +++ b/src/classes/share/javax/media/j3d/ScaleInterpolator.java @@ -48,8 +48,7 @@ public class ScaleInterpolator extends TransformInterpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode ScaleInterpolator() { diff --git a/src/classes/share/javax/media/j3d/SwitchValueInterpolator.java b/src/classes/share/javax/media/j3d/SwitchValueInterpolator.java index af48e4a..9b6a2c9 100644 --- a/src/classes/share/javax/media/j3d/SwitchValueInterpolator.java +++ b/src/classes/share/javax/media/j3d/SwitchValueInterpolator.java @@ -48,8 +48,7 @@ public class SwitchValueInterpolator extends Interpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode SwitchValueInterpolator() { diff --git a/src/classes/share/javax/media/j3d/TransformInterpolator.java b/src/classes/share/javax/media/j3d/TransformInterpolator.java index 238e75f..9afc9e4 100644 --- a/src/classes/share/javax/media/j3d/TransformInterpolator.java +++ b/src/classes/share/javax/media/j3d/TransformInterpolator.java @@ -63,8 +63,7 @@ public abstract class TransformInterpolator extends Interpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); /** diff --git a/src/classes/share/javax/media/j3d/TransparencyInterpolator.java b/src/classes/share/javax/media/j3d/TransparencyInterpolator.java index 99122d8..6b5714b 100644 --- a/src/classes/share/javax/media/j3d/TransparencyInterpolator.java +++ b/src/classes/share/javax/media/j3d/TransparencyInterpolator.java @@ -64,8 +64,7 @@ public class TransparencyInterpolator extends Interpolator { // once at alpha.finish(). So the best way is to // detect alpha value change. private float prevAlphaValue = Float.NaN; - private WakeupCriterion passiveWakeupCriterion = - (WakeupCriterion) new WakeupOnElapsedFrames(0, true); + private WakeupCriterion passiveWakeupCriterion = new WakeupOnElapsedFrames(0, true); // non-public, default constructor used by cloneNode TransparencyInterpolator() { diff --git a/src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java b/src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java index 4ed28c2..23be947 100644 --- a/src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java +++ b/src/classes/share/javax/media/j3d/WakeupCriteriaEnumerator.java @@ -139,7 +139,7 @@ class WakeupCriteriaEnumerator implements Enumeration { public Object nextElement() { if (currentIndex < length) { - return ((Object)criterion[currentIndex++]); + return criterion[currentIndex++]; } else { throw new NoSuchElementException(J3dI18N.getString("WakeupCriteriaEnumerator0")); } -- cgit v1.2.3