From f7609396fb53e6910cf30d984ae47c523bee98c1 Mon Sep 17 00:00:00 2001 From: Caspian Rychlik-Prince Date: Sat, 2 Aug 2003 17:09:56 +0000 Subject: [PATCH] Classes now abstract --- src/java/org/lwjgl/openal/AL.java | 2 +- src/java/org/lwjgl/openal/CoreAL.java | 2 +- src/java/org/lwjgl/opengl/CoreGL12.java | 2 +- src/java/org/lwjgl/opengl/CoreGL13.java | 2 +- src/java/org/lwjgl/opengl/CoreGL14.java | 2 +- src/java/org/lwjgl/opengl/GL.java | 2 +- src/java/org/lwjgl/opengl/GLCaps.java | 4 ++-- src/java/org/lwjgl/opengl/GLU.java | 8 +------- 8 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/java/org/lwjgl/openal/AL.java b/src/java/org/lwjgl/openal/AL.java index ad5c1172..256c5c52 100644 --- a/src/java/org/lwjgl/openal/AL.java +++ b/src/java/org/lwjgl/openal/AL.java @@ -39,7 +39,7 @@ package org.lwjgl.openal; * @author Brian Matzon * @version $Revision$ */ -public class AL extends CoreAL { +public abstract class AL extends CoreAL { /** ALC instance. */ protected static ALC alc; diff --git a/src/java/org/lwjgl/openal/CoreAL.java b/src/java/org/lwjgl/openal/CoreAL.java index 667d98ba..67233ce6 100644 --- a/src/java/org/lwjgl/openal/CoreAL.java +++ b/src/java/org/lwjgl/openal/CoreAL.java @@ -46,7 +46,7 @@ import java.nio.DoubleBuffer; * @author Brian Matzon * @version $Revision$ */ -public class CoreAL extends BaseAL implements BaseALConstants { +public abstract class CoreAL extends BaseAL implements BaseALConstants { /** * Enables a feature of the OpenAL driver. diff --git a/src/java/org/lwjgl/opengl/CoreGL12.java b/src/java/org/lwjgl/opengl/CoreGL12.java index dd74316e..fee68ad3 100644 --- a/src/java/org/lwjgl/opengl/CoreGL12.java +++ b/src/java/org/lwjgl/opengl/CoreGL12.java @@ -45,7 +45,7 @@ import java.nio.Buffer; * @author cix_foo * @version $Revision: 1.23 $ */ -public class CoreGL12 extends CoreGL11 implements CoreGL12Constants { +public abstract class CoreGL12 extends CoreGL11 implements CoreGL12Constants { public static void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) { nglColorTable(target, internalFormat, width, format, type, data, data.position()); diff --git a/src/java/org/lwjgl/opengl/CoreGL13.java b/src/java/org/lwjgl/opengl/CoreGL13.java index 273184c6..abb26beb 100644 --- a/src/java/org/lwjgl/opengl/CoreGL13.java +++ b/src/java/org/lwjgl/opengl/CoreGL13.java @@ -42,7 +42,7 @@ import java.nio.*; * @author cix_foo * @version $Revision: 1.23 $ */ -public class CoreGL13 extends CoreGL12 implements CoreGL13Constants { +public abstract class CoreGL13 extends CoreGL12 implements CoreGL13Constants { public static native void glActiveTexture(int texture); public static native void glClientActiveTexture(int texture); public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer data) { diff --git a/src/java/org/lwjgl/opengl/CoreGL14.java b/src/java/org/lwjgl/opengl/CoreGL14.java index a66bcf50..9b0cbb13 100644 --- a/src/java/org/lwjgl/opengl/CoreGL14.java +++ b/src/java/org/lwjgl/opengl/CoreGL14.java @@ -45,7 +45,7 @@ import java.nio.Buffer; * @author cix_foo * @version $Revision: 1.23 $ */ -public class CoreGL14 extends CoreGL13 implements CoreGL14Constants { +public abstract class CoreGL14 extends CoreGL13 implements CoreGL14Constants { public static native void glFogCoordf (float coord); public static void glFogCoordPointer (int stride, FloatBuffer data) { nglFogCoordPointer(GL_FLOAT, stride, data, data.position() << 2); diff --git a/src/java/org/lwjgl/opengl/GL.java b/src/java/org/lwjgl/opengl/GL.java index d26e9b97..d27c9db4 100644 --- a/src/java/org/lwjgl/opengl/GL.java +++ b/src/java/org/lwjgl/opengl/GL.java @@ -46,7 +46,7 @@ import java.nio.Buffer; * @author cix_foo * @version $Revision$ */ -public class GL extends CoreGL14 implements GLConstants { +public abstract class GL extends CoreGL14 implements GLConstants { public static native void glActiveStencilFaceEXT(int face); public static native void glActiveTextureARB(int texture); diff --git a/src/java/org/lwjgl/opengl/GLCaps.java b/src/java/org/lwjgl/opengl/GLCaps.java index d4d19162..b3498b72 100644 --- a/src/java/org/lwjgl/opengl/GLCaps.java +++ b/src/java/org/lwjgl/opengl/GLCaps.java @@ -48,7 +48,7 @@ import java.util.StringTokenizer; * @author elias_naur * @version $Revision$ */ -public class GLCaps { +public abstract class GLCaps { /* * Available extensions */ @@ -249,7 +249,7 @@ public class GLCaps { final String exts; if (WGL_ARB_extensions_string) - exts = GL.wglGetExtensionsStringARB(Window.getCurrentWindow().getHandle()); + exts = GL.wglGetExtensionsStringARB(Window.getHandle()); // Remember - this is an HWND not an HDC, which is what's required. The native // code on the other side of wglGetExtensionsStringARB gets the HDC from the HWND // behind the scenes. diff --git a/src/java/org/lwjgl/opengl/GLU.java b/src/java/org/lwjgl/opengl/GLU.java index 4fb099ba..2a4825a7 100644 --- a/src/java/org/lwjgl/opengl/GLU.java +++ b/src/java/org/lwjgl/opengl/GLU.java @@ -46,18 +46,12 @@ import java.nio.DoubleBuffer; * @author cix_foo * @version $Revision$ */ -public class GLU implements GLUConstants { +public abstract class GLU implements GLUConstants { static { System.loadLibrary(Sys.getLibraryName()); } - /** - * Private constructor for GLU. - */ - private GLU() { - } - public static native String gluErrorString(int errCode); public static native String gluGetString(int name);