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

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

Modified Files:
	Display.java Sys.java 
Log Message:
Reduced Sys.debug from bool -> int

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.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Display.java	20 Dec 2003 14:01:30 -0000	1.36
+++ Display.java	20 Dec 2003 22:03:24 -0000	1.37
@@ -80,7 +80,7 @@
 	static {
 		System.loadLibrary(Sys.getLibraryName());
 		init();
-		Sys.log(Sys.DEBUG, "Adapter: "+getAdapter()+" Version: "+getVersion());
+		Sys.log("Adapter: "+getAdapter()+" Version: "+getVersion());
 	}
 
 	/**
@@ -118,7 +118,7 @@
 		DisplayMode[] filteredModes = new DisplayMode[modes.size()];
 		modes.toArray(filteredModes);
 
-		Sys.log(Sys.DEBUG, "Removed " + (unfilteredModes.length - filteredModes.length) + " duplicate displaymodes");
+		Sys.log("Removed " + (unfilteredModes.length - filteredModes.length) + " duplicate displaymodes");
 
 		return filteredModes;
 	}
@@ -235,7 +235,7 @@
 			gammaRamp.put(i, rampEntry);
 		}
 		setGammaRamp(gammaRamp);
-		Sys.log(Sys.DEBUG, "Gamma set, gamma = " + gamma + ", brightness = " + brightness + ", contrast = " + contrast);
+		Sys.log("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.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Sys.java	20 Dec 2003 14:01:30 -0000	1.34
+++ Sys.java	20 Dec 2003 22:03:24 -0000	1.35
@@ -47,14 +47,6 @@
  * @version $Revision$
  */
 public final class Sys {
-	/** Debug level constants */
-	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;
 
@@ -90,25 +82,14 @@
 	/**
 	 * Debug level. 
 	 */
-	public static final int debug_level;
+	public static final boolean debug;
 
 	static {
-		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;
+		String debug_level_prop = System.getProperty("org.lwjgl.Sys.debug", "false");
+		if (debug_level_prop.equals("true"))
+			debug = true;
+		else
+			debug = false;
 		initialize();
 	}
 
@@ -126,19 +107,19 @@
 	}
 
 	/**
-	 * Prints the given message to System.err if atDebugLevel(debug_level)
+	 * Prints the given message to System.err if isDebugEnabled()
 	 * is true.
 	 */
-	public static void log(int debug_level, String msg) {
-		if (atDebugLevel(debug_level))
+	public static void log(String msg) {
+		if (isDebugEnabled())
 			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;
+	public static boolean isDebugEnabled() {
+		return debug;
 	}
 
 	/**
@@ -146,7 +127,7 @@
 	 */
 	private static void initialize() {
 		System.loadLibrary(LIBRARY_NAME);
-		setDebugLevel(debug_level);
+		setDebug(debug);
 		setTime(0);
 
 		Runtime.getRuntime().addShutdownHook(new Thread() {
@@ -166,7 +147,7 @@
 	/**
          * Set the debug level of the native library
 	 */
-	private static native void setDebugLevel(int level);
+	private static native void setDebug(boolean debug);
 
 	/**
 	 * Obtains the number of ticks that the hires timer does in a second.