aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2013-01-27 23:33:17 -0800
committerHarvey Harrison <[email protected]>2013-01-27 23:33:17 -0800
commit991207c7366c300c9adaf84e8831f09e080098a0 (patch)
tree5e092398e1962c7bcf9b76919752ac5e6c61e7ef
parenta92f965a9c20e583adbe9299cb998fd92a89e584 (diff)
j3dcore: annotate arguments taking lists of SwitchStates
Signed-off-by: Harvey Harrison <[email protected]>
-rw-r--r--src/classes/share/javax/media/j3d/SharedGroupRetained.java2
-rw-r--r--src/classes/share/javax/media/j3d/SwitchRetained.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/classes/share/javax/media/j3d/SharedGroupRetained.java b/src/classes/share/javax/media/j3d/SharedGroupRetained.java
index 9719c1d..ab77e11 100644
--- a/src/classes/share/javax/media/j3d/SharedGroupRetained.java
+++ b/src/classes/share/javax/media/j3d/SharedGroupRetained.java
@@ -584,7 +584,7 @@ Vector<NodeRetained> parents = new Vector<NodeRetained>(1);
int index, SwitchRetained switchRoot,
boolean init, boolean swChanged,
boolean switchOn, int switchLevel,
- ArrayList updateList) {
+ ArrayList<SwitchState> updateList) {
SwitchRetained sw;
LinkRetained ln;
diff --git a/src/classes/share/javax/media/j3d/SwitchRetained.java b/src/classes/share/javax/media/j3d/SwitchRetained.java
index b7af900..b2832c0 100644
--- a/src/classes/share/javax/media/j3d/SwitchRetained.java
+++ b/src/classes/share/javax/media/j3d/SwitchRetained.java
@@ -92,7 +92,7 @@ ArrayList<ArrayList<SwitchState>> childrenSwitchStates = null;
if (source != null && source.isLive()) {
updateTargets = new UpdateTargets();
- ArrayList updateList = new ArrayList(1);
+ ArrayList<SwitchState> updateList = new ArrayList<SwitchState>(1);
nchildren = children.size();
switch (whichChild) {
case Switch.CHILD_ALL:
@@ -180,7 +180,7 @@ ArrayList<ArrayList<SwitchState>> childrenSwitchStates = null;
if (source != null && source.isLive() &&
whichChild == Switch.CHILD_MASK) {
updateTargets = new UpdateTargets();
- ArrayList updateList = new ArrayList(1);
+ ArrayList<SwitchState> updateList = new ArrayList<SwitchState>(1);
nchildren = children.size();
for (i=0; i<nchildren; i++) {
if (childMask.get(i) == true) {
@@ -200,7 +200,7 @@ ArrayList<ArrayList<SwitchState>> childrenSwitchStates = null;
dirtyBoundsCache();
}
- void sendMessage(ArrayList updateList) {
+void sendMessage(ArrayList<SwitchState> updateList) {
J3dMessage m ;
int i,j,size,threads;
@@ -274,7 +274,7 @@ ArrayList<ArrayList<SwitchState>> childrenSwitchStates = null;
return getChild(whichChild);
}
- void updateSwitchChild(int child, boolean switchOn, ArrayList updateList) {
+void updateSwitchChild(int child, boolean switchOn, ArrayList<SwitchState> updateList) {
int i;
int switchLevel;
@@ -505,7 +505,7 @@ ArrayList<ArrayList<SwitchState>> childrenSwitchStates = null;
void traverseSwitchChild(int child, HashKey key, int index,
SwitchRetained switchRoot, boolean init,
boolean swChanged, boolean switchOn,
- int switchLevel, ArrayList updateList) {
+ int switchLevel, ArrayList<SwitchState> updateList) {
int i,j,k;
SwitchRetained sw;
LinkRetained ln;