From 3cdd9516f3ba8a66e9ac3f81c921fc9b060e8c6b Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Thu, 5 Feb 2004 16:33:31 +0000 Subject: [PATCH] assertion on Window.isCreated --- src/java/org/lwjgl/input/Controller.java | 4 ++++ src/java/org/lwjgl/input/Keyboard.java | 2 ++ src/java/org/lwjgl/input/Mouse.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/java/org/lwjgl/input/Controller.java b/src/java/org/lwjgl/input/Controller.java index b6fef124..2bd621b2 100644 --- a/src/java/org/lwjgl/input/Controller.java +++ b/src/java/org/lwjgl/input/Controller.java @@ -36,6 +36,7 @@ import java.util.HashMap; import java.util.Map; import org.lwjgl.Sys; +import org.lwjgl.opengl.Window; /** * $Id$ @@ -163,6 +164,9 @@ public class Controller { * @throws Exception if the controller could not be created for any reason */ public static void create() throws Exception { + + assert Window.isCreated() : "Window must be created prior to creating controller"; + if (!initialized) { initialize(); } diff --git a/src/java/org/lwjgl/input/Keyboard.java b/src/java/org/lwjgl/input/Keyboard.java index 730f8390..b3bb0765 100644 --- a/src/java/org/lwjgl/input/Keyboard.java +++ b/src/java/org/lwjgl/input/Keyboard.java @@ -40,6 +40,7 @@ import java.util.HashMap; import java.util.Map; import org.lwjgl.Sys; +import org.lwjgl.opengl.Window; /** * $Id$ @@ -282,6 +283,7 @@ public class Keyboard { * @throws Exception if the keyboard could not be created for any reason */ public static void create() throws Exception { + assert Window.isCreated() : "Window must be created prior to creating keyboard"; if (!initialized) initialize(); if (created) diff --git a/src/java/org/lwjgl/input/Mouse.java b/src/java/org/lwjgl/input/Mouse.java index da5a7876..c80e731b 100644 --- a/src/java/org/lwjgl/input/Mouse.java +++ b/src/java/org/lwjgl/input/Mouse.java @@ -234,6 +234,9 @@ public class Mouse { * @throws Exception if the mouse could not be created for any reason */ public static void create() throws Exception { + + assert Window.isCreated() : "Window must be created prior to creating mouse"; + if (!initialized) { initialize(); }