diff options
Diffstat (limited to 'src')
16 files changed, 71 insertions, 71 deletions
diff --git a/src/classes/share/javax/media/j3d/AppearanceRetained.java b/src/classes/share/javax/media/j3d/AppearanceRetained.java index d03533e..51892a9 100644 --- a/src/classes/share/javax/media/j3d/AppearanceRetained.java +++ b/src/classes/share/javax/media/j3d/AppearanceRetained.java @@ -1257,8 +1257,8 @@ class AppearanceRetained extends NodeComponentRetained { // 3rd argument used only when Rendering Attr comp changes final void sendMessage(int attrMask, Object attr, boolean visible) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) J3dMessage createMessage = new J3dMessage(); @@ -1279,12 +1279,12 @@ class AppearanceRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.APPEARANCE_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; @@ -1306,8 +1306,8 @@ class AppearanceRetained extends NodeComponentRetained { final void sendRenderingAttributesChangedMessage(boolean visible) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // System.err.println("univList.size is " + univList.size()); for(int i=0; i<univList.size(); i++) { @@ -1315,12 +1315,12 @@ class AppearanceRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_GEOMETRY; createMessage.type = J3dMessage.RENDERINGATTRIBUTES_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1] = null; // Sync with RenderingAttrRetained sendMessage createMessage.args[2]= visible?Boolean.TRUE:Boolean.FALSE; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java b/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java index 806670d..9b883d6 100644 --- a/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/ColoringAttributesRetained.java @@ -221,8 +221,8 @@ class ColoringAttributesRetained extends NodeComponentRetained { } final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) J3dMessage createMessage = new J3dMessage(); @@ -242,12 +242,12 @@ class ColoringAttributesRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.COLORINGATTRIBUTES_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/LineAttributesRetained.java b/src/classes/share/javax/media/j3d/LineAttributesRetained.java index 11c9b6b..42de5dc 100644 --- a/src/classes/share/javax/media/j3d/LineAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/LineAttributesRetained.java @@ -297,8 +297,8 @@ class LineAttributesRetained extends NodeComponentRetained { } final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -319,12 +319,12 @@ class LineAttributesRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.LINEATTRIBUTES_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/MaterialRetained.java b/src/classes/share/javax/media/j3d/MaterialRetained.java index 2dbd8bc..9039449 100644 --- a/src/classes/share/javax/media/j3d/MaterialRetained.java +++ b/src/classes/share/javax/media/j3d/MaterialRetained.java @@ -521,8 +521,8 @@ class MaterialRetained extends NodeComponentRetained { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) J3dMessage createMessage = new J3dMessage(); @@ -541,12 +541,12 @@ class MaterialRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.MATERIAL_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/PointAttributesRetained.java b/src/classes/share/javax/media/j3d/PointAttributesRetained.java index 7dcc1ad..c4e4805 100644 --- a/src/classes/share/javax/media/j3d/PointAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/PointAttributesRetained.java @@ -176,8 +176,8 @@ class PointAttributesRetained extends NodeComponentRetained { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -198,12 +198,12 @@ class PointAttributesRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.POINTATTRIBUTES_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/PolygonAttributesRetained.java b/src/classes/share/javax/media/j3d/PolygonAttributesRetained.java index 8848a5f..d451ff5 100644 --- a/src/classes/share/javax/media/j3d/PolygonAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/PolygonAttributesRetained.java @@ -313,8 +313,8 @@ class PolygonAttributesRetained extends NodeComponentRetained { } final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -334,12 +334,12 @@ class PolygonAttributesRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.POLYGONATTRIBUTES_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java b/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java index ac46850..eef14e2 100644 --- a/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/RenderingAttributesRetained.java @@ -657,8 +657,8 @@ class RenderingAttributesRetained extends NodeComponentRetained { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -681,12 +681,12 @@ class RenderingAttributesRetained extends NodeComponentRetained { createMessage.threads |= J3dThread.UPDATE_GEOMETRY; createMessage.type = J3dMessage.RENDERINGATTRIBUTES_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList)gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java b/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java index 9e35540..bc13db6 100644 --- a/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAppearanceRetained.java @@ -295,8 +295,8 @@ class ShaderAppearanceRetained extends AppearanceRetained { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) J3dMessage createMessage = new J3dMessage(); @@ -316,12 +316,12 @@ class ShaderAppearanceRetained extends AppearanceRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.SHADER_APPEARANCE_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java index d37583f..39503e3 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeObjectRetained.java @@ -147,8 +147,8 @@ abstract class ShaderAttributeObjectRetained extends ShaderAttributeRetained { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -169,12 +169,12 @@ abstract class ShaderAttributeObjectRetained extends ShaderAttributeRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.SHADER_ATTRIBUTE_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList)gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java b/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java index 29207d8..4f12dec 100644 --- a/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java +++ b/src/classes/share/javax/media/j3d/ShaderAttributeSetRetained.java @@ -325,8 +325,8 @@ Map<String, ShaderAttributeRetained> getAttrs() { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -347,12 +347,12 @@ Map<String, ShaderAttributeRetained> getAttrs() { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.SHADER_ATTRIBUTE_SET_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList)gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/Shape3DRetained.java b/src/classes/share/javax/media/j3d/Shape3DRetained.java index 7502995..d2f480e 100644 --- a/src/classes/share/javax/media/j3d/Shape3DRetained.java +++ b/src/classes/share/javax/media/j3d/Shape3DRetained.java @@ -2370,10 +2370,10 @@ class Shape3DRetained extends LeafRetained { * This is used to send a message of the snapshot of the * geometry atoms that are affected by this change. */ - final static ArrayList getGeomAtomsList(ArrayList userList, ArrayList univList) { - ArrayList listPerUniverse = new ArrayList(); +final static ArrayList<ArrayList<GeometryAtom>> getGeomAtomsList(ArrayList userList, ArrayList<VirtualUniverse> univList) { + ArrayList<ArrayList<GeometryAtom>> listPerUniverse = new ArrayList<ArrayList<GeometryAtom>>(); int index; - ArrayList gaList = null; + ArrayList<GeometryAtom> gaList = null; Shape3DRetained ms = null; boolean moreThanOneUniv = false; VirtualUniverse firstFndUniv = null; @@ -2387,13 +2387,13 @@ class Shape3DRetained extends LeafRetained { firstFndUniv = ms.universe; univList.add(ms.universe); - gaList = new ArrayList(); + gaList = new ArrayList<GeometryAtom>(); listPerUniverse.add(gaList); } else if(firstFndUniv != ms.universe) { moreThanOneUniv = true; univList.add(ms.universe); - gaList = new ArrayList(); + gaList = new ArrayList<GeometryAtom>(); listPerUniverse.add(gaList); } } @@ -2401,11 +2401,11 @@ class Shape3DRetained extends LeafRetained { index = univList.indexOf(ms.universe); if (index < 0) { univList.add(ms.universe); - gaList = new ArrayList(); + gaList = new ArrayList<GeometryAtom>(); listPerUniverse.add(gaList); } else { - gaList = (ArrayList) listPerUniverse.get(index); + gaList = listPerUniverse.get(index); } } diff --git a/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java b/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java index c5591b1..bb6a3da 100644 --- a/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java +++ b/src/classes/share/javax/media/j3d/TexCoordGenerationRetained.java @@ -375,8 +375,8 @@ class TexCoordGenerationRetained extends NodeComponentRetained { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -397,12 +397,12 @@ class TexCoordGenerationRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.TEXCOORDGENERATION_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/TextureAttributesRetained.java b/src/classes/share/javax/media/j3d/TextureAttributesRetained.java index 265dea6..78ab959 100644 --- a/src/classes/share/javax/media/j3d/TextureAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/TextureAttributesRetained.java @@ -951,8 +951,8 @@ class TextureAttributesRetained extends NodeComponentRetained { final void sendMessage(int attrMask, Object attr1, Object attr2) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of @@ -975,12 +975,12 @@ class TextureAttributesRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.TEXTUREATTRIBUTES_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1] = new Integer(attrMask); createMessage.args[2] = attr1; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/TextureRetained.java b/src/classes/share/javax/media/j3d/TextureRetained.java index 2b84800..7c77d30 100644 --- a/src/classes/share/javax/media/j3d/TextureRetained.java +++ b/src/classes/share/javax/media/j3d/TextureRetained.java @@ -2465,8 +2465,8 @@ abstract class TextureRetained extends NodeComponentRetained { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -2486,12 +2486,12 @@ abstract class TextureRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.TEXTURE_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java b/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java index 2008d37..e5cf5a9 100644 --- a/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java +++ b/src/classes/share/javax/media/j3d/TextureUnitStateRetained.java @@ -566,8 +566,8 @@ class TextureUnitStateRetained extends NodeComponentRetained { } final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -587,12 +587,12 @@ class TextureUnitStateRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.TEXTURE_UNIT_STATE_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; diff --git a/src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java b/src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java index 1e02560..d42904b 100644 --- a/src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java +++ b/src/classes/share/javax/media/j3d/TransparencyAttributesRetained.java @@ -295,8 +295,8 @@ class TransparencyAttributesRetained extends NodeComponentRetained { final void sendMessage(int attrMask, Object attr) { - ArrayList univList = new ArrayList(); - ArrayList gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); + ArrayList<VirtualUniverse> univList = new ArrayList<VirtualUniverse>(); + ArrayList<ArrayList<GeometryAtom>> gaList = Shape3DRetained.getGeomAtomsList(mirror.users, univList); // Send to rendering attribute structure, regardless of // whether there are users or not (alternate appearance case ..) @@ -317,12 +317,12 @@ class TransparencyAttributesRetained extends NodeComponentRetained { createMessage.threads = J3dThread.UPDATE_RENDER; createMessage.type = J3dMessage.TRANSPARENCYATTRIBUTES_CHANGED; - createMessage.universe = (VirtualUniverse) univList.get(i); + createMessage.universe = univList.get(i); createMessage.args[0] = this; createMessage.args[1]= new Integer(attrMask); createMessage.args[2] = attr; - ArrayList gL = (ArrayList) gaList.get(i); + ArrayList<GeometryAtom> gL = gaList.get(i); GeometryAtom[] gaArr = new GeometryAtom[gL.size()]; gL.toArray(gaArr); createMessage.args[3] = gaArr; |