From 1783aa4055c86e2a52c5782c0974a835e4c36aed Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Sat, 23 Jun 2012 22:49:01 -0700
Subject: j3dcore: annotate deviceMap with type information

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

diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java
index 62b778d..c2217a3 100644
--- a/src/classes/share/javax/media/j3d/Canvas3D.java
+++ b/src/classes/share/javax/media/j3d/Canvas3D.java
@@ -1166,13 +1166,11 @@ ArrayList<TextureRetained> textureIDResourceTable = new ArrayList<TextureRetaine
 	    canvasViewEventCatcher = new CanvasViewEventCatcher(this);
 
 	    synchronized(VirtualUniverse.mc.deviceScreenMap) {
-		screen = (Screen3D) VirtualUniverse.mc.
-		                   deviceScreenMap.get(graphicsDevice);
+			screen = VirtualUniverse.mc.deviceScreenMap.get(graphicsDevice);
 
 		if (screen == null) {
 		    screen = new Screen3D(graphicsConfiguration, offScreen);
-		    VirtualUniverse.mc.deviceScreenMap.put(graphicsDevice,
-							   screen);
+			VirtualUniverse.mc.deviceScreenMap.put(graphicsDevice, screen);
 		}
 	    }
 
diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java
index 2ef3987..201fe23 100644
--- a/src/classes/share/javax/media/j3d/MasterControl.java
+++ b/src/classes/share/javax/media/j3d/MasterControl.java
@@ -430,7 +430,7 @@ class MasterControl {
 
     // Hashtable that maps a GraphicsDevice to its associated
     // Screen3D--this is only used for on-screen Canvas3Ds
-    Hashtable deviceScreenMap = new Hashtable();
+    Hashtable<GraphicsDevice, Screen3D> deviceScreenMap = new Hashtable<GraphicsDevice, Screen3D>();
 
     // Use to store all requests from user threads.
     UnorderList requestObjList = new UnorderList();
-- 
cgit v1.2.3