From 45386b6f1136c52ed7966f47134ed9eaa38ed4c7 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Tue, 26 Jun 2012 23:49:01 -0700
Subject: j3dcore: use more specific types for loop variable where possible

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 .../javax/media/j3d/RenderingEnvironmentStructure.java     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/classes/share')

diff --git a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
index 2083cf9..89ec489 100644
--- a/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
+++ b/src/classes/share/javax/media/j3d/RenderingEnvironmentStructure.java
@@ -338,13 +338,12 @@ public void updateObject() {
 
     void insertNodes(J3dMessage m) {
 	Object[] nodes = (Object[])m.args[0];
-	ArrayList viewScopedNodes = (ArrayList)m.args[3];
+	ArrayList<NodeRetained> viewScopedNodes = (ArrayList<NodeRetained>)m.args[3];
 	ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
-	Object n;
 	int i;
 
 	for (i=0; i<nodes.length; i++) {
-	    n = nodes[i];
+	    Object n = nodes[i];
 	    if (n instanceof LightRetained) {
          LightRetained lt = (LightRetained)n;
 		numberOfLights++;
@@ -404,7 +403,7 @@ public void updateObject() {
 
 
 	    for (i = 0; i < size; i++) {
-		n = (NodeRetained)viewScopedNodes.get(i);
+		NodeRetained n = viewScopedNodes.get(i);
 		ArrayList<View> vl = scopedNodesViewList.get(i);
 			if (n instanceof LightRetained) {
 				LightRetained lt = (LightRetained) n;
@@ -516,9 +515,8 @@ public void updateObject() {
 
     void removeNodes(J3dMessage m) {
 	Object[] nodes = (Object[])m.args[0];
-	ArrayList viewScopedNodes = (ArrayList)m.args[3];
+	ArrayList<NodeRetained> viewScopedNodes = (ArrayList<NodeRetained>)m.args[3];
 	ArrayList<ArrayList<View>> scopedNodesViewList = (ArrayList<ArrayList<View>>)m.args[4];
-        Object n;
         int i;
 	GeometryAtom ga;
 	LeafRetained oldsrc = null;
@@ -527,7 +525,7 @@ public void updateObject() {
 	// System.err.println("RE : removeNodes m.args[0] " + m.args[0]);
 
 	for (i=0; i<nodes.length; i++) {
-	    n = nodes[i];
+	    Object n = nodes[i];
 	    if (n instanceof LightRetained) {
 		LightRetained lt = (LightRetained)n;
 		if (lt.inBackgroundGroup) {
@@ -580,7 +578,7 @@ public void updateObject() {
 	    int size = viewScopedNodes.size();
 	    int vlsize;
 	    for (i = 0; i < size; i++) {
-		n = (NodeRetained)viewScopedNodes.get(i);
+		NodeRetained n = viewScopedNodes.get(i);
 		ArrayList<View> vl = scopedNodesViewList.get(i);
 			if (n instanceof LightRetained) {
 				LightRetained lt = (LightRetained) n;
-- 
cgit v1.2.3