From 85640878fc5c8aba69006f6aee48a36897cd22cb Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Sat, 19 May 2012 00:57:40 -0700
Subject: j3dcore: annotate dirty list of displaylists

- This would be better doen with a trivial inner class instead of Object[]

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 src/classes/share/javax/media/j3d/Canvas3D.java  | 4 ++--
 src/classes/share/javax/media/j3d/RenderBin.java | 4 ++--
 src/classes/share/javax/media/j3d/Renderer.java  | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/classes/share')

diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java
index 236b34c..9827b27 100644
--- a/src/classes/share/javax/media/j3d/Canvas3D.java
+++ b/src/classes/share/javax/media/j3d/Canvas3D.java
@@ -751,8 +751,8 @@ public class Canvas3D extends Canvas {
 
 ArrayList<RenderMolecule> dirtyRenderMoleculeList = new ArrayList<RenderMolecule>();
 ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomListInfo>();
-    // List of (Rm, rInfo) pair of individual dlists that need to be rebuilt
-    ArrayList dirtyDlistPerRinfoList = new ArrayList();
+// List of (Rm, rInfo) pair of individual dlists that need to be rebuilt
+ArrayList<Object[]> dirtyDlistPerRinfoList = new ArrayList<Object[]>();
 
 ArrayList<Integer> displayListResourceFreeList = new ArrayList<Integer>();
 ArrayList<Integer> textureIdResourceFreeList = new ArrayList<Integer>();
diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java
index 777de0a..fb80571 100644
--- a/src/classes/share/javax/media/j3d/RenderBin.java
+++ b/src/classes/share/javax/media/j3d/RenderBin.java
@@ -3173,7 +3173,7 @@ System.err.println("......tb.soleUser= " +
     }
 
     void updateDirtyDisplayLists(Canvas3D cv,
-				 ArrayList<RenderMolecule> rmList, ArrayList dlistPerRinfoList,
+				 ArrayList<RenderMolecule> rmList, ArrayList<Object[]> dlistPerRinfoList,
 				 ArrayList<RenderAtomListInfo> raList, boolean useSharedCtx ) {
 	int size, i, bitMask;
 	Context ctx;
@@ -3204,7 +3204,7 @@ System.err.println("......tb.soleUser= " +
 
 	if (size > 0) {
 	    for (i = size-1; i >= 0 ; i--) {
-		Object[] obj = (Object[])dlistPerRinfoList.get(i);
+		Object[] obj = dlistPerRinfoList.get(i);
 		dlistRenderMethod.buildDlistPerRinfo((RenderAtomListInfo)obj[0], (RenderMolecule)obj[1], cv);
 	    }
 	    dlistPerRinfoList.clear();
diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java
index 84e84d8..0da7b5f 100644
--- a/src/classes/share/javax/media/j3d/Renderer.java
+++ b/src/classes/share/javax/media/j3d/Renderer.java
@@ -125,9 +125,8 @@ ArrayList<RenderMolecule> dirtyRenderMoleculeList = new ArrayList<RenderMolecule
 // List of individual dlists that need to be rebuilt
 ArrayList<RenderAtomListInfo> dirtyRenderAtomList = new ArrayList<RenderAtomListInfo>();
 
-    // List of (Rm, rInfo) pair of individual dlists that need to be rebuilt
-    ArrayList dirtyDlistPerRinfoList = new ArrayList();
-
+// List of (Rm, rInfo) pair of individual dlists that need to be rebuilt
+ArrayList<Object[]> dirtyDlistPerRinfoList = new ArrayList<Object[]>();
 
 // Texture and display list that should be freed
 ArrayList<Integer> textureIdResourceFreeList = new ArrayList<Integer>();
-- 
cgit v1.2.3