The BIG LWJGL REFACTORING

src/java/org/lwjgl/Display.java

@@ -32,11 +32,11 @@
 
 package org.lwjgl;
 
-import java.util.HashSet;
-import java.util.Arrays;
 import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
 import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.util.Arrays;
+import java.util.HashSet;
 
 /**
  * $Id$

src/java/org/lwjgl/input/Cursor.java

@@ -32,11 +32,11 @@
 
 package org.lwjgl.input;
 
-import org.lwjgl.Sys;
-
-import java.nio.IntBuffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+
+import org.lwjgl.Sys;
 
 /**
  * $Id$

src/java/org/lwjgl/input/Mouse.java

@@ -32,12 +32,12 @@
 
 package org.lwjgl.input;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.lwjgl.*;
+import org.lwjgl.Sys;
 import org.lwjgl.opengl.Window;
 
 /**
@@ -235,7 +235,7 @@ public class Mouse {
 	 */
 	public static void create() throws Exception {
     
-    assert Window.isCreated() : "Window must be created prior to creating mouse";
+		assert Window.isCreated() : "Window must be created prior to creating mouse";
     
 		if (!initialized) {
 			initialize();

src/java/org/lwjgl/openal/ALCcontext.java

@@ -31,9 +31,9 @@
  */
 package org.lwjgl.openal;
 
-import java.nio.*;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.IntBuffer;
 
 /**
  * $Id$

src/java/org/lwjgl/openal/BaseAL.java

@@ -32,11 +32,11 @@
 package org.lwjgl.openal;
 
 import java.io.File;
-import java.util.StringTokenizer;
 import java.lang.reflect.Method;
+import java.util.StringTokenizer;
 
-import org.lwjgl.Sys;
 import org.lwjgl.Display;
+import org.lwjgl.Sys;
 
 /**
  * $Id$

src/java/org/lwjgl/openal/CoreAL.java

@@ -32,8 +32,8 @@
 package org.lwjgl.openal;
 
 import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 /**
  * $Id$
  * <br>

src/java/org/lwjgl/opengl/ARBCubeMap.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBCubeMap {
 	public static final int GL_NORMAL_MAP_ARB                                       = 0x8511;

src/java/org/lwjgl/opengl/ARBDepthTexture.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBDepthTexture {
 	public static final int GL_DEPTH_COMPONENT16_ARB                                = 0x81A5;

src/java/org/lwjgl/opengl/ARBFragmentProgram.java

@@ -37,7 +37,7 @@
  * Time: 16:41:02
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBFragmentProgram extends ARBProgram {
 

src/java/org/lwjgl/opengl/ARBFragmentShader.java

@@ -36,7 +36,7 @@
  * Time: 4:19:23 ðì
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public interface ARBFragmentShader {
 

src/java/org/lwjgl/opengl/ARBMatrixPalette.java

@@ -37,15 +37,13 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
 import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
-import org.lwjgl.opengl.BufferChecks;
-import org.lwjgl.opengl.GL11;
 
 public class ARBMatrixPalette {
 	public static final int GL_MATRIX_PALETTE_ARB                                   = 0x8840;

src/java/org/lwjgl/opengl/ARBMultisample.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBMultisample {
 	public static final int GL_MULTISAMPLE_ARB                                      = 0x809D;

src/java/org/lwjgl/opengl/ARBMultitexture.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBMultitexture {
 	public static final int GL_TEXTURE0_ARB                                         = 0x84C0;

src/java/org/lwjgl/opengl/ARBOcclusionQuery.java

@@ -36,7 +36,7 @@
  * Time: 1:42:31 ðì
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 

src/java/org/lwjgl/opengl/ARBPointParameters.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 

src/java/org/lwjgl/opengl/ARBPointSprite.java

@@ -5,7 +5,7 @@
  * Time: 1:54:00 ðì
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public interface ARBPointSprite {
 

src/java/org/lwjgl/opengl/ARBProgram.java

@@ -36,13 +36,13 @@
  * Time: 16:32:30
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
+import java.nio.Buffer;
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
-import java.nio.Buffer;
-import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 
 class ARBProgram {
 

src/java/org/lwjgl/opengl/ARBShaderObjects.java

@@ -36,11 +36,11 @@
  * Time: 21:58:02
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 
 public class ARBShaderObjects {
 

src/java/org/lwjgl/opengl/ARBShadow.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBShadow
 {

src/java/org/lwjgl/opengl/ARBShadowAmbient.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBShadowAmbient
 {

src/java/org/lwjgl/opengl/ARBTextureBorderClamp.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBTextureBorderClamp
 {

src/java/org/lwjgl/opengl/ARBTextureCompression.java

@@ -37,13 +37,13 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
 public class ARBTextureCompression
 {

src/java/org/lwjgl/opengl/ARBTextureEnvCombine.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBTextureEnvCombine
 {

src/java/org/lwjgl/opengl/ARBTextureEnvDot3.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBTextureEnvDot3
 {

src/java/org/lwjgl/opengl/ARBTextureMirroredRepeat.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBTextureMirroredRepeat
 {

src/java/org/lwjgl/opengl/ARBTransposeMatrix.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.BufferUnderflowException;
 import java.nio.FloatBuffer;

src/java/org/lwjgl/opengl/ARBVertexBlend.java

@@ -37,16 +37,14 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
-import org.lwjgl.opengl.BufferChecks;
-import org.lwjgl.opengl.GL11;
 
 public class ARBVertexBlend {
 	public static final int GL_MAX_VERTEX_UNITS_ARB                                 = 0x86A4;

src/java/org/lwjgl/opengl/ARBVertexBufferObject.java

@@ -39,15 +39,14 @@
  * @version $Revision$
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
-import org.lwjgl.opengl.VBOTracker;
 
 public class ARBVertexBufferObject {
 	public static final int GL_ARRAY_BUFFER_ARB                             = 0x8892;

src/java/org/lwjgl/opengl/ARBVertexProgram.java

@@ -36,15 +36,13 @@
  * Time: 16:39:44
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
-import org.lwjgl.opengl.BufferChecks;
-import org.lwjgl.opengl.GL11;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
 public class ARBVertexProgram extends ARBProgram {
 

src/java/org/lwjgl/opengl/ARBVertexShader.java

@@ -36,7 +36,7 @@
  * Time: 3:58:43 ðì
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;

src/java/org/lwjgl/opengl/ARBWindowPos.java

@@ -32,7 +32,7 @@
 /*
  */
 
-package org.lwjgl.opengl.arb;
+package org.lwjgl.opengl;
 
 public class ARBWindowPos {
         public static native void glWindowPos2fARB(float x, float y);

src/java/org/lwjgl/opengl/ATIDrawBuffers.java

@@ -36,7 +36,7 @@
  * Time: 21:04:41
  */
 
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 

src/java/org/lwjgl/opengl/ATIElementArray.java

@@ -37,15 +37,13 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
 import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
-import org.lwjgl.opengl.VBOTracker;
-import org.lwjgl.opengl.GL11;
 
 public class ATIElementArray {
 	public static final int GL_ELEMENT_ARRAY_ATI                                    = 0x8768;

src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;

src/java/org/lwjgl/opengl/ATIFragmentShader.java

@@ -41,7 +41,7 @@
  * because variables cannot start with a number.
  *
  */
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 

src/java/org/lwjgl/opengl/ATIMapObjectBuffer.java

@@ -36,7 +36,7 @@
  * Time: 21:14:07
  */
 
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 import java.nio.ByteBuffer;
 

src/java/org/lwjgl/opengl/ATIPnTriangles.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 public class ATIPnTriangles {
 	public static final int GL_PN_TRIANGLES_ATI                                     = 0x87F0;

src/java/org/lwjgl/opengl/ATISeparateStencil.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 public class ATISeparateStencil {
 	public static final int GL_STENCIL_BACK_FUNC_ATI			= 0x8800;

src/java/org/lwjgl/opengl/ATITextureFloat.java

@@ -36,7 +36,7 @@
  * Time: 21:25:07
  */
 
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 public interface ATITextureFloat {
 

src/java/org/lwjgl/opengl/ATITextureMirrorOnce.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 public class ATITextureMirrorOnce
 {

src/java/org/lwjgl/opengl/ATIVertexArrayObject.java

@@ -37,13 +37,13 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
 public class ATIVertexArrayObject {
 	public static final int GL_STATIC_ATI                                           = 0x8760;

src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java

@@ -36,7 +36,7 @@
  * Time: 21:27:12
  */
 
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;

src/java/org/lwjgl/opengl/ATIVertexStreams.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ati;
+package org.lwjgl.opengl;
 
 public class ATIVertexStreams {
 	public static final int GL_MAX_VERTEX_STREAMS_ATI                               = 0x876B;

src/java/org/lwjgl/opengl/BufferChecks.java

@@ -52,7 +52,7 @@ import java.util.Map;
  * @author cix_foo <cix_foo@users.sourceforge.net>
  * @version $Revision$
  */
-public class BufferChecks {
+class BufferChecks {
 	
 	/** Static methods only! */
 	private BufferChecks() {}
@@ -104,7 +104,7 @@ public class BufferChecks {
 	 * Helper method to ensure that vertex buffer objects are disabled.
 	 * If they are enabled, we'll throw an OpenGLException
 	 */
-	public static void checkVBOdisabled() {
+	static void checkVBOdisabled() {
 		if (VBOTracker.getVBOArrayStack().getState() != 0) {
 			throw new OpenGLException("Cannot use Buffers when VBO is enabled");
 		}
@@ -114,7 +114,7 @@ public class BufferChecks {
 	 * Helper method to ensure that vertex buffer objects are enabled.
 	 * If they are disabled, we'll throw an OpenGLException
 	 */
-	public static void checkVBOenabled() {
+	static void checkVBOenabled() {
 		if (VBOTracker.getVBOArrayStack().getState() == 0) {
 			throw new OpenGLException("Cannot use offsets when VBO is disabled");
 		}

src/java/org/lwjgl/opengl/EXTAbgr.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 public class EXTAbgr {
 	public static final int GL_ABGR_EXT                                             = 0x8000;

src/java/org/lwjgl/opengl/EXTBgra.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
- package org.lwjgl.opengl.ext;
+ package org.lwjgl.opengl;
 
 /**
  * EXT_bgra_constants

src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 /**
  * Insert the type's description here.

src/java/org/lwjgl/opengl/EXTBlendSubtract.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 /**
  * EXT_blend_subtract constants

src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 public class EXTCompiledVertexArray {
 	public static final int GL_ARRAY_ELEMENT_LOCK_FIRST_EXT                         = 0x81A8;

src/java/org/lwjgl/opengl/EXTDrawRangeElements.java

@@ -37,15 +37,13 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
 import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
-import org.lwjgl.opengl.VBOTracker;
-import org.lwjgl.opengl.GL11;
 
 public class EXTDrawRangeElements {
 	public static final int GL_MAX_ELEMENTS_VERTICES_EXT                            = 0x80E8;

src/java/org/lwjgl/opengl/EXTFogCoord.java

@@ -37,13 +37,11 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
 
-import org.lwjgl.opengl.VBOTracker;
-import org.lwjgl.opengl.GL11;
 
 public class EXTFogCoord {
 	public static final int GL_FOG_COORDINATE_SOURCE_EXT                            = 0x8450;

src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 

src/java/org/lwjgl/opengl/EXTPackedPixels.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 /**
  * Insert the type's description here.

src/java/org/lwjgl/opengl/EXTPointParameters.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 

src/java/org/lwjgl/opengl/EXTRescaleNormal.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 
 /**

src/java/org/lwjgl/opengl/EXTSecondaryColor.java

@@ -37,14 +37,12 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 
-import org.lwjgl.opengl.VBOTracker;
-import org.lwjgl.opengl.GL11;
 
 public class EXTSecondaryColor {
 	public static final int GL_COLOR_SUM_EXT                                        = 0x8458;

src/java/org/lwjgl/opengl/EXTSeparateSpecularColor.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 
 /**

src/java/org/lwjgl/opengl/EXTSharedTexturePalette.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 /**
  * Insert the type's description here.

src/java/org/lwjgl/opengl/EXTStencilTwoSide.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 public class EXTStencilTwoSide {
 	public static final int GL_STENCIL_TEST_TWO_SIDE_EXT                            = 0x8910;

src/java/org/lwjgl/opengl/EXTStencilWrap.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 public class EXTStencilWrap
 {

src/java/org/lwjgl/opengl/EXTTextureCompressionS3TC.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 public class EXTTextureCompressionS3TC
 {

src/java/org/lwjgl/opengl/EXTTextureEnvCombine.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 /**
  * Insert the type's description here.

src/java/org/lwjgl/opengl/EXTTextureEnvDot3.java

@@ -30,7 +30,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 
 /**

src/java/org/lwjgl/opengl/EXTTextureFilterAnisotropic.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 public class EXTTextureFilterAnisotropic
 {

src/java/org/lwjgl/opengl/EXTTextureLODBias.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 public class EXTTextureLODBias
 {

src/java/org/lwjgl/opengl/EXTVertexShader.java

@@ -37,16 +37,14 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.VBOTracker;
 
 public class EXTVertexShader {
 	public static final int GL_VERTEX_SHADER_EXT                                    = 0x8780;

src/java/org/lwjgl/opengl/EXTVertexWeighting.java

@@ -37,13 +37,11 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.ext;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
 
-import org.lwjgl.opengl.VBOTracker;
-import org.lwjgl.opengl.GL11;
 
 public class EXTVertexWeighting {
 	public static final int GL_MODELVIEW0_STACK_DEPTH_EXT                           = 0x0BA3;  /* alias to MODELVIEW_STACK_DEPTH */

src/java/org/lwjgl/opengl/GL11.java

@@ -32,12 +32,13 @@
 
 package org.lwjgl.opengl;
 
-import java.nio.*;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.nio.FloatBuffer;
-import java.nio.DoubleBuffer;
 import java.nio.Buffer;
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.nio.DoubleBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
 /**
  * $Id$

src/java/org/lwjgl/opengl/GL12.java

@@ -32,10 +32,11 @@
 
 package org.lwjgl.opengl;
 
-import java.nio.*;
-import java.nio.IntBuffer;
-import java.nio.FloatBuffer;
 import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
 /**
  * $Id$

src/java/org/lwjgl/opengl/GL13.java

@@ -32,7 +32,12 @@
 
 package org.lwjgl.opengl;
 
-import java.nio.*;
+import java.nio.Buffer;
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
 /**
  * $Id$

src/java/org/lwjgl/opengl/GL14.java

@@ -32,10 +32,10 @@
 
 package org.lwjgl.opengl;
 
-import java.nio.*;
-import java.nio.IntBuffer;
-import java.nio.FloatBuffer;
 import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 
 /**
  * $Id$

src/java/org/lwjgl/opengl/GLCaps.java

@@ -32,14 +32,14 @@
 
 package org.lwjgl.opengl;
 
-import org.lwjgl.Sys;
-
-import java.lang.reflect.*;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.lwjgl.Sys;
+
 /**
  * $Id$
  * <p/>

src/java/org/lwjgl/opengl/NVCopyDepthToColor.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVCopyDepthToColor
 {

src/java/org/lwjgl/opengl/NVDepthClamp.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVDepthClamp
 {

src/java/org/lwjgl/opengl/NVEvaluators.java

@@ -37,11 +37,11 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
-import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 
 public class NVEvaluators {
 	public static final int GL_EVAL_2D_NV                                           = 0x86C0;

src/java/org/lwjgl/opengl/NVFence.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 

src/java/org/lwjgl/opengl/NVFloatBuffer.java

@@ -36,7 +36,7 @@
  * Time: 13:17:23
  */
 
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public interface NVFloatBuffer {
 

src/java/org/lwjgl/opengl/NVFogDistance.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVFogDistance
 {

src/java/org/lwjgl/opengl/NVFragmentProgram.java

@@ -37,10 +37,9 @@
  * Time: 18:59:45
  */
 
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.ByteBuffer;
-
 import java.nio.FloatBuffer;
 
 public class NVFragmentProgram extends NVProgram {

src/java/org/lwjgl/opengl/NVHalfFloat.java

@@ -36,7 +36,7 @@
  * Time: 15:45:05
  */
 
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.ShortBuffer;
 

src/java/org/lwjgl/opengl/NVLightMaxExponent.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVLightMaxExponent {
 	public static final int GL_MAX_SHININESS_NV                                     = 0x8504;

src/java/org/lwjgl/opengl/NVMultisampleFilterHint.java

@@ -36,7 +36,7 @@
  * Time: 17:19:22
  */
 
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public interface NVMultisampleFilterHint {
 

src/java/org/lwjgl/opengl/NVOcclusionQuery.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 

src/java/org/lwjgl/opengl/NVPackedDepthStencil.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVPackedDepthStencil
 {

src/java/org/lwjgl/opengl/NVPixelDataRange.java

@@ -36,9 +36,13 @@
  * Time: 17:22:44
  */
 
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
-import java.nio.*;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
 
 public class NVPixelDataRange {
 

src/java/org/lwjgl/opengl/NVPointSprite.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.IntBuffer;
 

src/java/org/lwjgl/opengl/NVPrimitiveRestart.java

@@ -36,7 +36,7 @@
  * Time: 17:45:36
  */
 
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVPrimitiveRestart {
 

src/java/org/lwjgl/opengl/NVProgram.java

@@ -37,12 +37,10 @@
  * Time: 18:39:30
  */
 
-package org.lwjgl.opengl.nv;
-
-import java.nio.ByteBuffer;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
-
+import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 
 class NVProgram {

src/java/org/lwjgl/opengl/NVRegisterCombiners.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;

src/java/org/lwjgl/opengl/NVRegisterCombiners2.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.FloatBuffer;
 

src/java/org/lwjgl/opengl/NVTexgenReflection.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVTexgenReflection
 {

src/java/org/lwjgl/opengl/NVTextureCompressionVTC.java

@@ -36,7 +36,7 @@
  * Time: 3:20:43 pm
  */
 
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVTextureCompressionVTC {
 

src/java/org/lwjgl/opengl/NVTextureEnvCombine4.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVTextureEnvCombine4
 {

src/java/org/lwjgl/opengl/NVTextureExpandNormal.java

@@ -36,7 +36,7 @@
  * Time: 17:54:31
  */
 
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public interface NVTextureExpandNormal {
 

src/java/org/lwjgl/opengl/NVTextureRectangle.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVTextureRectangle
 {

src/java/org/lwjgl/opengl/NVTextureShader.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVTextureShader
 {

src/java/org/lwjgl/opengl/NVTextureShader2.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVTextureShader2
 {

src/java/org/lwjgl/opengl/NVTextureShader3.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVTextureShader3
 {

src/java/org/lwjgl/opengl/NVVertexArrayRange.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;

src/java/org/lwjgl/opengl/NVVertexArrayRange2.java

@@ -37,7 +37,7 @@
  * To change template for new interface use
  * Code Style | Class Templates options (Tools | IDE Options).
  */
-package org.lwjgl.opengl.nv;
+package org.lwjgl.opengl;
 
 public class NVVertexArrayRange2 {
 	public static final int GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV                  = 0x8533;