diff options
| author | Sven Gothel <[email protected]> | 2011-09-27 11:59:06 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-09-27 11:59:06 +0200 |
| commit | df85f0dfafc09e147f9d422adf5ee8eabf67977b (patch) | |
| tree | 2cfa489bc37a8195e0742d8ce48d0d7b2ba468fb /src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java | |
| parent | e5ab975727134d8249277f4df707b2b14a7788f3 (diff) | |
Adapt to GlueGen's Lock ChangeSet: e4baba27507ce78e64a150ec6f69fb96f5721a34 ; Use generics
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java | 8 |
1 files changed, 4 insertions, 4 deletions
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() { |