From 8d2bfb6d7fca2af1855b2438a3066359f9f276dc Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Mon, 28 Jan 2013 00:24:01 -0800 Subject: j3dcore: annotate list of Scopes in ModelClipRetained Signed-off-by: Harvey Harrison --- src/classes/share/javax/media/j3d/ModelClip.java | 30 +++++++------- .../share/javax/media/j3d/ModelClipRetained.java | 48 +++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/classes/share') diff --git a/src/classes/share/javax/media/j3d/ModelClip.java b/src/classes/share/javax/media/j3d/ModelClip.java index 12d5162..601a623 100644 --- a/src/classes/share/javax/media/j3d/ModelClip.java +++ b/src/classes/share/javax/media/j3d/ModelClip.java @@ -347,21 +347,21 @@ public class ModelClip extends Leaf { } - /** - * Returns an enumeration of this ModelClip node's list of scopes. - * @return an Enumeration object containing all nodes in this ModelClip 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 ModelClip node's list of scopes. + * @return an Enumeration object containing all nodes in this ModelClip 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() { if (isLiveOrCompiled()) - if(!this.getCapability(ALLOW_SCOPE_READ)) - throw new CapabilityNotSetException(J3dI18N.getString("ModelClip11")); - - return (Enumeration) ((ModelClipRetained)this.retained).getAllScopes(); - } + if (!this.getCapability(ALLOW_SCOPE_READ)) + throw new CapabilityNotSetException( + J3dI18N.getString("ModelClip11")); + return ((ModelClipRetained) this.retained).getAllScopes(); +} /** * Appends the specified Group node to this ModelClip node's list of scopes. @@ -721,10 +721,10 @@ public class ModelClip extends Leaf { } rt.initInfluencingBounds(attr.getInfluencingBounds()); - Enumeration elm = attr.getAllScopes(); + Enumeration elm = attr.getAllScopes(); while (elm.hasMoreElements()) { // this reference will set correctly in updateNodeReferences() callback - rt.initAddScope((Group) elm.nextElement()); + rt.initAddScope(elm.nextElement()); } // correct value will set in updateNodeReferences diff --git a/src/classes/share/javax/media/j3d/ModelClipRetained.java b/src/classes/share/javax/media/j3d/ModelClipRetained.java index 20ec58d..9e1ad82 100644 --- a/src/classes/share/javax/media/j3d/ModelClipRetained.java +++ b/src/classes/share/javax/media/j3d/ModelClipRetained.java @@ -76,10 +76,10 @@ class ModelClipRetained extends LeafRetained { */ Bounds region = null; - /** - * Vector of GroupRetained nodes that scopes this model clip. - */ - Vector scopes = new Vector(); +/** + * Vector of GroupRetained nodes that scopes this model clip. + */ +Vector scopes = new Vector(); //Boolean to indicate if this object is scoped (only used for mirror objects boolean isScoped = false; @@ -380,7 +380,7 @@ class ModelClipRetained extends LeafRetained { GroupRetained group; Object[] scopeInfo = new Object[3]; - group = (GroupRetained) scopes.get(index); + group = scopes.get(index); tempKey.reset(); group.removeAllNodesForScopedModelClip(mirrorModelClip, removeScopeList, tempKey); @@ -430,7 +430,7 @@ class ModelClipRetained extends LeafRetained { void initRemoveScope(int index) { - GroupRetained group = (GroupRetained)scopes.elementAt(index); + GroupRetained group = scopes.elementAt(index); group.removeMclipScope(); scopes.removeElementAt(index); @@ -440,7 +440,7 @@ class ModelClipRetained extends LeafRetained { Object[] scopeInfo = new Object[3]; ArrayList removeScopeList = new ArrayList(); - GroupRetained group = (GroupRetained)scopes.elementAt(index); + GroupRetained group = scopes.elementAt(index); initRemoveScope(index); tempKey.reset(); @@ -480,7 +480,7 @@ class ModelClipRetained extends LeafRetained { ArrayList removeScopeList = new ArrayList(); int n = scopes.size(); for(int index = n-1; index >= 0; index--) { - GroupRetained group = (GroupRetained)scopes.elementAt(index); + GroupRetained group = scopes.elementAt(index); initRemoveScope(index); tempKey.reset(); group.removeAllNodesForScopedModelClip(mirrorModelClip, removeScopeList, tempKey); @@ -506,21 +506,21 @@ class ModelClipRetained extends LeafRetained { * @return the scoperen at location index */ Group getScope(int index) { - return (Group)(((GroupRetained)(scopes.elementAt(index))).source); + return (Group)scopes.elementAt(index).source; } - /** - * Returns an enumeration object of the scoperen. - * @return an enumeration object of the scoperen - */ - Enumeration getAllScopes() { - Enumeration elm = scopes.elements(); - Vector v = new Vector(scopes.size()); - while (elm.hasMoreElements()) { - v.add( ((GroupRetained) elm.nextElement()).source); - } - return v.elements(); - } +/** + * Returns an enumeration object of the scoperen. + * @return an enumeration object of the scoperen + */ +Enumeration getAllScopes() { + Enumeration elm = scopes.elements(); + Vector v = new Vector(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 @@ -568,7 +568,7 @@ class ModelClipRetained extends LeafRetained { */ int indexOfScope(Group node) { if(node != null) - return scopes.indexOf((GroupRetained)node.retained); + return scopes.indexOf(node.retained); else return scopes.indexOf(null); } @@ -847,7 +847,7 @@ void update(Context ctx, int enableMask, Transform3D trans) { createMessage.args[1]= new Integer(INIT_MIRROR); ArrayList addScopeList = new ArrayList(); for (int i = 0; i < scopes.size(); i++) { - group = (GroupRetained)scopes.get(i); + group = scopes.get(i); tempKey.reset(); group.addAllNodesForScopedModelClip(mirrorModelClip, addScopeList, tempKey); } @@ -906,7 +906,7 @@ void update(Context ctx, int enableMask, Transform3D trans) { createMessage.args[1]= new Integer(CLEAR_MIRROR); ArrayList removeScopeList = new ArrayList(); for (int i = 0; i < scopes.size(); i++) { - GroupRetained group = (GroupRetained)scopes.get(i); + GroupRetained group = scopes.get(i); tempKey.reset(); group.removeAllNodesForScopedModelClip(mirrorModelClip, removeScopeList, tempKey); } -- cgit v1.2.3