summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--.idea/compiler.xml24
-rw-r--r--.idea/copyright/profiles_settings.xml5
-rw-r--r--.idea/encodings.xml5
-rw-r--r--.idea/misc.xml33
-rw-r--r--.idea/modules.xml11
-rw-r--r--.idea/uiDesigner.xml125
-rw-r--r--.idea/vcs.xml7
-rwxr-xr-xCHANGELOG.txt3
-rw-r--r--doc/userguide/index.html2
-rw-r--r--doc/wiki/FAQ.xml2
-rw-r--r--doxygen/doxygen-all-pub.cfg2
-rw-r--r--make/build-jogl.xml114
-rw-r--r--make/build-nativewindow.xml2
-rw-r--r--make/build-newt.xml108
-rw-r--r--make/build.xml6
-rwxr-xr-xmake/config/jogl/cg-common-CustomJavaCode.java2
-rw-r--r--make/config/jogl/cg-common.cfg4
-rw-r--r--make/config/jogl/cgl-macosx.cfg2
-rwxr-xr-xmake/config/jogl/cglext.cfg4
-rw-r--r--make/config/jogl/egl-common.cfg2
-rwxr-xr-xmake/config/jogl/egl.cfg4
-rwxr-xr-xmake/config/jogl/eglext.cfg6
-rw-r--r--make/config/jogl/gl-common.cfg2
-rwxr-xr-xmake/config/jogl/gl-es1.cfg4
-rwxr-xr-xmake/config/jogl/gl-es2.cfg4
-rw-r--r--make/config/jogl/gl-gl2.cfg4
-rw-r--r--make/config/jogl/gl-gl2es12.cfg4
-rw-r--r--make/config/jogl/gl-gl3.cfg4
-rw-r--r--make/config/jogl/gl-gl3bc.cfg4
-rw-r--r--make/config/jogl/gl-impl-CustomCCode-gl2.c8
-rw-r--r--make/config/jogl/gl-impl-CustomCCode-gl2es12.c8
-rw-r--r--make/config/jogl/gl-impl-CustomCCode-gl3.c8
-rw-r--r--make/config/jogl/gl-impl-CustomCCode-gl3bc.c8
-rw-r--r--make/config/jogl/gl-impl-CustomCCode-gles1.c8
-rw-r--r--make/config/jogl/gl-impl-CustomCCode-gles2.c8
-rwxr-xr-xmake/config/jogl/glu-CustomJavaCode-base.java4
-rwxr-xr-xmake/config/jogl/glu-CustomJavaCode-gl2es1.java2
-rwxr-xr-xmake/config/jogl/glu-base.cfg4
-rw-r--r--make/config/jogl/glu-common.cfg6
-rwxr-xr-xmake/config/jogl/glu-gl2.cfg14
-rwxr-xr-xmake/config/jogl/glu-gl2es1.cfg2
-rwxr-xr-xmake/config/jogl/glx-CustomCCode.c24
-rw-r--r--make/config/jogl/glx-CustomJavaCode.java2
-rw-r--r--make/config/jogl/glx-x11.cfg2
-rwxr-xr-xmake/config/jogl/glxext.cfg6
-rw-r--r--make/config/jogl/wgl-win32.cfg2
-rw-r--r--make/config/jogl/wglext.cfg4
-rw-r--r--make/stub_includes/opengl/gl4.c11
-rwxr-xr-xnbproject/project.xml5
-rw-r--r--src/jogl/Jogl.iml13
-rw-r--r--src/jogl/classes/com/jogamp/opengl/cg/CgException.java (renamed from src/jogl/classes/com/sun/opengl/cg/CgException.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/DRIHack.java (renamed from src/jogl/classes/com/sun/opengl/impl/DRIHack.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/Debug.java (renamed from src/jogl/classes/com/sun/opengl/impl/Debug.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java (renamed from src/jogl/classes/com/sun/opengl/impl/ExtensionAvailabilityCache.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLBufferSizeTracker.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLBufferStateTracker.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLContextLock.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLContextShareSet.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLDrawableHelper.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java (renamed from src/jogl/classes/com/sun/opengl/impl/GLWorkerThread.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp (renamed from src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase (renamed from src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java (renamed from src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java (renamed from src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp (renamed from src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase (renamed from src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java (renamed from src/jogl/classes/com/sun/opengl/impl/ThreadingImpl.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java (renamed from src/jogl/classes/com/sun/opengl/impl/ThreadingPlugin.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java (renamed from src/jogl/classes/com/sun/opengl/impl/awt/AWTThreadingPlugin.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java (renamed from src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java (renamed from src/jogl/classes/com/sun/opengl/impl/awt/Java2D.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/awt/Java2DGLContext.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java)8
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java)12
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLExternalContext.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfigurationFactory.java)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenDrawable.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferDrawable.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java (renamed from src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java (renamed from src/jogl/classes/com/sun/opengl/impl/gl2/Util.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java (renamed from src/jogl/classes/com/sun/opengl/impl/gl2/fixme/GLObjectTracker.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/Glue.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfArcs.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfBreakpts.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfFloats.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/README.txt)0
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java)158
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java)20
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java)38
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java)26
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java)54
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java (renamed from src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java)5
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java)10
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java)8
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java)12
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXContext.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java (renamed from src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java (renamed from src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/Animator.java (renamed from src/jogl/classes/com/sun/opengl/util/Animator.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/AnimatorImpl.java (renamed from src/jogl/classes/com/sun/opengl/util/AnimatorImpl.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp (renamed from src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase (renamed from src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/FBObject.java (renamed from src/jogl/classes/com/sun/opengl/util/FBObject.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java (renamed from src/jogl/classes/com/sun/opengl/util/FPSAnimator.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/FileUtil.java (renamed from src/jogl/classes/com/sun/opengl/util/FileUtil.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/FixedPoint.java (renamed from src/jogl/classes/com/sun/opengl/util/FixedPoint.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java (renamed from src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLArrayDataEditable.java (renamed from src/jogl/classes/com/sun/opengl/util/GLArrayDataEditable.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java (renamed from src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java (renamed from src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java (renamed from src/jogl/classes/com/sun/opengl/util/GLArrayHandler.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLFixedArrayHandler.java (renamed from src/jogl/classes/com/sun/opengl/util/GLFixedArrayHandler.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/Gamma.java (renamed from src/jogl/classes/com/sun/opengl/util/Gamma.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java (renamed from src/jogl/classes/com/sun/opengl/util/ImmModeSink.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/Locator.java (renamed from src/jogl/classes/com/sun/opengl/util/Locator.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java (renamed from src/jogl/classes/com/sun/opengl/util/PMVMatrix.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/StreamUtil.java (renamed from src/jogl/classes/com/sun/opengl/util/StreamUtil.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/TGAWriter.java (renamed from src/jogl/classes/com/sun/opengl/util/TGAWriter.java)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/awt/ImageUtil.java (renamed from src/jogl/classes/com/sun/opengl/util/awt/ImageUtil.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/awt/Overlay.java (renamed from src/jogl/classes/com/sun/opengl/util/awt/Overlay.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/awt/Screenshot.java (renamed from src/jogl/classes/com/sun/opengl/util/awt/Screenshot.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java (renamed from src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java)16
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/awt/TextureRenderer.java (renamed from src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java)12
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapCharRec.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/BitmapCharRec.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapFontRec.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/BitmapFontRec.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/CoordRec.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/CoordRec.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUT.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUT.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap8x13.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap9x15.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica10.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica12.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica18.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman10.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman24.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeMonoRoman.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeRoman.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeCharRec.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/StrokeCharRec.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeFontRec.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/StrokeFontRec.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeRec.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/StrokeRec.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/gl2/TileRenderer.java (renamed from src/jogl/classes/com/sun/opengl/util/gl2/TileRenderer.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/GLSLArrayHandler.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/GLSLArrayHandler.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/ShaderCode.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/ShaderProgram.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/ShaderState.java)6
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/ShaderUtil.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java)8
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp)0
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp)bin1108 -> 1108 bytes
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp)bin2344 -> 2344 bytes
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp)bin8787 -> 8787 bytes
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp)bin2392 -> 2392 bytes
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl)0
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl)0
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat (renamed from src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShader.java)10
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShaderNVidia.java (renamed from src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShaderNVidia.java)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/packrect/BackingStoreManager.java (renamed from src/jogl/classes/com/sun/opengl/util/packrect/BackingStoreManager.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/packrect/Level.java (renamed from src/jogl/classes/com/sun/opengl/util/packrect/Level.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java (renamed from src/jogl/classes/com/sun/opengl/util/packrect/LevelSet.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/packrect/Rect.java (renamed from src/jogl/classes/com/sun/opengl/util/packrect/Rect.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/packrect/RectVisitor.java (renamed from src/jogl/classes/com/sun/opengl/util/packrect/RectVisitor.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java (renamed from src/jogl/classes/com/sun/opengl/util/packrect/RectanglePacker.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/packrect/package.html (renamed from src/jogl/classes/com/sun/opengl/util/packrect/package.html)0
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/Texture.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/Texture.java)8
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/TextureCoords.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/TextureCoords.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/TextureData.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp (renamed from src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp)12
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase (renamed from src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase)12
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureData.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureIO.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase)6
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java)2
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataOutputStream.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataOutputStream.java)2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/NetPbmTextureWriter.java)8
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/SGIImage.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp)8
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase)8
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureProvider.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java)4
-rwxr-xr-xsrc/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureWriter.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/TextureWriter.java)4
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java)10
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureWriter.java (renamed from src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureWriter.java)10
-rw-r--r--src/jogl/classes/com/sun/openmax/OMXInstance.java16
-rw-r--r--src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/GLAutoDrawable.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/GLContext.java3
-rw-r--r--src/jogl/classes/javax/media/opengl/GLDrawableFactory.java13
-rw-r--r--src/jogl/classes/javax/media/opengl/GLPipelineFactory.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/GLProfile.java42
-rwxr-xr-xsrc/jogl/classes/javax/media/opengl/Threading.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLCanvas.java2
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLJPanel.java11
-rwxr-xr-xsrc/jogl/classes/javax/media/opengl/glu/GLUquadric.java2
-rwxr-xr-xsrc/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java2
-rwxr-xr-xsrc/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java2
-rwxr-xr-xsrc/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java12
-rwxr-xr-xsrc/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java8
-rw-r--r--src/nativewindow/Nativewindow.iml12
-rw-r--r--src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java2
-rw-r--r--src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java2
-rw-r--r--src/newt/Newt.iml13
-rw-r--r--src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java2
-rw-r--r--src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java2
-rwxr-xr-xtest/Issue326Test1.java6
-rwxr-xr-xtest/Issue326Test2.java2
-rwxr-xr-xtest/Issue344Base.java4
359 files changed, 1185 insertions, 919 deletions
diff --git a/.gitignore b/.gitignore
index 378eac2..6e3af64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
build
+javadoc_public
+build-temp
+make/temp*
+.idea/workspace.xml
+**~ \ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..97c9ca5
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <resourceExtensions>
+ <entry name=".+\.(properties|xml|html|dtd|tld)" />
+ <entry name=".+\.(gif|png|jpeg|jpg)" />
+ </resourceExtensions>
+ <wildcardResourcePatterns>
+ <entry name="?*.properties" />
+ <entry name="?*.xml" />
+ <entry name="?*.gif" />
+ <entry name="?*.png" />
+ <entry name="?*.jpeg" />
+ <entry name="?*.jpg" />
+ <entry name="?*.html" />
+ <entry name="?*.dtd" />
+ <entry name="?*.tld" />
+ <entry name="?*.ftl" />
+ </wildcardResourcePatterns>
+ <annotationProcessing enabled="false" useClasspath="true" />
+ </component>
+</project>
+
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..3572571
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,5 @@
+<component name="CopyrightManager">
+ <settings default="">
+ <module2copyright />
+ </settings>
+</component> \ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..e206d70
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..ef58a04
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="DependencyValidationManager">
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </component>
+ <component name="JavadocGenerationManager">
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="OPTION_SCOPE" value="protected" />
+ <option name="OPTION_HIERARCHY" value="true" />
+ <option name="OPTION_NAVIGATOR" value="true" />
+ <option name="OPTION_INDEX" value="true" />
+ <option name="OPTION_SEPARATE_INDEX" value="true" />
+ <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+ <option name="OPTION_DEPRECATED_LIST" value="true" />
+ <option name="OTHER_OPTIONS" value="" />
+ <option name="HEAP_SIZE" />
+ <option name="LOCALE" />
+ <option name="OPEN_IN_BROWSER" value="true" />
+ </component>
+ <component name="ProjectDetails">
+ <option name="projectName" value="jogl" />
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
+ <component name="SvnBranchConfigurationManager">
+ <option name="mySupportsUserInfoFilter" value="true" />
+ </component>
+</project>
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..6147423
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/src/jogl/Jogl.iml" filepath="$PROJECT_DIR$/src/jogl/Jogl.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/nativewindow/Nativewindow.iml" filepath="$PROJECT_DIR$/src/nativewindow/Nativewindow.iml" />
+ <module fileurl="file://$PROJECT_DIR$/src/newt/Newt.iml" filepath="$PROJECT_DIR$/src/newt/Newt.iml" />
+ </modules>
+ </component>
+</project>
+
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..3b00020
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..275077f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
+
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c976f68..39112db 100755
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -103,3 +103,6 @@ Changes between JOGL 1.0.0 and 1.1.0:
- Worked around breakage of JOGL with 5.0u10; see Sun bug IDs 6504460
and 6333613.
+
+Changes between JOGL 1.1.1 and 2.0:
+ - lots of changes \ No newline at end of file
diff --git a/doc/userguide/index.html b/doc/userguide/index.html
index 64047cf..6b4d281 100644
--- a/doc/userguide/index.html
+++ b/doc/userguide/index.html
@@ -209,7 +209,7 @@ as 1.4.2, which is the earliest version of Java supported by JOGL.
<P>
The JOGLAppletInstaller is distributed inside jogl.jar as a utility
-class in com.sun.opengl.util. It requires that the developer host a
+class in com.jogamp.opengl.util. It requires that the developer host a
local, signed copy of jogl.jar and all of the jogl-natives jars; the
certificates must be the same on all of these jars. Note that in the
release builds of JOGL all of these jars are signed by Sun
diff --git a/doc/wiki/FAQ.xml b/doc/wiki/FAQ.xml
index 25c3fe9..7ee1f63 100644
--- a/doc/wiki/FAQ.xml
+++ b/doc/wiki/FAQ.xml
@@ -86,7 +86,7 @@ and the output is:
Detected screen size 1920x1200
GLProfile[GL2ES1/GL2ES12] Entering initialization
GLProfile[GL2ES1/GL2ES12] GL Profile: GLProfile[GL2ES1/GL2ES12]
- GLProfile[GL2ES1/GL2ES12] GL:com.sun.opengl.impl.gl2es12.GL2ES12Impl@b815859
+ GLProfile[GL2ES1/GL2ES12] GL:com.jogamp.opengl.impl.gl2es12.GL2ES12Impl@b815859
GLProfile[GL2ES1/GL2ES12] GL_VERSION=3.0.0 NVIDIA 185.18.14
GLProfile[GL2ES1/GL2ES12] GL_EXTENSIONS: ..
diff --git a/doxygen/doxygen-all-pub.cfg b/doxygen/doxygen-all-pub.cfg
index 8bf4685..3cac3e6 100644
--- a/doxygen/doxygen-all-pub.cfg
+++ b/doxygen/doxygen-all-pub.cfg
@@ -461,7 +461,7 @@ WARN_LOGFILE =
INPUT = ../src/jogl/classes/javax
INPUT += ../build-x86_64/jogl/gensrc/classes/javax
-INPUT += ../src/jogl/classes/com/sun/opengl/util
+INPUT += ../src/jogl/classes/com/jogamp/opengl/util
INPUT += ../src/newt/classes/com/sun/javafx/newt
# If the value of the INPUT tag contains directories, you can use the
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index c7a8a18..80b1064 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -95,86 +95,86 @@
<!-- partitioning -->
<property name="java.part.core"
- value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/sun/opengl/impl/* com/sun/opengl/impl/glu/* com/sun/opengl/impl/glu/error/*"/>
+ value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/opengl/impl/* com/jogamp/opengl/impl/glu/* com/jogamp/opengl/impl/glu/error/*"/>
<property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace*"/>
<property name="java.part.nv-cg"
- value="com/sun/opengl/cg com/sun/opengl/cg/*"/>
+ value="com/jogamp/opengl/cg com/jogamp/opengl/cg/*"/>
<property name="java.part.egl"
- value="com/sun/opengl/impl/egl/*"/>
+ value="com/jogamp/opengl/impl/egl/*"/>
<property name="java.part.glutess"
- value="com/sun/opengl/impl/glu/tessellator/**"/>
+ value="com/jogamp/opengl/impl/glu/tessellator/**"/>
<property name="java.part.glumipmap"
- value="com/sun/opengl/impl/glu/mipmap/**"/>
+ value="com/jogamp/opengl/impl/glu/mipmap/**"/>
<property name="java.part.glugl2"
- value="com/sun/opengl/impl/glu/gl2/** com/sun/opengl/impl/glu/nurbs/** com/sun/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
+ value="com/jogamp/opengl/impl/glu/gl2/** com/jogamp/opengl/impl/glu/nurbs/** com/jogamp/opengl/impl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
<property name="java.part.openmax"
value="com/sun/openmax/**"/>
<property name="java.part.sdk"
- value="com/sun/opengl/util/glsl/sdk/**"/>
+ value="com/jogamp/opengl/util/glsl/sdk/**"/>
<property name="java.part.glx"
- value="com/sun/opengl/impl/x11/glx/*"/>
+ value="com/jogamp/opengl/impl/x11/glx/*"/>
<property name="java.part.wgl"
- value="com/sun/opengl/impl/windows/wgl/*"/>
+ value="com/jogamp/opengl/impl/windows/wgl/*"/>
<property name="java.part.cgl"
- value="com/sun/opengl/impl/macosx/cgl/*"/>
+ value="com/jogamp/opengl/impl/macosx/cgl/*"/>
<property name="java.part.gl2es12"
- value="com/sun/opengl/impl/gl2es12/**"/>
+ value="com/jogamp/opengl/impl/gl2es12/**"/>
<property name="java.part.gl3"
- value="com/sun/opengl/impl/**/gl3/**"/>
+ value="com/jogamp/opengl/impl/**/gl3/**"/>
<property name="java.part.gl3.dbg"
value="javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.*"/>
<property name="java.part.gl2"
- value="com/sun/opengl/impl/**/gl2/**"/>
+ value="com/jogamp/opengl/impl/**/gl2/**"/>
<property name="java.part.gl2.dbg"
value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.*"/>
<property name="java.part.es1"
- value="javax/media/opengl/**/es1/** com/sun/opengl/**/es1/**"/>
+ value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/**"/>
<property name="java.part.es1.dbg"
value="javax/media/opengl/TraceGLES1.* javax/media/opengl/DebugGLES1.* javax/media/opengl/TraceGL2ES1.* javax/media/opengl/DebugGL2ES1.*"/>
<property name="java.part.es2"
- value="javax/media/opengl/**/es2/** com/sun/opengl/**/es2/**"/>
+ value="javax/media/opengl/**/es2/** com/jogamp/opengl/**/es2/**"/>
<property name="java.part.es2.dbg"
value="javax/media/opengl/TraceGLES2.* javax/media/opengl/DebugGLES2.* javax/media/opengl/TraceGL2ES2.* javax/media/opengl/DebugGL2ES2.*"/>
<property name="java.part.awt"
- value="javax/media/opengl/awt/** com/sun/opengl/impl/**/awt/**"/>
+ value="javax/media/opengl/awt/** com/jogamp/opengl/impl/**/awt/**"/>
<property name="java.part.util"
- value="com/sun/opengl/util/* com/sun/opengl/util/texture/** com/sun/opengl/util/packrect/**"/>
+ value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/**"/>
<property name="java.part.util.awt"
- value="com/sun/opengl/util/**/awt/** com/sun/opengl/util/AWTAnimatorImpl*"/>
+ value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/>
<property name="java.part.util.gl2"
- value="com/sun/opengl/util/**/gl2/**"/>
+ value="com/jogamp/opengl/util/**/gl2/**"/>
<property name="java.part.util.glsl"
- value="com/sun/opengl/util/glsl/* com/sun/opengl/util/glsl/fixedfunc/*"/>
+ value="com/jogamp/opengl/util/glsl/* com/jogamp/opengl/util/glsl/fixedfunc/*"/>
<property name="java.part.util.fixedfuncemu"
- value="com/sun/opengl/util/glsl/fixedfunc/impl/**"/>
+ value="com/jogamp/opengl/util/glsl/fixedfunc/impl/**"/>
<property name="java.part.util.fixedfuncemu.shadercode"
- value="com/sun/opengl/util/glsl/fixedfunc/impl/shaders/* com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/>
+ value="com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/* com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/>
<!-- condition excludes -->
@@ -191,13 +191,13 @@
</condition>
<property name="java.excludes.javadoc.packagenames"
- value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
+ value="com.jogamp.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
<property name="java.excludes.fixme"
- value="com/sun/opengl/impl/gl2/fixme/** com/sun/javafx/audio/windows/waveout/TestSpatialization.java" />
+ value="com/jogamp/opengl/impl/gl2/fixme/** com/sun/javafx/audio/windows/waveout/TestSpatialization.java" />
<property name="java.excludes.cdcfp"
- value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/sun/opengl/util/TGAWriter.java"/>
+ value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gl2} ${java.part.gl2.dbg} ${java.part.gl3} ${java.part.gl3.dbg} ${java.part.awt} ${java.part.glugl2} ${java.part.util.awt} ${java.part.util.gl2} com/jogamp/opengl/util/TGAWriter.java"/>
<condition property="java.excludes.desktop"
value="${java.part.glx} ${java.excludes.cdcfp}">
@@ -310,7 +310,7 @@
<property name="src.generated" value="${build}/gensrc" />
<property name="src.generated.java" value="${src.generated}/classes" />
<property name="src.generated.java-cdc" value="${src.generated}/classes-cdc" />
- <property name="src.generated.java.cg" value="${src.generated.java}/com/sun/opengl/cg" />
+ <property name="src.generated.java.cg" value="${src.generated.java}/com/jogamp/opengl/cg" />
<property name="src.generated.c" value="${src.generated}/native/jogl" />
<property name="src.generated.c.openmax" value="${src.generated}/native/openmax" />
<property name="src.generated.c.cg" value="${src.generated}/native/jogl_cg" />
@@ -468,9 +468,9 @@
<property name="javadoc.overview" value="doc/jogl/spec-overview.html" />
<property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
- <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.sun.opengl.util.*" />
+ <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.jogamp.opengl.util.*" />
- <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.gluegen,com.sun.gluegen.runtime" />
+ <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
<property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
</target>
@@ -498,21 +498,21 @@
</target>
<target name="setup.javacdc">
- <copy file="../src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/impl/SystemUtil.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/BufferUtil.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/impl/InternalBufferUtil.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/texture/TextureIO.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/texture/spi/DDSImage.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/sun/opengl/util/texture/spi/TGAImage.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/SystemUtil.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/BufferUtil.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/impl/InternalBufferUtil.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/TextureIO.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/TGAImage.java" />
</target>
<target name="setup.javase">
- <copy file="../src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/impl/SystemUtil.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/BufferUtil.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase" tofile="${src.generated.java}/com/sun/opengl/impl/InternalBufferUtil.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/TextureIO.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/spi/DDSImage.java" />
- <copy file="../src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase" tofile="${src.generated.java}/com/sun/opengl/util/texture/spi/TGAImage.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/SystemUtil.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/BufferUtil.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/impl/InternalBufferUtil.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/TextureIO.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
+ <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/TGAImage.java" />
</target>
<!-- ================================================================== -->
@@ -932,7 +932,7 @@
<!-- Now check for the presence of one well-known file -->
<uptodate property="java.generate.cg.skip">
<srcfiles refid="stub.includes.cg.dependencies.fileset" />
- <mapper type="merge" to="${src.generated.java}/com/sun/opengl/cg/CgGL.java" />
+ <mapper type="merge" to="${src.generated.java}/com/jogamp/opengl/cg/CgGL.java" />
</uptodate>
</target>
@@ -1017,7 +1017,7 @@
<targetfileset dir="${src.generated.java}/javax/media/opengl"
includes="DebugGL2.java,TraceGL2.java" />
</dependset>
-
+
<!-- Now choose one of the two to test to see if we have to regenerate -->
<uptodate property="java.generate.composable.pipeline.skip.gl2"
srcfile="${classes}/javax/media/opengl/GL2.class"
@@ -1119,31 +1119,31 @@
<!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed
(the uptodate element doesn't support arbitrary source and destination files) -->
<dependset>
- <srcfilelist dir="${classes}/com/sun/opengl/util/glsl/fixedfunc" files="FixedFuncHook.class" />
+ <srcfilelist dir="${classes}/com/jogamp/opengl/util/glsl/fixedfunc" files="FixedFuncHook.class" />
<srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES1.class" />
<srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES2.class" />
- <targetfileset dir="${src.generated.java}/com/sun/opengl/util/glsl/fixedfunc/impl"
+ <targetfileset dir="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl"
includes="FixedFuncImpl.java" />
</dependset>
<!-- Now choose one of the two to test to see if we have to regenerate -->
<uptodate property="java.generate.composable.pipeline.custom.skip.glfixfunc"
srcfile="${classes}/javax/media/opengl/GL2ES1.class"
- targetfile="${src.generated.java}/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
+ targetfile="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
</target>
<target name="java.generate.composable.pipeline.custom.glfixfunc" depends="java.generate.composable.pipeline.custom.check.glfixfunc" unless="java.generate.composable.pipeline.custom.skip.glfixfunc">
<java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
<arg value="javax.media.opengl.GL2ES1" />
- <arg value="${src.generated.java}/com/sun/opengl/util/glsl/fixedfunc/impl" />
- <arg value="com.sun.opengl.util.glsl.fixedfunc.impl.FixedFuncImpl" />
- <arg value="com.sun.opengl.util.glsl.fixedfunc.impl.FixedFuncHook" />
+ <arg value="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl" />
+ <arg value="com.jogamp.opengl.util.glsl.fixedfunc.impl.FixedFuncImpl" />
+ <arg value="com.jogamp.opengl.util.glsl.fixedfunc.impl.FixedFuncHook" />
<arg value="javax.media.opengl.GL2ES2" />
<arg value="prolog_xor_downstream" />
<classpath refid="pipeline.classpath" />
</java>
<copy todir="${src.generated.java-cdc}">
<fileset dir="${src.generated.java}"
- includes="com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
+ includes="com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
</copy>
</target>
<target name="java.generate.composable.pipeline.custom" depends="init, build.gluegen, java.generate.composable.pipeline.custom.glfixfunc">
@@ -1171,7 +1171,7 @@
<copy todir="${src.generated.java-cdc}">
<fileset dir="${src.generated.java}"
includes="**"
- excludes="com/sun/opengl/cg/** com/sun/opengl/impl/gl2/** com/sun/opengl/impl/gl3/** com/sun/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
+ excludes="com/jogamp/opengl/cg/** com/jogamp/opengl/impl/gl2/** com/jogamp/opengl/impl/gl3/** com/jogamp/opengl/impl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
</copy>
<copy todir="${classes-cdc}">
<fileset dir="${classes}"
@@ -1182,7 +1182,7 @@
<target name="java.compile.secondpass.javase">
<!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
<javac destdir="${classes}"
- excludes="com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
+ excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
source="${jogl.sourcelevel}"
fork="yes"
memoryMaximumSize="${javac.memorymax}"
@@ -1196,7 +1196,7 @@
<target name="java.compile.secondpass.javacdc" unless="setup.noCDC">
<!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
<javac destdir="${classes-cdc}"
- excludes="com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}"
+ excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}"
source="${jogl.sourcelevel}"
bootclasspath="${javac.bootclasspath-cdc.jar}"
fork="yes"
@@ -1823,7 +1823,7 @@
<fileset dir="${classes}">
<include name="javax/media/opengl/**" />
<include name="com/sun/gluegen/runtime/**" />
- <include name="com/sun/opengl/**" />
+ <include name="com/jogamp/opengl/**" />
<include name="${java.part.openmax}" />
<!-- FIXME: this is temporary until we move these classes to another workspace -->
<include name="com/sun/javafx/**" />
@@ -1835,7 +1835,7 @@
<target name="build-jars-all-noawt" depends="setup-manifestfile">
<jar manifest="${build}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true">
<fileset dir="${classes}"
- includes="javax/media/opengl/** com/sun/gluegen/runtime/** com/sun/opengl/** ${java.part.openmax} com/sun/javafx/**"
+ includes="javax/media/opengl/** com/sun/gluegen/runtime/** com/jogamp/opengl/** ${java.part.openmax} com/sun/javafx/**"
excludes="${java.part.awt} ${java.part.util.awt}">
</fileset>
<fileset dir="${src.java}"
@@ -1907,7 +1907,7 @@
<jar manifest="${build}/tempversion" destfile="${jogl.util.gl2.jar}" filesonly="true">
<fileset dir="${classes}"
includes="${java.part.util.gl2}"
- excludes="com/sun/opengl/**/awt/**"/>
+ excludes="com/jogamp/opengl/**/awt/**"/>
</jar>
</target>
@@ -1968,7 +1968,7 @@
<!-- Same as above but with Cg directories added -->
<target name="javadoc.cg" depends="load.user.properties,init" if="jogl.cg">
<!-- Build the general public Javadoc with CG -->
- <javadoc packagenames="${javadoc.packagenames},com.sun.opengl.cg"
+ <javadoc packagenames="${javadoc.packagenames},com.jogamp.opengl.cg"
excludepackagenames="${java.excludes.javadoc.packagenames}"
sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
@@ -2038,7 +2038,7 @@
<!-- Same as above but with Cg directories added -->
<target name="javadoc.dev.cg" if="jogl.cg">
<!-- Build the internal developer Javadoc -->
- <javadoc packagenames="${javadoc.dev.packagenames},com.sun.opengl.cg"
+ <javadoc packagenames="${javadoc.dev.packagenames},com.jogamp.opengl.cg"
excludepackagenames="${java.excludes.javadoc.packagenames}"
sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index c0930cb..7763419 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -257,7 +257,7 @@
<property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
- <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.nativewindow.impl.*,com.sun.gluegen,com.sun.gluegen.runtime" />
+ <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.nativewindow.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
<property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
</target>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index e74a036..df57833 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -27,14 +27,14 @@
- Java and C file generators. Note that it is only supported
- to create the Javadoc for the platform on which you are
- currently running.
- -
+ -
- Note: on Windows the "win32.c.compiler" property in newt.properties
- is required to select the appropriate C compiler. See the example
- newt.properties in this directory for valid values. On Mac OS X
- universal binaries may also be built by setting the "macosxfat"
- property in newt.properties; again see the example file in this
- directory.
- -
+ -
- Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
- ANT build, including the GlueGen and StaticGLInfo tasks, the building of
- the Java generated sources, the first and second phase Java compiles, and
@@ -63,7 +63,7 @@
<import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
<!-- ================================================================== -->
- <!--
+ <!--
- Base initialization and detection of operating system.
-->
<target name="base.init" depends="gluegen.cpptasks.detect.os">
@@ -79,7 +79,7 @@
</condition>
<condition property="setup.noall">
- <isset property="setup.noAWT"/>
+ <isset property="setup.noAWT"/>
</condition>
<condition property="setup.nonatives">
@@ -132,19 +132,19 @@
<condition property="java.excludes.awt"
value="${java.part.awt}">
- <isset property="setup.noAWT"/>
+ <isset property="setup.noAWT"/>
</condition>
<condition property="java.excludes.opengl"
value="${java.part.opengl} ${java.part.broadcomegl}">
- <isset property="setup.noOpenGL"/>
+ <isset property="setup.noOpenGL"/>
</condition>
<property name="java.excludes.cdcfp" value="${java.part.awt}"/>
<condition property="java.excludes.desktop"
value="${java.part.x11} ${java.part.windows}, ${java.part.macosx}, ${java.part.awt}">
- <isset property="setup.nodesktop"/>
+ <isset property="setup.nodesktop"/>
</condition>
<property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl} ${java.excludes.desktop}" />
@@ -153,7 +153,7 @@
<!-- Set the project root directory to be up one directory. -->
<property name="project.root" value=".." />
-
+
<!-- Set the configuration and build files to this directory. -->
<property name="make" value="." />
</target>
@@ -167,7 +167,7 @@
</target-->
<!-- ================================================================== -->
- <!--
+ <!--
- Load user properties which override build defaults.
-->
<target name="load.user.properties" depends="base.init,base.init.sourcelevel.1" unless="user.properties.file">
@@ -182,17 +182,17 @@
</target>
<!-- ================================================================== -->
- <!--
+ <!--
- Declare all paths and user defined variables.
-->
<target name="declare.common" description="Declare properties" depends="load.user.properties">
- <!-- The location and name of the configuration ANT file that will
+ <!-- The location and name of the configuration ANT file that will
- validate to ensure that all user-define variables are set. -->
<property name="validate.user.properties" value="${make}/validate-properties.xml" />
-
+
<!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
- <property name="javacdebug" value="true" />
- <property name="javacdebuglevel" value="source,lines" />
+ <property name="javacdebug" value="true" />
+ <property name="javacdebuglevel" value="source,lines" />
<!-- Names of directories relative to the project root.
Some of these are used in FileMappers later for dependence information
@@ -226,7 +226,7 @@
<property name="src.java" value="${project.root}/${rootrel.src.java}" />
<property name="src.c" value="${project.root}/${rootrel.src.c}" />
<property name="build" value="${project.root}/${rootrel.build.newt}" />
-
+
<!-- The generated source directories. -->
<property name="src.generated" value="${build}/gensrc" />
<property name="src.generated.c" value="${src.generated}/native/newt" />
@@ -286,16 +286,16 @@
<property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.javafx.newt.*" />
<property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
</target>
-
+
<!-- ================================================================== -->
- <!--
+ <!--
- Initialize all parameters required for the build and create any
- required directories.
-->
<target name="init" depends="declare.common">
<!-- Call the external config validator script to make sure the config is ok and consistent -->
<ant antfile="${validate.user.properties}" inheritall="true"/>
-
+
<mkdir dir="${src.generated.c}" />
<mkdir dir="${src.generated.c}/X11" />
<mkdir dir="${src.generated.c}/MacOSX" />
@@ -309,7 +309,7 @@
</target>
<!-- ================================================================== -->
- <!--
+ <!--
- Compile the original and generated source.
-->
<target name="java.compile.javase">
@@ -342,7 +342,7 @@
<target name="java.compile" depends="java.compile.javase,java.compile.javacdc" />
<!-- ================================================================== -->
- <!--
+ <!--
- Compile the native C code for JOGL (and optionally the Cg binding).
-->
@@ -356,7 +356,7 @@
</compiler>
<!-- linker configuration -->
-
+
<linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
<syslibset dir="/nfsroot/lg/lib" libs="EGL"/>
<syslibset dir="/nfsroot/lg/lib" libs="GLES_CM"/>
@@ -409,7 +409,7 @@
<property name="linker.cfg.id.core" value="linker.cfg.win32.msvc" />
<property name="linker.cfg.id.oswin" value="linker.cfg.win32.msvc.newt" />
</target>
-
+
<target name="c.configure.win32.mingw" if="isMingW">
<echo message="Win32.MingW" />
<property name="compiler.cfg.id" value="compiler.cfg.win32.mingw" />
@@ -427,7 +427,7 @@
</condition>
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
-
+
<target name="c.configure.linux.amd64" if="isLinuxAMD64">
<echo message="Linux.AMD64" />
<property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" />
@@ -438,7 +438,7 @@
</condition>
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
-
+
<target name="c.configure.linux.ia64" if="isLinuxIA64">
<echo message="Linux.IA64" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -454,15 +454,15 @@
<property name="linker.cfg.id.core" value="linker.cfg.solaris" />
<property name="linker.cfg.id.oswin" value="linker.cfg.solaris.newt.x11" />
</target>
-
-
+
+
<target name="c.configure.solaris.sparcv9" depends="c.configure.x11" if="isSolarisSparcv9">
<echo message="SolarisSparcv9" />
<property name="compiler.cfg.id" value="compiler.cfg.solaris.sparcv9" />
<property name="linker.cfg.id.core" value="linker.cfg.solaris.sparcv9" />
<property name="linker.cfg.id.oswin" value="linker.cfg.solaris.sparcv9.newt.x11" />
</target>
-
+
<target name="c.configure.solaris.amd64" depends="c.configure.x11" if="isSolarisAMD64">
<echo message="SolarisAMD64" />
@@ -470,7 +470,7 @@
<property name="linker.cfg.id.core" value="linker.cfg.solaris.amd64" />
<property name="linker.cfg.id.oswin" value="linker.cfg.solaris.amd64.newt.x11" />
</target>
-
+
<target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
<echo message="FreeBSD" />
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" />
@@ -494,7 +494,7 @@
<property name="linker.cfg.id.core" value="linker.cfg.macosx" />
<property name="linker.cfg.id.oswin" value="linker.cfg.macosx.newt" />
</target>
-
+
<target name="c.configure.2" depends="c.configure.win32,c.configure.linux,c.configure.solaris32,c.configure.solaris.sparcv9,c.configure.solaris.amd64,c.configure.macosx,c.configure.freebsd,c.configure.hpux" />
<target name="c.configure" depends="c.configure.1,c.configure.2" />
@@ -518,9 +518,9 @@
<echo message="Output lib name = @{output.lib.name}" />
<!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
- <property name="c.compiler.debug" value="false" />
- <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } -->
- <property name="c.compiler.optimise" value="none" />
+ <property name="c.compiler.debug" value="false" />
+ <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } -->
+ <property name="c.compiler.optimise" value="none" />
<condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
@@ -535,25 +535,25 @@
<echo message="Compiling @{output.lib.name}" />
- <cc outtype="shared"
- objdir="${obj}"
+ <cc outtype="shared"
+ objdir="${obj}"
outfile="${obj}/@{output.lib.name}"
- optimize="${c.compiler.optimise}"
+ optimize="${c.compiler.optimise}"
debug="${c.compiler.debug}"
- multithreaded="true"
- exceptions="false"
- rtti="false">
-
+ multithreaded="true"
+ exceptions="false"
+ rtti="false">
+
<!-- TODO: versioninfo companyname="java.net"
legalcopyright="Copyright"
- productname="JOGL"
+ productname="JOGL"
productversion="x.y.z"
description="Description"
- fileversion="x.y.z"
- filecomments="File Comment" /-->
-
+ fileversion="x.y.z"
+ filecomments="File Comment" /-->
+
<fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset>
-
+
<compiler extends="@{compiler.cfg.id}" >
<sysincludepath path="${java.includes.dir}"/>
<sysincludepath path="${java.includes.dir.platform}"/>
@@ -567,11 +567,11 @@
<includepath path="${src.generated.c}/IntelGDL" if="useIntelGDL" />
<includepath path="stub_includes/embedded/IntelGDL" if="useIntelGDL" />
<includepath path="${src.generated.c}/BroadcomEGL" if="useBroadcomEGL" />
-
+
<!-- This must come last to not override real include paths -->
<!-- includepath path="stub_includes/macosx" if="isOSX" / -->
</compiler>
-
+
<linker extends="@{linker.cfg.id}">
<syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
<syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
@@ -593,7 +593,7 @@
<param name="dest" value="${build}/obj/@{output.lib.name}.dll" />
</antcall>
</sequential>
- </macrodef>
+ </macrodef>
<target name="c.build.newt.prepare.KD" if="useKD">
<javah destdir="${src.generated.c}/KD" classpath="${classes}" class="com.sun.javafx.newt.opengl.kd.KDWindow" />
@@ -797,17 +797,17 @@
<!-- ================================================================== -->
<!--
- Build the Javadocs for the sources.
- - NOTE: these are not entirely correct as the javadocs targets depend
- - on the platform specific build targets. To circumvent any
+ - NOTE: these are not entirely correct as the javadocs targets depend
+ - on the platform specific build targets. To circumvent any
- errors, ensure that the source is built first.
-->
<target name="javadoc" depends="load.user.properties,init">
<!-- Build the general Javadoc -->
<javadoc packagenames="${javadoc.packagenames}"
excludepackagenames="${java.excludes.javadoc.packagenames}"
- sourcepath="${src.java};${src.generated.java}"
+ sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
- overview="${javadoc.overview}"
+ overview="${javadoc.overview}"
source="1.4"
linkoffline="${javadoc.link} 142-packages"
bottom="${javadoc.bottom}" >
@@ -828,14 +828,14 @@
<classpath refid="nativewindow_gluegen_jogl.classpath"/>
</javadoc>
</target>
-
+
<target name="javadoc.dev" depends="load.user.properties,init">
<!-- Build the internal developer Javadoc -->
<javadoc packagenames="${javadoc.dev.packagenames}"
excludepackagenames="${java.excludes.javadoc.packagenames}"
- sourcepath="${src.java};${src.generated.java}"
+ sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
- overview="${javadoc.overview}"
+ overview="${javadoc.overview}"
source="1.4"
linkoffline="${javadoc.link} 142-packages"
bottom="${javadoc.bottom}" >
diff --git a/make/build.xml b/make/build.xml
index b8b3872..cd3ee2a 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -43,12 +43,12 @@
<property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
<property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" />
- <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.sun.opengl.util.*,com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
+ <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.sun.javafx.newt, com.sun.javafx.newt.opengl" />
<property name="javadoc.dev" value="${project.root}/javadoc_dev" />
- <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.sun.opengl.impl.*,com.sun.nativewindow.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.sun.gluegen.runtime" />
+ <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.sun.nativewindow.impl.*,com.sun.javafx.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
- <property name="java.excludes.javadoc.packagenames" value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
+ <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
<property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
<property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" />
diff --git a/make/config/jogl/cg-common-CustomJavaCode.java b/make/config/jogl/cg-common-CustomJavaCode.java
index 1f109d9..974e24b 100755
--- a/make/config/jogl/cg-common-CustomJavaCode.java
+++ b/make/config/jogl/cg-common-CustomJavaCode.java
@@ -1,5 +1,5 @@
static {
- com.sun.opengl.impl.NativeLibLoader.loadCgImpl();
+ com.jogamp.opengl.impl.NativeLibLoader.loadCgImpl();
}
/** A convenience method which reads all available data from the InputStream and then calls cgCreateProgram. */
diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg
index 9b8dba0..e9ff9d9 100644
--- a/make/config/jogl/cg-common.cfg
+++ b/make/config/jogl/cg-common.cfg
@@ -1,6 +1,6 @@
# This .cfg file provides common options used among all Cg glue code
# generated for Jogl on all platforms.
-Package com.sun.opengl.cg
+Package com.jogamp.opengl.cg
JavaClass CgGL
Style AllStatic
JavaOutputDir gensrc/classes
@@ -97,7 +97,7 @@ Ignore cgGetProgramOptions
#
Import java.nio.*
# And NativeLibLoader for help loading the native libraries
-Import com.sun.opengl.impl.*
+Import com.jogamp.opengl.impl.*
#
# NIODirectOnly directives for routines requiring them for semantic reasons
diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg
index 54b4be1..f2af29e 100644
--- a/make/config/jogl/cgl-macosx.cfg
+++ b/make/config/jogl/cgl-macosx.cfg
@@ -3,7 +3,7 @@
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl/MacOSX
-Package com.sun.opengl.impl.macosx.cgl
+Package com.jogamp.opengl.impl.macosx.cgl
JavaClass CGL
Style allstatic
Include gl-common.cfg
diff --git a/make/config/jogl/cglext.cfg b/make/config/jogl/cglext.cfg
index 3bd027c..404a852 100755
--- a/make/config/jogl/cglext.cfg
+++ b/make/config/jogl/cglext.cfg
@@ -6,10 +6,10 @@
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl/MacOSX
-Package com.sun.opengl.impl.macosx.cgl
+Package com.jogamp.opengl.impl.macosx.cgl
Style InterfaceAndImpl
JavaClass CGLExt
-ImplPackage com.sun.opengl.impl.macosx.cgl
+ImplPackage com.jogamp.opengl.impl.macosx.cgl
ImplJavaClass CGLExtImpl
Include gl-common.cfg
Include gl-desktop.cfg
diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg
index bcda00b..01b681b 100644
--- a/make/config/jogl/egl-common.cfg
+++ b/make/config/jogl/egl-common.cfg
@@ -8,7 +8,7 @@ Import java.nio.*
Import java.util.*
Import javax.media.opengl.*
Import javax.media.opengl.fixedfunc.*
-Import com.sun.opengl.impl.*
+Import com.jogamp.opengl.impl.*
# Treat all of the EGL types as opaque longs
# Opaque long EGLConfig
diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg
index 086152b..7404707 100755
--- a/make/config/jogl/egl.cfg
+++ b/make/config/jogl/egl.cfg
@@ -3,7 +3,7 @@
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl/egl
-Package com.sun.opengl.impl.egl
+Package com.jogamp.opengl.impl.egl
JavaClass EGL
Style allstatic
# Shouldn't matter which one of these we pick up
@@ -47,4 +47,4 @@ CustomJavaCode EGL return dispatch_eglGetProcAddress1(procname, eglGetProcAdd
CustomJavaCode EGL }
-Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper
+Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg
index fedff35..4023937 100755
--- a/make/config/jogl/eglext.cfg
+++ b/make/config/jogl/eglext.cfg
@@ -3,15 +3,15 @@
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl/egl
-Package com.sun.opengl.impl.egl
+Package com.jogamp.opengl.impl.egl
Style InterfaceAndImpl
JavaClass EGLExt
-ImplPackage com.sun.opengl.impl.egl
+ImplPackage com.jogamp.opengl.impl.egl
ImplJavaClass EGLExtImpl
# Shouldn't matter which one of these we pick up
Include egl-common.cfg
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/sun/opengl/impl/egl/EGL.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/egl/EGL.java
HierarchicalNativeOutput false
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index d9d6632..022c272 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -12,7 +12,7 @@ Import java.nio.*
Import java.util.*
Import javax.media.opengl.*
Import javax.media.opengl.fixedfunc.*
-Import com.sun.opengl.impl.*
+Import com.jogamp.opengl.impl.*
#####################################################################
# Mostly desktop OpenGL stuff below
diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg
index 867ef8a..da22671 100755
--- a/make/config/jogl/gl-es1.cfg
+++ b/make/config/jogl/gl-es1.cfg
@@ -17,7 +17,7 @@ JavaClass GLES1
Extends GLES1 GLBase
Extends GLES1 GL
Extends GLES1 GL2ES1
-ImplPackage com.sun.opengl.impl.es1
+ImplPackage com.jogamp.opengl.impl.es1
ImplJavaClass GLES1Impl
Implements GLES1Impl GLBase
Implements GLES1Impl GL
@@ -97,4 +97,4 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gles1.c
Import javax.media.opengl.GLES1
Import javax.media.opengl.GLES2
Import javax.media.opengl.GL2
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg
index f78001d..fd11ffc 100755
--- a/make/config/jogl/gl-es2.cfg
+++ b/make/config/jogl/gl-es2.cfg
@@ -12,7 +12,7 @@ JavaClass GLES2
Extends GLES2 GLBase
Extends GLES2 GL
Extends GLES2 GL2ES2
-ImplPackage com.sun.opengl.impl.es2
+ImplPackage com.jogamp.opengl.impl.es2
ImplJavaClass GLES2Impl
Implements GLES2Impl GLBase
Implements GLES2Impl GL
@@ -79,6 +79,6 @@ Import javax.media.opengl.GLES2
Import javax.media.opengl.GL2
Import javax.media.opengl.GLArrayData
Import javax.media.opengl.GLUniformData
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl2.cfg b/make/config/jogl/gl-gl2.cfg
index 820243f..37452d1 100644
--- a/make/config/jogl/gl-gl2.cfg
+++ b/make/config/jogl/gl-gl2.cfg
@@ -19,7 +19,7 @@ Extends GL2 GL
Extends GL2 GL2ES1
Extends GL2 GL2ES2
Extends GL2 GL2GL3
-ImplPackage com.sun.opengl.impl.gl2
+ImplPackage com.jogamp.opengl.impl.gl2
ImplJavaClass GL2Impl
Implements GL2Impl GLBase
Implements GL2Impl GL
@@ -79,5 +79,5 @@ Import javax.media.opengl.GLES2
Import javax.media.opengl.GL2
Import javax.media.opengl.GLArrayData
Import javax.media.opengl.GLUniformData
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg
index 232116a..3942b14 100644
--- a/make/config/jogl/gl-gl2es12.cfg
+++ b/make/config/jogl/gl-gl2es12.cfg
@@ -11,7 +11,7 @@ ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GL
ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
Style ImplOnly
-ImplPackage com.sun.opengl.impl.gl2es12
+ImplPackage com.jogamp.opengl.impl.gl2es12
ImplJavaClass GL2ES12Impl
Implements GL2ES12Impl GLBase
Implements GL2ES12Impl GL
@@ -86,5 +86,5 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c
Import javax.media.opengl.GLES1
Import javax.media.opengl.GLES2
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl3.cfg b/make/config/jogl/gl-gl3.cfg
index 9f0ea05..0bfe2cc 100644
--- a/make/config/jogl/gl-gl3.cfg
+++ b/make/config/jogl/gl-gl3.cfg
@@ -14,7 +14,7 @@ Extends GL3 GLBase
Extends GL3 GL
Extends GL3 GL2ES2
Extends GL3 GL2GL3
-ImplPackage com.sun.opengl.impl.gl3
+ImplPackage com.jogamp.opengl.impl.gl3
ImplJavaClass GL3Impl
Implements GL3Impl GLBase
Implements GL3Impl GL
@@ -70,5 +70,5 @@ Import javax.media.opengl.GLES2
Import javax.media.opengl.GL3
Import javax.media.opengl.GLArrayData
Import javax.media.opengl.GLUniformData
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl3bc.cfg b/make/config/jogl/gl-gl3bc.cfg
index d252573..a637df9 100644
--- a/make/config/jogl/gl-gl3bc.cfg
+++ b/make/config/jogl/gl-gl3bc.cfg
@@ -23,7 +23,7 @@ Extends GL3bc GL2ES2
Extends GL3bc GL2GL3
Extends GL3bc GL2
Extends GL3bc GL3
-ImplPackage com.sun.opengl.impl.gl3
+ImplPackage com.jogamp.opengl.impl.gl3
ImplJavaClass GL3bcImpl
Implements GL3bcImpl GLBase
Implements GL3bcImpl GL
@@ -97,5 +97,5 @@ Import javax.media.opengl.GL2GL3
Import javax.media.opengl.GL2
Import javax.media.opengl.GL3
Import javax.media.opengl.GL3bc
-Import com.sun.opengl.impl.InternalBufferUtil
+Import com.jogamp.opengl.impl.InternalBufferUtil
Import java.io.PrintStream
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2.c b/make/config/jogl/gl-impl-CustomCCode-gl2.c
index f97b8ea..91fd007 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl2.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2.c
@@ -1,10 +1,10 @@
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.gl2.GL2Impl
+ * Java package: com.jogamp.opengl.impl.gl2.GL2Impl
* Java method: long dispatch_glMapBuffer(int target, int access)
* C function: void * glMapBuffer(GLenum target, GLenum access);
*/
JNIEXPORT jlong JNICALL
-Java_com_sun_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
PFNGLMAPBUFFERPROC ptr_glMapBuffer;
void * _res;
ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -14,11 +14,11 @@ Java_com_sun_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.gl2.GL2Impl
+ * Java package: com.jogamp.opengl.impl.gl2.GL2Impl
* Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
* C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_gl2_GL2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+Java_com_jogamp_opengl_impl_gl2_GL2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
}
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
index e2d5cb5..07b8218 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
@@ -1,10 +1,10 @@
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.gl2es12.GL2ES12Impl
+ * Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl
* Java method: long dispatch_glMapBuffer(int target, int access)
* C function: void * glMapBuffer(GLenum target, GLenum access);
*/
JNIEXPORT jlong JNICALL
-Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
PFNGLMAPBUFFERPROC ptr_glMapBuffer;
void * _res;
ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -14,11 +14,11 @@ Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env,
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.gl2es12.GL2ES12Impl
+ * Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl
* Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
* C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
}
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl3.c b/make/config/jogl/gl-impl-CustomCCode-gl3.c
index a5f78a4..f540a7d 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl3.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl3.c
@@ -1,10 +1,10 @@
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.gl3.GL3Impl
+ * Java package: com.jogamp.opengl.impl.gl3.GL3Impl
* Java method: long dispatch_glMapBuffer(int target, int access)
* C function: void * glMapBuffer(GLenum target, GLenum access);
*/
JNIEXPORT jlong JNICALL
-Java_com_sun_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
PFNGLMAPBUFFERPROC ptr_glMapBuffer;
void * _res;
ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -14,11 +14,11 @@ Java_com_sun_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.gl3.GL3Impl
+ * Java package: com.jogamp.opengl.impl.gl3.GL3Impl
* Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
* C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_gl3_GL3Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+Java_com_jogamp_opengl_impl_gl3_GL3Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
}
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl3bc.c b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
index a692041..21de8c9 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c
@@ -1,10 +1,10 @@
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.gl3.GL3bcImpl
+ * Java package: com.jogamp.opengl.impl.gl3.GL3bcImpl
* Java method: long dispatch_glMapBuffer(int target, int access)
* C function: void * glMapBuffer(GLenum target, GLenum access);
*/
JNIEXPORT jlong JNICALL
-Java_com_sun_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
PFNGLMAPBUFFERPROC ptr_glMapBuffer;
void * _res;
ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -14,11 +14,11 @@ Java_com_sun_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.gl3.GL3bcImpl
+ * Java package: com.jogamp.opengl.impl.gl3.GL3bcImpl
* Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
* C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_gl3_GL3bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+Java_com_jogamp_opengl_impl_gl3_GL3bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
}
diff --git a/make/config/jogl/gl-impl-CustomCCode-gles1.c b/make/config/jogl/gl-impl-CustomCCode-gles1.c
index efc614e..a71ca4a 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gles1.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gles1.c
@@ -1,11 +1,11 @@
typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.es1.GLES1Impl
+ * Java package: com.jogamp.opengl.impl.es1.GLES1Impl
* Java method: long dispatch_glMapBuffer(int target, int access)
* C function: void * glMapBuffer(GLenum target, GLenum access);
*/
JNIEXPORT jlong JNICALL
-Java_com_sun_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
PFNGLMAPBUFFERPROC ptr_glMapBuffer;
void * _res;
ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -15,11 +15,11 @@ Java_com_sun_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.es1.GLES1Impl
+ * Java package: com.jogamp.opengl.impl.es1.GLES1Impl
* Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
* C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+Java_com_jogamp_opengl_impl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
}
diff --git a/make/config/jogl/gl-impl-CustomCCode-gles2.c b/make/config/jogl/gl-impl-CustomCCode-gles2.c
index 27be047..f99822d 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gles2.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gles2.c
@@ -1,11 +1,11 @@
typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.es2.GLES2Impl
+ * Java package: com.jogamp.opengl.impl.es2.GLES2Impl
* Java method: long dispatch_glMapBuffer(int target, int access)
* C function: void * glMapBuffer(GLenum target, GLenum access);
*/
JNIEXPORT jlong JNICALL
-Java_com_sun_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
+Java_com_jogamp_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) {
PFNGLMAPBUFFERPROC ptr_glMapBuffer;
void * _res;
ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress;
@@ -15,11 +15,11 @@ Java_com_sun_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.es2.GLES2Impl
+ * Java package: com.jogamp.opengl.impl.es2.GLES2Impl
* Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
* C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+Java_com_jogamp_opengl_impl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
}
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index 78c0676..aeb4f2e 100755
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -169,7 +169,7 @@ protected static boolean checkedGLUtessellatorImpl = false;
protected static final void validateGLUtessellatorImpl() {
if(!checkedGLUtessellatorImpl) {
- availableGLUtessellatorImpl = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl");
+ availableGLUtessellatorImpl = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl");
checkedGLUtessellatorImpl = true;
}
if(!availableGLUtessellatorImpl) {
@@ -1220,7 +1220,7 @@ protected static final void validateGLUquadricImpl() {
if(!checkedGLUquadricImpl) {
synchronized (syncObject) {
if(!checkedGLUquadricImpl) {
- availableGLUquadricImpl = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.GLUquadricImpl");
+ availableGLUquadricImpl = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl");
checkedGLUquadricImpl = true;
}
}
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index 8afc28c..b5cb3b2 100755
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -86,7 +86,7 @@ protected static boolean checkedMipmap = false;
protected static final void validateMipmap() {
if(!checkedMipmap) {
- availableMipmap = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.mipmap.Mipmap");
+ availableMipmap = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap");
checkedMipmap = true;
}
if(!availableMipmap) {
diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg
index f67673a..d859225 100755
--- a/make/config/jogl/glu-base.cfg
+++ b/make/config/jogl/glu-base.cfg
@@ -20,8 +20,8 @@ Ignore gluScaleImage
IncludeAs CustomJavaCode GLU glu-CustomJavaCode-base.java
# Imports for the Error and Registry classes
-Import com.sun.opengl.impl.glu.error.Error
-Import com.sun.opengl.impl.glu.registry.Registry
+Import com.jogamp.opengl.impl.glu.error.Error
+Import com.jogamp.opengl.impl.glu.registry.Registry
Include glu-common.cfg
diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg
index df59175..28a0759 100644
--- a/make/config/jogl/glu-common.cfg
+++ b/make/config/jogl/glu-common.cfg
@@ -12,9 +12,9 @@ TagNativeBinding true
Import java.nio.*
Import javax.media.opengl.*
Import javax.media.opengl.glu.*
-Import com.sun.opengl.impl.*
-Import com.sun.opengl.impl.glu.*
-Import com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl
+Import com.jogamp.opengl.impl.*
+Import com.jogamp.opengl.impl.glu.*
+Import com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl
Import com.sun.nativewindow.impl.NWReflection
# Raise GLException instead of RuntimeException in glue code
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 712f9a3..cc5b16f 100755
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -25,7 +25,7 @@ CustomCCode #endif
Include ../intptr.cfg
EmitProcAddressTable true
-ProcAddressTablePackage com.sun.opengl.impl.glu.gl2
+ProcAddressTablePackage com.jogamp.opengl.impl.glu.gl2
ProcAddressTableClassName GLUgl2ProcAddressTable
GetProcAddressTableExpr getGLUProcAddressTable()
@@ -38,14 +38,14 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java
# GLU needs access to the GLUtesselatorImpl class for GLUtesselator,
# to the Mipmap class for scaling and mipmap generation,
# and to the nurbs.* package for the NURBS functionality
-Import com.sun.opengl.impl.glu.nurbs.*
+Import com.jogamp.opengl.impl.glu.nurbs.*
Import java.security.*
-Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper
-Import com.sun.opengl.impl.glu.gl2.nurbs.*
-Import com.sun.opengl.impl.glu.mipmap.Mipmap
-Import com.sun.opengl.impl.glu.gl2.*
+Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
+Import com.jogamp.opengl.impl.glu.gl2.nurbs.*
+Import com.jogamp.opengl.impl.glu.mipmap.Mipmap
+Import com.jogamp.opengl.impl.glu.gl2.*
Import javax.media.opengl.GL2
-Import com.sun.opengl.impl.gl2.ProjectDouble
+Import com.jogamp.opengl.impl.gl2.ProjectDouble
#
# ------------------------
diff --git a/make/config/jogl/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg
index 8927f96..af89014 100755
--- a/make/config/jogl/glu-gl2es1.cfg
+++ b/make/config/jogl/glu-gl2es1.cfg
@@ -20,7 +20,7 @@ Ignore gluScaleImage
IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java
Import javax.media.opengl.GLES1
-Import com.sun.opengl.impl.glu.mipmap.Mipmap
+Import com.jogamp.opengl.impl.glu.mipmap.Mipmap
Include glu-common.cfg
diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c
index a075c48..7dac53f 100755
--- a/make/config/jogl/glx-CustomCCode.c
+++ b/make/config/jogl/glx-CustomCCode.c
@@ -15,7 +15,7 @@
/* We expect glXGetProcAddressARB to be defined */
extern void (*glXGetProcAddressARB(const GLubyte *procname))();
-static const char * clazzNameInternalBufferUtil = "com/sun/opengl/impl/InternalBufferUtil";
+static const char * clazzNameInternalBufferUtil = "com/jogamp/opengl/impl/InternalBufferUtil";
static const char * clazzNameInternalBufferUtilStaticCstrName = "copyByteBuffer";
static const char * clazzNameInternalBufferUtilStaticCstrSignature = "(Ljava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;";
static const char * clazzNameByteBuffer = "java/nio/ByteBuffer";
@@ -30,29 +30,29 @@ static void _initClazzAccess(JNIEnv *env) {
c = (*env)->FindClass(env, clazzNameInternalBufferUtil);
if(NULL==c) {
- fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameInternalBufferUtil);
+ fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameInternalBufferUtil);
(*env)->FatalError(env, clazzNameInternalBufferUtil);
}
clazzInternalBufferUtil = (jclass)(*env)->NewGlobalRef(env, c);
if(NULL==clazzInternalBufferUtil) {
- fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameInternalBufferUtil);
+ fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameInternalBufferUtil);
(*env)->FatalError(env, clazzNameInternalBufferUtil);
}
c = (*env)->FindClass(env, clazzNameByteBuffer);
if(NULL==c) {
- fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer);
+ fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer);
(*env)->FatalError(env, clazzNameByteBuffer);
}
clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c);
if(NULL==c) {
- fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer);
+ fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer);
(*env)->FatalError(env, clazzNameByteBuffer);
}
cstrInternalBufferUtil = (*env)->GetStaticMethodID(env, clazzInternalBufferUtil,
clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature);
if(NULL==cstrInternalBufferUtil) {
- fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX:: can't create %s.%s %s\n",
+ fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX:: can't create %s.%s %s\n",
clazzNameInternalBufferUtil,
clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature);
(*env)->FatalError(env, clazzNameInternalBufferUtilStaticCstrName);
@@ -60,12 +60,12 @@ static void _initClazzAccess(JNIEnv *env) {
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.x11.glx.GLX
+ * Java package: com.jogamp.opengl.impl.x11.glx.GLX
* Java method: XVisualInfo glXGetVisualFromFBConfig(long dpy, long config)
* C function: XVisualInfo * glXGetVisualFromFBConfig(Display * dpy, GLXFBConfig config);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv *env, jclass _unused, jlong dpy, jlong config) {
+Java_com_jogamp_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv *env, jclass _unused, jlong dpy, jlong config) {
XVisualInfo * _res;
jobject jbyteSource;
jobject jbyteCopy;
@@ -85,12 +85,12 @@ Java_com_sun_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.x11.glx.GLX
+ * Java package: com.jogamp.opengl.impl.x11.glx.GLX
* Java method: java.nio.LongBuffer glXChooseFBConfig(long dpy, int screen, java.nio.IntBuffer attribList, java.nio.IntBuffer nitems)
* C function: GLXFBConfig * glXChooseFBConfig(Display * dpy, int screen, const int * attribList, int * nitems);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset) {
+Java_com_jogamp_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset) {
int * _ptr2 = NULL;
int * _ptr3 = NULL;
GLXFBConfig * _res;
@@ -126,12 +126,12 @@ Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Obje
}
/* Java->C glue code:
- * Java package: com.sun.opengl.impl.x11.glx.GLX
+ * Java package: com.jogamp.opengl.impl.x11.glx.GLX
* Java method: XVisualInfo glXChooseVisual(long dpy, int screen, java.nio.IntBuffer attribList)
* C function: XVisualInfo * glXChooseVisual(Display * dpy, int screen, int * attribList);
*/
JNIEXPORT jobject JNICALL
-Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseVisualCopied1__JILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset) {
+Java_com_jogamp_opengl_impl_x11_glx_GLX_glXChooseVisualCopied1__JILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset) {
int * _ptr2 = NULL;
XVisualInfo * _res;
jobject jbyteSource;
diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index 3cb1d36..5605737 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -13,7 +13,7 @@
/** Interface to C language function: <br> - Alias for: <br> <code> GLXFBConfig * glXChooseFBConfigSGIX, glXChooseFBConfig(Display * dpy, int screen, const int * attribList, int * nitems); </code> */
- public static com.sun.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
+ public static com.jogamp.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
{
if(attribList != null && attribList.length <= attribList_offset)
throw new GLException("array offset argument \"attribList_offset\" (" + attribList_offset + ") equals or exceeds array length (" + attribList.length + ")");
diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg
index c9079b8..8814f5e 100644
--- a/make/config/jogl/glx-x11.cfg
+++ b/make/config/jogl/glx-x11.cfg
@@ -3,7 +3,7 @@
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl/X11
-Package com.sun.opengl.impl.x11.glx
+Package com.jogamp.opengl.impl.x11.glx
JavaClass GLX
Style allstatic
Include gl-common.cfg
diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg
index 39ba379..f07d5cc 100755
--- a/make/config/jogl/glxext.cfg
+++ b/make/config/jogl/glxext.cfg
@@ -3,13 +3,13 @@
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl/X11
-Package com.sun.opengl.impl.x11.glx
+Package com.jogamp.opengl.impl.x11.glx
Style InterfaceAndImpl
JavaClass GLXExt
-ImplPackage com.sun.opengl.impl.x11.glx
+ImplPackage com.jogamp.opengl.impl.x11.glx
ImplJavaClass GLXExtImpl
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/sun/opengl/impl/x11/glx/GLX.java
+ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/x11/glx/GLX.java
Include gl-common.cfg
Include gl-desktop.cfg
diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg
index 6cd4fd4..2a69290 100644
--- a/make/config/jogl/wgl-win32.cfg
+++ b/make/config/jogl/wgl-win32.cfg
@@ -3,7 +3,7 @@
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl/Windows
-Package com.sun.opengl.impl.windows.wgl
+Package com.jogamp.opengl.impl.windows.wgl
JavaClass WGL
Style allstatic
Include gl-common.cfg
diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg
index ea9a025..35c43cb 100644
--- a/make/config/jogl/wglext.cfg
+++ b/make/config/jogl/wglext.cfg
@@ -3,10 +3,10 @@
JavaOutputDir gensrc/classes
NativeOutputDir gensrc/native/jogl/Windows
-Package com.sun.opengl.impl.windows.wgl
+Package com.jogamp.opengl.impl.windows.wgl
Style InterfaceAndImpl
JavaClass WGLExt
-ImplPackage com.sun.opengl.impl.windows.wgl
+ImplPackage com.jogamp.opengl.impl.windows.wgl
ImplJavaClass WGLExtImpl
Include gl-common.cfg
Include gl-desktop.cfg
diff --git a/make/stub_includes/opengl/gl4.c b/make/stub_includes/opengl/gl4.c
new file mode 100644
index 0000000..cf8a709
--- /dev/null
+++ b/make/stub_includes/opengl/gl4.c
@@ -0,0 +1,11 @@
+#define GLAPI
+
+// Define GL4_PROTOTYPES so that the OpenGL prototypes in
+// "gl3.h" are parsed.
+#define GL4_PROTOTYPES
+
+// Define GL_GL4EXT_PROTOTYPES so that the OpenGL extension prototypes in
+// "gl3ext.h" are parsed.
+#define GL_GL4EXT_PROTOTYPES
+
+#include <GL4/gl3.h>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 0c128d1..31339c9 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -75,6 +75,10 @@
</arity>
</context>
</action>
+ <action name="test">
+ <script>${ant.script}</script>
+ <target>junit.run</target>
+ </action>
</ide-actions>
<export>
<type>folder</type>
@@ -112,6 +116,7 @@
<ide-action name="build"/>
<ide-action name="rebuild"/>
<ide-action name="clean"/>
+ <ide-action name="test"/>
</context-menu>
</view>
<subprojects/>
diff --git a/src/jogl/Jogl.iml b/src/jogl/Jogl.iml
new file mode 100644
index 0000000..7811f42
--- /dev/null
+++ b/src/jogl/Jogl.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/junit" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
diff --git a/src/jogl/classes/com/sun/opengl/cg/CgException.java b/src/jogl/classes/com/jogamp/opengl/cg/CgException.java
index 3380bb5..8bfd9e2 100644
--- a/src/jogl/classes/com/sun/opengl/cg/CgException.java
+++ b/src/jogl/classes/com/jogamp/opengl/cg/CgException.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.cg;
+package com.jogamp.opengl.cg;
/**
* A generic exception for errors that occur throughout the NVidia Cg
diff --git a/src/jogl/classes/com/sun/opengl/impl/DRIHack.java b/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
index 63a2f7e..ede9662 100755
--- a/src/jogl/classes/com/sun/opengl/impl/DRIHack.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/DRIHack.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.io.*;
import java.security.*;
-import com.sun.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.*;
/**
* Helper class for working around problems with open-source DRI
diff --git a/src/jogl/classes/com/sun/opengl/impl/Debug.java b/src/jogl/classes/com/jogamp/opengl/impl/Debug.java
index 7c54517..82a5f2f 100644
--- a/src/jogl/classes/com/sun/opengl/impl/Debug.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/Debug.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.security.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/ExtensionAvailabilityCache.java b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
index 2607251..f36c4f7 100644
--- a/src/jogl/classes/com/sun/opengl/impl/ExtensionAvailabilityCache.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ExtensionAvailabilityCache.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import javax.media.opengl.*;
import java.util.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLBufferSizeTracker.java b/src/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java
index 53fcc2d..48affa5 100755
--- a/src/jogl/classes/com/sun/opengl/impl/GLBufferSizeTracker.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLBufferSizeTracker.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.util.*;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLBufferStateTracker.java b/src/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java
index c61d360..df8d673 100755
--- a/src/jogl/classes/com/sun/opengl/impl/GLBufferStateTracker.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLBufferStateTracker.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.util.*;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
index 1d500bb..32a32e3 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextImpl.java
@@ -37,15 +37,15 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.nio.*;
import java.lang.reflect.*;
import javax.media.opengl.*;
import com.sun.nativewindow.impl.NWReflection;
-import com.sun.gluegen.runtime.*;
-import com.sun.gluegen.runtime.opengl.*;
+import com.jogamp.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.opengl.*;
public abstract class GLContextImpl extends GLContext {
protected GLContextLock lock = new GLContextLock();
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextLock.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java
index 753ef14..56a5b02 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLContextLock.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextLock.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextShareSet.java b/src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java
index 5f8fc1c..abeb231 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLContextShareSet.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLContextShareSet.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
// FIXME: refactor Java SE dependencies
// import java.awt.GraphicsConfiguration;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
index ceef077..20d0c80 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableFactoryImpl.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.nio.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.*;
import com.sun.nativewindow.impl.NWReflection;
import java.lang.reflect.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
index d6ca2cb..7a4e840 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableHelper.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.util.*;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
index befee17..20bf20c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLDrawableImpl.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
public abstract class GLDrawableImpl implements GLDrawable {
protected static final boolean DEBUG = Debug.debug("GLDrawable");
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java
index ffaf798..dd8d980 100644
--- a/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLPbufferImpl.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
/**
import java.awt.Dimension;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java b/src/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java
index d28d39f..744e7b9 100755
--- a/src/jogl/classes/com/sun/opengl/impl/GLStateTracker.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLStateTracker.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.util.*;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/GLWorkerThread.java b/src/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java
index b110e43..768eea3 100755
--- a/src/jogl/classes/com/sun/opengl/impl/GLWorkerThread.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/GLWorkerThread.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.lang.reflect.InvocationTargetException;
import java.security.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
index 32c3cd7..4a0eaa2 100644
--- a/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javame_cdc_fp
@@ -31,13 +31,13 @@
*
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.lang.reflect.*;
import java.nio.*;
/** Internal copy of selected routines from BufferUtil to avoid
- outward dependencies on com.sun.opengl.util package. */
+ outward dependencies on com.jogamp.opengl.util package. */
public class InternalBufferUtil {
public static final int SIZEOF_BYTE = 1;
public static final int SIZEOF_SHORT = 2;
diff --git a/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase b/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase
index 59d44f0..655fa95 100644
--- a/src/jogl/classes/com/sun/opengl/impl/InternalBufferUtil.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/impl/InternalBufferUtil.java.javase
@@ -31,13 +31,13 @@
*
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.lang.reflect.*;
import java.nio.*;
/** Internal copy of selected routines from BufferUtil to avoid
- outward dependencies on com.sun.opengl.util package. */
+ outward dependencies on com.jogamp.opengl.util package. */
public class InternalBufferUtil {
public static final int SIZEOF_BYTE = 1;
public static final int SIZEOF_SHORT = 2;
diff --git a/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
index 59f92e5..aa71a37 100644
--- a/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/NativeLibLoader.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
// FIXME: refactor Java SE dependencies
//import java.awt.Toolkit;
diff --git a/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java b/src/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java
index f9f3816..dbd84c9 100755
--- a/src/jogl/classes/com/sun/opengl/impl/ProjectFloat.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ProjectFloat.java
@@ -112,7 +112,7 @@
* in the design, construction, operation or maintenance of any nuclear
* facility.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp
index 91723b5..f686bea 100644
--- a/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javame_cdc_fp
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
public class SystemUtil {
diff --git a/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase
index 3f201c2..dbb717a 100644
--- a/src/jogl/classes/com/sun/opengl/impl/SystemUtil.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/impl/SystemUtil.java.javase
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
public class SystemUtil {
diff --git a/src/jogl/classes/com/sun/opengl/impl/ThreadingImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
index 4a4b2d5..2576c8a 100644
--- a/src/jogl/classes/com/sun/opengl/impl/ThreadingImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingImpl.java
@@ -31,7 +31,7 @@
*
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
@@ -102,7 +102,7 @@ public class ThreadingImpl {
Object threadingPluginObj=null;
// try to fetch the AWTThreadingPlugin
try {
- threadingPluginObj = NWReflection.createInstance("com.sun.opengl.impl.awt.AWTThreadingPlugin");
+ threadingPluginObj = NWReflection.createInstance("com.jogamp.opengl.impl.awt.AWTThreadingPlugin");
} catch (Throwable t) { }
return threadingPluginObj;
}
diff --git a/src/jogl/classes/com/sun/opengl/impl/ThreadingPlugin.java b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java
index 5c52f87..37e4aac 100644
--- a/src/jogl/classes/com/sun/opengl/impl/ThreadingPlugin.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/ThreadingPlugin.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl;
+package com.jogamp.opengl.impl;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/AWTThreadingPlugin.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java
index c7dd9ea..07bf2f2 100755
--- a/src/jogl/classes/com/sun/opengl/impl/awt/AWTThreadingPlugin.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTThreadingPlugin.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.awt;
+package com.jogamp.opengl.impl.awt;
import javax.media.opengl.*;
@@ -46,7 +46,7 @@ import java.awt.event.*;
import java.awt.EventQueue;
import java.lang.reflect.InvocationTargetException;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class AWTThreadingPlugin implements ThreadingPlugin {
diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
index f4c8944..306f6ce 100644
--- a/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/AWTUtil.java
@@ -34,11 +34,11 @@
* facility.
*/
-package com.sun.opengl.impl.awt;
+package com.jogamp.opengl.impl.awt;
import com.sun.nativewindow.impl.jawt.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import javax.media.opengl.*;
@@ -58,7 +58,7 @@ public class AWTUtil {
headlessMode = GraphicsEnvironment.isHeadless();
if(!headlessMode) {
try {
- j2dClazz = Class.forName("com.sun.opengl.impl.awt.Java2D");
+ j2dClazz = Class.forName("com.jogamp.opengl.impl.awt.Java2D");
isOGLPipelineActive = j2dClazz.getMethod("isOGLPipelineActive", null);
isQueueFlusherThread = j2dClazz.getMethod("isQueueFlusherThread", null);
j2dOk = true;
diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/Java2D.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java
index 098ec85..b871c66 100755
--- a/src/jogl/classes/com/sun/opengl/impl/awt/Java2D.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2D.java
@@ -37,9 +37,9 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.awt;
+package com.jogamp.opengl.impl.awt;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import java.awt.*;
import java.awt.image.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/Java2DGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java
index 48461c1..07bc54b 100644
--- a/src/jogl/classes/com/sun/opengl/impl/awt/Java2DGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/awt/Java2DGLContext.java
@@ -37,9 +37,9 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.awt;
+package com.jogamp.opengl.impl.awt;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import java.awt.Graphics;
/** Provides a construct by which the shared GLJPanel code can
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
index 756f6af..42d4588 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLContext.java
@@ -33,12 +33,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
import java.nio.*;
import java.util.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
index dd801e4..e48c783 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawable.java
@@ -33,11 +33,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
-import com.sun.opengl.impl.GLDrawableImpl;
+import com.jogamp.opengl.impl.GLDrawableImpl;
import com.sun.nativewindow.impl.NWReflection;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
import javax.media.nativewindow.*;
import javax.media.nativewindow.egl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
index e9a622c..f6c8b80 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDrawableFactory.java
@@ -33,14 +33,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.NativeLibrary;
public class EGLDrawableFactory extends GLDrawableFactoryImpl {
@@ -52,7 +52,7 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
// Check for other underlying stuff ..
if(NativeWindowFactory.TYPE_X11.equals(NativeWindowFactory.getNativeWindowType(true))) {
try {
- NWReflection.createInstance("com.sun.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory");
+ NWReflection.createInstance("com.jogamp.opengl.impl.x11.glx.X11GLXGraphicsConfigurationFactory");
} catch (Throwable t) {}
}
}
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
index fed07a1..beffb51 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLDynamicLookupHelper.java
@@ -33,15 +33,15 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
import java.security.*;
/**
@@ -51,7 +51,7 @@ import java.security.*;
* Currently two implementations exist, one for ES1 and one for ES2.
*/
public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
- protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("EGL");
+ protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("EGL");
protected static final boolean DEBUG_LOOKUP;
private static final EGLDynamicLookupHelper eglES1DynamicLookupHelper;
@@ -60,7 +60,7 @@ public abstract class EGLDynamicLookupHelper implements DynamicLookupHelper {
static {
AccessControlContext localACC=AccessController.getContext();
- DEBUG_LOOKUP = com.sun.opengl.impl.Debug.isPropertyDefined("jogl.debug.DynamicLookup", true, localACC);
+ DEBUG_LOOKUP = com.jogamp.opengl.impl.Debug.isPropertyDefined("jogl.debug.DynamicLookup", true, localACC);
EGLDynamicLookupHelper tmp=null;
try {
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
index 7e60e25..0dc9535 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES1DynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES1DynamicLookupHelper.java
@@ -33,14 +33,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.NativeLibrary;
/**
* Implementation of the EGLDynamicLookupHelper for ES1.
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
index cfd0558..595ded5 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLES2DynamicLookupHelper.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLES2DynamicLookupHelper.java
@@ -33,14 +33,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.NativeLibrary;
/**
* Implementation of the EGLDynamicLookupHelper for ES2.
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLExternalContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
index 86c8239..de7fd2b 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLExternalContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLExternalContext.java
@@ -33,10 +33,10 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import javax.media.nativewindow.*;
public class EGLExternalContext extends EGLContext {
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
index 5ab3c3e..33f9db1 100644
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfiguration.java
@@ -33,14 +33,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.egl.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
public class EGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
index 3997850..6546eca 100644
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLGraphicsConfigurationFactory.java
@@ -30,7 +30,7 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import java.io.PrintStream;
import javax.media.nativewindow.*;
@@ -38,7 +38,7 @@ import javax.media.nativewindow.egl.*;
import com.sun.nativewindow.impl.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
are used on X11 platforms. Toolkits will likely need to delegate
@@ -46,7 +46,7 @@ import com.sun.opengl.impl.*;
GraphicsDevice and GraphicsConfiguration abstractions. */
public class EGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
- protected static final boolean DEBUG = GraphicsConfigurationFactory.DEBUG || com.sun.opengl.impl.Debug.debug("EGL");
+ protected static final boolean DEBUG = GraphicsConfigurationFactory.DEBUG || com.jogamp.opengl.impl.Debug.debug("EGL");
public EGLGraphicsConfigurationFactory() {
// become the selector for KD/EGL ..
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java
index c1a5bd5..b749916 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenContext.java
@@ -33,12 +33,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
import java.nio.*;
import java.util.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
index 45fffbc..d37a36f 100644
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLOnscreenDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLOnscreenDrawable.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.egl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NullWindow;
public class EGLOnscreenDrawable extends EGLDrawable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java
index 2a7a770..5c634b9 100755
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferContext.java
@@ -33,12 +33,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
import java.nio.*;
import java.util.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
index e16420b..a860457 100644
--- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLPbufferDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/egl/EGLPbufferDrawable.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.egl;
+package com.jogamp.opengl.impl.egl;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.egl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class EGLPbufferDrawable extends EGLDrawable {
private int texFormat;
diff --git a/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java b/src/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java
index 54a0290..2eb3ca5 100755
--- a/src/jogl/classes/com/sun/opengl/impl/gl2/ProjectDouble.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/gl2/ProjectDouble.java
@@ -112,12 +112,12 @@
* in the design, construction, operation or maintenance of any nuclear
* facility.
*/
-package com.sun.opengl.impl.gl2;
+package com.jogamp.opengl.impl.gl2;
import java.nio.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
/**
* Project.java
diff --git a/src/jogl/classes/com/sun/opengl/impl/gl2/Util.java b/src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java
index 0fc72da..a542dcf 100644
--- a/src/jogl/classes/com/sun/opengl/impl/gl2/Util.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/gl2/Util.java
@@ -66,9 +66,9 @@
* facility.
*/
-package com.sun.opengl.impl.gl2;
+package com.jogamp.opengl.impl.gl2;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import java.nio.IntBuffer;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/gl2/fixme/GLObjectTracker.java b/src/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java
index 885f3cb..3e3b6ae 100755
--- a/src/jogl/classes/com/sun/opengl/impl/gl2/fixme/GLObjectTracker.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/gl2/fixme/GLObjectTracker.java
@@ -37,9 +37,9 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.gl2;
+package com.jogamp.opengl.impl.gl2;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import java.nio.*;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java
index cc07841..d7e6a23 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/GLUquadricImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/GLUquadricImpl.java
@@ -113,11 +113,11 @@
* facility.
*/
-package com.sun.opengl.impl.glu;
+package com.jogamp.opengl.impl.glu;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
-import com.sun.opengl.util.ImmModeSink;
+import com.jogamp.opengl.util.ImmModeSink;
import java.nio.*;
/**
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java
index 4613ae5..7c360c5 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/Glue.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/Glue.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu;
+package com.jogamp.opengl.impl.glu;
/**
*
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java
index cdf2870..7c7e6b0 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/error/Error.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/error/Error.java
@@ -42,11 +42,11 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.error;
+package com.jogamp.opengl.impl.glu.error;
import javax.media.opengl.GL;
import javax.media.opengl.glu.GLU;
-import com.sun.opengl.impl.glu.Glue;
+import com.jogamp.opengl.impl.glu.Glue;
/**
*
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java
index 4b78498..42ddeea 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2Backend.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2Backend.java
@@ -1,5 +1,5 @@
-package com.sun.opengl.impl.glu.gl2.nurbs;
-import com.sun.opengl.impl.glu.nurbs.*;
+package com.jogamp.opengl.impl.glu.gl2.nurbs;
+import com.jogamp.opengl.impl.glu.nurbs.*;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
index 107ec92..adb8c51 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2CurveEvaluator.java
@@ -1,5 +1,5 @@
-package com.sun.opengl.impl.glu.gl2.nurbs;
-import com.sun.opengl.impl.glu.nurbs.*;
+package com.jogamp.opengl.impl.glu.gl2.nurbs;
+import com.jogamp.opengl.impl.glu.nurbs.*;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
index 51fb83e..393601f 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GL2SurfaceEvaluator.java
@@ -1,5 +1,5 @@
-package com.sun.opengl.impl.glu.gl2.nurbs;
-import com.sun.opengl.impl.glu.nurbs.*;
+package com.jogamp.opengl.impl.glu.gl2.nurbs;
+import com.jogamp.opengl.impl.glu.nurbs.*;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
index 8e24ed4..13b6813 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/gl2/nurbs/GLUgl2nurbsImpl.java
@@ -1,5 +1,5 @@
-package com.sun.opengl.impl.glu.gl2.nurbs;
-import com.sun.opengl.impl.glu.nurbs.*;
+package com.jogamp.opengl.impl.glu.gl2.nurbs;
+import com.jogamp.opengl.impl.glu.nurbs.*;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java
index 41eb84b..501f5f5 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/BuildMipmap.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/BuildMipmap.java
@@ -42,13 +42,13 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.glu.GLU;
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.impl.InternalBufferUtil;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.impl.InternalBufferUtil;
import java.nio.*;
import java.io.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java
index 3f0fab5..be86585 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java
index 38ca2e5..7e172b1 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1010102.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1010102.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java
index 5810b1e..3789509 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract1555rev.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract1555rev.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java
index 493f403..077f303 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract2101010rev.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract2101010rev.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java
index b0a9753..fa35c6f 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract233rev.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract233rev.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java
index 3c9594e..3593646 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract332.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract332.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java
index 03f7458..bac4f57 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java
index bf623e6..b1bea75 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract4444rev.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract4444rev.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java
index 81480f7..a624784 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract5551.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract5551.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java
index cf5e799..624a4f3 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java
index a810d87..4ab6d7e 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract565rev.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract565rev.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java
index 0ae18ef..90d7e57 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java
index 3b22860..1097057 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Extract8888rev.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Extract8888rev.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java
index 3776b48..c427994 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractFloat.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractFloat.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java
index 35b2e51..8b986d6 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractPrimitive.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractPrimitive.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java
index 08d966c..4f61015 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSByte.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSByte.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java
index f7642f5..2d5ac53 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSInt.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSInt.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java
index a20784c..8b8d50c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractSShort.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractSShort.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java
index ed55ab1..d33213f 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUByte.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUByte.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.ByteBuffer;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java
index 38c156f..873668a 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUInt.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUInt.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java
index 5aba276..86bbb95 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ExtractUShort.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ExtractUShort.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java
index 40625ee..893d33c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/HalveImage.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/HalveImage.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import javax.media.opengl.GL;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java
index 1925442..b2aaad2 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Image.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Image.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import javax.media.opengl.GL;
import javax.media.opengl.GL2;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
index c985063..2c3f60d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Mipmap.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Mipmap.java
@@ -42,14 +42,14 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.glu.GLU;
import javax.media.opengl.GLException;
import java.nio.*;
-import com.sun.opengl.impl.InternalBufferUtil;
+import com.jogamp.opengl.impl.InternalBufferUtil;
/**
*
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java
index c66d138..43b5c56 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/PixelStorageModes.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/PixelStorageModes.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
/**
*
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java
index d998e4b..f0bb7fb 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/ScaleInternal.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/ScaleInternal.java
@@ -42,13 +42,13 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import javax.media.opengl.GL;
import javax.media.opengl.GL2;
import javax.media.opengl.glu.GLU;
import java.nio.*;
-import com.sun.opengl.impl.InternalBufferUtil;
+import com.jogamp.opengl.impl.InternalBufferUtil;
/**
*
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java
index fd2eabb..b329840 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/mipmap/Type_Widget.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/mipmap/Type_Widget.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.mipmap;
+package com.jogamp.opengl.impl.glu.mipmap;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java
index ed629d1..9ee2494 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Arc.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Arc.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java
index 9a70638..3955e31 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcSdirSorter.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcSdirSorter.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java
index 2fbb518..098ba97 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTdirSorter.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTdirSorter.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java
index c40780e..edfb890 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/ArcTesselator.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/ArcTesselator.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java
index caa17a7..3909772 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Backend.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Backend.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java
index e249787..d9b390b 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/BezierArc.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/BezierArc.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java
index 4a1ac14..61316f3 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Bin.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Bin.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java
index d088de8..b5b88ad 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Breakpt.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Breakpt.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfArcs.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java
index 3d6e1d4..0646e1d 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfArcs.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfArcs.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/**
* Class replacing C language pointer
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfBreakpts.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
index f5932d9..e47fdf9 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfBreakpts.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/**
* Class replacing C language pointer
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfFloats.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java
index fb3fac6..60cef99 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfFloats.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfFloats.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/**
* Class replacing C language pointer
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
index fed3018..ef16a82 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CArrayOfQuiltspecs.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/**
* Class replacing C language pointer
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java
index 752d7ac..fb1a5ac 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curve.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curve.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java
index ddfe30a..c27ffd4 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/CurveEvaluator.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/CurveEvaluator.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java
index 2de7e82..fc30188 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Curvelist.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Curvelist.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java
index d0090d7..39a3a28 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/DisplayList.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/DisplayList.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java
index c329a5c..00757ed 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Flist.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Flist.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java
index a6b3c45..9251aa2 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotspec.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotspec.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java
index 9af8a7d..658a1cb 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Knotvector.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Knotvector.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java
index 9a1d434..568eddc 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Mapdesc.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Mapdesc.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java
index 66d9b78..b23a1f6 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Maplist.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Maplist.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java
index d6fb1b6..ee7f3b3 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/NurbsConsts.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/NurbsConsts.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java
index 285c444..900f8e5 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_curve.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_curve.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java
index f1c3ffe..8111081 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbscurve.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbscurve.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java
index 4a4c675..b598f52 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_nurbssurface.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_nurbssurface.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java
index 53c0060..e50f41d 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_pwlcurve.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_pwlcurve.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java
index f135026..76ac79f 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_surface.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_surface.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java
index 0f59cce..17e5002 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/O_trim.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/O_trim.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java
index d9a79c4..d3066cc 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patch.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patch.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java
index 8755ad6..8b439a0 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Patchlist.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Patchlist.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java
index 8640b1d..b486a0e 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Property.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Property.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java
index 1e0a091..1e60ed3 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Pspec.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Pspec.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java
index 9f6c777..0c9eca9 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/PwlArc.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/PwlArc.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java
index 640eb2e..03e809d 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quilt.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quilt.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java
index ee29249..6c8e55e 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Quiltspec.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Quiltspec.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/README.txt b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt
index 89630c7..89630c7 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/README.txt
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/README.txt
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java
index 8470a64..d1a23fb 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Renderhints.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Renderhints.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java
index 7f01435..487b47f 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Splinespec.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Splinespec.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java
index b8da3e1..99c1b74 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/Subdivider.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/Subdivider.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java
index 99209b7..fe23f9c 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/SurfaceEvaluator.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/SurfaceEvaluator.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java
index 2c4b94b..6608f8f 100755
--- a/src/jogl/classes/com/sun/opengl/impl/glu/nurbs/TrimVertex.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/nurbs/TrimVertex.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.impl.glu.nurbs;
+package com.jogamp.opengl.impl.glu.nurbs;
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java
index 5c6b03c..21b15f4 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/registry/Registry.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/registry/Registry.java
@@ -42,7 +42,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package com.sun.opengl.impl.glu.registry;
+package com.jogamp.opengl.impl.glu.registry;
import javax.media.opengl.glu.GLU;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java
index a875fb9..85397dd 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/ActiveRegion.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/ActiveRegion.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class ActiveRegion {
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java
index 85c9d50..8948acf 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/CachedVertex.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/CachedVertex.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class CachedVertex {
public double[] coords = new double[3];
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java
index 9b7fb65..d26948e 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Dict.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Dict.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class Dict {
DictNode head;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java
index 3c63427..8864de1 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/DictNode.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/DictNode.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class DictNode {
Object key;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java
index 1bcd12b..2ff4aae 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUface.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUface.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class GLUface {
public GLUface next; /* next face (never NULL) */
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java
index 3747bcf..c2128b6 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUhalfEdge.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUhalfEdge.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class GLUhalfEdge {
public GLUhalfEdge next; /* doubly-linked list (prev==Sym->next) */
@@ -58,10 +58,10 @@ class GLUhalfEdge {
public GLUhalfEdge Onext; /* next edge CCW around origin */
public GLUhalfEdge Lnext; /* next edge CCW around left face */
public GLUvertex Org; /* origin vertex (Overtex too long) */
- public com.sun.opengl.impl.glu.tessellator.GLUface Lface; /* left face */
+ public com.jogamp.opengl.impl.glu.tessellator.GLUface Lface; /* left face */
/* Internal data (keep hidden) */
- public com.sun.opengl.impl.glu.tessellator.ActiveRegion activeRegion; /* a region with this upper edge (sweep.c) */
+ public com.jogamp.opengl.impl.glu.tessellator.ActiveRegion activeRegion; /* a region with this upper edge (sweep.c) */
public int winding; /* change in winding number when crossing */
public boolean first;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java
index 4f753a2..493eb20 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUmesh.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUmesh.java
@@ -50,11 +50,11 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class GLUmesh {
GLUvertex vHead = new GLUvertex(); /* dummy header for vertex list */
- com.sun.opengl.impl.glu.tessellator.GLUface fHead = new GLUface(); /* dummy header for face list */
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eHead = new GLUhalfEdge(true); /* dummy header for edge list */
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false); /* and its symmetric counterpart */
+ com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = new GLUface(); /* dummy header for face list */
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHead = new GLUhalfEdge(true); /* dummy header for edge list */
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHeadSym = new GLUhalfEdge(false); /* and its symmetric counterpart */
}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
index 5155272..b219983 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUtessellatorImpl.java
@@ -50,9 +50,9 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
-import com.sun.opengl.impl.glu.tessellator.*;
+import com.jogamp.opengl.impl.glu.tessellator.*;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java
index 9c01148..af294ca 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/GLUvertex.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/GLUvertex.java
@@ -50,12 +50,12 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class GLUvertex {
public GLUvertex next; /* next vertex (never NULL) */
public GLUvertex prev; /* previous vertex (never NULL) */
- public com.sun.opengl.impl.glu.tessellator.GLUhalfEdge anEdge; /* a half-edge with this origin */
+ public com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge anEdge; /* a half-edge with this origin */
public Object data; /* client's data */
/* Internal data (keep hidden) */
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java
index 818dc66..2710346 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Geom.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Geom.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class Geom {
private Geom() {
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java
index a1e36e8..b8be9f8 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Mesh.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Mesh.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class Mesh {
private Mesh() {
@@ -61,19 +61,19 @@ class Mesh {
* No vertex or face structures are allocated, but these must be assigned
* before the current edge operation is completed.
*/
- static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge MakeEdge(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNext) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge ePrev;
+ static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge MakeEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNext) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge ePrev;
// EdgePair * pair = (EdgePair *)
// memAlloc(sizeof(EdgePair));
// if (pair == NULL) return NULL;
//
// e = &pair - > e;
- e = new com.sun.opengl.impl.glu.tessellator.GLUhalfEdge(true);
+ e = new com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge(true);
// eSym = &pair - > eSym;
- eSym = new com.sun.opengl.impl.glu.tessellator.GLUhalfEdge(false);
+ eSym = new com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge(false);
/* Make sure eNext points to the first edge of the edge pair */
@@ -115,9 +115,9 @@ class Mesh {
* depending on whether a and b belong to different face or vertex rings.
* For more explanation see __gl_meshSplice() below.
*/
- static void Splice(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge a, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge b) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge aOnext = a.Onext;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge bOnext = b.Onext;
+ static void Splice(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge a, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge b) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge aOnext = a.Onext;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge bOnext = b.Onext;
aOnext.Sym.Lnext = b;
bOnext.Sym.Lnext = a;
@@ -131,11 +131,11 @@ class Mesh {
* the new vertex *before* vNext so that algorithms which walk the vertex
* list will not see the newly created vertices.
*/
- static void MakeVertex(com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex,
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.sun.opengl.impl.glu.tessellator.GLUvertex vNext) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
- com.sun.opengl.impl.glu.tessellator.GLUvertex vPrev;
- com.sun.opengl.impl.glu.tessellator.GLUvertex vNew = newVertex;
+ static void MakeVertex(com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex,
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.jogamp.opengl.impl.glu.tessellator.GLUvertex vNext) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex vPrev;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex vNew = newVertex;
assert (vNew != null);
@@ -164,10 +164,10 @@ class Mesh {
* the new face *before* fNext so that algorithms which walk the face
* list will not see the newly created faces.
*/
- static void MakeFace(com.sun.opengl.impl.glu.tessellator.GLUface newFace, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.sun.opengl.impl.glu.tessellator.GLUface fNext) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
- com.sun.opengl.impl.glu.tessellator.GLUface fPrev;
- com.sun.opengl.impl.glu.tessellator.GLUface fNew = newFace;
+ static void MakeFace(com.jogamp.opengl.impl.glu.tessellator.GLUface newFace, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig, com.jogamp.opengl.impl.glu.tessellator.GLUface fNext) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface fNew = newFace;
assert (fNew != null);
@@ -199,8 +199,8 @@ class Mesh {
/* KillEdge( eDel ) destroys an edge (the half-edges eDel and eDel->Sym),
* and removes from the global edge list.
*/
- static void KillEdge(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge ePrev, eNext;
+ static void KillEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge ePrev, eNext;
/* Half-edges are allocated in pairs, see EdgePair above */
if (!eDel.first) {
@@ -218,9 +218,9 @@ class Mesh {
/* KillVertex( vDel ) destroys a vertex and removes it from the global
* vertex list. It updates the vertex loop to point to a given new vertex.
*/
- static void KillVertex(com.sun.opengl.impl.glu.tessellator.GLUvertex vDel, com.sun.opengl.impl.glu.tessellator.GLUvertex newOrg) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = vDel.anEdge;
- com.sun.opengl.impl.glu.tessellator.GLUvertex vPrev, vNext;
+ static void KillVertex(com.jogamp.opengl.impl.glu.tessellator.GLUvertex vDel, com.jogamp.opengl.impl.glu.tessellator.GLUvertex newOrg) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = vDel.anEdge;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex vPrev, vNext;
/* change the origin of all affected edges */
e = eStart;
@@ -239,9 +239,9 @@ class Mesh {
/* KillFace( fDel ) destroys a face and removes it from the global face
* list. It updates the face loop to point to a given new face.
*/
- static void KillFace(com.sun.opengl.impl.glu.tessellator.GLUface fDel, com.sun.opengl.impl.glu.tessellator.GLUface newLface) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = fDel.anEdge;
- com.sun.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
+ static void KillFace(com.jogamp.opengl.impl.glu.tessellator.GLUface fDel, com.jogamp.opengl.impl.glu.tessellator.GLUface newLface) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eStart = fDel.anEdge;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
/* change the left face of all affected edges */
e = eStart;
@@ -263,11 +263,11 @@ class Mesh {
/* __gl_meshMakeEdge creates one edge, two vertices, and a loop (face).
* The loop consists of the two new half-edges.
*/
- public static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshMakeEdge(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
- com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex1 = new com.sun.opengl.impl.glu.tessellator.GLUvertex();
- com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex2 = new com.sun.opengl.impl.glu.tessellator.GLUvertex();
- com.sun.opengl.impl.glu.tessellator.GLUface newFace = new com.sun.opengl.impl.glu.tessellator.GLUface();
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ public static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshMakeEdge(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex1 = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex2 = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
+ com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
e = MakeEdge(mesh.eHead);
if (e == null) return null;
@@ -302,7 +302,7 @@ class Mesh {
* If eDst == eOrg->Onext, the new vertex will have a single edge.
* If eDst == eOrg->Oprev, the old vertex will have a single edge.
*/
- public static boolean __gl_meshSplice(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
+ public static boolean __gl_meshSplice(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
boolean joiningLoops = false;
boolean joiningVertices = false;
@@ -323,7 +323,7 @@ class Mesh {
Splice(eDst, eOrg);
if (!joiningVertices) {
- com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.sun.opengl.impl.glu.tessellator.GLUvertex();
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
/* We split one vertex into two -- the new vertex is eDst.Org.
* Make sure the old vertex points to a valid half-edge.
@@ -332,7 +332,7 @@ class Mesh {
eOrg.Org.anEdge = eOrg;
}
if (!joiningLoops) {
- com.sun.opengl.impl.glu.tessellator.GLUface newFace = new com.sun.opengl.impl.glu.tessellator.GLUface();
+ com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
/* We split one loop into two -- the new loop is eDst.Lface.
* Make sure the old face points to a valid half-edge.
@@ -355,8 +355,8 @@ class Mesh {
* plus a few calls to memFree, but this would allocate and delete
* unnecessary vertices and faces.
*/
- static boolean __gl_meshDelete(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDelSym = eDel.Sym;
+ static boolean __gl_meshDelete(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDel) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDelSym = eDel.Sym;
boolean joiningLoops = false;
/* First step: disconnect the origin vertex eDel.Org. We make all
@@ -377,7 +377,7 @@ class Mesh {
Splice(eDel, eDel.Sym.Lnext);
if (!joiningLoops) {
- com.sun.opengl.impl.glu.tessellator.GLUface newFace = new com.sun.opengl.impl.glu.tessellator.GLUface();
+ com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
/* We are splitting one loop into two -- create a new loop for eDel. */
MakeFace(newFace, eDel, eDel.Lface);
@@ -415,9 +415,9 @@ class Mesh {
* eNew == eOrg.Lnext, and eNew.Dst is a newly created vertex.
* eOrg and eNew will have the same left face.
*/
- static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshAddEdgeVertex(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
+ static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshAddEdgeVertex(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
eNewSym = eNew.Sym;
@@ -427,7 +427,7 @@ class Mesh {
/* Set the vertex and face information */
eNew.Org = eOrg.Sym.Org;
{
- com.sun.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.sun.opengl.impl.glu.tessellator.GLUvertex();
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex newVertex = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex();
MakeVertex(newVertex, eNewSym, eNew.Org);
}
@@ -441,9 +441,9 @@ class Mesh {
* such that eNew == eOrg.Lnext. The new vertex is eOrg.Sym.Org == eNew.Org.
* eOrg and eNew will have the same left face.
*/
- public static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshSplitEdge(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNew;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg);
+ public static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshSplitEdge(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge tempHalfEdge = __gl_meshAddEdgeVertex(eOrg);
eNew = tempHalfEdge.Sym;
@@ -472,10 +472,10 @@ class Mesh {
* If (eOrg.Lnext == eDst), the old face is reduced to a single edge.
* If (eOrg.Lnext.Lnext == eDst), the old face is reduced to two edges.
*/
- static com.sun.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshConnect(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
+ static com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge __gl_meshConnect(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrg, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eDst) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNewSym;
boolean joiningLoops = false;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eNew = MakeEdge(eOrg);
eNewSym = eNew.Sym;
@@ -498,7 +498,7 @@ class Mesh {
eOrg.Lface.anEdge = eNewSym;
if (!joiningLoops) {
- com.sun.opengl.impl.glu.tessellator.GLUface newFace = new com.sun.opengl.impl.glu.tessellator.GLUface();
+ com.jogamp.opengl.impl.glu.tessellator.GLUface newFace = new com.jogamp.opengl.impl.glu.tessellator.GLUface();
/* We split one loop into two -- the new loop is eNew.Lface */
MakeFace(newFace, eNew, eOrg.Lface);
@@ -516,10 +516,10 @@ class Mesh {
* An entire mesh can be deleted by zapping its faces, one at a time,
* in any order. Zapped faces cannot be used in further mesh operations!
*/
- static void __gl_meshZapFace(com.sun.opengl.impl.glu.tessellator.GLUface fZap) {
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eStart = fZap.anEdge;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext, eSym;
- com.sun.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
+ static void __gl_meshZapFace(com.jogamp.opengl.impl.glu.tessellator.GLUface fZap) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart = fZap.anEdge;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext, eSym;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface fPrev, fNext;
/* walk around face, deleting edges whose right face is also null */
eNext = eStart.Lnext;
@@ -561,12 +561,12 @@ class Mesh {
/* __gl_meshNewMesh() creates a new mesh with no edges, no vertices,
* and no loops (what we usually call a "face").
*/
- public static com.sun.opengl.impl.glu.tessellator.GLUmesh __gl_meshNewMesh() {
- com.sun.opengl.impl.glu.tessellator.GLUvertex v;
- com.sun.opengl.impl.glu.tessellator.GLUface f;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
- com.sun.opengl.impl.glu.tessellator.GLUmesh mesh = new com.sun.opengl.impl.glu.tessellator.GLUmesh();
+ public static com.jogamp.opengl.impl.glu.tessellator.GLUmesh __gl_meshNewMesh() {
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex v;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface f;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eSym;
+ com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh = new com.jogamp.opengl.impl.glu.tessellator.GLUmesh();
v = mesh.vHead;
f = mesh.fHead;
@@ -609,13 +609,13 @@ class Mesh {
/* __gl_meshUnion( mesh1, mesh2 ) forms the union of all structures in
* both meshes, and returns the new mesh (the old meshes are destroyed).
*/
- static com.sun.opengl.impl.glu.tessellator.GLUmesh __gl_meshUnion(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh1, com.sun.opengl.impl.glu.tessellator.GLUmesh mesh2) {
- com.sun.opengl.impl.glu.tessellator.GLUface f1 = mesh1.fHead;
- com.sun.opengl.impl.glu.tessellator.GLUvertex v1 = mesh1.vHead;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e1 = mesh1.eHead;
- com.sun.opengl.impl.glu.tessellator.GLUface f2 = mesh2.fHead;
- com.sun.opengl.impl.glu.tessellator.GLUvertex v2 = mesh2.vHead;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e2 = mesh2.eHead;
+ static com.jogamp.opengl.impl.glu.tessellator.GLUmesh __gl_meshUnion(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh1, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh2) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUface f1 = mesh1.fHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex v1 = mesh1.vHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e1 = mesh1.eHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface f2 = mesh2.fHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex v2 = mesh2.vHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e2 = mesh2.eHead;
/* Add the faces, vertices, and edges of mesh2 to those of mesh1 */
if (f2.next != f2) {
@@ -645,8 +645,8 @@ class Mesh {
/* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
*/
- static void __gl_meshDeleteMeshZap(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
- com.sun.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
+ static void __gl_meshDeleteMeshZap(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
while (fHead.next != fHead) {
__gl_meshZapFace(fHead.next);
@@ -656,10 +656,10 @@ class Mesh {
/* __gl_meshDeleteMesh( mesh ) will free all storage for any valid mesh.
*/
- public static void __gl_meshDeleteMesh(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
- com.sun.opengl.impl.glu.tessellator.GLUface f, fNext;
- com.sun.opengl.impl.glu.tessellator.GLUvertex v, vNext;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext;
+ public static void __gl_meshDeleteMesh(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUface f, fNext;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vNext;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eNext;
for (f = mesh.fHead.next; f != mesh.fHead; f = fNext) {
fNext = f.next;
@@ -677,13 +677,13 @@ class Mesh {
/* __gl_meshCheckMesh( mesh ) checks a mesh for self-consistency.
*/
- public static void __gl_meshCheckMesh(com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
- com.sun.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
- com.sun.opengl.impl.glu.tessellator.GLUvertex vHead = mesh.vHead;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eHead = mesh.eHead;
- com.sun.opengl.impl.glu.tessellator.GLUface f, fPrev;
- com.sun.opengl.impl.glu.tessellator.GLUvertex v, vPrev;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, ePrev;
+ public static void __gl_meshCheckMesh(com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUface fHead = mesh.fHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex vHead = mesh.vHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eHead = mesh.eHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface f, fPrev;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vPrev;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, ePrev;
fPrev = fHead;
for (fPrev = fHead; (f = fPrev.next) != fHead; fPrev = f) {
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java
index cf6239d..fe1a20c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Normal.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Normal.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
@@ -110,17 +110,17 @@ class Normal {
}
static void ComputeNormal(GLUtessellatorImpl tess, double[] norm) {
- com.sun.opengl.impl.glu.tessellator.GLUvertex v, v1, v2;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, v1, v2;
double c, tLen2, maxLen2;
double[] maxVal, minVal, d1, d2, tNorm;
- com.sun.opengl.impl.glu.tessellator.GLUvertex[] maxVert, minVert;
- com.sun.opengl.impl.glu.tessellator.GLUvertex vHead = tess.mesh.vHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex[] maxVert, minVert;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex vHead = tess.mesh.vHead;
int i;
maxVal = new double[3];
minVal = new double[3];
- minVert = new com.sun.opengl.impl.glu.tessellator.GLUvertex[3];
- maxVert = new com.sun.opengl.impl.glu.tessellator.GLUvertex[3];
+ minVert = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex[3];
+ maxVert = new com.jogamp.opengl.impl.glu.tessellator.GLUvertex[3];
d1 = new double[3];
d2 = new double[3];
tNorm = new double[3];
@@ -194,9 +194,9 @@ class Normal {
static void CheckOrientation(GLUtessellatorImpl tess) {
double area;
- com.sun.opengl.impl.glu.tessellator.GLUface f, fHead = tess.mesh.fHead;
- com.sun.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface f, fHead = tess.mesh.fHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
/* When we compute the normal automatically, we choose the orientation
* so that the the sum of the signed areas of all contours is non-negative.
@@ -225,7 +225,7 @@ class Normal {
* of the polygon.
*/
public static void __gl_projectPolygon(GLUtessellatorImpl tess) {
- com.sun.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUvertex v, vHead = tess.mesh.vHead;
double w;
double[] norm = new double[3];
double[] sUnit, tUnit;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java
index 83914c1..b77305a 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQ.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQ.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
abstract class PriorityQ {
public static final int INIT_SIZE = 32;
@@ -76,7 +76,7 @@ abstract class PriorityQ {
/* Violates modularity, but a little faster */
// #include "geom.h"
public static boolean LEQ(Leq leq, Object x, Object y) {
- return com.sun.opengl.impl.glu.tessellator.Geom.VertLeq((com.sun.opengl.impl.glu.tessellator.GLUvertex) x, (com.sun.opengl.impl.glu.tessellator.GLUvertex) y);
+ return com.jogamp.opengl.impl.glu.tessellator.Geom.VertLeq((com.jogamp.opengl.impl.glu.tessellator.GLUvertex) x, (com.jogamp.opengl.impl.glu.tessellator.GLUvertex) y);
}
static PriorityQ pqNewPriorityQ(Leq leq) {
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java
index 7eec106..61aa957 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQHeap.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQHeap.java
@@ -50,25 +50,25 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
-class PriorityQHeap extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] nodes;
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] handles;
+class PriorityQHeap extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] nodes;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] handles;
int size, max;
int freeList;
boolean initialized;
- com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
/* really __gl_pqHeapNewPriorityQ */
- public PriorityQHeap(com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
+ public PriorityQHeap(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
size = 0;
- max = com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
- nodes = new com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
+ max = com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
+ nodes = new com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
for (int i = 0; i < nodes.length; i++) {
nodes[i] = new PQnode();
}
- handles = new com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
+ handles = new com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE + 1];
for (int i = 0; i < handles.length; i++) {
handles[i] = new PQhandleElem();
}
@@ -87,8 +87,8 @@ class PriorityQHeap extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
}
void FloatDown(int curr) {
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
int hCurr, hChild;
int child;
@@ -116,8 +116,8 @@ class PriorityQHeap extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
void FloatUp(int curr) {
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
int hCurr, hParent;
int parent;
@@ -158,8 +158,8 @@ class PriorityQHeap extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
curr = ++size;
if ((curr * 2) > max) {
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] saveNodes = nodes;
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] saveHandles = handles;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] saveNodes = nodes;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] saveHandles = handles;
/* If the heap overflows, double its size. */
max <<= 1;
@@ -208,8 +208,8 @@ class PriorityQHeap extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
/* really __gl_pqHeapExtractMin */
Object pqExtractMin() {
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
int hMin = n[1].handle;
Object min = h[hMin].key;
@@ -230,8 +230,8 @@ class PriorityQHeap extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
/* really __gl_pqHeapDelete */
void pqDelete(int hCurr) {
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
- com.sun.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQnode[] n = nodes;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.PQhandleElem[] h = handles;
int curr;
assert (hCurr >= 1 && hCurr <= max && h[hCurr].key != null);
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java
index 0b22e55..f115b8f 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/PriorityQSort.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/PriorityQSort.java
@@ -45,10 +45,10 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
-class PriorityQSort extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
- com.sun.opengl.impl.glu.tessellator.PriorityQHeap heap;
+class PriorityQSort extends com.jogamp.opengl.impl.glu.tessellator.PriorityQ {
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap heap;
Object[] keys;
// JAVA: 'order' contains indices into the keys array.
@@ -57,15 +57,15 @@ class PriorityQSort extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
int[] order;
int size, max;
boolean initialized;
- com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
+ com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq;
- public PriorityQSort(com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
- heap = new com.sun.opengl.impl.glu.tessellator.PriorityQHeap(leq);
+ public PriorityQSort(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq) {
+ heap = new com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap(leq);
- keys = new Object[com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE];
+ keys = new Object[com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE];
size = 0;
- max = com.sun.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
+ max = com.jogamp.opengl.impl.glu.tessellator.PriorityQ.INIT_SIZE;
initialized = false;
this.leq = leq;
}
@@ -77,12 +77,12 @@ class PriorityQSort extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
keys = null;
}
- private static boolean LT(com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
- return (!com.sun.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, y, x));
+ private static boolean LT(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
+ return (!com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, y, x));
}
- private static boolean GT(com.sun.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
- return (!com.sun.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, x, y));
+ private static boolean GT(com.jogamp.opengl.impl.glu.tessellator.PriorityQ.Leq leq, Object x, Object y) {
+ return (!com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, x, y));
}
private static void Swap(int[] array, int a, int b) {
@@ -249,7 +249,7 @@ class PriorityQSort extends com.sun.opengl.impl.glu.tessellator.PriorityQ {
sortMin = keys[order[size - 1]];
if (!heap.pqIsEmpty()) {
heapMin = heap.pqMinimum();
- if (com.sun.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) {
+ if (com.jogamp.opengl.impl.glu.tessellator.PriorityQHeap.LEQ(leq, heapMin, sortMin)) {
return heapMin;
}
}
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java
index a5e0ae8..9761200 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Render.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Render.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
@@ -73,19 +73,19 @@ class Render {
public FaceCount() {
}
- public FaceCount(long size, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eStart, renderCallBack render) {
+ public FaceCount(long size, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart, renderCallBack render) {
this.size = size;
this.eStart = eStart;
this.render = render;
}
long size; /* number of triangles used */
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eStart; /* edge where this primitive starts */
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eStart; /* edge where this primitive starts */
renderCallBack render;
};
private static interface renderCallBack {
- void render(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, long size);
+ void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size);
}
/************************ Strips and Fans decomposition ******************/
@@ -97,8 +97,8 @@ class Render {
*
* The rendering output is provided as callbacks (see the api).
*/
- public static void __gl_renderMesh(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
- com.sun.opengl.impl.glu.tessellator.GLUface f;
+ public static void __gl_renderMesh(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUface f;
/* Make a list of separate triangles so we can render them all at once */
tess.lonelyTriList = null;
@@ -124,7 +124,7 @@ class Render {
}
- static void RenderMaximumFaceGroup(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUface fOrig) {
+ static void RenderMaximumFaceGroup(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUface fOrig) {
/* We want to find the largest triangle fan or strip of unmarked faces
* which includes the given face fOrig. There are 3 possible fans
* passing through fOrig (one centered at each vertex), and 3 possible
@@ -132,7 +132,7 @@ class Render {
* is to try all of these, and take the primitive which uses the most
* triangles (a greedy approach).
*/
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e = fOrig.anEdge;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e = fOrig.anEdge;
FaceCount max = new FaceCount();
FaceCount newFace = new FaceCount();
@@ -178,17 +178,17 @@ class Render {
* more complicated, and we need a general tracking method like the
* one here.
*/
- private static boolean Marked(com.sun.opengl.impl.glu.tessellator.GLUface f) {
+ private static boolean Marked(com.jogamp.opengl.impl.glu.tessellator.GLUface f) {
return !f.inside || f.marked;
}
- private static GLUface AddToTrail(com.sun.opengl.impl.glu.tessellator.GLUface f, com.sun.opengl.impl.glu.tessellator.GLUface t) {
+ private static GLUface AddToTrail(com.jogamp.opengl.impl.glu.tessellator.GLUface f, com.jogamp.opengl.impl.glu.tessellator.GLUface t) {
f.trail = t;
f.marked = true;
return f;
}
- private static void FreeTrail(com.sun.opengl.impl.glu.tessellator.GLUface t) {
+ private static void FreeTrail(com.jogamp.opengl.impl.glu.tessellator.GLUface t) {
if (true) {
while (t != null) {
t.marked = false;
@@ -199,14 +199,14 @@ class Render {
}
}
- static FaceCount MaximumFan(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
+ static FaceCount MaximumFan(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
/* eOrig.Lface is the face we want to render. We want to find the size
* of a maximal fan around eOrig.Org. To do this we just walk around
* the origin vertex as far as possible in both directions.
*/
FaceCount newFace = new FaceCount(0, null, renderFan);
- com.sun.opengl.impl.glu.tessellator.GLUface trail = null;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface trail = null;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
for (e = eOrig; !Marked(e.Lface); e = e.Onext) {
trail = AddToTrail(e.Lface, trail);
@@ -227,7 +227,7 @@ class Render {
return (n & 0x1L) == 0;
}
- static FaceCount MaximumStrip(com.sun.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
+ static FaceCount MaximumStrip(com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge eOrig) {
/* Here we are looking for a maximal strip that contains the vertices
* eOrig.Org, eOrig.Dst, eOrig.Lnext.Dst (in that order or the
* reverse, such that all triangles are oriented CCW).
@@ -240,8 +240,8 @@ class Render {
*/
FaceCount newFace = new FaceCount(0, null, renderStrip);
long headSize = 0, tailSize = 0;
- com.sun.opengl.impl.glu.tessellator.GLUface trail = null;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, eTail, eHead;
+ com.jogamp.opengl.impl.glu.tessellator.GLUface trail = null;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, eTail, eHead;
for (e = eOrig; !Marked(e.Lface); ++tailSize, e = e.Onext) {
trail = AddToTrail(e.Lface, trail);
@@ -279,7 +279,7 @@ class Render {
}
private static class RenderTriangle implements renderCallBack {
- public void render(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+ public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
/* Just add the triangle to a triangle list, so we can render all
* the separate triangles at once.
*/
@@ -289,11 +289,11 @@ class Render {
}
- static void RenderLonelyTriangles(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUface f) {
+ static void RenderLonelyTriangles(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUface f) {
/* Now we render all the separate triangles which could not be
* grouped into a triangle fan or strip.
*/
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
int newState;
int edgeState = -1; /* force edge state output for first vertex */
@@ -323,7 +323,7 @@ class Render {
}
private static class RenderFan implements renderCallBack {
- public void render(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+ public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
/* Render as many CCW triangles as possible in a fan starting from
* edge "e". The fan *should* contain exactly "size" triangles
* (otherwise we've goofed up somewhere).
@@ -345,7 +345,7 @@ class Render {
}
private static class RenderStrip implements renderCallBack {
- public void render(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
+ public void render(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e, long size) {
/* Render as many CCW triangles as possible in a strip starting from
* edge "e". The strip *should* contain exactly "size" triangles
* (otherwise we've goofed up somewhere).
@@ -378,9 +378,9 @@ class Render {
* contour for each face marked "inside". The rendering output is
* provided as callbacks (see the api).
*/
- public static void __gl_renderBoundary(GLUtessellatorImpl tess, com.sun.opengl.impl.glu.tessellator.GLUmesh mesh) {
- com.sun.opengl.impl.glu.tessellator.GLUface f;
- com.sun.opengl.impl.glu.tessellator.GLUhalfEdge e;
+ public static void __gl_renderBoundary(GLUtessellatorImpl tess, com.jogamp.opengl.impl.glu.tessellator.GLUmesh mesh) {
+ com.jogamp.opengl.impl.glu.tessellator.GLUface f;
+ com.jogamp.opengl.impl.glu.tessellator.GLUhalfEdge e;
for (f = mesh.fHead.next; f != mesh.fHead; f = f.next) {
if (f.inside) {
@@ -409,7 +409,7 @@ class Render {
* are degenerate return 0; otherwise (no consistent orientation) return
* SIGN_INCONSISTENT.
*/ {
- com.sun.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
+ com.jogamp.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
// CachedVertex vn = v0 + tess.cacheCount;
int vn = tess.cacheCount;
// CachedVertex vc;
@@ -488,7 +488,7 @@ class Render {
* output is provided as callbacks (see the api).
*/
public static boolean __gl_renderCache(GLUtessellatorImpl tess) {
- com.sun.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
+ com.jogamp.opengl.impl.glu.tessellator.CachedVertex[] v = tess.cache;
// CachedVertex vn = v0 + tess.cacheCount;
int vn = tess.cacheCount;
// CachedVertex vc;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java
index 140cdcf..8ffeadb 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/Sweep.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/Sweep.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java
index f4c9545..ef89b16 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessMono.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessMono.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class TessMono {
/* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region
diff --git a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java
index 73ac7eb..a8aa41d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/glu/tessellator/TessState.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/glu/tessellator/TessState.java
@@ -50,7 +50,7 @@
** Java Port: Pepijn Van Eeckhoudt, July 2003
** Java Port: Nathan Parker Burg, August 2003
*/
-package com.sun.opengl.impl.glu.tessellator;
+package com.jogamp.opengl.impl.glu.tessellator;
class TessState {
public static final int T_DORMANT = 0;
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
index ef3e9f9..bf4023c 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLContext.java
@@ -37,14 +37,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import java.nio.*;
import java.util.*;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
public abstract class MacOSXCGLContext extends GLContextImpl
{
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
index b417668..2b91eb5 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
public abstract class MacOSXCGLDrawable extends GLDrawableImpl {
// The Java2D/OpenGL pipeline on OS X uses low-level CGLContextObjs
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
index be18ee2..c085999 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -37,16 +37,16 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import java.lang.reflect.InvocationTargetException;
import java.nio.*;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
public MacOSXCGLDrawableFactory() {
@@ -57,7 +57,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl implements D
new MacOSXCGLGraphicsConfigurationFactory();
try {
- NWReflection.createInstance("com.sun.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory",
+ NWReflection.createInstance("com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLGraphicsConfigurationFactory",
new Object[] {});
} catch (Throwable t) { }
}
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
index c94efc9..889d1c3 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java
@@ -33,13 +33,10 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
-import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
public class MacOSXCGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
long pixelformat;
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
index 7c2c7b7..ab53e49 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXCGLGraphicsConfigurationFactory.java
@@ -30,14 +30,14 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import javax.media.nativewindow.*;
import javax.media.nativewindow.macosx.*;
import com.sun.nativewindow.impl.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
are used on OSX platforms. Toolkits will likely need to delegate
@@ -45,7 +45,7 @@ import com.sun.opengl.impl.*;
GraphicsDevice and GraphicsConfiguration abstractions. */
public class MacOSXCGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
- protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
+ protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
public MacOSXCGLGraphicsConfigurationFactory() {
GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.macosx.MacOSXGraphicsDevice.class, this);
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
index 0e468e5..239eedd 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXExternalCGLContext.java
@@ -37,10 +37,10 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import javax.media.nativewindow.*;
import com.sun.nativewindow.impl.NullWindow;
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
index b60c482..8b8bb46 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLContext.java
@@ -37,10 +37,10 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class MacOSXOffscreenCGLContext extends MacOSXPbufferCGLContext
{
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
index 3448b00..adaa48f 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class MacOSXOffscreenCGLDrawable extends MacOSXPbufferCGLDrawable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
index 4a3e0a8..4c64864 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java
@@ -37,13 +37,13 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class MacOSXOnscreenCGLContext extends MacOSXCGLContext {
protected MacOSXOnscreenCGLDrawable drawable;
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
index 56951ae..6ee0238 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import java.lang.ref.WeakReference;
import java.security.*;
@@ -45,7 +45,7 @@ import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class MacOSXOnscreenCGLDrawable extends MacOSXCGLDrawable {
private List/*<WeakReference<GLContext>>*/ createdContexts =
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
index 0754c4b..1313753 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java
@@ -1,11 +1,11 @@
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import java.security.*;
import java.util.*;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class MacOSXPbufferCGLContext extends MacOSXCGLContext {
protected MacOSXPbufferCGLDrawable drawable;
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
index f57952b..eb6de92 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl;
+package com.jogamp.opengl.impl.macosx.cgl;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
private static final boolean DEBUG = Debug.debug("MacOSXPbufferCGLDrawable");
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
index d100ab4..cc973c5 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLDrawableFactory.java
@@ -37,15 +37,15 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl.awt;
+package com.jogamp.opengl.impl.macosx.cgl.awt;
import java.lang.reflect.InvocationTargetException;
import java.nio.*;
import java.util.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.awt.*;
-import com.sun.opengl.impl.macosx.cgl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.awt.*;
+import com.jogamp.opengl.impl.macosx.cgl.*;
public class MacOSXAWTCGLDrawableFactory extends MacOSXCGLDrawableFactory {
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
index 5e43eea..97d5e8d 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXAWTCGLGraphicsConfigurationFactory.java
@@ -30,7 +30,7 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.macosx.cgl.awt;
+package com.jogamp.opengl.impl.macosx.cgl.awt;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
@@ -41,13 +41,13 @@ import javax.media.nativewindow.awt.*;
import javax.media.opengl.*;
import javax.media.opengl.awt.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.macosx.cgl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.macosx.cgl.*;
import com.sun.nativewindow.impl.jawt.*;
import com.sun.nativewindow.impl.jawt.macosx.*;
public class MacOSXAWTCGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
- protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
+ protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
public MacOSXAWTCGLGraphicsConfigurationFactory() {
GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
index 22b0ffe..9010d44 100644
--- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/macosx/cgl/awt/MacOSXJava2DCGLContext.java
@@ -37,15 +37,15 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.macosx.cgl.awt;
+package com.jogamp.opengl.impl.macosx.cgl.awt;
-import com.sun.opengl.impl.macosx.cgl.*;
+import com.jogamp.opengl.impl.macosx.cgl.*;
import java.awt.Graphics;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.awt.*;
-import com.sun.opengl.impl.macosx.cgl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.awt.*;
+import com.jogamp.opengl.impl.macosx.cgl.*;
/** MacOSXCGLContext implementation supporting the Java2D/JOGL bridge
* on Mac OS X. The external GLDrawable mechanism does not work on Mac
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
index f1e9483..89a25fe 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java
@@ -37,10 +37,10 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NullWindow;
public class WindowsDummyWGLDrawable extends WindowsWGLDrawable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
index b433b6b..25691ab 100755
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLContext.java
@@ -37,13 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
-import java.nio.*;
-import java.util.*;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NullWindow;
public class WindowsExternalWGLContext extends WindowsWGLContext {
@@ -53,7 +51,7 @@ public class WindowsExternalWGLContext extends WindowsWGLContext {
private WindowsExternalWGLContext(Drawable drawable, long hglrc, WindowsWGLGraphicsConfiguration cfg) {
super(drawable, null);
- this.hglrc = hglrc;
+ this.context = hglrc;
if (DEBUG) {
System.err.println(getThreadName() + ": !!! Created external OpenGL context " + toHexString(hglrc) + " for " + this);
}
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
index 9b87afc..f5b8984 100755
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NullWindow;
public class WindowsExternalWGLDrawable extends WindowsWGLDrawable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
index 9f0a5d2..25d93b5 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLContext.java
@@ -37,10 +37,10 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class WindowsOffscreenWGLContext extends WindowsWGLContext {
public WindowsOffscreenWGLContext(WindowsOffscreenWGLDrawable drawable,
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
index cd04918..88bfb3b 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NullWindow;
public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
index 2261f77..aeb1311 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java
@@ -37,13 +37,13 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class WindowsOnscreenWGLContext extends WindowsWGLContext {
protected WindowsOnscreenWGLDrawable drawable;
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
index 395ccf7..401b8c3 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class WindowsOnscreenWGLDrawable extends WindowsWGLDrawable {
protected WindowsOnscreenWGLDrawable(GLDrawableFactory factory, NativeWindow component) {
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
index 9c492e2..b0524bc 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java
@@ -37,10 +37,10 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class WindowsPbufferWGLContext extends WindowsWGLContext {
private static final boolean DEBUG = Debug.debug("WindowsPbufferWGLContext");
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
index c324b1c..c7034e9 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable {
private long cachedParentHdc;
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
index 497e9f0..08c7753 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java
@@ -37,14 +37,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import java.nio.*;
import java.util.*;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
public class WindowsWGLContext extends GLContextImpl {
protected long hglrc;
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
index 91604d1..c76766b 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawable.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
public abstract class WindowsWGLDrawable extends GLDrawableImpl {
private static final int MAX_SET_PIXEL_FORMAT_FAIL_COUNT = 5;
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
index e371791..38b9bac 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java
@@ -37,15 +37,15 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import java.nio.*;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NWReflection;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
import com.sun.nativewindow.impl.NullWindow;
public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements DynamicLookupHelper {
@@ -65,7 +65,7 @@ public class WindowsWGLDrawableFactory extends GLDrawableFactoryImpl implements
// The act of constructing them causes them to be registered
new WindowsWGLGraphicsConfigurationFactory();
try {
- NWReflection.createInstance("com.sun.opengl.impl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory",
+ NWReflection.createInstance("com.jogamp.opengl.impl.windows.wgl.awt.WindowsAWTWGLGraphicsConfigurationFactory",
new Object[] {});
} catch (Throwable t) { }
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
index d6ea21b..bb59434 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfiguration.java
@@ -30,17 +30,17 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
public class WindowsWGLGraphicsConfiguration extends DefaultGraphicsConfiguration implements Cloneable {
// Keep this under the same debug flag as the drawable factory for convenience
- protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
+ protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
protected static final int MAX_PFORMATS = 256;
protected static final int MAX_ATTRIBS = 256;
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index 229042d..06590a9 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -30,14 +30,14 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.windows.wgl;
+package com.jogamp.opengl.impl.windows.wgl;
import javax.media.nativewindow.*;
import javax.media.nativewindow.windows.*;
import com.sun.nativewindow.impl.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
are used on Windows platforms. Toolkits will likely need to delegate
@@ -45,7 +45,7 @@ import com.sun.opengl.impl.*;
GraphicsDevice and GraphicsConfiguration abstractions. */
public class WindowsWGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
- protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
+ protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
public WindowsWGLGraphicsConfigurationFactory() {
GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.windows.WindowsGraphicsDevice.class, this);
diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
index f4c0a80..4458fb1 100644
--- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java
@@ -30,7 +30,7 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.windows.wgl.awt;
+package com.jogamp.opengl.impl.windows.wgl.awt;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
@@ -41,13 +41,13 @@ import javax.media.nativewindow.awt.*;
import javax.media.opengl.*;
import javax.media.opengl.awt.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.windows.wgl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.windows.wgl.*;
import com.sun.nativewindow.impl.jawt.*;
import com.sun.nativewindow.impl.jawt.windows.*;
public class WindowsAWTWGLGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
- protected static final boolean DEBUG = com.sun.opengl.impl.Debug.debug("GraphicsConfiguration");
+ protected static final boolean DEBUG = com.jogamp.opengl.impl.Debug.debug("GraphicsConfiguration");
public WindowsAWTWGLGraphicsConfigurationFactory() {
GraphicsConfigurationFactory.registerFactory(javax.media.nativewindow.awt.AWTGraphicsDevice.class, this);
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
index 418d315..cbd9801 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/GLXUtil.java
@@ -30,11 +30,11 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import javax.media.nativewindow.NativeWindowFactory;
import com.sun.nativewindow.impl.x11.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
index 7e37558..b94dac1 100755
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXContext.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.nativewindow.*;
import javax.media.nativewindow.x11.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NullWindow;
import com.sun.nativewindow.impl.x11.*;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
index 75a6b22..261b1b3 100755
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
@@ -37,16 +37,16 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.nativewindow.*;
import javax.media.nativewindow.x11.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NullWindow;
import com.sun.nativewindow.impl.x11.*;
-import com.sun.gluegen.runtime.PointerBuffer;
+import com.jogamp.gluegen.runtime.PointerBuffer;
public class X11ExternalGLXDrawable extends X11GLXDrawable {
private int fbConfigID;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index 330d0a4..629bcb0 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -37,17 +37,17 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import java.nio.*;
import java.util.*;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.x11.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.glx.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.glx.*;
import com.sun.nativewindow.impl.x11.*;
-import com.sun.gluegen.runtime.ProcAddressTable;
+import com.jogamp.gluegen.runtime.ProcAddressTable;
public abstract class X11GLXContext extends GLContextImpl {
protected long context;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
index c2a1987..fe030af 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawable.java
@@ -37,13 +37,13 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.x11.*;
-import com.sun.gluegen.runtime.DynamicLookupHelper;
+import com.jogamp.gluegen.runtime.DynamicLookupHelper;
public abstract class X11GLXDrawable extends GLDrawableImpl {
protected X11GLXDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized) {
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
index 09bea72..089a516 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXDrawableFactory.java
@@ -34,7 +34,7 @@
* facility.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import java.nio.*;
import java.security.*;
@@ -42,10 +42,10 @@ import java.util.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.x11.*;
import javax.media.opengl.*;
-import com.sun.gluegen.runtime.*;
-import com.sun.gluegen.runtime.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.glx.*;
+import com.jogamp.gluegen.runtime.*;
+import com.jogamp.gluegen.runtime.opengl.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.glx.*;
import com.sun.nativewindow.impl.NullWindow;
import com.sun.nativewindow.impl.NWReflection;
import com.sun.nativewindow.impl.x11.*;
@@ -60,7 +60,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl implements Dyna
// The act of constructing them causes them to be registered
new X11GLXGraphicsConfigurationFactory();
try {
- NWReflection.createInstance("com.sun.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
+ NWReflection.createInstance("com.jogamp.opengl.impl.x11.glx.awt.X11AWTGLXGraphicsConfigurationFactory",
new Object[] {});
} catch (Throwable t) { }
}
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
index e1dca3a..4986055 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfiguration.java
@@ -30,15 +30,15 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.x11.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.gluegen.runtime.NativeLibrary;
-import com.sun.gluegen.runtime.PointerBuffer;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.gluegen.runtime.NativeLibrary;
+import com.jogamp.gluegen.runtime.PointerBuffer;
import com.sun.nativewindow.impl.x11.*;
public class X11GLXGraphicsConfiguration extends X11GraphicsConfiguration implements Cloneable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 808f2ab..1ddac90 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -30,7 +30,7 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.nativewindow.*;
import javax.media.nativewindow.x11.*;
@@ -38,10 +38,10 @@ import com.sun.nativewindow.impl.NativeWindowFactoryImpl;
import com.sun.nativewindow.impl.x11.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.glx.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.glx.*;
-import com.sun.gluegen.runtime.PointerBuffer;
+import com.jogamp.gluegen.runtime.PointerBuffer;
/** Subclass of GraphicsConfigurationFactory used when non-AWT tookits
are used on X11 platforms. Toolkits will likely need to delegate
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
index 7a38f0c..306a711 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.*;
public class X11OffscreenGLXContext extends X11GLXContext {
private X11OffscreenGLXDrawable drawable;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
index 30772f8..7d866a2 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.x11.*;
public class X11OffscreenGLXDrawable extends X11GLXDrawable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java
index a73b411..c89a5ef 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXContext.java
@@ -37,14 +37,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import java.util.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.*;
public class X11OnscreenGLXContext extends X11GLXContext {
// This indicates whether the context we have created is indirect
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
index 4a81448..43468b8 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.*;
public class X11OnscreenGLXDrawable extends X11GLXDrawable {
protected X11OnscreenGLXDrawable(GLDrawableFactory factory, NativeWindow component) {
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
index 3938c0e..e0993ab 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.*;
public class X11PbufferGLXContext extends X11GLXContext {
private X11PbufferGLXDrawable drawable;
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
index e87ef54..3e01222 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXDrawable.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.impl.x11.glx;
+package com.jogamp.opengl.impl.x11.glx;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.x11.glx.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.x11.glx.*;
import com.sun.nativewindow.impl.x11.*;
public class X11PbufferGLXDrawable extends X11GLXDrawable {
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
index 1b92e6f..3b2c8f5 100644
--- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java
@@ -30,7 +30,7 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.impl.x11.glx.awt;
+package com.jogamp.opengl.impl.x11.glx.awt;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
@@ -41,12 +41,12 @@ import javax.media.nativewindow.awt.*;
import javax.media.opengl.*;
import javax.media.opengl.awt.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.jawt.*;
import com.sun.nativewindow.impl.jawt.x11.*;
import com.sun.nativewindow.impl.x11.*;
-import com.sun.opengl.impl.x11.*;
-import com.sun.opengl.impl.x11.glx.*;
+import com.jogamp.opengl.impl.x11.*;
+import com.jogamp.opengl.impl.x11.glx.*;
public class X11AWTGLXGraphicsConfigurationFactory extends GraphicsConfigurationFactory {
protected static final boolean DEBUG = Debug.debug("GraphicsConfiguration");
diff --git a/src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java b/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java
index 9809e44..d8e1cf0 100644
--- a/src/jogl/classes/com/sun/opengl/util/AWTAnimatorImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/AWTAnimatorImpl.java
@@ -30,7 +30,7 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.awt.Component;
import java.awt.EventQueue;
diff --git a/src/jogl/classes/com/sun/opengl/util/Animator.java b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
index 1d4b832..30be0bd 100755
--- a/src/jogl/classes/com/sun/opengl/util/Animator.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
@@ -37,13 +37,13 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.util.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
/** <P> An Animator can be attached to one or more {@link
GLAutoDrawable}s to drive their display() methods in a loop. </P>
@@ -72,7 +72,7 @@ public class Animator {
if(GLProfile.isAWTJOGLAvailable()) {
try {
- impl = (AnimatorImpl) Class.forName("com.sun.opengl.util.awt.AWTAnimatorImpl").newInstance();
+ impl = (AnimatorImpl) Class.forName("com.jogamp.opengl.util.awt.AWTAnimatorImpl").newInstance();
} catch (Exception e) { }
}
if(null==impl) {
diff --git a/src/jogl/classes/com/sun/opengl/util/AnimatorImpl.java b/src/jogl/classes/com/jogamp/opengl/util/AnimatorImpl.java
index 8bba4b7..50b91b7 100644
--- a/src/jogl/classes/com/sun/opengl/util/AnimatorImpl.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/AnimatorImpl.java
@@ -30,7 +30,7 @@
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.util.*;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp
index 40f0355..2f82487 100755
--- a/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javame_cdc_fp
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.GL;
import javax.media.opengl.GL2;
diff --git a/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase
index d02f3d1..fde1e86 100755
--- a/src/jogl/classes/com/sun/opengl/util/BufferUtil.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/BufferUtil.java.javase
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.GL;
import javax.media.opengl.GL2;
diff --git a/src/jogl/classes/com/sun/opengl/util/FBObject.java b/src/jogl/classes/com/jogamp/opengl/util/FBObject.java
index 84b79df..4920ed5 100755
--- a/src/jogl/classes/com/sun/opengl/util/FBObject.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/FBObject.java
@@ -31,7 +31,7 @@
*
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/FPSAnimator.java b/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java
index 290de89..75c4cdf 100755
--- a/src/jogl/classes/com/sun/opengl/util/FPSAnimator.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.util.*;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/FileUtil.java b/src/jogl/classes/com/jogamp/opengl/util/FileUtil.java
index 84b8468..6ad0da8 100755
--- a/src/jogl/classes/com/sun/opengl/util/FileUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/FileUtil.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.io.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/FixedPoint.java b/src/jogl/classes/com/jogamp/opengl/util/FixedPoint.java
index e9bdae0..6412db5 100644
--- a/src/jogl/classes/com/sun/opengl/util/FixedPoint.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/FixedPoint.java
@@ -31,7 +31,7 @@
*
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
public class FixedPoint {
public static final int toFixed(int value) {
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
index ec4c5e3..f8951f0 100644
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataClient.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
@@ -1,13 +1,13 @@
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.security.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.glsl.*;
-import com.sun.opengl.impl.SystemUtil;
+import com.jogamp.opengl.impl.SystemUtil;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataEditable.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataEditable.java
index c8fcbf5..0f8ed27 100644
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataEditable.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataEditable.java
@@ -1,5 +1,5 @@
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java
index dc233ce..c061e21 100644
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataServer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java
@@ -1,10 +1,10 @@
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.*;
import java.nio.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.glsl.*;
public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataEditable {
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
index 72e7c19..aa30598 100644
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayDataWrapper.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataWrapper.java
@@ -1,9 +1,9 @@
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.*;
-import com.sun.opengl.util.glsl.fixedfunc.impl.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.impl.*;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/GLArrayHandler.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java
index 9443ad6..bfabb5b 100644
--- a/src/jogl/classes/com/sun/opengl/util/GLArrayHandler.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java
@@ -1,5 +1,5 @@
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/GLFixedArrayHandler.java b/src/jogl/classes/com/jogamp/opengl/util/GLFixedArrayHandler.java
index f1e2502..f0f5ea8 100644
--- a/src/jogl/classes/com/sun/opengl/util/GLFixedArrayHandler.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLFixedArrayHandler.java
@@ -1,9 +1,9 @@
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.*;
import javax.media.opengl.fixedfunc.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
import java.nio.*;
public class GLFixedArrayHandler implements GLArrayHandler {
diff --git a/src/jogl/classes/com/sun/opengl/util/Gamma.java b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
index da0d7bd..672325c 100755
--- a/src/jogl/classes/com/sun/opengl/util/Gamma.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/Gamma.java
@@ -37,10 +37,10 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
/** 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/sun/opengl/util/ImmModeSink.java b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
index 65c676f..9824918 100644
--- a/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/ImmModeSink.java
@@ -1,5 +1,5 @@
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import javax.media.opengl.*;
import javax.media.opengl.fixedfunc.*;
@@ -746,7 +746,7 @@ public class ImmModeSink {
public void enableBufferGLSL(GL gl, boolean enable) {
GL2ES2 glsl = gl.getGL2ES2();
- com.sun.opengl.util.glsl.ShaderState st = com.sun.opengl.util.glsl.ShaderState.getCurrent();
+ com.jogamp.opengl.util.glsl.ShaderState st = com.jogamp.opengl.util.glsl.ShaderState.getCurrent();
if(null==st) {
throw new GLException("No ShaderState current");
}
diff --git a/src/jogl/classes/com/sun/opengl/util/Locator.java b/src/jogl/classes/com/jogamp/opengl/util/Locator.java
index 06cd50c..c524c08 100644
--- a/src/jogl/classes/com/sun/opengl/util/Locator.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/Locator.java
@@ -31,7 +31,7 @@
*
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.util.*;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
index 4211e89..9cf4180 100755
--- a/src/jogl/classes/com/sun/opengl/util/PMVMatrix.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -31,9 +31,9 @@
*
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
-import com.sun.opengl.impl.ProjectFloat;
+import com.jogamp.opengl.impl.ProjectFloat;
import java.nio.*;
import java.util.ArrayList;
diff --git a/src/jogl/classes/com/sun/opengl/util/StreamUtil.java b/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
index 8ad7317..294f863 100755
--- a/src/jogl/classes/com/sun/opengl/util/StreamUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/StreamUtil.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.io.*;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/TGAWriter.java b/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java
index c5b1041..c53cafd 100755
--- a/src/jogl/classes/com/sun/opengl/util/TGAWriter.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/TGAWriter.java
@@ -34,7 +34,7 @@
* facility.
*/
-package com.sun.opengl.util;
+package com.jogamp.opengl.util;
import java.io.*;
import java.nio.*;
@@ -43,8 +43,8 @@ import java.nio.channels.*;
/**
* Utility class which helps take fast screenshots of OpenGL rendering
* results into Targa-format files. Used by the {@link
- * com.sun.opengl.util.gl2.Screenshot Screenshot} class; can also be used
- * in conjunction with the {@link com.sun.opengl.util.gl2.TileRenderer
+ * com.jogamp.opengl.util.gl2.Screenshot Screenshot} class; can also be used
+ * in conjunction with the {@link com.jogamp.opengl.util.gl2.TileRenderer
* TileRenderer} class. <P>
*/
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/ImageUtil.java b/src/jogl/classes/com/jogamp/opengl/util/awt/ImageUtil.java
index 534ab44..a3139b1 100755
--- a/src/jogl/classes/com/sun/opengl/util/awt/ImageUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/ImageUtil.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.awt;
+package com.jogamp.opengl.util.awt;
import java.awt.*;
import java.awt.image.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/Overlay.java b/src/jogl/classes/com/jogamp/opengl/util/awt/Overlay.java
index 5a54a71..1275c93 100755
--- a/src/jogl/classes/com/sun/opengl/util/awt/Overlay.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/Overlay.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.awt;
+package com.jogamp.opengl.util.awt;
import java.awt.Graphics2D;
import javax.media.opengl.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
/** Provides a Java 2D overlay on top of an arbitrary GLDrawable,
making it easier to do things like draw text and images on top of
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/Screenshot.java b/src/jogl/classes/com/jogamp/opengl/util/awt/Screenshot.java
index 5509944..7019d72 100755
--- a/src/jogl/classes/com/sun/opengl/util/awt/Screenshot.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/Screenshot.java
@@ -34,7 +34,7 @@
* facility.
*/
-package com.sun.opengl.util.awt;
+package com.jogamp.opengl.util.awt;
import java.awt.image.*;
import java.io.*;
@@ -46,7 +46,7 @@ import javax.media.opengl.*;
import javax.media.opengl.glu.*;
import javax.media.opengl.glu.gl2.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
/** Utilities for taking screenshots of OpenGL applications. */
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
index 059ead6..1fbdade 100755
--- a/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
@@ -36,13 +36,13 @@
* Sun gratefully acknowledges that this software was originally authored
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.awt;
+package com.jogamp.opengl.util.awt;
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.packrect.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.awt.*;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.packrect.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.awt.*;
import java.awt.AlphaComposite;
import java.awt.Color;
@@ -114,7 +114,7 @@ import javax.media.opengl.awt.*;
pack both glyphs and full Strings' rendering results (which are
variable size) onto a larger OpenGL texture. The internal backing
store is maintained using a {@link
- com.sun.opengl.util.awt.TextureRenderer TextureRenderer}. A least
+ com.jogamp.opengl.util.awt.TextureRenderer TextureRenderer}. A least
recently used (LRU) algorithm is used to discard previously
rendered strings; the specific algorithm is undefined, but is
currently implemented by flushing unused Strings' rendering
@@ -442,7 +442,7 @@ public class TextRenderer {
one, where each component ranges from 0.0f - 1.0f. The alpha
component, if used, does not need to be premultiplied into the
color channels as described in the documentation for {@link
- com.sun.opengl.util.texture.Texture Texture}, although
+ com.jogamp.opengl.util.texture.Texture Texture}, although
premultiplied colors are used internally. The default color is
opaque white.
diff --git a/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextureRenderer.java
index 86ea1db..bc5aa51 100755
--- a/src/jogl/classes/com/sun/opengl/util/awt/TextureRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextureRenderer.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.awt;
+package com.jogamp.opengl.util.awt;
import java.awt.Color;
import java.awt.Dimension;
@@ -49,12 +49,12 @@ import java.awt.image.*;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
import javax.media.opengl.glu.gl2.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.spi.*;
-import com.sun.opengl.util.texture.awt.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.texture.awt.*;
/** Provides the ability to render into an OpenGL {@link
- com.sun.opengl.util.texture.Texture Texture} using the Java 2D
+ com.jogamp.opengl.util.texture.Texture Texture} using the Java 2D
APIs. This renderer class uses an internal Java 2D image (of
unspecified type) for its backing store and flushes portions of
that image to an OpenGL texture on demand. The resulting OpenGL
@@ -389,7 +389,7 @@ public class TextureRenderer {
Each component ranges from 0.0f - 1.0f. The alpha component, if
used, does not need to be premultiplied into the color channels
as described in the documentation for {@link
- com.sun.opengl.util.texture.Texture Texture}, although
+ com.jogamp.opengl.util.texture.Texture Texture}, although
premultiplied colors are used internally. The default color is
opaque white.
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/BitmapCharRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapCharRec.java
index 9738be6..34685e1 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/BitmapCharRec.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapCharRec.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/BitmapFontRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapFontRec.java
index d110c26..18f7d3b 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/BitmapFontRec.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/BitmapFontRec.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/CoordRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/CoordRec.java
index e87354d..9ad95ec 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/CoordRec.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/CoordRec.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUT.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUT.java
index 5a1f7d1..8befc13 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUT.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUT.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap8x13.java
index b6e5c42..07ded65 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap8x13.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTBitmap8x13 {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap9x15.java
index bba9a8f..5d357f3 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmap9x15.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTBitmap9x15 {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica10.java
index cca045f..b9c7e6e 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica10.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTBitmapHelvetica10 {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica12.java
index b73c82f..bc86f62 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica12.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTBitmapHelvetica12 {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica18.java
index cf34a6d..1b2e69b 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapHelvetica18.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTBitmapHelvetica18 {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman10.java
index 3269986..f753b56 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman10.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTBitmapTimesRoman10 {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman24.java
index 36fb76c..073e6e6 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTBitmapTimesRoman24.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTBitmapTimesRoman24 {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeMonoRoman.java
index 79e4b70..b829692 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeMonoRoman.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTStrokeMonoRoman {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeRoman.java
index e960f15..94fa1c4 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/GLUTStrokeRoman.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
class GLUTStrokeRoman {
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeCharRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeCharRec.java
index 1d5d3de..af3d538 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeCharRec.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeCharRec.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeFontRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeFontRec.java
index 0e6133a..d3195f2 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeFontRec.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeFontRec.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeRec.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeRec.java
index 91241eb..8796e8b 100644
--- a/src/jogl/classes/com/sun/opengl/util/gl2/StrokeRec.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/StrokeRec.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
diff --git a/src/jogl/classes/com/sun/opengl/util/gl2/TileRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/gl2/TileRenderer.java
index a446b09..714c134 100755
--- a/src/jogl/classes/com/sun/opengl/util/gl2/TileRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/gl2/TileRenderer.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.util.gl2;
+package com.jogamp.opengl.util.gl2;
import java.awt.Dimension;
import java.nio.Buffer;
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/GLSLArrayHandler.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/GLSLArrayHandler.java
index 1ef9874..1119aa5 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/GLSLArrayHandler.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/GLSLArrayHandler.java
@@ -1,10 +1,10 @@
-package com.sun.opengl.util.glsl;
+package com.jogamp.opengl.util.glsl;
import javax.media.opengl.*;
import javax.media.opengl.fixedfunc.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.ShaderState;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.ShaderState;
import java.nio.*;
public class GLSLArrayHandler implements GLArrayHandler {
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
index 606d2e1..01b94d0 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -1,9 +1,9 @@
-package com.sun.opengl.util.glsl;
+package com.jogamp.opengl.util.glsl;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.impl.Debug;
import java.util.*;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderProgram.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
index c06eae3..49a341c 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderProgram.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
@@ -1,5 +1,5 @@
-package com.sun.opengl.util.glsl;
+package com.jogamp.opengl.util.glsl;
import javax.media.opengl.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
index 8712ac7..33f6e21 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -1,9 +1,9 @@
-package com.sun.opengl.util.glsl;
+package com.jogamp.opengl.util.glsl;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.impl.Debug;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
index 390fb27..21f359f 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/ShaderUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
@@ -31,7 +31,7 @@
*
*/
-package com.sun.opengl.util.glsl;
+package com.jogamp.opengl.util.glsl;
import java.io.PrintStream;
import java.nio.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
index 4149aec..a7042c4 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java
@@ -2,12 +2,12 @@
* Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
*/
-package com.sun.opengl.util.glsl.fixedfunc;
+package com.jogamp.opengl.util.glsl.fixedfunc;
import javax.media.opengl.*;
import javax.media.opengl.fixedfunc.*;
-import com.sun.opengl.util.glsl.fixedfunc.impl.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.impl.*;
/**
* Tool to pipeline GL2ES2 into a fixed function emulation implementing GL2ES1.
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
index 6f44f10..c03ee8e 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncHook.java
@@ -2,14 +2,14 @@
* Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
*/
-package com.sun.opengl.util.glsl.fixedfunc.impl;
+package com.jogamp.opengl.util.glsl.fixedfunc.impl;
import javax.media.opengl.*;
import javax.media.opengl.fixedfunc.*;
import javax.media.opengl.glu.*;
-import com.sun.gluegen.runtime.BufferFactory;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.gluegen.runtime.BufferFactory;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
import java.nio.*;
public class FixedFuncHook implements GLLightingFunc, GLMatrixFunc, GLPointerFunc {
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
index 1b8dd1f..1a60ab2 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncPipeline.java
@@ -1,11 +1,11 @@
-package com.sun.opengl.util.glsl.fixedfunc.impl;
+package com.jogamp.opengl.util.glsl.fixedfunc.impl;
import javax.media.opengl.*;
import javax.media.opengl.fixedfunc.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
import java.nio.*;
public class FixedFuncPipeline {
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
index 408ff72..408ff72 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.fp
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
index 346e401..346e401 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColor.vp
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
index ce203cf..ce203cf 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorLight.vp
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
index 86e6ace..86e6ace 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/FixedFuncColorTexture.fp
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp
index 3ebaaee..3ebaaee 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bfp
Binary files differ
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp
index 279ef72..279ef72 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColor.bvp
Binary files differ
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp
index 5a9deea..5a9deea 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorLight.bvp
Binary files differ
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp
index ce1397f..ce1397f 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/bin/nvidia/FixedFuncColorTexture.bfp
Binary files differ
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
index fd6abe5..fd6abe5 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/es_precision.glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
index b09bdb0..b09bdb0 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_attribute.glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
index 1a464a1..1a464a1 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_const.glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
index 98e2141..98e2141 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_lightdef.glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
index 1efe328..1efe328 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_settexcoord.vp
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
index d8b3c7f..d8b3c7f 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform.glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
index 0dedb5d..0dedb5d 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_uniform_light.glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
index fc9f735..fc9f735 100644
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/mgl_varying.glsl
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
index 002dca8..8a2114e 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc-ff.bat
@@ -6,4 +6,4 @@ IF !"%JOGLDIR%"==""! GOTO YESPATH
set JOGLDIR=..\lib
:YESPATH
-java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.sun.opengl.util.glsl.sdk.CompileShaderNVidia FixedFuncColor.fp FixedFuncColorTexture.fp FixedFuncColorLight.vp FixedFuncColor.vp
+java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.jogamp.opengl.util.glsl.sdk.CompileShaderNVidia FixedFuncColor.fp FixedFuncColorTexture.fp FixedFuncColorLight.vp FixedFuncColor.vp
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
index 9b5a4b3..c7ca0a8 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/impl/shaders/scripts/nvidia-apx/glslc.bat
@@ -6,4 +6,4 @@ IF !"%JOGLDIR%"==""! GOTO YESPATH
set JOGLDIR=..\lib
:YESPATH
-java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.sun.opengl.util.glsl.sdk.CompileShaderNVidia %1
+java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.jogamp.opengl.util.glsl.sdk.CompileShaderNVidia %1
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShader.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
index f18005f..9741da7 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShader.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java
@@ -1,16 +1,16 @@
-package com.sun.opengl.util.glsl.sdk;
+package com.jogamp.opengl.util.glsl.sdk;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
import java.io.*;
import java.net.*;
/** Precompiles a shader into a vendor binary format. Input is the
resource name of the shader, such as
- "com/sun/opengl/impl/glsl/fixed/shader/a.fp".
- Output is "com/sun/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp".
+ "com/jogamp/opengl/impl/glsl/fixed/shader/a.fp".
+ Output is "com/jogamp/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp".
All path and suffixes are determined by the ShaderCode class,
which ensures runtime compatibility.
diff --git a/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShaderNVidia.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShaderNVidia.java
index 387ccf7..8eb9ef5 100755
--- a/src/jogl/classes/com/sun/opengl/util/glsl/sdk/CompileShaderNVidia.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShaderNVidia.java
@@ -1,4 +1,4 @@
-package com.sun.opengl.util.glsl.sdk;
+package com.jogamp.opengl.util.glsl.sdk;
import javax.media.opengl.*;
@@ -6,8 +6,8 @@ import java.io.*;
/** Precompiles a shader into NVidia binary format. Input is the
resource name of the shader, such as
- "com/sun/opengl/impl/glsl/fixed/shader/a.fp".
- Output is "com/sun/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp". */
+ "com/jogamp/opengl/impl/glsl/fixed/shader/a.fp".
+ Output is "com/jogamp/opengl/impl/glsl/fixed/shader/bin/nvidia/a.bfp". */
public class CompileShaderNVidia extends CompileShader {
private static final String NVAPSDK;
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/BackingStoreManager.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/BackingStoreManager.java
index 754ba27..7b6a1b4 100755
--- a/src/jogl/classes/com/sun/opengl/util/packrect/BackingStoreManager.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/BackingStoreManager.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.packrect;
+package com.jogamp.opengl.util.packrect;
/** This interface must be implemented by the end user and is called
in response to events like addition of rectangles into the
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/Level.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java
index 3dae430..5ba3f73 100755
--- a/src/jogl/classes/com/sun/opengl/util/packrect/Level.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/Level.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.packrect;
+package com.jogamp.opengl.util.packrect;
import java.util.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/LevelSet.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java
index 973980f..6783aec 100755
--- a/src/jogl/classes/com/sun/opengl/util/packrect/LevelSet.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.packrect;
+package com.jogamp.opengl.util.packrect;
import java.util.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/Rect.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/Rect.java
index 2f12981..6206c4a 100755
--- a/src/jogl/classes/com/sun/opengl/util/packrect/Rect.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/Rect.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.packrect;
+package com.jogamp.opengl.util.packrect;
/** Represents a rectangular region on the backing store. The edges of
the rectangle are the infinitely thin region between adjacent
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/RectVisitor.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectVisitor.java
index 8f395ed..49cfc82 100755
--- a/src/jogl/classes/com/sun/opengl/util/packrect/RectVisitor.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectVisitor.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.packrect;
+package com.jogamp.opengl.util.packrect;
/** Iteration construct without exposing the internals of the
RectanglePacker and without implementing a complex Iterator. */
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/RectanglePacker.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
index 51e6842..1496a04 100755
--- a/src/jogl/classes/com/sun/opengl/util/packrect/RectanglePacker.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.packrect;
+package com.jogamp.opengl.util.packrect;
import java.util.*;
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/package.html b/src/jogl/classes/com/jogamp/opengl/util/packrect/package.html
index c1c5db4..c1c5db4 100755
--- a/src/jogl/classes/com/sun/opengl/util/packrect/package.html
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/package.html
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/Texture.java b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
index 3a2799c..5ef96ee 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/Texture.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/Texture.java
@@ -34,7 +34,7 @@
* facility.
*/
-package com.sun.opengl.util.texture;
+package com.jogamp.opengl.util.texture;
import java.nio.*;
import java.security.*;
@@ -42,9 +42,9 @@ import java.security.*;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
import javax.media.nativewindow.NativeWindowFactory;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.spi.*;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.spi.*;
/**
* Represents an OpenGL texture object. Contains convenience routines
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureCoords.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureCoords.java
index 51710e0..8d8b367 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureCoords.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureCoords.java
@@ -34,7 +34,7 @@
* facility.
*/
-package com.sun.opengl.util.texture;
+package com.jogamp.opengl.util.texture;
/** Specifies texture coordinates for a rectangular area of a
texture. Note that some textures are inherently flipped vertically
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java
index 7899a23..9a28f33 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureData.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureData.java
@@ -34,12 +34,12 @@
* facility.
*/
-package com.sun.opengl.util.texture;
+package com.jogamp.opengl.util.texture;
import java.nio.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
/**
* Represents the data for an OpenGL texture. This is separated from
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
index 5c64806..dbd194d 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture;
+package com.jogamp.opengl.util.texture;
import java.io.*;
import java.net.*;
@@ -46,9 +46,9 @@ import java.util.*;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.spi.*;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.spi.*;
/** <P> Provides input and output facilities for both loading OpenGL
textures from disk and streams as well as writing textures already
@@ -734,7 +734,7 @@ public class TextureIO {
try {
// Use reflection to avoid compile-time dependencies on AWT-related classes
TextureProvider provider = (TextureProvider)
- Class.forName("com.sun.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
+ Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
addTextureProvider(provider);
} catch (Exception e) {
if (DEBUG) {
@@ -755,7 +755,7 @@ public class TextureIO {
try {
// Use reflection to avoid compile-time dependencies on AWT-related classes
TextureWriter writer = (TextureWriter)
- Class.forName("com.sun.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
+ Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
addTextureWriter(writer);
} catch (Exception e) {
if (DEBUG) {
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
index 034a850..3e6f66f 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/TextureIO.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture;
+package com.jogamp.opengl.util.texture;
import java.io.*;
import java.net.*;
@@ -46,9 +46,9 @@ import java.util.*;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.spi.*;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.spi.*;
/** <P> Provides input and output facilities for both loading OpenGL
textures from disk and streams as well as writing textures already
@@ -733,7 +733,7 @@ public class TextureIO {
try {
// Use reflection to avoid compile-time dependencies on AWT-related classes
TextureProvider provider = (TextureProvider)
- Class.forName("com.sun.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
+ Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureProvider").newInstance();
addTextureProvider(provider);
} catch (Exception e) {
if (DEBUG) {
@@ -752,7 +752,7 @@ public class TextureIO {
try {
// Use reflection to avoid compile-time dependencies on AWT-related classes
TextureWriter writer = (TextureWriter)
- Class.forName("com.sun.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
+ Class.forName("com.jogamp.opengl.util.texture.spi.awt.IIOTextureWriter").newInstance();
addTextureWriter(writer);
} catch (Exception e) {
if (DEBUG) {
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java b/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureData.java
index f98feb8..39ec74b 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureData.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureData.java
@@ -34,7 +34,7 @@
* facility.
*/
-package com.sun.opengl.util.texture.awt;
+package com.jogamp.opengl.util.texture.awt;
import java.awt.AlphaComposite;
import java.awt.Color;
@@ -45,7 +45,7 @@ import java.awt.image.*;
import java.nio.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
public class AWTTextureData extends TextureData {
// Mechanism for lazily converting input BufferedImages with custom
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java b/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureIO.java
index 1828101..fdd1365 100644
--- a/src/jogl/classes/com/sun/opengl/util/texture/awt/AWTTextureIO.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/awt/AWTTextureIO.java
@@ -37,12 +37,12 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.awt;
+package com.jogamp.opengl.util.texture.awt;
import java.awt.image.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
public class AWTTextureIO extends TextureIO {
/**
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
index ce3d977..4feeb9f 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp
@@ -37,14 +37,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.*;
import java.nio.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.*;
/** A reader and writer for DirectDraw Surface (.dds) files, which are
used to describe textures. These files can contain multiple mipmap
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
index 8a3e1c4..b1f18cc 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/DDSImage.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase
@@ -37,15 +37,15 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.*;
import java.nio.*;
import java.nio.channels.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.*;
/** A reader and writer for DirectDraw Surface (.dds) files, which are
used to describe textures. These files can contain multiple mipmap
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java
index b2b1226..d5f4959 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataInputStream.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.DataInput;
import java.io.DataInputStream;
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataOutputStream.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataOutputStream.java
index 730ec0d..e1e1ca9 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/LEDataOutputStream.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataOutputStream.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.DataOutput;
import java.io.DataOutputStream;
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/NetPbmTextureWriter.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java
index 18df1dc..499dce7 100644
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/NetPbmTextureWriter.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/NetPbmTextureWriter.java
@@ -37,16 +37,16 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.*;
import java.net.*;
import java.nio.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.spi.*;
public class NetPbmTextureWriter implements TextureWriter {
int magic;
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/SGIImage.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java
index 284fa64..bb5040a 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/SGIImage.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/SGIImage.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
/** <p> Reads and writes SGI RGB/RGBA images. </p>
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
index c54713a..d1eca7c 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp
@@ -37,14 +37,14 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.*;
import java.nio.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.spi.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.texture.*;
/**
* Targa image reader and writer adapted from sources of the <a href =
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
index 1e78ef2..8575f55 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TGAImage.java.javase
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase
@@ -37,15 +37,15 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.*;
import java.nio.*;
import java.nio.channels.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.spi.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.texture.*;
/**
* Targa image reader and writer adapted from sources of the <a href =
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureProvider.java
index afc6a99..88018edb 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureProvider.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureProvider.java
@@ -37,13 +37,13 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.*;
import java.net.*;
import javax.media.opengl.GLProfile;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
/** Plug-in interface to TextureIO to support reading OpenGL textures
from new file formats. For all methods, either internalFormat or
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureWriter.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureWriter.java
index cdad15b..55527ce 100755
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/TextureWriter.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/TextureWriter.java
@@ -37,11 +37,11 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi;
+package com.jogamp.opengl.util.texture.spi;
import java.io.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
/** Plug-in interface to TextureIO to support writing OpenGL textures
to new file formats. */
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
index f025ba5..a45821d 100644
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureProvider.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureProvider.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi.awt;
+package com.jogamp.opengl.util.texture.spi.awt;
import java.awt.Graphics;
import java.awt.image.*;
@@ -46,10 +46,10 @@ import java.net.*;
import javax.imageio.*;
import javax.media.opengl.GLProfile;
-import com.sun.opengl.impl.Debug;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.awt.*;
-import com.sun.opengl.util.texture.spi.*;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.awt.*;
+import com.jogamp.opengl.util.texture.spi.*;
public class IIOTextureProvider implements TextureProvider {
private static final boolean DEBUG = Debug.debug("TextureIO");
diff --git a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureWriter.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureWriter.java
index db77572..4052112 100644
--- a/src/jogl/classes/com/sun/opengl/util/texture/spi/awt/IIOTextureWriter.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/awt/IIOTextureWriter.java
@@ -37,7 +37,7 @@
* and developed by Kenneth Bradley Russell and Christopher John Kline.
*/
-package com.sun.opengl.util.texture.spi.awt;
+package com.jogamp.opengl.util.texture.spi.awt;
import java.awt.Graphics;
import java.awt.image.*;
@@ -47,10 +47,10 @@ import java.nio.*;
import javax.imageio.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.awt.*;
-import com.sun.opengl.util.texture.*;
-import com.sun.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.awt.*;
+import com.jogamp.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.spi.*;
public class IIOTextureWriter implements TextureWriter {
public boolean write(File file,
diff --git a/src/jogl/classes/com/sun/openmax/OMXInstance.java b/src/jogl/classes/com/sun/openmax/OMXInstance.java
index 2eff166..84bd878 100644
--- a/src/jogl/classes/com/sun/openmax/OMXInstance.java
+++ b/src/jogl/classes/com/sun/openmax/OMXInstance.java
@@ -3,12 +3,12 @@ package com.sun.openmax;
import javax.media.opengl.*;
import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
-import com.sun.opengl.impl.egl.EGL;
-import com.sun.opengl.impl.egl.EGLContext;
-import com.sun.opengl.impl.egl.EGLDrawable;
-import com.sun.opengl.impl.egl.EGLExt;
+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 java.net.URL;
import java.nio.ByteBuffer;
@@ -50,13 +50,13 @@ public class OMXInstance {
protected long o_totalFrames = 0; // duration in frames
static class EGLImageTexture {
- public EGLImageTexture(com.sun.opengl.util.texture.Texture t, long i, long s) {
+ public EGLImageTexture(com.jogamp.opengl.util.texture.Texture t, long i, long s) {
texture = t; image = i; sync = s;
}
public String toString() {
return "EGLImageTexture[" + texture + ", image " + image + ", sync "+sync+"]";
}
- protected com.sun.opengl.util.texture.Texture texture;
+ protected com.jogamp.opengl.util.texture.Texture texture;
protected long image;
protected long sync;
}
@@ -219,7 +219,7 @@ public class OMXInstance {
_setStreamEGLImageTexture2D(moviePtr, i, tex, image, sync);
eglImgTexs[i] = new EGLImageTexture(
- com.sun.opengl.util.texture.TextureIO.newTexture(tex,
+ com.jogamp.opengl.util.texture.TextureIO.newTexture(tex,
javax.media.opengl.GL2.GL_TEXTURE_2D,
width,
height,
diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
index 5450e40..8603c71 100644
--- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
+++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java
@@ -41,7 +41,7 @@ package javax.media.opengl;
import javax.media.nativewindow.Capabilities;
import javax.media.nativewindow.NativeWindowException;
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
/** <P> The default implementation of the {@link
GLCapabilitiesChooser} interface, which provides consistent visual
diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
index a94c14f..7342369 100644
--- a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
+++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java
@@ -40,7 +40,7 @@
package javax.media.opengl;
import javax.media.opengl.glu.*;
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
import java.security.*;
/** A higher-level abstraction than {@link GLDrawable} which supplies
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 840de47..3ca1cd3 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -39,7 +39,6 @@
package javax.media.opengl;
-import com.sun.opengl.impl.Debug;
import java.util.HashMap;
/** Abstraction for an OpenGL rendering context. In order to perform
@@ -67,6 +66,8 @@ public abstract class GLContext {
private HashMap/*<int, Object>*/ attachedObjects = new HashMap();
+ protected long context;
+
/**
* Returns the GLDrawable to which this context may be used to
* draw.
diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
index b7c81cb..ca6bc90 100644
--- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java
@@ -41,9 +41,8 @@ package javax.media.opengl;
import javax.media.nativewindow.*;
-import java.lang.reflect.*;
import java.security.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import com.sun.nativewindow.impl.NWReflection;
/** <P> Provides a virtual machine- and operating system-independent
@@ -88,8 +87,8 @@ public abstract class GLDrawableFactory {
private static final GLDrawableFactory eglFactory;
private static final GLDrawableFactory nativeOSFactory;
private static final String nativeOSType;
- static final String macosxFactoryClassNameCGL = "com.sun.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory";
- static final String macosxFactoryClassNameAWTCGL = "com.sun.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory";
+ static final String macosxFactoryClassNameCGL = "com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory";
+ static final String macosxFactoryClassNameAWTCGL = "com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory";
/**
* Instantiate singleton factories if available, EGLES1, EGLES2 and the OS native ones.
@@ -97,7 +96,7 @@ public abstract class GLDrawableFactory {
static {
GLDrawableFactory tmp = null;
try {
- tmp = (GLDrawableFactory) NWReflection.createInstance("com.sun.opengl.impl.egl.EGLDrawableFactory");
+ tmp = (GLDrawableFactory) NWReflection.createInstance("com.jogamp.opengl.impl.egl.EGLDrawableFactory");
} catch (Throwable t) {
if (GLProfile.DEBUG) {
System.err.println("GLDrawableFactory.static - EGLDrawableFactory - not available");
@@ -114,9 +113,9 @@ public abstract class GLDrawableFactory {
factoryClassName = Debug.getProperty("jogl.gldrawablefactory.class.name", true, AccessController.getContext());
if (null == factoryClassName) {
if ( nativeOSType.equals(NativeWindowFactory.TYPE_X11) ) {
- factoryClassName = "com.sun.opengl.impl.x11.glx.X11GLXDrawableFactory";
+ factoryClassName = "com.jogamp.opengl.impl.x11.glx.X11GLXDrawableFactory";
} else if ( nativeOSType.equals(NativeWindowFactory.TYPE_WINDOWS) ) {
- factoryClassName = "com.sun.opengl.impl.windows.wgl.WindowsWGLDrawableFactory";
+ factoryClassName = "com.jogamp.opengl.impl.windows.wgl.WindowsWGLDrawableFactory";
} else if ( nativeOSType.equals(NativeWindowFactory.TYPE_MACOSX) ) {
if(NWReflection.isClassAvailable(macosxFactoryClassNameAWTCGL)) {
factoryClassName = macosxFactoryClassNameAWTCGL;
diff --git a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
index 63b50cb..3525458 100644
--- a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
+++ b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java
@@ -39,7 +39,7 @@ package javax.media.opengl;
import java.lang.reflect.*;
import java.util.StringTokenizer;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
/**
* Factory for pipelining GL instances
diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java
index 69cdd3f..6719a76 100644
--- a/src/jogl/classes/javax/media/opengl/GLProfile.java
+++ b/src/jogl/classes/javax/media/opengl/GLProfile.java
@@ -36,13 +36,15 @@
package javax.media.opengl;
-import javax.media.opengl.fixedfunc.*;
-import java.lang.reflect.*;
-import java.util.HashMap;
-import java.security.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.DRIHack;
+import com.jogamp.opengl.impl.Debug;
+import com.jogamp.opengl.impl.NativeLibLoader;
import com.sun.nativewindow.impl.NWReflection;
import com.sun.nativewindow.impl.jvm.JVMUtil;
+import java.util.HashMap;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import javax.media.opengl.fixedfunc.GLPointerFunc;
/**
* Specifies the the OpenGL profile.
@@ -192,17 +194,17 @@ public class GLProfile implements Cloneable {
private static final String getGLImplBaseClassName(String profileImpl) {
if(GL3bc.equals(profileImpl)) {
- return "com.sun.opengl.impl.gl3.GL3bc";
+ return "com.jogamp.opengl.impl.gl3.GL3bc";
} else if(GL3.equals(profileImpl)) {
- return "com.sun.opengl.impl.gl3.GL3";
+ return "com.jogamp.opengl.impl.gl3.GL3";
} else if(GL2.equals(profileImpl)) {
- return "com.sun.opengl.impl.gl2.GL2";
+ return "com.jogamp.opengl.impl.gl2.GL2";
} else if(GL2ES12.equals(profileImpl)) {
- return "com.sun.opengl.impl.gl2es12.GL2ES12";
+ return "com.jogamp.opengl.impl.gl2es12.GL2ES12";
} else if(GLES1.equals(profileImpl) || GL2ES1.equals(profileImpl)) {
- return "com.sun.opengl.impl.es1.GLES1";
+ return "com.jogamp.opengl.impl.es1.GLES1";
} else if(GLES2.equals(profileImpl) || GL2ES2.equals(profileImpl)) {
- return "com.sun.opengl.impl.es2.GLES2";
+ return "com.jogamp.opengl.impl.es2.GLES2";
} else {
throw new GLException("unsupported profile \"" + profileImpl + "\"");
}
@@ -715,22 +717,22 @@ public class GLProfile implements Cloneable {
}
// FIXME: check for real GL3 availability .. ?
- hasGL3bcImpl = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl3.GL3bcImpl");
- hasGL3Impl = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl3.GL3Impl");
- hasGL2Impl = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl2.GL2Impl");
+ hasGL3bcImpl = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3bcImpl");
+ hasGL3Impl = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3Impl");
+ hasGL2Impl = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2.GL2Impl");
- hasGL2ES12Impl = hasDesktopGLES12 && NWReflection.isClassAvailable("com.sun.opengl.impl.gl2es12.GL2ES12Impl");
+ hasGL2ES12Impl = hasDesktopGLES12 && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2es12.GL2ES12Impl");
boolean btest = false;
- boolean hasEGLDynLookup = NWReflection.isClassAvailable("com.sun.opengl.impl.egl.EGLDynamicLookupHelper");
+ boolean hasEGLDynLookup = NWReflection.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper");
boolean hasEGLDrawableFactory = false;
try {
if(hasEGLDynLookup) {
hasEGLDrawableFactory = null!=GLDrawableFactory.getFactoryImpl(GLES2);
btest = hasEGLDrawableFactory &&
- NWReflection.isClassAvailable("com.sun.opengl.impl.es2.GLES2Impl") &&
- null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2);
+ NWReflection.isClassAvailable("com.jogamp.opengl.impl.es2.GLES2Impl") &&
+ null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2);
}
} catch (Throwable t) {
if (DEBUG) {
@@ -744,8 +746,8 @@ public class GLProfile implements Cloneable {
try {
if(hasEGLDynLookup) {
btest = hasEGLDrawableFactory &&
- NWReflection.isClassAvailable("com.sun.opengl.impl.es1.GLES1Impl") &&
- null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1);
+ NWReflection.isClassAvailable("com.jogamp.opengl.impl.es1.GLES1Impl") &&
+ null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1);
}
} catch (Throwable t) {
if (DEBUG) {
diff --git a/src/jogl/classes/javax/media/opengl/Threading.java b/src/jogl/classes/javax/media/opengl/Threading.java
index fecf6c7..e58792b 100755
--- a/src/jogl/classes/javax/media/opengl/Threading.java
+++ b/src/jogl/classes/javax/media/opengl/Threading.java
@@ -39,7 +39,7 @@
package javax.media.opengl;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
/** This API provides access to the threading model for the implementation of
the classes in this package.
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index 038d6d2..53e79b8 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -43,7 +43,7 @@ import javax.media.opengl.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.awt.*;
-import com.sun.opengl.impl.*;
+import com.jogamp.opengl.impl.*;
import java.awt.Canvas;
import java.awt.Color;
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index e475821..43b2e1e 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -41,20 +41,17 @@ package javax.media.opengl.awt;
import javax.media.opengl.*;
import javax.media.nativewindow.*;
-import javax.media.nativewindow.awt.*;
import java.awt.*;
import java.awt.geom.*;
import java.awt.image.*;
import java.beans.*;
-import javax.swing.*;
import java.nio.*;
import java.security.*;
-import javax.swing.JComponent;
import javax.swing.JPanel;
-import com.sun.opengl.util.FBObject;
-import com.sun.opengl.impl.*;
-import com.sun.opengl.impl.awt.*;
+import com.jogamp.opengl.util.FBObject;
+import com.jogamp.opengl.impl.*;
+import com.jogamp.opengl.impl.awt.*;
// FIXME: Subclasses need to call resetGLFunctionAvailability() on their
// context whenever the displayChanged() function is called on their
@@ -1429,7 +1426,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable {
System.err.println("-- Created External Context: "+j2dContext);
}
if (DEBUG) {
- j2dContext.setGL(new DebugGL2(j2dContext.getGL().getGL2()));
+// j2dContext.setGL(new DebugGL2(j2dContext.getGL().getGL2()));
}
// Check to see whether we can support the requested
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java b/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
index d5a7a11..49451a3 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java
@@ -1,7 +1,7 @@
package javax.media.opengl.glu;
import javax.media.opengl.GL;
-import com.sun.opengl.util.ImmModeSink;
+import com.jogamp.opengl.util.ImmModeSink;
/**
* Wrapper for a GLU quadric object.
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
index 9719915..72ad68c 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java
@@ -352,5 +352,5 @@ public interface GLUtessellatorCallback {
*/
public void errorData(int errnum, Object polygonData);
- //void mesh(com.sun.opengl.impl.tessellator.GLUmesh mesh);
+ //void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh);
}
diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
index 7845ac2..f380f46 100755
--- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
+++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java
@@ -68,7 +68,7 @@ public class GLUtessellatorCallbackAdapter implements GLUtessellatorCallback {
public void edgeFlag(boolean boundaryEdge) {}
public void vertex(Object vertexData) {}
public void end() {}
-// public void mesh(com.sun.opengl.impl.tessellator.GLUmesh mesh) {}
+// public void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh) {}
public void error(int errnum) {}
public void combine(double[] coords, Object[] data,
float[] weight, Object[] outData) {}
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
index 9772d1a..bf80ec7 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/awt/Texture1.java
@@ -42,12 +42,12 @@ import javax.media.opengl.GL2;
import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLEventListener;
import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.Animator;
import java.awt.AlphaComposite;
import java.awt.Color;
diff --git a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
index cd02d5d..bdb8bd9 100755
--- a/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
+++ b/src/jogl/junit/com/jogamp/opengl/test/junit/texture/util/gl2/TextureGL2ListenerDraw1.java
@@ -32,10 +32,10 @@
package com.jogamp.opengl.test.junit.texture.util.gl2;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
import javax.media.opengl.GL;
import javax.media.opengl.GL2ES1;
import javax.media.opengl.GL2;
diff --git a/src/nativewindow/Nativewindow.iml b/src/nativewindow/Nativewindow.iml
new file mode 100644
index 0000000..673f8d1
--- /dev/null
+++ b/src/nativewindow/Nativewindow.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
index 0425014..7cf2e3f 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/InternalBufferUtil.java
@@ -37,7 +37,7 @@ import java.lang.reflect.*;
import java.nio.*;
/** Internal copy of selected routines from BufferUtil to avoid
- outward dependencies on com.sun.opengl.util package. */
+ outward dependencies on com.jogamp.opengl.util package. */
public class InternalBufferUtil {
public static final int SIZEOF_BYTE = 1;
public static final int SIZEOF_SHORT = 2;
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
index aac01e9..6a8f8cd 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
@@ -65,7 +65,7 @@ public class JAWTUtil {
Method m=null;
if(!headlessMode) {
try {
- jC = Class.forName("com.sun.opengl.impl.awt.Java2D");
+ jC = Class.forName("com.jogamp.opengl.impl.awt.Java2D");
m = jC.getMethod("isQueueFlusherThread", null);
ok = true;
} catch (Exception e) {}
diff --git a/src/newt/Newt.iml b/src/newt/Newt.iml
new file mode 100644
index 0000000..ab83592
--- /dev/null
+++ b/src/newt/Newt.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="Nativewindow" />
+ </component>
+</module>
+
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
index e809d2c..98010b2 100644
--- a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java
@@ -36,7 +36,7 @@ package com.sun.javafx.newt.opengl;
import com.sun.javafx.newt.*;
import javax.media.nativewindow.*;
import javax.media.opengl.*;
-import com.sun.opengl.impl.GLDrawableHelper;
+import com.jogamp.opengl.impl.GLDrawableHelper;
import java.util.*;
/**
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
index debe9e9..1b74aeb 100644
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java
@@ -34,7 +34,7 @@
package com.sun.javafx.newt.opengl.broadcom.egl;
import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.egl.*;
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
index 11672dd..8446ec2 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java
@@ -34,7 +34,7 @@
package com.sun.javafx.newt.opengl.broadcom.egl;
import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
import javax.media.nativewindow.*;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
index 5aeae75..9e328a2 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java
@@ -35,7 +35,7 @@ package com.sun.javafx.newt.opengl.kd;
import com.sun.javafx.newt.*;
import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
import javax.media.nativewindow.*;
import javax.media.nativewindow.egl.*;
diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
index 605e9c0..9919d1f 100755
--- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
+++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java
@@ -35,7 +35,7 @@ package com.sun.javafx.newt.opengl.kd;
import com.sun.javafx.newt.*;
import com.sun.javafx.newt.impl.*;
-import com.sun.opengl.impl.egl.*;
+import com.jogamp.opengl.impl.egl.*;
import javax.media.nativewindow.*;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
diff --git a/test/Issue326Test1.java b/test/Issue326Test1.java
index 42b6ec0..217c281 100755
--- a/test/Issue326Test1.java
+++ b/test/Issue326Test1.java
@@ -13,8 +13,8 @@ import javax.media.opengl.GLCanvas;
import javax.media.opengl.GLEventListener;
import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.j2d.TextRenderer;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.j2d.TextRenderer;
/**
* Demonstrates corruption with older versions of TextRenderer. Two
@@ -65,7 +65,7 @@ public class Issue326Test1 extends Frame implements GLEventListener {
gl.glLoadIdentity();
tr.beginRendering(800,800);
- tr.draw( "die Marktwirtschaft. Da regelt sich angeblich", 16, 32);
+ tr.draw( "die Marktwirtschaft. Da regelt sich � angeblich", 16, 32);
tr.draw( "Hello World! This text is scrambled", 16, 16);
tr.endRendering();
diff --git a/test/Issue326Test2.java b/test/Issue326Test2.java
index f2258c8..10ec441 100755
--- a/test/Issue326Test2.java
+++ b/test/Issue326Test2.java
@@ -2,7 +2,7 @@ import java.awt.Font;
import java.awt.Frame;
import java.awt.event.*;
import javax.media.opengl.*;
-import com.sun.opengl.util.j2d.*;
+import com.jogamp.opengl.util.j2d.*;
/**
* Another test case demonstrating corruption with older version of
diff --git a/test/Issue344Base.java b/test/Issue344Base.java
index 548e3ec..6d0c992 100755
--- a/test/Issue344Base.java
+++ b/test/Issue344Base.java
@@ -7,8 +7,8 @@ import java.awt.geom.*;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.j2d.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.j2d.*;
/** Test Code adapted from TextCube.java (in JOGL demos)
*