j3dcore: annotate getAllScopes method for FogRetained to return Enumeration<Group>

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

3 files changed, 20 insertions, 23 deletions

diff --git a/src/classes/share/javax/media/j3d/Fog.java b/src/classes/share/javax/media/j3d/Fog.java
index c128eda..9f587fc 100644
--- a/src/classes/share/javax/media/j3d/Fog.java
+++ b/src/classes/share/javax/media/j3d/Fog.java
@@ -348,20 +348,20 @@ public abstract class Fog extends Leaf {
     }
 
 
-    /**
-     * Returns an enumeration of this Fog node's list of scopes.
-     * @return an Enumeration object containing all nodes in this Fog node's
-     * list of scopes.
-     * @exception CapabilityNotSetException if appropriate capability is
-     * not set and this object is part of live or compiled scene graph
-     */
-    public Enumeration getAllScopes() {
+/**
+ * Returns an enumeration of this Fog node's list of scopes.
+ * @return an Enumeration object containing all nodes in this Fog node's
+ * list of scopes.
+ * @exception CapabilityNotSetException if appropriate capability is
+ * not set and this object is part of live or compiled scene graph
+ */
+public Enumeration<Group> getAllScopes() {
 	if (isLiveOrCompiled())
-	    if(!this.getCapability(ALLOW_SCOPE_READ))
-		throw new CapabilityNotSetException(J3dI18N.getString("Fog11"));
+		if (!this.getCapability(ALLOW_SCOPE_READ))
+			throw new CapabilityNotSetException(J3dI18N.getString("Fog11"));
 
-	return (Enumeration) ((FogRetained)this.retained).getAllScopes();
-    }
+	return ((FogRetained)this.retained).getAllScopes();
+}
 
 
     /**
@@ -510,10 +510,10 @@ public abstract class Fog extends Leaf {
 	rt.initColor(c);
 	rt.initInfluencingBounds(attr.getInfluencingBounds());
 
-	Enumeration elm = attr.getAllScopes();
+	Enumeration<Group> elm = attr.getAllScopes();
 	while (elm.hasMoreElements()) {
 	  // this reference will set correctly in updateNodeReferences() callback
-	    rt.initAddScope((Group) elm.nextElement());
+	    rt.initAddScope(elm.nextElement());
 	}
 
 	  // this reference will set correctly in updateNodeReferences() callback
diff --git a/src/classes/share/javax/media/j3d/FogRetained.java b/src/classes/share/javax/media/j3d/FogRetained.java
index 6529463..31da43b 100644
--- a/src/classes/share/javax/media/j3d/FogRetained.java
+++ b/src/classes/share/javax/media/j3d/FogRetained.java
@@ -330,18 +330,18 @@ Vector<GroupRetained> scopes = new Vector<GroupRetained>();
 	return (Group)(scopes.elementAt(index).source);
     }
 
-    /**
-     * Returns an enumeration object of the scoperen.
-     * @return an enumeration object of the scoperen
-     */
-    Enumeration getAllScopes() {
+/**
+ * Returns an enumeration object of the scoperen.
+ * @return an enumeration object of the scoperen
+ */
+Enumeration<Group> getAllScopes() {
 	Enumeration<GroupRetained> elm = scopes.elements();
 	Vector<Group> v = new Vector<Group>(scopes.size());
 	while (elm.hasMoreElements()) {
 		v.add((Group)elm.nextElement().source);
 	}
 	return v.elements();
-    }
+}
 
     /**
      * Appends the specified scope to this node's list of scopes before
diff --git a/src/classes/share/javax/media/j3d/ModelClipRetained.java b/src/classes/share/javax/media/j3d/ModelClipRetained.java
index 9e1ad82..6593f68 100644
--- a/src/classes/share/javax/media/j3d/ModelClipRetained.java
+++ b/src/classes/share/javax/media/j3d/ModelClipRetained.java
@@ -681,8 +681,6 @@ void update(Context ctx, int enableMask, Transform3D trans) {
     // The update Object function.
     void updateImmediateMirrorObject(Object[] objs) {
 	int component = ((Integer)objs[1]).intValue();
-	Transform3D trans;
-
 
 	if  ((component & BOUNDINGLEAF_CHANGED) != 0) {
 	    mirrorModelClip.boundingLeaf = (BoundingLeafRetained)objs[2];
@@ -919,7 +917,6 @@ void update(Context ctx, int enableMask, Transform3D trans) {
     void clearMirrorObject(Object[] args) {
 	Shape3DRetained shape;
 	ArrayList shapeList = (ArrayList)args[2];
-	ArrayList removeScopeList = new ArrayList();
 
 	for (int i = 0; i < shapeList.size(); i++) {
 	    shape = ((GeometryAtom)shapeList.get(i)).source;