Adapt to GlueGen's Lock ChangeSet: e4baba27507ce78e64a150ec6f69fb96f5721a34 ; Use generics

3 files changed, 19 insertions, 19 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java b/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java
index 9c77a0508..93b75e70b 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java
@@ -54,21 +54,21 @@ import javax.media.opengl.GLAutoDrawable;
 class AWTAnimatorImpl implements AnimatorBase.AnimatorImpl {
     // For efficient rendering of Swing components, in particular when
     // they overlap one another
-    private List lightweights    = new ArrayList();
-    private Map  repaintManagers = new IdentityHashMap();
-    private Map  dirtyRegions    = new IdentityHashMap();
+    private List<JComponent> lightweights    = new ArrayList<JComponent>();
+    private Map<RepaintManager,RepaintManager> repaintManagers = new IdentityHashMap<RepaintManager,RepaintManager>();
+    private Map<JComponent,Rectangle>  dirtyRegions    = new IdentityHashMap<JComponent,Rectangle>();
 
-    public void display(ArrayList drawables,
+    public void display(ArrayList<GLAutoDrawable> drawables,
                         boolean ignoreExceptions,
                         boolean printExceptions) {
         for (int i=0; i<drawables.size(); i++) {
-            GLAutoDrawable drawable = (GLAutoDrawable) drawables.get(i);
+            GLAutoDrawable drawable = drawables.get(i);
             if (drawable instanceof JComponent) {
                 // Lightweight components need a more efficient drawing
                 // scheme than simply forcing repainting of each one in
                 // turn since drawing one can force another one to be
                 // drawn in turn
-                lightweights.add(drawable);
+                lightweights.add((JComponent)drawable);
             } else {
                 try {
                     drawable.display();
@@ -98,8 +98,8 @@ class AWTAnimatorImpl implements AnimatorBase.AnimatorImpl {
     // the Swing widgets we're animating
     private Runnable drawWithRepaintManagerRunnable = new Runnable() {
             public void run() {
-                for (Iterator iter = lightweights.iterator(); iter.hasNext(); ) {
-                    JComponent comp = (JComponent) iter.next();
+                for (Iterator<JComponent> iter = lightweights.iterator(); iter.hasNext(); ) {
+                    JComponent comp = iter.next();
                     RepaintManager rm = RepaintManager.currentManager(comp);
                     rm.markCompletelyDirty(comp);
                     repaintManagers.put(rm, rm);
@@ -148,16 +148,16 @@ class AWTAnimatorImpl implements AnimatorBase.AnimatorImpl {
                 }
 
                 // Dirty any needed regions on non-optimizable components
-                for (Iterator iter = dirtyRegions.keySet().iterator(); iter.hasNext(); ) {
-                    JComponent comp = (JComponent) iter.next();
-                    Rectangle  rect = (Rectangle) dirtyRegions.get(comp);
+                for (Iterator<JComponent> iter = dirtyRegions.keySet().iterator(); iter.hasNext(); ) {
+                    JComponent comp = iter.next();
+                    Rectangle  rect = dirtyRegions.get(comp);
                     RepaintManager rm = RepaintManager.currentManager(comp);
                     rm.addDirtyRegion(comp, rect.x, rect.y, rect.width, rect.height);
                 }
 
                 // Draw all dirty regions
-                for (Iterator iter = repaintManagers.keySet().iterator(); iter.hasNext(); ) {
-                    ((RepaintManager) iter.next()).paintDirtyRegions();
+                for (Iterator<RepaintManager> iter = repaintManagers.keySet().iterator(); iter.hasNext(); ) {
+                    iter.next().paintDirtyRegions();
                 }
                 dirtyRegions.clear();
                 repaintManagers.clear();
diff --git a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
index a6ba74665..e84a9bf78 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
@@ -28,6 +28,7 @@
 
 package com.jogamp.opengl.util;
 
+import com.jogamp.common.util.locks.LockFactory;
 import com.jogamp.common.util.locks.RecursiveLock;
 import jogamp.opengl.Debug;
 import jogamp.opengl.FPSCounterImpl;
@@ -35,7 +36,6 @@ import jogamp.opengl.FPSCounterImpl;
 import java.io.PrintStream;
 import java.util.ArrayList;
 
-import javax.media.opengl.FPSCounter;
 import javax.media.opengl.GLAnimatorControl;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLProfile;
@@ -55,11 +55,11 @@ public abstract class AnimatorBase implements GLAnimatorControl {
     private static int animatorCount = 0;
 
     public interface AnimatorImpl {
-        void display(ArrayList drawables, boolean ignoreExceptions, boolean printExceptions);
+        void display(ArrayList<GLAutoDrawable> drawables, boolean ignoreExceptions, boolean printExceptions);
         boolean skipWaitForCompletion(Thread thread);
     }
 
-    protected ArrayList/*<GLAutoDrawable>*/ drawables = new ArrayList();
+    protected ArrayList<GLAutoDrawable> drawables = new ArrayList<GLAutoDrawable>();
     protected boolean drawablesEmpty;
     protected AnimatorImpl impl;
     protected String baseName;
@@ -67,7 +67,7 @@ public abstract class AnimatorBase implements GLAnimatorControl {
     protected boolean ignoreExceptions;
     protected boolean printExceptions;
     protected FPSCounterImpl fpsCounter = new FPSCounterImpl();    
-    protected RecursiveLock stateSync = new RecursiveLock();
+    protected RecursiveLock stateSync = LockFactory.createRecursiveLock();
 
     /** Creates a new, empty Animator. */
     public AnimatorBase() {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/DefaultAnimatorImpl.java b/src/jogl/classes/com/jogamp/opengl/util/DefaultAnimatorImpl.java
index d3f9cdeeb..bad268f70 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/DefaultAnimatorImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/DefaultAnimatorImpl.java
@@ -41,11 +41,11 @@ import javax.media.opengl.GLAutoDrawable;
     up this behavior if desired. */
 
 class DefaultAnimatorImpl implements AnimatorBase.AnimatorImpl {
-    public void display(ArrayList drawables,
+    public void display(ArrayList<GLAutoDrawable> drawables,
                         boolean ignoreExceptions,
                         boolean printExceptions) {
         for (int i=0; i<drawables.size(); i++) {
-            GLAutoDrawable drawable = (GLAutoDrawable) drawables.get(i);
+            GLAutoDrawable drawable = drawables.get(i);
             try {
                 drawable.display();
             } catch (RuntimeException e) {