[Java-game-lib-cvs] CVS: LWJGL/src/java/org/lwjgl Display.java,1.35,1.36 Sys.java,1.33,1.34

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv21938/src/java/org/lwjgl

Modified Files:
	Display.java Sys.java 
Log Message:
Implemented proper debug levels

Index: Display.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Display.java	15 Dec 2003 11:49:16 -0000	1.35
+++ Display.java	20 Dec 2003 14:01:30 -0000	1.36
@@ -80,9 +80,7 @@
 	static {
 		System.loadLibrary(Sys.getLibraryName());
 		init();
-		if (Sys.atDebugLevel()) {
-			System.out.println("Adapter: "+getAdapter()+" Version: "+getVersion());
-		}
+		Sys.log(Sys.DEBUG, "Adapter: "+getAdapter()+" Version: "+getVersion());
 	}
 
 	/**
@@ -120,9 +118,7 @@
 		DisplayMode[] filteredModes = new DisplayMode[modes.size()];
 		modes.toArray(filteredModes);
 
-		if (Sys.atDebugLevel()) {
-			System.out.println("Removed " + (unfilteredModes.length - filteredModes.length) + " duplicate displaymodes");
-		}
+		Sys.log(Sys.DEBUG, "Removed " + (unfilteredModes.length - filteredModes.length) + " duplicate displaymodes");
 
 		return filteredModes;
 	}
@@ -239,9 +235,7 @@
 			gammaRamp.put(i, rampEntry);
 		}
 		setGammaRamp(gammaRamp);
-		if (Sys.atDebugLevel()) {
-			System.out.println("Gamma set, gamma = " + gamma + ", brightness = " + brightness + ", contrast = " + contrast);
-		}
+		Sys.log(Sys.DEBUG, "Gamma set, gamma = " + gamma + ", brightness = " + brightness + ", contrast = " + contrast);
 	}
 
 	/**

Index: Sys.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Sys.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Sys.java	15 Dec 2003 11:49:16 -0000	1.33
+++ Sys.java	20 Dec 2003 14:01:30 -0000	1.34
@@ -48,8 +48,12 @@
  */
 public final class Sys {
 	/** Debug level constants */
-	public static final int DEBUG_DISABLED = 1;
-	public static final int DEBUG_ENABLED = 2;
+	public static final int DEBUG = 6;
+	public static final int INFO = 5;
+	public static final int WARN = 4;
+	public static final int ERROR = 3;
+	public static final int FATAL = 2;
+	public static final int NONE = 1;
 
 	/** Low process priority. @see #setProcessPriority() */
 	public static final int LOW_PRIORITY = -1;
@@ -84,22 +88,28 @@
 	private static String LIBRARY_NAME = "lwjgl";
 	
 	/**
-	 * Debug level. This will tell you if you are using the debug version of
-	 * the library, and whether assertions are enabled or not.
+	 * Debug level. 
 	 */
-	public static final int DEBUG;
+	public static final int debug_level;
 
 	static {
-		int _debug = DEBUG_DISABLED;
-		try {
-			assert false;
-		} catch (AssertionError e) {
-			// Assertions are enabled, so we'll enabled debugging
-			_debug = DEBUG_ENABLED;
-		} finally {
-			DEBUG = _debug;
-			initialize();
+		String debug_level_prop = System.getProperty("lwjgl.debuglevel", "NONE");
+		int _debug = NONE;
+		if (debug_level_prop.equals("DEBUG")) {
+			_debug = DEBUG;
+		} else if (debug_level_prop.equals("INFO")) {
+			_debug = INFO;
+		} else if (debug_level_prop.equals("WARN")) {
+			_debug = WARN;
+		} else if (debug_level_prop.equals("ERROR")) {
+			_debug = ERROR;
+		} else if (debug_level_prop.equals("FATAL")) {
+			_debug = FATAL;
+		} else if (debug_level_prop.equals("NONE")) {
+			_debug = NONE;
 		}
+		debug_level = _debug;
+		initialize();
 	}
 
 	/**
@@ -114,9 +124,21 @@
 	 */
 	private Sys() {
 	}
-	
-	public static boolean atDebugLevel() {
-		return DEBUG >= DEBUG_ENABLED;
+
+	/**
+	 * Prints the given message to System.err if atDebugLevel(debug_level)
+	 * is true.
+	 */
+	public static void log(int debug_level, String msg) {
+		if (atDebugLevel(debug_level))
+			System.err.println(msg);
+	}
+
+	/**
+	 * @return true if the debug level is greater than or equal to level
+	 */
+	public static boolean atDebugLevel(int level) {
+		return debug_level >= level;
 	}
 
 	/**
@@ -124,7 +146,7 @@
 	 */
 	private static void initialize() {
 		System.loadLibrary(LIBRARY_NAME);
-		setDebugLevel(DEBUG);
+		setDebugLevel(debug_level);
 		setTime(0);
 
 		Runtime.getRuntime().addShutdownHook(new Thread() {