diff --git a/src/java/org/lwjgl/LWJGLException.java b/src/java/org/lwjgl/LWJGLException.java index 1c9c9531..54d63344 100644 --- a/src/java/org/lwjgl/LWJGLException.java +++ b/src/java/org/lwjgl/LWJGLException.java @@ -43,6 +43,8 @@ package org.lwjgl; */ public class LWJGLException extends Exception { + private static final long serialVersionUID = 1L; + /** * Plain c'tor */ diff --git a/src/java/org/lwjgl/openal/OpenALException.java b/src/java/org/lwjgl/openal/OpenALException.java index a4835f4c..ac3b56b2 100644 --- a/src/java/org/lwjgl/openal/OpenALException.java +++ b/src/java/org/lwjgl/openal/OpenALException.java @@ -42,6 +42,8 @@ package org.lwjgl.openal; */ public class OpenALException extends RuntimeException { + private static final long serialVersionUID = 1L; + /** * Constructor for OpenALException. */ diff --git a/src/java/org/lwjgl/opengl/AWTGLCanvas.java b/src/java/org/lwjgl/opengl/AWTGLCanvas.java index cc80e3e3..4e27ebe4 100644 --- a/src/java/org/lwjgl/opengl/AWTGLCanvas.java +++ b/src/java/org/lwjgl/opengl/AWTGLCanvas.java @@ -55,6 +55,9 @@ import org.lwjgl.Sys; * $Id$ */ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener, HierarchyListener { + + private static final long serialVersionUID = 1L; + private final static AWTCanvasImplementation implementation; private boolean update_context; private Object SYNC_LOCK = new Object(); @@ -173,7 +176,7 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener, /** * Set swap interval. */ - public void setSwapInterval(int swap_interval) throws LWJGLException { + public void setSwapInterval(int swap_interval) { synchronized(SYNC_LOCK) { if (context == null) throw new IllegalStateException("Canvas not yet displayable"); @@ -184,7 +187,7 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener, /** * Enable vsync */ - public void setVSyncEnabled(boolean enabled) throws LWJGLException { + public void setVSyncEnabled(boolean enabled) { setSwapInterval(enabled ? 1 : 0); } diff --git a/src/java/org/lwjgl/opengl/Display.java b/src/java/org/lwjgl/opengl/Display.java index b6e013eb..b4cd8931 100644 --- a/src/java/org/lwjgl/opengl/Display.java +++ b/src/java/org/lwjgl/opengl/Display.java @@ -355,7 +355,7 @@ public final class Display { * @param fps The desired frame rate, in frames per second */ public static void sync3(int fps) { - float frameTime = 1.0f / (float) (fps > 1 ? fps - 1 : 1); + float frameTime = 1.0f / (fps > 1 ? fps - 1 : 1); timeNow = Sys.getTime(); while (timeNow > timeThen && (float) (timeNow - timeThen) / (float) Sys.getTimerResolution() < frameTime) { // This is a system-friendly way of allowing other stuff to use CPU if it wants to @@ -685,7 +685,7 @@ public final class Display { // We haven't used GLU here to do this to avoid an unnecessary dependency. GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); - GL11.glOrtho(0.0, (double) current_mode.getWidth(), 0.0, (double) current_mode.getHeight(), -1.0, 1.0); + GL11.glOrtho(0.0, current_mode.getWidth(), 0.0, current_mode.getHeight(), -1.0, 1.0); GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glLoadIdentity(); GL11.glViewport(0, 0, current_mode.getWidth(), current_mode.getHeight()); diff --git a/src/java/org/lwjgl/opengl/KeyboardEventQueue.java b/src/java/org/lwjgl/opengl/KeyboardEventQueue.java index 086ebae4..da201581 100644 --- a/src/java/org/lwjgl/opengl/KeyboardEventQueue.java +++ b/src/java/org/lwjgl/opengl/KeyboardEventQueue.java @@ -264,7 +264,7 @@ final class KeyboardEventQueue extends EventQueue implements KeyListener { if ( key_states[key_code_mapped] == state ) return; key_states[key_code_mapped] = state; - int key_int_char = ((int)character) & 0xffff; + int key_int_char = character & 0xffff; putKeyboardEvent(key_code_mapped, state, key_int_char); } diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java index 42ef0c32..80738c26 100644 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java @@ -287,8 +287,6 @@ final class MacOSXDisplay implements DisplayImplementation { native void getMouseDeltas(IntBuffer delta_buffer); - private native void updateContext(); - public void reshape(int x, int y, int width, int height) { frame.resize(x, y, width, height); } diff --git a/src/java/org/lwjgl/opengl/MacOSXFrame.java b/src/java/org/lwjgl/opengl/MacOSXFrame.java index 936c1122..21ea781b 100644 --- a/src/java/org/lwjgl/opengl/MacOSXFrame.java +++ b/src/java/org/lwjgl/opengl/MacOSXFrame.java @@ -55,13 +55,14 @@ import org.lwjgl.LWJGLException; final class MacOSXFrame extends Frame implements WindowListener, ComponentListener { + private static final long serialVersionUID = -5823294716668988777L; + private final MacOSXGLCanvas canvas; private boolean close_requested; /* States */ private Rectangle bounds; private boolean active; - private boolean visible; private boolean minimized; private boolean should_warp_cursor; diff --git a/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java b/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java index 5a0e9caa..1fc6765b 100644 --- a/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java +++ b/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java @@ -47,6 +47,8 @@ import java.awt.event.HierarchyListener; final class MacOSXGLCanvas extends Canvas implements ComponentListener, HierarchyListener { + private static final long serialVersionUID = 6916664741667434870L; + private int width; private int height; private boolean context_update; diff --git a/src/java/org/lwjgl/opengl/OpenGLException.java b/src/java/org/lwjgl/opengl/OpenGLException.java index 27fd733f..4b5b2027 100644 --- a/src/java/org/lwjgl/opengl/OpenGLException.java +++ b/src/java/org/lwjgl/opengl/OpenGLException.java @@ -43,6 +43,8 @@ import org.lwjgl.opengl.glu.GLU; */ public class OpenGLException extends RuntimeException { + private static final long serialVersionUID = 1L; + /** Constructor for OpenGLException. */ public OpenGLException(int gl_error_code) { this(createErrorMessage(gl_error_code)); diff --git a/src/java/org/lwjgl/opengl/glu/MipMap.java b/src/java/org/lwjgl/opengl/glu/MipMap.java index 5055d284..4f93abc8 100644 --- a/src/java/org/lwjgl/opengl/glu/MipMap.java +++ b/src/java/org/lwjgl/opengl/glu/MipMap.java @@ -234,7 +234,7 @@ public class MipMap extends Util { for ( i = 0; i < heightIn; i++ ) { int ubptr = i * rowstride + pss.unpackSkipRows * rowstride + pss.unpackSkipPixels * components; for ( j = 0; j < widthIn * components; j++ ) { - tempIn[k++] = (float)((int)dataIn.get(ubptr++) & 0xff); + tempIn[k++] = dataIn.get(ubptr++) & 0xff; } } break; diff --git a/src/java/org/lwjgl/opengl/glu/PartialDisk.java b/src/java/org/lwjgl/opengl/glu/PartialDisk.java index 78421ddd..8e8f1423 100644 --- a/src/java/org/lwjgl/opengl/glu/PartialDisk.java +++ b/src/java/org/lwjgl/opengl/glu/PartialDisk.java @@ -83,11 +83,10 @@ public class PartialDisk extends Quadric { float startAngle, float sweepAngle) { - int i, j, max; + int i, j; float[] sinCache = new float[CACHE_SIZE]; float[] cosCache = new float[CACHE_SIZE]; float angle; - float x, y; float sintemp, costemp; float deltaRadius; float radiusLow, radiusHigh; diff --git a/src/java/org/lwjgl/util/Color.java b/src/java/org/lwjgl/util/Color.java index a292d8fb..57f06784 100644 --- a/src/java/org/lwjgl/util/Color.java +++ b/src/java/org/lwjgl/util/Color.java @@ -462,7 +462,7 @@ public final class Color implements ReadableColor, Serializable, WritableColor { int i1 = r >= g ? g : r; if (b < i1) i1 = b; - float brightness = (float) l / 255F; + float brightness = l / 255F; float saturation; if (l != 0) saturation = (float) (l - i1) / (float) l; diff --git a/src/java/org/lwjgl/util/Display.java b/src/java/org/lwjgl/util/Display.java index 1b70a909..cedb76b5 100644 --- a/src/java/org/lwjgl/util/Display.java +++ b/src/java/org/lwjgl/util/Display.java @@ -163,7 +163,7 @@ public final class Display { final FieldAccessor[] field; - Sorter() throws NoSuchFieldException { + Sorter() { field = new FieldAccessor[param.length]; for (int i = 0; i < field.length; i ++) { int idx = param[i].indexOf('='); diff --git a/src/java/org/lwjgl/util/XPMFile.java b/src/java/org/lwjgl/util/XPMFile.java index abb7df7b..1c3719f0 100644 --- a/src/java/org/lwjgl/util/XPMFile.java +++ b/src/java/org/lwjgl/util/XPMFile.java @@ -62,10 +62,8 @@ public class XPMFile { * @param is * InputStream to read file from * @return XPMFile loaded, or exception - * @throws IOException - * If any IO exceptions occurs while reading file */ - public static XPMFile load(InputStream is) throws IOException { + public static XPMFile load(InputStream is) { XPMFile xFile = new XPMFile(); xFile.readImage(is); return xFile; @@ -94,11 +92,8 @@ public class XPMFile { /** * Read the image from the specified file. - * - * @throws IOException - * If any IO exceptions occurs while reading file */ - private void readImage(InputStream is) throws IOException { + private void readImage(InputStream is) { try { LineNumberReader reader = new LineNumberReader( new InputStreamReader(is)); diff --git a/src/java/org/lwjgl/util/jinput/LWJGLMouse.java b/src/java/org/lwjgl/util/jinput/LWJGLMouse.java index 4d44f956..48c09b32 100644 --- a/src/java/org/lwjgl/util/jinput/LWJGLMouse.java +++ b/src/java/org/lwjgl/util/jinput/LWJGLMouse.java @@ -25,16 +25,14 @@ package org.lwjgl.util.jinput; +import java.io.IOException; + import net.java.games.input.AbstractComponent; -import net.java.games.input.Mouse; import net.java.games.input.Component; import net.java.games.input.Controller; -import net.java.games.input.Rumbler; import net.java.games.input.Event; -import java.util.List; -import java.util.ArrayList; - -import java.io.IOException; +import net.java.games.input.Mouse; +import net.java.games.input.Rumbler; /** * @author elias diff --git a/src/java/org/lwjgl/util/vector/Matrix2f.java b/src/java/org/lwjgl/util/vector/Matrix2f.java index 1423c502..c0aa1be9 100644 --- a/src/java/org/lwjgl/util/vector/Matrix2f.java +++ b/src/java/org/lwjgl/util/vector/Matrix2f.java @@ -45,6 +45,8 @@ import java.nio.FloatBuffer; public class Matrix2f extends Matrix implements Serializable { + private static final long serialVersionUID = 1L; + public float m00 = 1.0f, m01, m10, m11 = 1.0f; /** diff --git a/src/java/org/lwjgl/util/vector/Matrix3f.java b/src/java/org/lwjgl/util/vector/Matrix3f.java index fa5246ae..9f385bdc 100644 --- a/src/java/org/lwjgl/util/vector/Matrix3f.java +++ b/src/java/org/lwjgl/util/vector/Matrix3f.java @@ -45,6 +45,8 @@ import java.nio.FloatBuffer; public class Matrix3f extends Matrix implements Serializable { + private static final long serialVersionUID = 1L; + public float m00 = 1.0f, m01, m02, diff --git a/src/java/org/lwjgl/util/vector/Matrix4f.java b/src/java/org/lwjgl/util/vector/Matrix4f.java index 576c979b..4198f514 100644 --- a/src/java/org/lwjgl/util/vector/Matrix4f.java +++ b/src/java/org/lwjgl/util/vector/Matrix4f.java @@ -41,6 +41,8 @@ import java.nio.FloatBuffer; */ public class Matrix4f extends Matrix implements Serializable { + private static final long serialVersionUID = 1L; + public float m00 = 1.0f, m01, m02, m03, m10, m11 = 1.0f, m12, m13, m20, m21, m22 = 1.0f, m23, m30, m31, m32, m33 = 1.0f; /** diff --git a/src/java/org/lwjgl/util/vector/Quaternion.java b/src/java/org/lwjgl/util/vector/Quaternion.java index 1daf93a9..457af235 100644 --- a/src/java/org/lwjgl/util/vector/Quaternion.java +++ b/src/java/org/lwjgl/util/vector/Quaternion.java @@ -44,6 +44,8 @@ import java.nio.FloatBuffer; public class Quaternion extends Vector implements ReadableVector4f { + private static final long serialVersionUID = 1L; + private float x, y, z, w; /** diff --git a/src/java/org/lwjgl/util/vector/Vector2f.java b/src/java/org/lwjgl/util/vector/Vector2f.java index 126b7719..15bcb6dd 100644 --- a/src/java/org/lwjgl/util/vector/Vector2f.java +++ b/src/java/org/lwjgl/util/vector/Vector2f.java @@ -45,6 +45,8 @@ import java.nio.FloatBuffer; public class Vector2f extends Vector implements Serializable, ReadableVector2f, WritableVector2f { + private static final long serialVersionUID = 1L; + public float x, y; /** diff --git a/src/java/org/lwjgl/util/vector/Vector3f.java b/src/java/org/lwjgl/util/vector/Vector3f.java index c88c3e94..d15c8e75 100644 --- a/src/java/org/lwjgl/util/vector/Vector3f.java +++ b/src/java/org/lwjgl/util/vector/Vector3f.java @@ -45,6 +45,8 @@ import java.nio.FloatBuffer; public class Vector3f extends Vector implements Serializable, ReadableVector3f, WritableVector3f { + private static final long serialVersionUID = 1L; + public float x, y, z; /** diff --git a/src/java/org/lwjgl/util/vector/Vector4f.java b/src/java/org/lwjgl/util/vector/Vector4f.java index d308880c..5707b034 100644 --- a/src/java/org/lwjgl/util/vector/Vector4f.java +++ b/src/java/org/lwjgl/util/vector/Vector4f.java @@ -45,6 +45,8 @@ import java.nio.FloatBuffer; public class Vector4f extends Vector implements Serializable, ReadableVector4f, WritableVector4f { + private static final long serialVersionUID = 1L; + public float x, y, z, w; /**