j3dcore: more list type annotation

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

2 files changed, 9 insertions, 10 deletions

diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java
index c3b611b..c711588 100644
--- a/src/classes/share/javax/media/j3d/MasterControl.java
+++ b/src/classes/share/javax/media/j3d/MasterControl.java
@@ -445,7 +445,7 @@ class MasterControl {
 
     static private Object mcThreadLock = new Object();
 
-    private ArrayList timestampUpdateList = new ArrayList(3);
+	private ArrayList<View> timestampUpdateList = new ArrayList<View>(3);
 
     private UnorderList freeMessageList = new UnorderList(8);
 
@@ -2157,7 +2157,7 @@ class MasterControl {
 		renderingAttributesStructure.updateThread = null;
 	    }
 	    renderingAttributesStructure.messageList.clear();
-	    renderingAttributesStructure.objList = new ArrayList();
+	    renderingAttributesStructure.objList = new ArrayList<J3dMessage>();
 	    renderingAttributesStructure = new RenderingAttributesStructure();
 	    if (timerThread != null) {
 		timerThread.finish();
@@ -3497,12 +3497,11 @@ class MasterControl {
                     (currentRenderThread == renderThreadSize) &&
                     (currentRequestRenderThread == requestRenderThreadSize) &&
 		    (threadPending == 0)) {
-		    for (int k=timestampUpdateList.size()-1; k >=0;
-			 k--) {
-			View v = (View) timestampUpdateList.get(k);
-			v.setFrameTimingValues();
-			v.universe.behaviorStructure.incElapsedFrames();
-		    }
+			for (int k = timestampUpdateList.size() - 1; k >= 0; k--) {
+				View v = timestampUpdateList.get(k);
+				v.setFrameTimingValues();
+				v.universe.behaviorStructure.incElapsedFrames();
+			}
 		    timestampUpdateList.clear();
 		    updateMirrorObjects();
 		    done = true;
diff --git a/src/classes/share/javax/media/j3d/RenderingAttributesStructure.java b/src/classes/share/javax/media/j3d/RenderingAttributesStructure.java
index bd9b15e..30d556c 100644
--- a/src/classes/share/javax/media/j3d/RenderingAttributesStructure.java
+++ b/src/classes/share/javax/media/j3d/RenderingAttributesStructure.java
@@ -36,7 +36,7 @@ import java.util.Arrays;
 
 class RenderingAttributesStructure extends J3dStructure implements ObjectUpdate {
     // List of textures whose resourceCreation mask should be updated
-    ArrayList objList = new ArrayList();
+    ArrayList<J3dMessage> objList = new ArrayList<J3dMessage>();
 
     RenderingAttributesStructure() {
 	super(null, J3dThread.UPDATE_RENDERING_ATTRIBUTES);
@@ -183,7 +183,7 @@ class RenderingAttributesStructure extends J3dStructure implements ObjectUpdate
 
 	int size = objList.size();
 	for (int i = 0; i < size; i++) {
-	    J3dMessage m = (J3dMessage)objList.get(i);
+	    J3dMessage m = objList.get(i);
 	    // Message Only sent to RenderingAttributesStructure
 	    // when the geometry type is indexed
 	    if (m.type == J3dMessage.GEOMETRY_CHANGED) {