From 05010d9b4757e906bd94d880c59ba7af1120a5a4 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Sun, 27 Jan 2013 13:57:02 -0800
Subject: j3dcore: annotate lists of OrderedBins in RenderBin

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 src/classes/share/javax/media/j3d/RenderBin.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/classes')

diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java
index f134e0d..7a97a69 100644
--- a/src/classes/share/javax/media/j3d/RenderBin.java
+++ b/src/classes/share/javax/media/j3d/RenderBin.java
@@ -252,11 +252,11 @@ ArrayList<J3dMessage> ogCIOList = new ArrayList<J3dMessage>(5);
  */
 ArrayList<OrderedBin> obList = new ArrayList<OrderedBin>(5);
 
-    /**
-     * Ordered Bin processing
-     */
-    ArrayList orderedBinsList = new ArrayList(5);
-    ArrayList toBeAddedBinList = new ArrayList(5);
+/**
+ * Ordered Bin processing
+ */
+ArrayList<ArrayList<OrderedBin>> orderedBinsList = new ArrayList<ArrayList<OrderedBin>>(5);
+ArrayList<ArrayList<OrderedBin>> toBeAddedBinList = new ArrayList<ArrayList<OrderedBin>>(5);
 
     /**
      * arraylist of geometry that should be locked to ensure
@@ -505,8 +505,8 @@ ArrayList<RenderAtomListInfo> removeDlistPerRinfo = new ArrayList<RenderAtomList
 	if (size > 0 ) {
 
 	    for (i = 0; i < size; i++) {
-		ArrayList obs= (ArrayList) orderedBinsList.get(i);
-		ArrayList list = (ArrayList) toBeAddedBinList.get(i);
+			ArrayList<OrderedBin> obs = orderedBinsList.get(i);
+			ArrayList<OrderedBin> list = toBeAddedBinList.get(i);
 
 		int lSize = list.size();
 		for (j = 0; j < lSize; j++) {
@@ -4439,7 +4439,6 @@ private void processOrderedGroupInserted(J3dMessage m) {
         int i, n;
         int oi; // an id which identifies a children of the orderedGroup
         int ci; // child index of the ordered group
-	ArrayList list = null;
 	int val;
 
         OrderedGroupRetained og;
@@ -4484,12 +4483,12 @@ private void processOrderedGroupInserted(J3dMessage m) {
 			}
 			if (index == -1) {
 				orderedBinsList.add(parentChildOrderedBins);
-				list = new ArrayList(5);
+				ArrayList<OrderedBin> list = new ArrayList<OrderedBin>(5);
 				list.add(ob);
 				toBeAddedBinList.add(list);
 			}
 			else {
-				list = (ArrayList)toBeAddedBinList.get(index);
+				ArrayList<OrderedBin> list = toBeAddedBinList.get(index);
 				list.add(ob);
 			}
 		}
-- 
cgit v1.2.3