aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2013-09-19 23:42:16 -0700
committerHarvey Harrison <[email protected]>2013-09-19 23:51:42 -0700
commitc31cf95e647e8eb37fb5834636f5a9851b061c7c (patch)
treedc027ea4593136ab5cd430fb51bbb9fb6ad5b28e
parent6960b90c744143152f2a92de4b847add53112f21 (diff)
j3dcore: annotate list of VirtualUniverse in GeometryRetained
Signed-off-by: Harvey Harrison <[email protected]>
-rw-r--r--src/classes/share/javax/media/j3d/GeometryArrayRetained.java2
-rw-r--r--src/classes/share/javax/media/j3d/GeometryRetained.java4
-rw-r--r--src/classes/share/javax/media/j3d/RasterRetained.java2
-rw-r--r--src/classes/share/javax/media/j3d/Text3DRetained.java4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/classes/share/javax/media/j3d/GeometryArrayRetained.java b/src/classes/share/javax/media/j3d/GeometryArrayRetained.java
index 9e16872..eedc2e8 100644
--- a/src/classes/share/javax/media/j3d/GeometryArrayRetained.java
+++ b/src/classes/share/javax/media/j3d/GeometryArrayRetained.java
@@ -3533,7 +3533,7 @@ ArrayList<ArrayList<MorphRetained>> morphUserLists = null;
m[k].args[1] = this;
m[k].args[2]= null;
m[k].args[3] = new Integer(changedFrequent);
- m[k].universe=(VirtualUniverse)universeList.get(i);
+ m[k].universe = universeList.get(i);
}
VirtualUniverse.mc.processMessage(m);
}
diff --git a/src/classes/share/javax/media/j3d/GeometryRetained.java b/src/classes/share/javax/media/j3d/GeometryRetained.java
index 47c816c..7f9fded 100644
--- a/src/classes/share/javax/media/j3d/GeometryRetained.java
+++ b/src/classes/share/javax/media/j3d/GeometryRetained.java
@@ -90,8 +90,8 @@ abstract class GeometryRetained extends NodeComponentRetained {
// indicates whether the geometry in editable
boolean isEditable = true;
- // A list of Universes that this Geometry is referenced from
- ArrayList universeList = new ArrayList();
+// A list of Universes that this Geometry is referenced from
+ArrayList<VirtualUniverse> universeList = new ArrayList<VirtualUniverse>();
// A list of ArrayLists which contain all the Shape3DRetained objects
// refering to this geometry. Each list corresponds to the universe
diff --git a/src/classes/share/javax/media/j3d/RasterRetained.java b/src/classes/share/javax/media/j3d/RasterRetained.java
index 0216040..dd8245e 100644
--- a/src/classes/share/javax/media/j3d/RasterRetained.java
+++ b/src/classes/share/javax/media/j3d/RasterRetained.java
@@ -426,7 +426,7 @@ class RasterRetained extends GeometryRetained {
obj[1] = arg2;
m[i].args[2] = obj;
m[i].args[3] = new Integer(changedFrequent);
- m[i].universe = (VirtualUniverse)universeList.get(i);
+ m[i].universe = universeList.get(i);
}
VirtualUniverse.mc.processMessage(m);
}
diff --git a/src/classes/share/javax/media/j3d/Text3DRetained.java b/src/classes/share/javax/media/j3d/Text3DRetained.java
index f84b0cf..ed21941 100644
--- a/src/classes/share/javax/media/j3d/Text3DRetained.java
+++ b/src/classes/share/javax/media/j3d/Text3DRetained.java
@@ -621,7 +621,7 @@ class Text3DRetained extends GeometryRetained {
m[i].args[0] = oldGAArray;
m[i].args[1] = newGAArray;
- m[i].universe = (VirtualUniverse)universeList.get(i);
+ m[i].universe = universeList.get(i);
if(tiArrList.size() > 0) {
m[i].args[2] = tiArrList.toArray();
@@ -673,7 +673,7 @@ class Text3DRetained extends GeometryRetained {
}
m[i].args[0] = gaList.toArray();
m[i].args[1] = charTransforms;
- m[i].universe = (VirtualUniverse)universeList.get(i);
+ m[i].universe = universeList.get(i);
}
VirtualUniverse.mc.processMessage(m);
}