From 360b6716f68b44b28fd8c4f8e61ab86d5a56738b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 9 Feb 2011 02:50:09 +0100
Subject: Move implementation private files from com.jogamp.<module>.impl. to
 jogamp.<module> (2/2) - edit files

- com.jogamp.opengl.impl                     -> jogamp.opengl
- com.jogamp.opengl.util.glsl.fixedfunc.impl -> jogamp.opengl.util.glsl.fixedfunc
- com.jogamp.nativewindow.impl               -> jogamp.nativewindow
- com.jogamp.newt.impl                       -> jogamp.newt

This sorts implementation details from the top level, ie skipping the public 'com',
allowing a better seperation of public classes and implementation details
and also reduces strings.

This approach of public/private seperation is also used in the OpenJDK.
---
 .../com/jogamp/gluegen/opengl/BuildComposablePipeline.java        | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java         | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java    | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java   | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/Gamma.java                | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java            | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java     | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java      | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java     | 2 +-
 .../com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java      | 2 +-
 src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java      | 2 +-
 .../com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp   | 2 +-
 .../classes/com/jogamp/opengl/util/texture/TextureIO.java.javase  | 2 +-
 .../jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java    | 2 +-
 src/jogl/classes/com/jogamp/openmax/OMXInstance.java              | 8 ++++----
 15 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/jogl/classes/com')

diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
index 7acba95e6..d11504a64 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java
@@ -550,7 +550,7 @@ public class BuildComposablePipeline {
          * method wrappers have been generated.
          */
         protected void preMethodEmissionHook(PrintWriter output) {
-            output.println("  public static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug(\"" + getOutputName() + "\");");
+            output.println("  public static final boolean DEBUG = jogamp.opengl.Debug.debug(\"" + getOutputName() + "\");");
         }
 
         /**
diff --git a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
index 96cfe6562..4a8579767 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/AnimatorBase.java
@@ -29,7 +29,7 @@
 package com.jogamp.opengl.util;
 
 import com.jogamp.common.util.locks.RecursiveLock;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import java.util.ArrayList;
 import javax.media.opengl.GLAnimatorControl;
 import javax.media.opengl.GLAutoDrawable;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
index 1141f6624..4586d1df5 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
@@ -8,7 +8,7 @@ import javax.media.opengl.*;
 
 import com.jogamp.opengl.util.glsl.*;
 
-import com.jogamp.opengl.impl.SystemUtil;
+import jogamp.opengl.SystemUtil;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
index 2ab77fa1b..88a8603f9 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
@@ -3,7 +3,7 @@ package com.jogamp.opengl.util;
 
 import javax.media.opengl.*;
 
-import com.jogamp.opengl.util.glsl.fixedfunc.impl.*;
+import jogamp.opengl.util.glsl.fixedfunc.*;
 
 import java.nio.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/Gamma.java b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
index 672325cf3..c649d1c6a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
@@ -40,7 +40,7 @@
 package com.jogamp.opengl.util;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 
 /** Provides control over the primary display's gamma, brightness and
     contrast controls via the hardware gamma ramp tables. Not
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
index 47de8ce0a..0e1b7926e 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -34,7 +34,7 @@
 package com.jogamp.opengl.util;
 
 import com.jogamp.common.nio.Buffers;
-import com.jogamp.opengl.impl.ProjectFloat;
+import jogamp.opengl.ProjectFloat;
 
 import java.nio.*;
 import java.util.ArrayList;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
index 6073a75f8..86882176a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
@@ -40,7 +40,7 @@
 package com.jogamp.opengl.util.awt;
 
 import com.jogamp.common.nio.Buffers;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.packrect.*;
 import com.jogamp.opengl.util.texture.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
index 1d7f38afe..5dd1b5a3a 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -31,7 +31,7 @@ package com.jogamp.opengl.util.glsl;
 import com.jogamp.common.nio.Buffers;
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 
 import java.util.*;
 import java.nio.*;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
index 42bf91e65..57ae6cfda 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -29,7 +29,7 @@
 package com.jogamp.opengl.util.glsl;
 
 import javax.media.opengl.*;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
index 7ec4ac50e..9d7eecb60 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
@@ -7,7 +7,7 @@ package com.jogamp.opengl.util.glsl.fixedfunc;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 
-import com.jogamp.opengl.util.glsl.fixedfunc.impl.*;
+import jogamp.opengl.util.glsl.fixedfunc.*;
 
 /**
  * Tool to pipeline GL2ES2 into a fixed function emulation implementing GL2ES1.
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
index 57ac0d45a..38f8ff974 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
@@ -42,7 +42,7 @@ import java.security.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.NativeWindowFactory;
-import com.jogamp.opengl.impl.*;
+import jogamp.opengl.*;
 import com.jogamp.opengl.util.texture.*;
 import com.jogamp.opengl.util.texture.spi.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
index 3b694be68..eb65ff538 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
@@ -46,7 +46,7 @@ import java.util.*;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.texture.spi.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
index 819a6acf5..e86ff161b 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
@@ -46,7 +46,7 @@ import java.util.*;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.texture.spi.*;
 
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
index a45821d87..6e2f1b992 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
@@ -46,7 +46,7 @@ import java.net.*;
 import javax.imageio.*;
 import javax.media.opengl.GLProfile;
 
-import com.jogamp.opengl.impl.Debug;
+import jogamp.opengl.Debug;
 import com.jogamp.opengl.util.texture.*;
 import com.jogamp.opengl.util.texture.awt.*;
 import com.jogamp.opengl.util.texture.spi.*;
diff --git a/src/jogl/classes/com/jogamp/openmax/OMXInstance.java b/src/jogl/classes/com/jogamp/openmax/OMXInstance.java
index d49eeb8e6..fcd055f8b 100644
--- a/src/jogl/classes/com/jogamp/openmax/OMXInstance.java
+++ b/src/jogl/classes/com/jogamp/openmax/OMXInstance.java
@@ -5,10 +5,10 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.GLU;
 import com.jogamp.opengl.util.texture.*;
 
-import com.jogamp.opengl.impl.egl.EGL;
-import com.jogamp.opengl.impl.egl.EGLContext;
-import com.jogamp.opengl.impl.egl.EGLDrawable;
-import com.jogamp.opengl.impl.egl.EGLExt;
+import jogamp.opengl.egl.EGL;
+import jogamp.opengl.egl.EGLContext;
+import jogamp.opengl.egl.EGLDrawable;
+import jogamp.opengl.egl.EGLExt;
 
 import java.net.URL;
 import java.nio.ByteBuffer;
-- 
cgit v1.2.3