From 1ec82447e464d5308442581f14d32f9775928454 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 2 Feb 2015 02:36:39 +0100 Subject: Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.* (Part 1) sed -i 's/javax\.media\.opengl/com\.jogamp\.opengl/g' `grep -Rl "javax\.media\.opengl" src` sed -i 's/javax\.media\.nativewindow/com\.jogamp\.nativewindow/g' `grep -Rl "javax\.media\.nativewindow" src` sed -i 's/javax\/media\//com\/jogamp\//g' `grep -Rl "javax/media/" src` sed -i 's/javax\/media\//com\/jogamp\//g' `grep -Rl "javax/media/" doc` Manually edited all occurences within make/** --- src/jogl/classes/javax/media/opengl/DebugGL2.java | 2 +- src/jogl/classes/javax/media/opengl/DebugGL3.java | 2 +- .../classes/javax/media/opengl/DebugGL3bc.java | 2 +- src/jogl/classes/javax/media/opengl/DebugGL4.java | 2 +- .../classes/javax/media/opengl/DebugGLES2.java | 2 +- .../media/opengl/DefaultGLCapabilitiesChooser.java | 6 +-- .../classes/javax/media/opengl/FPSCounter.java | 2 +- .../javax/media/opengl/GLAnimatorControl.java | 4 +- .../classes/javax/media/opengl/GLArrayData.java | 4 +- .../classes/javax/media/opengl/GLAutoDrawable.java | 42 ++++++++-------- src/jogl/classes/javax/media/opengl/GLBase.java | 2 +- .../javax/media/opengl/GLBufferStorage.java | 2 +- .../classes/javax/media/opengl/GLCapabilities.java | 6 +-- .../javax/media/opengl/GLCapabilitiesChooser.java | 8 +-- .../media/opengl/GLCapabilitiesImmutable.java | 8 +-- src/jogl/classes/javax/media/opengl/GLContext.java | 16 +++--- .../javax/media/opengl/GLDebugListener.java | 2 +- .../classes/javax/media/opengl/GLDebugMessage.java | 2 +- .../classes/javax/media/opengl/GLDrawable.java | 10 ++-- .../javax/media/opengl/GLDrawableFactory.java | 38 +++++++------- .../javax/media/opengl/GLEventListener.java | 2 +- .../classes/javax/media/opengl/GLException.java | 2 +- .../classes/javax/media/opengl/GLFBODrawable.java | 4 +- .../media/opengl/GLOffscreenAutoDrawable.java | 4 +- .../javax/media/opengl/GLPipelineFactory.java | 10 ++-- src/jogl/classes/javax/media/opengl/GLProfile.java | 54 ++++++++++---------- .../classes/javax/media/opengl/GLRunnable.java | 4 +- .../classes/javax/media/opengl/GLRunnable2.java | 2 +- .../javax/media/opengl/GLSharedContextSetter.java | 6 +-- .../classes/javax/media/opengl/GLUniformData.java | 2 +- src/jogl/classes/javax/media/opengl/Threading.java | 6 +-- src/jogl/classes/javax/media/opengl/TraceGL2.java | 2 +- src/jogl/classes/javax/media/opengl/TraceGL3.java | 2 +- .../classes/javax/media/opengl/TraceGL3bc.java | 2 +- src/jogl/classes/javax/media/opengl/TraceGL4.java | 2 +- .../classes/javax/media/opengl/TraceGLES2.java | 2 +- .../javax/media/opengl/awt/AWTGLAutoDrawable.java | 4 +- .../javax/media/opengl/awt/ComponentEvents.java | 4 +- .../classes/javax/media/opengl/awt/GLCanvas.java | 58 +++++++++++----------- .../classes/javax/media/opengl/awt/GLJPanel.java | 54 ++++++++++---------- .../media/opengl/fixedfunc/GLLightingFunc.java | 2 +- .../javax/media/opengl/fixedfunc/GLMatrixFunc.java | 4 +- .../media/opengl/fixedfunc/GLPointerFunc.java | 4 +- .../media/opengl/fixedfunc/GLPointerFuncUtil.java | 2 +- .../classes/javax/media/opengl/glu/GLUnurbs.java | 2 +- .../classes/javax/media/opengl/glu/GLUquadric.java | 4 +- .../javax/media/opengl/glu/GLUtessellator.java | 2 +- .../media/opengl/glu/GLUtessellatorCallback.java | 10 ++-- .../opengl/glu/GLUtessellatorCallbackAdapter.java | 2 +- 49 files changed, 210 insertions(+), 210 deletions(-) (limited to 'src/jogl/classes/javax/media/opengl') diff --git a/src/jogl/classes/javax/media/opengl/DebugGL2.java b/src/jogl/classes/javax/media/opengl/DebugGL2.java index e0d24c4a1..dc0f0df50 100644 --- a/src/jogl/classes/javax/media/opengl/DebugGL2.java +++ b/src/jogl/classes/javax/media/opengl/DebugGL2.java @@ -1,4 +1,4 @@ -package javax.media.opengl; +package com.jogamp.opengl; /** *

diff --git a/src/jogl/classes/javax/media/opengl/DebugGL3.java b/src/jogl/classes/javax/media/opengl/DebugGL3.java index 678e800f6..6b27d207b 100644 --- a/src/jogl/classes/javax/media/opengl/DebugGL3.java +++ b/src/jogl/classes/javax/media/opengl/DebugGL3.java @@ -1,4 +1,4 @@ -package javax.media.opengl; +package com.jogamp.opengl; /** *

diff --git a/src/jogl/classes/javax/media/opengl/DebugGL3bc.java b/src/jogl/classes/javax/media/opengl/DebugGL3bc.java index 2636e9428..d92f6043f 100644 --- a/src/jogl/classes/javax/media/opengl/DebugGL3bc.java +++ b/src/jogl/classes/javax/media/opengl/DebugGL3bc.java @@ -1,4 +1,4 @@ -package javax.media.opengl; +package com.jogamp.opengl; /** *

diff --git a/src/jogl/classes/javax/media/opengl/DebugGL4.java b/src/jogl/classes/javax/media/opengl/DebugGL4.java index c4f8764cb..76f5a4ac3 100644 --- a/src/jogl/classes/javax/media/opengl/DebugGL4.java +++ b/src/jogl/classes/javax/media/opengl/DebugGL4.java @@ -1,4 +1,4 @@ -package javax.media.opengl; +package com.jogamp.opengl; /** *

diff --git a/src/jogl/classes/javax/media/opengl/DebugGLES2.java b/src/jogl/classes/javax/media/opengl/DebugGLES2.java index c4e06f347..e2b280515 100644 --- a/src/jogl/classes/javax/media/opengl/DebugGLES2.java +++ b/src/jogl/classes/javax/media/opengl/DebugGLES2.java @@ -1,4 +1,4 @@ -package javax.media.opengl; +package com.jogamp.opengl; /** *

diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java index 1991ad7d0..88a88087f 100644 --- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java +++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java @@ -38,13 +38,13 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package javax.media.opengl; +package com.jogamp.opengl; -import javax.media.nativewindow.NativeWindowException; +import com.jogamp.nativewindow.NativeWindowException; import java.util.List; -import javax.media.nativewindow.CapabilitiesImmutable; +import com.jogamp.nativewindow.CapabilitiesImmutable; import com.jogamp.common.ExceptionUtils; import com.jogamp.common.util.PropertyAccess; diff --git a/src/jogl/classes/javax/media/opengl/FPSCounter.java b/src/jogl/classes/javax/media/opengl/FPSCounter.java index 4997258e0..a3b7ccb70 100644 --- a/src/jogl/classes/javax/media/opengl/FPSCounter.java +++ b/src/jogl/classes/javax/media/opengl/FPSCounter.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package javax.media.opengl; +package com.jogamp.opengl; import java.io.PrintStream; diff --git a/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java b/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java index d14ada48b..549efd569 100644 --- a/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java +++ b/src/jogl/classes/javax/media/opengl/GLAnimatorControl.java @@ -26,11 +26,11 @@ * or implied, of JogAmp Community. */ -package javax.media.opengl; +package com.jogamp.opengl; /** * An animator control interface, - * which implementation may drive a {@link javax.media.opengl.GLAutoDrawable} animation. + * which implementation may drive a {@link com.jogamp.opengl.GLAutoDrawable} animation. */ public interface GLAnimatorControl extends FPSCounter { /** diff --git a/src/jogl/classes/javax/media/opengl/GLArrayData.java b/src/jogl/classes/javax/media/opengl/GLArrayData.java index 97f58a92a..ea2dfb0f3 100644 --- a/src/jogl/classes/javax/media/opengl/GLArrayData.java +++ b/src/jogl/classes/javax/media/opengl/GLArrayData.java @@ -26,11 +26,11 @@ * or implied, of JogAmp Community. */ -package javax.media.opengl; +package com.jogamp.opengl; import java.nio.Buffer; -import javax.media.opengl.fixedfunc.GLPointerFunc; +import com.jogamp.opengl.fixedfunc.GLPointerFunc; /** * diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java index bded88d20..385acf082 100644 --- a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java +++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java @@ -38,11 +38,11 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package javax.media.opengl; +package com.jogamp.opengl; import java.util.List; -import javax.media.nativewindow.NativeSurface; +import com.jogamp.nativewindow.NativeSurface; import com.jogamp.common.util.locks.RecursiveLock; @@ -63,7 +63,7 @@ import jogamp.opengl.Debug;

GLAutoDrawable Initialization

The implementation shall initialize itself as soon as possible, - which is only possible after the attached {@link javax.media.nativewindow.NativeSurface NativeSurface} becomes visible and and is realized.
+ which is only possible after the attached {@link com.jogamp.nativewindow.NativeSurface NativeSurface} becomes visible and and is realized.
The following initialization sequence should be implemented: