From 360b6716f68b44b28fd8c4f8e61ab86d5a56738b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 9 Feb 2011 02:50:09 +0100 Subject: Move implementation private files from com.jogamp..impl. to jogamp. (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. --- src/newt/classes/com/jogamp/newt/Display.java | 4 ++-- src/newt/classes/com/jogamp/newt/NewtFactory.java | 8 ++++---- src/newt/classes/com/jogamp/newt/Screen.java | 2 +- src/newt/classes/com/jogamp/newt/Window.java | 2 +- src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 4 ++-- src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java | 4 ++-- src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java | 2 +- src/newt/classes/com/jogamp/newt/opengl/GLWindow.java | 4 ++-- src/newt/classes/com/jogamp/newt/util/MainThread.java | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/newt/classes/com') diff --git a/src/newt/classes/com/jogamp/newt/Display.java b/src/newt/classes/com/jogamp/newt/Display.java index 3e5c0c25e..f879449b9 100644 --- a/src/newt/classes/com/jogamp/newt/Display.java +++ b/src/newt/classes/com/jogamp/newt/Display.java @@ -29,8 +29,8 @@ package com.jogamp.newt; import com.jogamp.newt.util.EDTUtil; -import com.jogamp.newt.impl.Debug; -import com.jogamp.newt.impl.DisplayImpl; +import jogamp.newt.Debug; +import jogamp.newt.DisplayImpl; import java.util.*; diff --git a/src/newt/classes/com/jogamp/newt/NewtFactory.java b/src/newt/classes/com/jogamp/newt/NewtFactory.java index 3b836787e..4b7eedca2 100644 --- a/src/newt/classes/com/jogamp/newt/NewtFactory.java +++ b/src/newt/classes/com/jogamp/newt/NewtFactory.java @@ -37,10 +37,10 @@ package com.jogamp.newt; import javax.media.nativewindow.*; import com.jogamp.common.jvm.JVMUtil; import com.jogamp.newt.event.WindowEvent; -import com.jogamp.newt.impl.DisplayImpl; -import com.jogamp.newt.impl.ScreenImpl; -import com.jogamp.newt.impl.WindowImpl; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.DisplayImpl; +import jogamp.newt.ScreenImpl; +import jogamp.newt.WindowImpl; +import jogamp.newt.Debug; public class NewtFactory { public static final boolean DEBUG_IMPLEMENTATION = Debug.debug("Window"); diff --git a/src/newt/classes/com/jogamp/newt/Screen.java b/src/newt/classes/com/jogamp/newt/Screen.java index bf8c6f0eb..fec3613a2 100644 --- a/src/newt/classes/com/jogamp/newt/Screen.java +++ b/src/newt/classes/com/jogamp/newt/Screen.java @@ -28,7 +28,7 @@ package com.jogamp.newt; import com.jogamp.newt.event.ScreenModeListener; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java index 9fe5089be..b78f7a9e8 100644 --- a/src/newt/classes/com/jogamp/newt/Window.java +++ b/src/newt/classes/com/jogamp/newt/Window.java @@ -31,7 +31,7 @@ package com.jogamp.newt; import com.jogamp.newt.event.WindowListener; import com.jogamp.newt.event.KeyListener; import com.jogamp.newt.event.MouseListener; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; import javax.media.nativewindow.CapabilitiesChooser; import javax.media.nativewindow.CapabilitiesImmutable; import javax.media.nativewindow.NativeWindow; diff --git a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java index 18213f94f..9154ab7d8 100644 --- a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java +++ b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java @@ -42,7 +42,7 @@ import javax.media.nativewindow.NativeWindow; import javax.media.nativewindow.NativeWindowException; import javax.media.nativewindow.WindowClosingProtocol; import javax.media.nativewindow.awt.AWTWindowClosingProtocol; -import com.jogamp.nativewindow.impl.awt.AWTMisc; +import jogamp.nativewindow.awt.AWTMisc; import com.jogamp.newt.event.awt.AWTAdapter; import com.jogamp.newt.event.awt.AWTParentWindowAdapter; @@ -50,7 +50,7 @@ import com.jogamp.newt.event.WindowEvent; import com.jogamp.newt.Window; import com.jogamp.newt.event.WindowAdapter; import com.jogamp.newt.event.WindowListener; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; import javax.swing.MenuSelectionManager; public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProtocol { diff --git a/src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java b/src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java index cd03454c8..e1370f05e 100644 --- a/src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java +++ b/src/newt/classes/com/jogamp/newt/awt/NewtFactoryAWT.java @@ -34,7 +34,7 @@ import javax.media.nativewindow.*; import javax.media.nativewindow.awt.*; import com.jogamp.newt.NewtFactory; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; public class NewtFactoryAWT extends NewtFactory { public static final boolean DEBUG_IMPLEMENTATION = Debug.debug("Window"); @@ -43,7 +43,7 @@ public class NewtFactoryAWT extends NewtFactory { * Wraps an AWT component into a {@link javax.media.nativewindow.NativeWindow} utilizing the {@link javax.media.nativewindow.NativeWindowFactory},
* using a configuration agnostic dummy {@link javax.media.nativewindow.DefaultGraphicsConfiguration}.
*

- * The actual wrapping implementation is {@link com.jogamp.nativewindow.impl.jawt.JAWTWindow}.

+ * The actual wrapping implementation is {@link jogamp.nativewindow.jawt.JAWTWindow}.

*

* Purpose of this wrapping is to access the AWT window handle,
* not to actually render into it.
diff --git a/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java b/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java index c136946ac..e24002659 100644 --- a/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java +++ b/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java @@ -28,7 +28,7 @@ package com.jogamp.newt.event.awt; -import com.jogamp.newt.impl.Debug; +import jogamp.newt.Debug; /** * Convenient adapter forwarding AWT events to NEWT via the event listener model.
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java index 6886fc71b..f3fab7bce 100644 --- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java +++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java @@ -41,14 +41,14 @@ import com.jogamp.common.util.VersionUtil; import com.jogamp.nativewindow.NativeWindowVersion; import com.jogamp.newt.*; import com.jogamp.newt.event.*; -import com.jogamp.newt.impl.WindowImpl; +import jogamp.newt.WindowImpl; import javax.media.nativewindow.*; import javax.media.nativewindow.util.Point; import javax.media.nativewindow.util.Insets; import javax.media.opengl.*; -import com.jogamp.opengl.impl.GLDrawableHelper; +import jogamp.opengl.GLDrawableHelper; import com.jogamp.opengl.JoglVersion; /** diff --git a/src/newt/classes/com/jogamp/newt/util/MainThread.java b/src/newt/classes/com/jogamp/newt/util/MainThread.java index 5b26cfbda..607645052 100644 --- a/src/newt/classes/com/jogamp/newt/util/MainThread.java +++ b/src/newt/classes/com/jogamp/newt/util/MainThread.java @@ -46,7 +46,7 @@ import javax.media.nativewindow.*; import com.jogamp.common.util.*; import com.jogamp.newt.*; -import com.jogamp.newt.impl.*; +import jogamp.newt.*; /** * NEWT Utility class MainThread

@@ -181,7 +181,7 @@ public class MainThread implements EDTUtil { mainAction = new MainAction(mainClassName, mainClassArgs); if(NativeWindowFactory.TYPE_MACOSX.equals(NativeWindowFactory.getNativeWindowType(false))) { - ReflectionUtil.callStaticMethod("com.jogamp.newt.impl.macosx.MacDisplay", "initSingleton", + ReflectionUtil.callStaticMethod("jogamp.newt.macosx.MacDisplay", "initSingleton", null, null, MainThread.class.getClassLoader()); } -- cgit v1.2.3