diff options
author | Sven Gothel <[email protected]> | 2010-04-24 14:27:18 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-04-24 14:27:18 +0200 |
commit | 6e273ec07af21ad3c2a1b50fece9f46a3cc92658 (patch) | |
tree | 365395e2d05f9b10549fc9946554edb0af375069 /src/newt/classes/com/jogamp | |
parent | 1ad8c39df6b097c80ba7a85badf555e7f669cc3f (diff) |
NEWT Cleanup
- Moved all implementation details (awt/x11/windows/macosx/..)
to com.jogamp.newt.impl
- Moved awt event handling
com.jogamp.newt.awt.event -> com.jogamp.newt.event.awt
- NEWTEvent extends java.util.EventObject
- NEWTEventListener extends java.util.EventListener
- Added Trace*Adapter, logging the event, incl. the time lag
Diffstat (limited to 'src/newt/classes/com/jogamp')
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/Display.java | 18 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/Screen.java | 10 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/Window.java | 12 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/InputEvent.java | 4 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/KeyListener.java | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/MouseListener.java | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/NEWTEvent.java (renamed from src/newt/classes/com/jogamp/newt/event/Event.java) | 28 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/NEWTEventListener.java (renamed from src/newt/classes/com/jogamp/newt/event/EventListener.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/event/PaintEvent.java | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/TraceKeyAdapter.java | 60 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/TraceMouseAdapter.java | 81 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/TraceWindowAdapter.java | 68 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/WindowEvent.java | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/WindowListener.java | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java (renamed from src/newt/classes/com/jogamp/newt/awt/event/AWTAdapter.java) | 16 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/awt/AWTKeyAdapter.java (renamed from src/newt/classes/com/jogamp/newt/awt/event/AWTKeyAdapter.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/awt/AWTMouseAdapter.java (renamed from src/newt/classes/com/jogamp/newt/awt/event/AWTMouseAdapter.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/awt/AWTNewtEventFactory.java (renamed from src/newt/classes/com/jogamp/newt/awt/event/AWTNewtEventFactory.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/event/awt/AWTWindowAdapter.java (renamed from src/newt/classes/com/jogamp/newt/awt/event/AWTWindowAdapter.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/impl/awt/AWTCanvas.java (renamed from src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/impl/awt/AWTDisplay.java (renamed from src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/impl/awt/AWTScreen.java (renamed from src/newt/classes/com/jogamp/newt/awt/AWTScreen.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/impl/awt/AWTWindow.java (renamed from src/newt/classes/com/jogamp/newt/awt/AWTWindow.java) | 4 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/impl/intel/gdl/Display.java (renamed from src/newt/classes/com/jogamp/newt/intel/gdl/Display.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/impl/intel/gdl/Screen.java (renamed from src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/impl/intel/gdl/Window.java (renamed from src/newt/classes/com/jogamp/newt/intel/gdl/Window.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/macosx/MacDisplay.java (renamed from src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/macosx/MacScreen.java (renamed from src/newt/classes/com/jogamp/newt/macosx/MacScreen.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/macosx/MacWindow.java (renamed from src/newt/classes/com/jogamp/newt/macosx/MacWindow.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Display.java (renamed from src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Screen.java (renamed from src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Window.java (renamed from src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDDisplay.java (renamed from src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDScreen.java (renamed from src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDWindow.java (renamed from src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/windows/WindowsDisplay.java (renamed from src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/windows/WindowsScreen.java (renamed from src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java (renamed from src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/x11/X11Display.java (renamed from src/newt/classes/com/jogamp/newt/x11/X11Display.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/x11/X11Screen.java (renamed from src/newt/classes/com/jogamp/newt/x11/X11Screen.java) | 2 | ||||
-rwxr-xr-x | src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java (renamed from src/newt/classes/com/jogamp/newt/x11/X11Window.java) | 2 | ||||
-rw-r--r-- | src/newt/classes/com/jogamp/newt/util/MainThread.java | 2 |
42 files changed, 284 insertions, 81 deletions
diff --git a/src/newt/classes/com/jogamp/newt/Display.java b/src/newt/classes/com/jogamp/newt/Display.java index 931c16cd9..df4d5b4f8 100755 --- a/src/newt/classes/com/jogamp/newt/Display.java +++ b/src/newt/classes/com/jogamp/newt/Display.java @@ -48,15 +48,15 @@ public abstract class Display { Class displayClass = NewtFactory.getCustomClass(type, "Display"); if(null==displayClass) { if (NativeWindowFactory.TYPE_EGL.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.opengl.kd.KDDisplay"); + displayClass = Class.forName("com.jogamp.newt.impl.opengl.kd.KDDisplay"); } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.windows.WindowsDisplay"); + displayClass = Class.forName("com.jogamp.newt.impl.windows.WindowsDisplay"); } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.macosx.MacDisplay"); + displayClass = Class.forName("com.jogamp.newt.impl.macosx.MacDisplay"); } else if (NativeWindowFactory.TYPE_X11.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.x11.X11Display"); + displayClass = Class.forName("com.jogamp.newt.impl.x11.X11Display"); } else if (NativeWindowFactory.TYPE_AWT.equals(type)) { - displayClass = Class.forName("com.jogamp.newt.awt.AWTDisplay"); + displayClass = Class.forName("com.jogamp.newt.impl.awt.AWTDisplay"); } else { throw new RuntimeException("Unknown display type \"" + type + "\""); } @@ -267,14 +267,14 @@ public abstract class Display { protected abstract void dispatchMessagesNative(); - private LinkedList/*<Event>*/ events = new LinkedList(); + private LinkedList/*<NEWTEvent>*/ events = new LinkedList(); protected void dispatchMessages() { - Event e; + NEWTEvent e; do { synchronized(events) { if (!events.isEmpty()) { - e = (Event) events.removeFirst(); + e = (NEWTEvent) events.removeFirst(); } else { e = null; } @@ -292,7 +292,7 @@ public abstract class Display { dispatchMessagesNative(); } - public void enqueueEvent(com.jogamp.newt.event.Event e) { + public void enqueueEvent(NEWTEvent e) { synchronized(events) { events.add(e); } diff --git a/src/newt/classes/com/jogamp/newt/Screen.java b/src/newt/classes/com/jogamp/newt/Screen.java index b393d30de..7bf520332 100755 --- a/src/newt/classes/com/jogamp/newt/Screen.java +++ b/src/newt/classes/com/jogamp/newt/Screen.java @@ -46,15 +46,15 @@ public abstract class Screen { Class screenClass = NewtFactory.getCustomClass(type, "Screen"); if(null==screenClass) { if (NativeWindowFactory.TYPE_EGL.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.opengl.kd.KDScreen"); + screenClass = Class.forName("com.jogamp.newt.impl.opengl.kd.KDScreen"); } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.windows.WindowsScreen"); + screenClass = Class.forName("com.jogamp.newt.impl.windows.WindowsScreen"); } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.macosx.MacScreen"); + screenClass = Class.forName("com.jogamp.newt.impl.macosx.MacScreen"); } else if (NativeWindowFactory.TYPE_X11.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.x11.X11Screen"); + screenClass = Class.forName("com.jogamp.newt.impl.x11.X11Screen"); } else if (NativeWindowFactory.TYPE_AWT.equals(type)) { - screenClass = Class.forName("com.jogamp.newt.awt.AWTScreen"); + screenClass = Class.forName("com.jogamp.newt.impl.awt.AWTScreen"); } else { throw new RuntimeException("Unknown window type \"" + type + "\""); } diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java index 33b971578..6f585a20a 100755 --- a/src/newt/classes/com/jogamp/newt/Window.java +++ b/src/newt/classes/com/jogamp/newt/Window.java @@ -71,15 +71,15 @@ public abstract class Window implements NativeWindow Class windowClass = NewtFactory.getCustomClass(type, "Window"); if(null==windowClass) { if (NativeWindowFactory.TYPE_EGL.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.opengl.kd.KDWindow"); + windowClass = Class.forName("com.jogamp.newt.impl.opengl.kd.KDWindow"); } else if (NativeWindowFactory.TYPE_WINDOWS.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.windows.WindowsWindow"); + windowClass = Class.forName("com.jogamp.newt.impl.windows.WindowsWindow"); } else if (NativeWindowFactory.TYPE_MACOSX.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.macosx.MacWindow"); + windowClass = Class.forName("com.jogamp.newt.impl.macosx.MacWindow"); } else if (NativeWindowFactory.TYPE_X11.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.x11.X11Window"); + windowClass = Class.forName("com.jogamp.newt.impl.x11.X11Window"); } else if (NativeWindowFactory.TYPE_AWT.equals(type)) { - windowClass = Class.forName("com.jogamp.newt.awt.AWTWindow"); + windowClass = Class.forName("com.jogamp.newt.impl.awt.AWTWindow"); } else { throw new NativeWindowException("Unknown window type \"" + type + "\""); } @@ -576,7 +576,7 @@ public abstract class Window implements NativeWindow // Generic Event Support // - protected void sendEvent(Event e) { + protected void sendEvent(NEWTEvent e) { if(e instanceof WindowEvent) { sendWindowEvent((WindowEvent)e); } else if(e instanceof KeyEvent) { diff --git a/src/newt/classes/com/jogamp/newt/event/InputEvent.java b/src/newt/classes/com/jogamp/newt/event/InputEvent.java index 01a4b307a..02fbe59ef 100644 --- a/src/newt/classes/com/jogamp/newt/event/InputEvent.java +++ b/src/newt/classes/com/jogamp/newt/event/InputEvent.java @@ -35,7 +35,7 @@ package com.jogamp.newt.event; import com.jogamp.newt.*; -public abstract class InputEvent extends Event +public abstract class InputEvent extends NEWTEvent { public static final int SHIFT_MASK = 1 << 0; public static final int CTRL_MASK = 1 << 1; @@ -91,7 +91,7 @@ public abstract class InputEvent extends Event } public String toString() { - return "InputEvent[modifiers:"+modifiers+"]"; + return "InputEvent[modifiers:"+modifiers+", "+super.toString()+"]"; } private boolean consumed; diff --git a/src/newt/classes/com/jogamp/newt/event/KeyListener.java b/src/newt/classes/com/jogamp/newt/event/KeyListener.java index 925a902f7..5ce3868f5 100644 --- a/src/newt/classes/com/jogamp/newt/event/KeyListener.java +++ b/src/newt/classes/com/jogamp/newt/event/KeyListener.java @@ -35,7 +35,7 @@ package com.jogamp.newt.event; import com.jogamp.newt.*; -public interface KeyListener extends EventListener +public interface KeyListener extends NEWTEventListener { public void keyPressed(KeyEvent e); public void keyReleased(KeyEvent e); diff --git a/src/newt/classes/com/jogamp/newt/event/MouseListener.java b/src/newt/classes/com/jogamp/newt/event/MouseListener.java index 3d5b4d83f..b328aeac7 100644 --- a/src/newt/classes/com/jogamp/newt/event/MouseListener.java +++ b/src/newt/classes/com/jogamp/newt/event/MouseListener.java @@ -35,7 +35,7 @@ package com.jogamp.newt.event; import com.jogamp.newt.*; -public interface MouseListener extends EventListener +public interface MouseListener extends NEWTEventListener { public void mouseClicked(MouseEvent e); public void mouseEntered(MouseEvent e); diff --git a/src/newt/classes/com/jogamp/newt/event/Event.java b/src/newt/classes/com/jogamp/newt/event/NEWTEvent.java index d93995ead..6559c5953 100644 --- a/src/newt/classes/com/jogamp/newt/event/Event.java +++ b/src/newt/classes/com/jogamp/newt/event/NEWTEvent.java @@ -36,33 +36,32 @@ package com.jogamp.newt.event; import com.jogamp.newt.*; import java.util.*; -public class Event { +public class NEWTEvent extends java.util.EventObject { private boolean isSystemEvent; private int eventType; - private Object source; private long when; static final boolean DEBUG = false; - // 0: Event.java + // 0: NEWTEvent.java // 1: InputEvent.java // 2: KeyEvent.java // 3: com.jogamp.newt.Window - // 3: com.jogamp.newt.awt.event.AWTNewtEventFactory + // 3: com.jogamp.newt.event.awt.AWTNewtEventFactory // 2: MouseEvent.java // 3: com.jogamp.newt.Window - // 3: com.jogamp.newt.awt.event.AWTNewtEventFactory + // 3: com.jogamp.newt.event.awt.AWTNewtEventFactory // 1: PaintEvent.java // 2: com.jogamp.newt.Window - // 2: com.jogamp.newt.awt.event.AWTNewtEventFactory + // 2: com.jogamp.newt.event.awt.AWTNewtEventFactory // 1: WindowEvent.java // 2: com.jogamp.newt.Window - // 2: com.jogamp.newt.awt.event.AWTNewtEventFactory + // 2: com.jogamp.newt.event.awt.AWTNewtEventFactory // static final String WindowClazzName = "com.jogamp.newt.Window" ; - static final String AWTNewtEventFactoryClazzName = "com.jogamp.newt.awt.event.AWTNewtEventFactory" ; + static final String AWTNewtEventFactoryClazzName = "com.jogamp.newt.event.awt.AWTNewtEventFactory" ; - static final boolean evaluateIsSystemEvent(Event event, Throwable t) { + static final boolean evaluateIsSystemEvent(NEWTEvent event, Throwable t) { StackTraceElement[] stack = t.getStackTrace(); if(stack.length==0 || null==stack[0]) { return false; @@ -96,10 +95,10 @@ public class Event { return res; } - protected Event(int eventType, Object source, long when) { + protected NEWTEvent(int eventType, Object source, long when) { + super(source); this.isSystemEvent = evaluateIsSystemEvent(this, new Throwable()); this.eventType = eventType; - this.source = source; this.when = when; } @@ -114,18 +113,13 @@ public class Event { return eventType; } - /** Returns the source Object which produced this Event. */ - public final Object getSource() { - return source; - } - /** Returns the timestamp, in milliseconds, of this event. */ public final long getWhen() { return when; } public String toString() { - return "Event[sys:"+isSystemEvent()+", source:"+getSource()+", when:"+getWhen()+"]"; + return "NEWTEvent[sys:"+isSystemEvent()+", source:"+getSource().getClass().getName()+", when:"+getWhen()+" d "+(System.currentTimeMillis()-getWhen())+"ms]"; } public static String toHexString(int hex) { diff --git a/src/newt/classes/com/jogamp/newt/event/EventListener.java b/src/newt/classes/com/jogamp/newt/event/NEWTEventListener.java index e47b9ccb3..2a187f8c4 100644 --- a/src/newt/classes/com/jogamp/newt/event/EventListener.java +++ b/src/newt/classes/com/jogamp/newt/event/NEWTEventListener.java @@ -35,7 +35,7 @@ package com.jogamp.newt.event; import com.jogamp.newt.*; -public interface EventListener extends java.util.EventListener +public interface NEWTEventListener extends java.util.EventListener { public static final int WINDOW = 1 << 0; public static final int MOUSE = 1 << 1; diff --git a/src/newt/classes/com/jogamp/newt/event/PaintEvent.java b/src/newt/classes/com/jogamp/newt/event/PaintEvent.java index 469358625..e1c667b55 100755 --- a/src/newt/classes/com/jogamp/newt/event/PaintEvent.java +++ b/src/newt/classes/com/jogamp/newt/event/PaintEvent.java @@ -39,7 +39,7 @@ import com.jogamp.newt.*; * * @author tdv */ -public class PaintEvent extends Event { +public class PaintEvent extends NEWTEvent { // bounds of the damage region private int x, y, width, height; diff --git a/src/newt/classes/com/jogamp/newt/event/TraceKeyAdapter.java b/src/newt/classes/com/jogamp/newt/event/TraceKeyAdapter.java new file mode 100644 index 000000000..8034bdb9f --- /dev/null +++ b/src/newt/classes/com/jogamp/newt/event/TraceKeyAdapter.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2010 Sven Gothel. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistribution in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name Sven Gothel or the names of + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * This software is provided "AS IS," without a warranty of any kind. ALL + * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR + * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR + * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF + * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + */ + +package com.jogamp.newt.event; + +public class TraceKeyAdapter implements KeyListener { + + KeyListener downstream; + + public TraceKeyAdapter() { + this.downstream = null; + } + + public TraceKeyAdapter(KeyListener downstream) { + this.downstream = downstream; + } + + public void keyPressed(KeyEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.keyPressed(e); } + } + public void keyReleased(KeyEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.keyReleased(e); } + } + public void keyTyped(KeyEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.keyTyped(e); } + } +} + diff --git a/src/newt/classes/com/jogamp/newt/event/TraceMouseAdapter.java b/src/newt/classes/com/jogamp/newt/event/TraceMouseAdapter.java new file mode 100644 index 000000000..b19b5eb21 --- /dev/null +++ b/src/newt/classes/com/jogamp/newt/event/TraceMouseAdapter.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2010 Sven Gothel. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistribution in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name Sven Gothel or the names of + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * This software is provided "AS IS," without a warranty of any kind. ALL + * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR + * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR + * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF + * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + */ +package com.jogamp.newt.event; + +import com.jogamp.newt.*; + +public class TraceMouseAdapter implements MouseListener { + + MouseListener downstream; + + public TraceMouseAdapter() { + this.downstream = null; + } + + public TraceMouseAdapter(MouseListener downstream) { + this.downstream = downstream; + } + + public void mouseClicked(MouseEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.mouseClicked(e); } + } + public void mouseEntered(MouseEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.mouseEntered(e); } + } + public void mouseExited(MouseEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.mouseExited(e); } + } + public void mousePressed(MouseEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.mousePressed(e); } + } + public void mouseReleased(MouseEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.mouseReleased(e); } + } + public void mouseMoved(MouseEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.mouseMoved(e); } + } + public void mouseDragged(MouseEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.mouseDragged(e); } + } + public void mouseWheelMoved(MouseEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.mouseWheelMoved(e); } + } +} + diff --git a/src/newt/classes/com/jogamp/newt/event/TraceWindowAdapter.java b/src/newt/classes/com/jogamp/newt/event/TraceWindowAdapter.java new file mode 100644 index 000000000..5a93bca36 --- /dev/null +++ b/src/newt/classes/com/jogamp/newt/event/TraceWindowAdapter.java @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2010 Sven Gothel. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistribution in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name Sven Gothel or the names of + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * This software is provided "AS IS," without a warranty of any kind. ALL + * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR + * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR + * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF + * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + */ +package com.jogamp.newt.event; + +import com.jogamp.newt.*; + +public class TraceWindowAdapter implements WindowListener { + + WindowListener downstream; + + public TraceWindowAdapter() { + this.downstream = null; + } + + public TraceWindowAdapter(WindowListener downstream) { + this.downstream = downstream; + } + + public void windowResized(WindowEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.windowResized(e); } + } + public void windowMoved(WindowEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.windowMoved(e); } + } + public void windowDestroyNotify(WindowEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.windowDestroyNotify(e); } + } + public void windowGainedFocus(WindowEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.windowGainedFocus(e); } + } + public void windowLostFocus(WindowEvent e) { + System.out.println(e); + if(null!=downstream) { downstream.windowLostFocus(e); } + } +} diff --git a/src/newt/classes/com/jogamp/newt/event/WindowEvent.java b/src/newt/classes/com/jogamp/newt/event/WindowEvent.java index 8204bfc79..6706ef778 100644 --- a/src/newt/classes/com/jogamp/newt/event/WindowEvent.java +++ b/src/newt/classes/com/jogamp/newt/event/WindowEvent.java @@ -35,7 +35,7 @@ package com.jogamp.newt.event; import com.jogamp.newt.*; -public class WindowEvent extends Event { +public class WindowEvent extends NEWTEvent { public static final int EVENT_WINDOW_RESIZED = 100; public static final int EVENT_WINDOW_MOVED = 101; public static final int EVENT_WINDOW_DESTROY_NOTIFY = 102; diff --git a/src/newt/classes/com/jogamp/newt/event/WindowListener.java b/src/newt/classes/com/jogamp/newt/event/WindowListener.java index 8c7601a8d..871f0fe12 100644 --- a/src/newt/classes/com/jogamp/newt/event/WindowListener.java +++ b/src/newt/classes/com/jogamp/newt/event/WindowListener.java @@ -35,7 +35,7 @@ package com.jogamp.newt.event; import com.jogamp.newt.*; -public interface WindowListener extends EventListener { +public interface WindowListener extends NEWTEventListener { public void windowResized(WindowEvent e); public void windowMoved(WindowEvent e); public void windowDestroyNotify(WindowEvent e); diff --git a/src/newt/classes/com/jogamp/newt/awt/event/AWTAdapter.java b/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java index 345eb02b9..6fb02e8e7 100644 --- a/src/newt/classes/com/jogamp/newt/awt/event/AWTAdapter.java +++ b/src/newt/classes/com/jogamp/newt/event/awt/AWTAdapter.java @@ -29,7 +29,7 @@ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.newt.awt.event; +package com.jogamp.newt.event.awt; /** * Convenient adapter forwarding AWT events to NEWT via the event listener model.<br> @@ -38,11 +38,11 @@ package com.jogamp.newt.awt.event; * it is converted to a NEWT event and the given NEWT listener is being called.<br> * * This adapter fullfills three use cases. First as a plain utility to write code AWT agnostic, - * ie write an {@link javax.media.opengl.GLEvenListener} and some appropriate NEWT {@link com.jogamp.newt.event.EventListener}.<br> + * ie write an {@link javax.media.opengl.GLEvenListener} and some appropriate NEWT {@link com.jogamp.newt.event.NEWTEventListener}.<br> * * Attach the {@link javax.media.opengl.GLEvenListener} to a NEWT {@link javax.media.opengl.GLAutoDrawable}, e.g. {@link com.jogamp.newt.opengl.GLWindow}, * or to an AWT {@link javax.media.opengl.GLAutoDrawable}, e.g. {@link javax.media.opengl.awt.GLCanvas}.<br> - * Attach the NEWT {@link com.jogamp.newt.event.EventListener} to a NEWT component, e.g. {@link com.jogamp.newt.Window}, + * Attach the NEWT {@link com.jogamp.newt.event.NEWTEventListener} to a NEWT component, e.g. {@link com.jogamp.newt.Window}, * or to an AWT component, e.g. {@link java.awt.Component}.<br><br> * <code> javax.media.opengl.GLEvenListener demo1 = new javax.media.opengl.GLEvenListener() { ... } ; @@ -93,14 +93,14 @@ package com.jogamp.newt.awt.event; */ public abstract class AWTAdapter implements java.util.EventListener { - com.jogamp.newt.event.EventListener newtListener; + com.jogamp.newt.event.NEWTEventListener newtListener; com.jogamp.newt.Window newtWindow; /** * Simply wrap aroung a NEWT EventListener, exposed as an AWT EventListener.<br> * The NEWT EventListener will be called when an event happens.<br> */ - public AWTAdapter(com.jogamp.newt.event.EventListener newtListener) { + public AWTAdapter(com.jogamp.newt.event.NEWTEventListener newtListener) { if(null==newtListener) { throw new RuntimeException("Argument newtListener is null"); } @@ -113,7 +113,7 @@ public abstract class AWTAdapter implements java.util.EventListener * where the given NEWT Window impersonates as the event's source. * The NEWT EventListener will be called when an event happens.<br> */ - public AWTAdapter(com.jogamp.newt.event.EventListener newtListener, com.jogamp.newt.Window newtProxy) { + public AWTAdapter(com.jogamp.newt.event.NEWTEventListener newtListener, com.jogamp.newt.Window newtProxy) { if(null==newtListener) { throw new RuntimeException("Argument newtListener is null"); } @@ -137,14 +137,14 @@ public abstract class AWTAdapter implements java.util.EventListener } /** - * Due to the fact that some NEWT {@link com.jogamp.newt.event.EventListener} + * Due to the fact that some NEWT {@link com.jogamp.newt.event.NEWTEventListener} * are mapped to more than one {@link java.util.EventListener}, * this method is for your convenience to use this Adapter as a listener for all types.<br> * E.g. {@link com.jogamp.newt.event.MouseListener} is mapped to {@link java.awt.event.MouseListener} and {@link java.awt.event.MouseMotionListener}. */ public abstract AWTAdapter addTo(java.awt.Component awtComponent); - void enqueueEvent(com.jogamp.newt.event.Event event) { + void enqueueEvent(com.jogamp.newt.event.NEWTEvent event) { try { newtWindow.getScreen().getDisplay().enqueueEvent(event); } catch (NullPointerException npe) { diff --git a/src/newt/classes/com/jogamp/newt/awt/event/AWTKeyAdapter.java b/src/newt/classes/com/jogamp/newt/event/awt/AWTKeyAdapter.java index 866ec5476..64d4d8d86 100644 --- a/src/newt/classes/com/jogamp/newt/awt/event/AWTKeyAdapter.java +++ b/src/newt/classes/com/jogamp/newt/event/awt/AWTKeyAdapter.java @@ -29,7 +29,7 @@ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.newt.awt.event; +package com.jogamp.newt.event.awt; public class AWTKeyAdapter extends AWTAdapter implements java.awt.event.KeyListener { diff --git a/src/newt/classes/com/jogamp/newt/awt/event/AWTMouseAdapter.java b/src/newt/classes/com/jogamp/newt/event/awt/AWTMouseAdapter.java index db28616b9..7efcd123e 100644 --- a/src/newt/classes/com/jogamp/newt/awt/event/AWTMouseAdapter.java +++ b/src/newt/classes/com/jogamp/newt/event/awt/AWTMouseAdapter.java @@ -29,7 +29,7 @@ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.newt.awt.event; +package com.jogamp.newt.event.awt; public class AWTMouseAdapter extends AWTAdapter implements java.awt.event.MouseListener, java.awt.event.MouseMotionListener { diff --git a/src/newt/classes/com/jogamp/newt/awt/event/AWTNewtEventFactory.java b/src/newt/classes/com/jogamp/newt/event/awt/AWTNewtEventFactory.java index ea10c9de5..e4e97946a 100644 --- a/src/newt/classes/com/jogamp/newt/awt/event/AWTNewtEventFactory.java +++ b/src/newt/classes/com/jogamp/newt/event/awt/AWTNewtEventFactory.java @@ -30,7 +30,7 @@ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.newt.awt.event; +package com.jogamp.newt.event.awt; import com.jogamp.common.util.IntIntHashMap; diff --git a/src/newt/classes/com/jogamp/newt/awt/event/AWTWindowAdapter.java b/src/newt/classes/com/jogamp/newt/event/awt/AWTWindowAdapter.java index d17bac242..2a5312d0b 100644 --- a/src/newt/classes/com/jogamp/newt/awt/event/AWTWindowAdapter.java +++ b/src/newt/classes/com/jogamp/newt/event/awt/AWTWindowAdapter.java @@ -29,7 +29,7 @@ * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF * SVEN GOTHEL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -package com.jogamp.newt.awt.event; +package com.jogamp.newt.event.awt; public class AWTWindowAdapter extends AWTAdapter implements java.awt.event.ComponentListener, java.awt.event.WindowListener { diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java b/src/newt/classes/com/jogamp/newt/impl/awt/AWTCanvas.java index f6ea9acc3..8750a8bc1 100644 --- a/src/newt/classes/com/jogamp/newt/awt/AWTCanvas.java +++ b/src/newt/classes/com/jogamp/newt/impl/awt/AWTCanvas.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.awt; +package com.jogamp.newt.impl.awt; import com.jogamp.newt.Window; diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java b/src/newt/classes/com/jogamp/newt/impl/awt/AWTDisplay.java index d1fc1bc85..f54e66f07 100644 --- a/src/newt/classes/com/jogamp/newt/awt/AWTDisplay.java +++ b/src/newt/classes/com/jogamp/newt/impl/awt/AWTDisplay.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.awt; +package com.jogamp.newt.impl.awt; import java.awt.event.*; import com.jogamp.newt.Display; diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTScreen.java b/src/newt/classes/com/jogamp/newt/impl/awt/AWTScreen.java index c804bce06..8702686c0 100644 --- a/src/newt/classes/com/jogamp/newt/awt/AWTScreen.java +++ b/src/newt/classes/com/jogamp/newt/impl/awt/AWTScreen.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.awt; +package com.jogamp.newt.impl.awt; import com.jogamp.newt.*; import java.awt.DisplayMode; diff --git a/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java b/src/newt/classes/com/jogamp/newt/impl/awt/AWTWindow.java index daeaa3e4e..bc04f2523 100644 --- a/src/newt/classes/com/jogamp/newt/awt/AWTWindow.java +++ b/src/newt/classes/com/jogamp/newt/impl/awt/AWTWindow.java @@ -31,9 +31,9 @@ * */ -package com.jogamp.newt.awt; +package com.jogamp.newt.impl.awt; -import com.jogamp.newt.awt.event.*; +import com.jogamp.newt.event.awt.*; import java.awt.BorderLayout; import java.awt.Canvas; diff --git a/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java b/src/newt/classes/com/jogamp/newt/impl/intel/gdl/Display.java index f79573644..d19aaf796 100644 --- a/src/newt/classes/com/jogamp/newt/intel/gdl/Display.java +++ b/src/newt/classes/com/jogamp/newt/impl/intel/gdl/Display.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.intel.gdl; +package com.jogamp.newt.impl.intel.gdl; import com.jogamp.newt.impl.*; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java b/src/newt/classes/com/jogamp/newt/impl/intel/gdl/Screen.java index 873d1d009..3d9a5a309 100644 --- a/src/newt/classes/com/jogamp/newt/intel/gdl/Screen.java +++ b/src/newt/classes/com/jogamp/newt/impl/intel/gdl/Screen.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.intel.gdl; +package com.jogamp.newt.impl.intel.gdl; import com.jogamp.newt.impl.*; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/intel/gdl/Window.java b/src/newt/classes/com/jogamp/newt/impl/intel/gdl/Window.java index 879fc6134..cb52618b2 100644 --- a/src/newt/classes/com/jogamp/newt/intel/gdl/Window.java +++ b/src/newt/classes/com/jogamp/newt/impl/intel/gdl/Window.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.intel.gdl; +package com.jogamp.newt.impl.intel.gdl; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java b/src/newt/classes/com/jogamp/newt/impl/macosx/MacDisplay.java index cf67537ae..68242bba7 100755 --- a/src/newt/classes/com/jogamp/newt/macosx/MacDisplay.java +++ b/src/newt/classes/com/jogamp/newt/impl/macosx/MacDisplay.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.macosx; +package com.jogamp.newt.impl.macosx; import javax.media.nativewindow.*; import javax.media.nativewindow.macosx.*; diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacScreen.java b/src/newt/classes/com/jogamp/newt/impl/macosx/MacScreen.java index 92f8e908c..ce9254857 100755 --- a/src/newt/classes/com/jogamp/newt/macosx/MacScreen.java +++ b/src/newt/classes/com/jogamp/newt/impl/macosx/MacScreen.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.macosx; +package com.jogamp.newt.impl.macosx; import com.jogamp.newt.*; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java b/src/newt/classes/com/jogamp/newt/impl/macosx/MacWindow.java index 8762d106c..8fb095661 100755 --- a/src/newt/classes/com/jogamp/newt/macosx/MacWindow.java +++ b/src/newt/classes/com/jogamp/newt/impl/macosx/MacWindow.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.macosx; +package com.jogamp.newt.impl.macosx; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Display.java index 7db5b18dd..c2d323e56 100644 --- a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Display.java +++ b/src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Display.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.opengl.broadcom.egl; +package com.jogamp.newt.impl.opengl.broadcom.egl; import com.jogamp.newt.impl.*; import com.jogamp.opengl.impl.egl.*; diff --git a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java b/src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Screen.java index b4f07599b..e30896468 100755 --- a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Screen.java +++ b/src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Screen.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.opengl.broadcom.egl; +package com.jogamp.newt.impl.opengl.broadcom.egl; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Window.java index 185dc97b9..9e1ead40e 100755 --- a/src/newt/classes/com/jogamp/newt/opengl/broadcom/egl/Window.java +++ b/src/newt/classes/com/jogamp/newt/impl/opengl/broadcom/egl/Window.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.opengl.broadcom.egl; +package com.jogamp.newt.impl.opengl.broadcom.egl; import com.jogamp.opengl.impl.egl.*; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDDisplay.java index 8a8e2a7c3..2ab30773f 100755 --- a/src/newt/classes/com/jogamp/newt/opengl/kd/KDDisplay.java +++ b/src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDDisplay.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.opengl.kd; +package com.jogamp.newt.impl.opengl.kd; import com.jogamp.newt.*; import com.jogamp.newt.impl.*; diff --git a/src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java b/src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDScreen.java index cd53c8152..d570d9f5b 100755 --- a/src/newt/classes/com/jogamp/newt/opengl/kd/KDScreen.java +++ b/src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDScreen.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.opengl.kd; +package com.jogamp.newt.impl.opengl.kd; import com.jogamp.newt.*; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDWindow.java index c8bed8a68..5f1068cad 100755 --- a/src/newt/classes/com/jogamp/newt/opengl/kd/KDWindow.java +++ b/src/newt/classes/com/jogamp/newt/impl/opengl/kd/KDWindow.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.opengl.kd; +package com.jogamp.newt.impl.opengl.kd; import com.jogamp.newt.*; import com.jogamp.newt.event.*; diff --git a/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsDisplay.java index 678777e81..000e64b6d 100755 --- a/src/newt/classes/com/jogamp/newt/windows/WindowsDisplay.java +++ b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsDisplay.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.windows; +package com.jogamp.newt.impl.windows; import javax.media.nativewindow.*; import javax.media.nativewindow.windows.*; diff --git a/src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsScreen.java index aea3cd439..b0161cfc2 100755 --- a/src/newt/classes/com/jogamp/newt/windows/WindowsScreen.java +++ b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsScreen.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.windows; +package com.jogamp.newt.impl.windows; import com.jogamp.newt.*; import javax.media.nativewindow.*; diff --git a/src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java index db1ae4718..dc870f43d 100755 --- a/src/newt/classes/com/jogamp/newt/windows/WindowsWindow.java +++ b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.windows; +package com.jogamp.newt.impl.windows; import javax.media.nativewindow.*; import com.jogamp.newt.*; diff --git a/src/newt/classes/com/jogamp/newt/x11/X11Display.java b/src/newt/classes/com/jogamp/newt/impl/x11/X11Display.java index 70e002e9e..94d568f55 100755 --- a/src/newt/classes/com/jogamp/newt/x11/X11Display.java +++ b/src/newt/classes/com/jogamp/newt/impl/x11/X11Display.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.x11; +package com.jogamp.newt.impl.x11; import javax.media.nativewindow.*; import javax.media.nativewindow.x11.*; diff --git a/src/newt/classes/com/jogamp/newt/x11/X11Screen.java b/src/newt/classes/com/jogamp/newt/impl/x11/X11Screen.java index e053d99c0..3561bec2a 100755 --- a/src/newt/classes/com/jogamp/newt/x11/X11Screen.java +++ b/src/newt/classes/com/jogamp/newt/impl/x11/X11Screen.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.x11; +package com.jogamp.newt.impl.x11; import com.jogamp.newt.*; import javax.media.nativewindow.x11.*; diff --git a/src/newt/classes/com/jogamp/newt/x11/X11Window.java b/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java index 59ecc3bab..c7401ef23 100755 --- a/src/newt/classes/com/jogamp/newt/x11/X11Window.java +++ b/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java @@ -31,7 +31,7 @@ * */ -package com.jogamp.newt.x11; +package com.jogamp.newt.impl.x11; import com.jogamp.newt.*; import com.jogamp.newt.event.*; diff --git a/src/newt/classes/com/jogamp/newt/util/MainThread.java b/src/newt/classes/com/jogamp/newt/util/MainThread.java index daa09edce..cfe1876b5 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 com.jogamp.newt.macosx.MacDisplay; +import com.jogamp.newt.impl.macosx.MacDisplay; /** * NEWT Utility class MainThread<P> |