3rd round cdcfp - compile clean.

Re-adding cdcfp:
    com/sun/opengl/impl/glu/mipmap/*
    com/sun/opengl/impl/GLPbufferImpl.java

    Using 'BufferUtil.nativeOrder(ByteBuffer)'
    to set up the native byte order.
    'BufferUtil.nativeOrder' is now public.

    GLDrawableFactory:
        - removed 'hardcoded' awt attribute.

    Cleanup NEWT's AWT wrapping implementation.
        - NativeWindowFactory incooperates with the wrapping property.

    Bugs on X11/NEWT/AWT:
        - no events
        - deadlock at shutdown
        - deadlock if EGLDrawable with AWT get's locked


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1700 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 8 insertions, 7 deletions

diff --git a/src/classes/com/sun/javafx/newt/Window.java b/src/classes/com/sun/javafx/newt/Window.java
index faf98d3d0..1486091e8 100755
--- a/src/classes/com/sun/javafx/newt/Window.java
+++ b/src/classes/com/sun/javafx/newt/Window.java
@@ -55,11 +55,7 @@ public abstract class Window implements NativeWindow
             windowClass = Class.forName("com.sun.javafx.newt.windows.WindowsWindow");
         } else if (NewtFactory.X11.equals(type)) {
             windowClass = Class.forName("com.sun.javafx.newt.x11.X11Window");
-        } else if (NewtFactory.MACOSX.equals(type)) {
-            // For the time being, use the AWT on Mac OS X since
-            // there's no advantage to avoiding its usage -- this
-            // would change if we were running on the iPhone and
-            // didn't have an AWT
+        } else if (NewtFactory.AWT.equals(type)) {
             windowClass = Class.forName("com.sun.javafx.newt.awt.AWTWindow");
         } else {
             throw new RuntimeException("Unknown window type \"" + type + "\"");
@@ -106,6 +102,8 @@ public abstract class Window implements NativeWindow
         }
     }
 
+    public abstract boolean isTerminalObject();
+
     /**
      * create native windowHandle, ie creates a new native invisible window
      */
@@ -142,9 +140,12 @@ public abstract class Window implements NativeWindow
     protected abstract void dispatchMessages(int eventMask);
 
     public String toString() {
-        return "Window[handle "+windowHandle+
+    return "NEWT-Window[windowHandle "+getWindowHandle()+
+                    ", surfaceHandle "+getSurfaceHandle()+
                     ", pos "+getX()+"/"+getY()+", size "+getWidth()+"x"+getHeight()+
-                    ", visible "+isVisible()+"]";
+                    ", visible "+isVisible()+
+                    ", wrappedWindow "+getWrappedWindow()+
+                    ", terminalObject "+isTerminalObject()+"]";
     }
 
     protected Screen screen;