From 429c20d2f4335ddc5409dcbfc183336dc8d3155f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 23 Feb 2012 22:35:27 +0100
Subject: MemoryObject: Use proper generics style

---
 make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 2 +-
 make/config/jogl/gl-impl-CustomJavaCode-gles1.java | 2 +-
 make/config/jogl/gl-impl-CustomJavaCode-gles2.java | 2 +-
 src/jogl/classes/jogamp/opengl/MemoryObject.java   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index d83ccd8de..dc4f898e6 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -182,7 +182,7 @@ public boolean glIsPBOUnpackEnabled() {
     return checkUnpackPBOEnabled(false);
 }
 
-private HashMap/*<MemoryObject>*/ arbMemCache = new HashMap();
+private HashMap<MemoryObject, MemoryObject> arbMemCache = new HashMap<MemoryObject, MemoryObject>();
 
 /** Entry point to C language function: <br> <code> LPVOID glMapBuffer(GLenum target, GLenum access); </code>    */
 public java.nio.ByteBuffer glMapBuffer(int target, int access) {
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index abb10cee0..9b0d98fe9 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -203,7 +203,7 @@ private boolean checkPackPBOEnabled(boolean throwException) {
     return false;
 }
 
-private HashMap/*<MemoryObject>*/ arbMemCache = new HashMap();
+private HashMap<MemoryObject, MemoryObject> arbMemCache = new HashMap<MemoryObject, MemoryObject>();
 
 /** Entry point to C language function: <br> <code> LPVOID glMapBuffer(GLenum target, GLenum access); </code>    */
 public java.nio.ByteBuffer glMapBuffer(int target, int access) {
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
index 195124d79..ea6544d29 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
@@ -207,7 +207,7 @@ private boolean checkPackPBOEnabled(boolean throwException) {
     return false;
 }
 
-private HashMap/*<MemoryObject>*/ arbMemCache = new HashMap();
+private HashMap<MemoryObject, MemoryObject> arbMemCache = new HashMap<MemoryObject, MemoryObject>();
 
 /** Entry point to C language function: <br> <code> LPVOID glMapBuffer(GLenum target, GLenum access); </code>    */
 public java.nio.ByteBuffer glMapBuffer(int target, int access) {
diff --git a/src/jogl/classes/jogamp/opengl/MemoryObject.java b/src/jogl/classes/jogamp/opengl/MemoryObject.java
index 8b2cf0c4c..292700701 100644
--- a/src/jogl/classes/jogamp/opengl/MemoryObject.java
+++ b/src/jogl/classes/jogamp/opengl/MemoryObject.java
@@ -110,8 +110,8 @@ public class MemoryObject {
      * @param obj0 the MemoryObject
      * @return either the already mapped MemoryObject - not changing the map, or the newly mapped one.
      */
-    public static MemoryObject getOrAddSafe(HashMap/*<MemoryObject,MemoryObject>*/ map, MemoryObject obj0) {
-        MemoryObject obj1 = (MemoryObject) map.get(obj0); // get identity (fast)
+    public static MemoryObject getOrAddSafe(HashMap<MemoryObject,MemoryObject> map, MemoryObject obj0) {
+        MemoryObject obj1 = map.get(obj0); // get identity (fast)
         if(null == obj1) {
             map.put(obj0, obj0);
             obj1 = obj0;
-- 
cgit v1.2.3