[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2674] trunk/LWJGL/src/java/org/lwjgl

[<eli...@us...>]

Revision: 2674
          http://svn.sourceforge.net/java-game-lib/?rev=2674&view=rev
Author:   elias_naur
Date:     2006-11-20 11:28:50 -0800 (Mon, 20 Nov 2006)

Log Message:
-----------
Made LWJGLUtil.getPathFromClassLoader private

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
    trunk/LWJGL/src/java/org/lwjgl/openal/AL.java

Modified: trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2006-11-20 09:26:44 UTC (rev 2673)
+++ trunk/LWJGL/src/java/org/lwjgl/LWJGLUtil.java	2006-11-20 19:28:50 UTC (rev 2674)
@@ -404,7 +404,7 @@
 	 * @param classloader Classloader to use
 	 * @return Absolute path to library if found, otherwise null
 	 */
-	public static String getPathFromClassLoader(final String libname, final ClassLoader classloader) {
+	private static String getPathFromClassLoader(final String libname, final ClassLoader classloader) {
 		try {
 			log("getPathFromClassLoader: searching for: " + libname);
 			Class c = classloader.getClass();

Modified: trunk/LWJGL/src/java/org/lwjgl/openal/AL.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/openal/AL.java	2006-11-20 09:26:44 UTC (rev 2673)
+++ trunk/LWJGL/src/java/org/lwjgl/openal/AL.java	2006-11-20 19:28:50 UTC (rev 2674)
@@ -122,6 +122,7 @@
 			try {
 				nCreate(oalPaths[i]);
 				created = true;
+				init(deviceArguments, contextFrequency, contextRefresh, contextSynchronized, openDevice);
 				break;
 			} catch (LWJGLException e) {
 				LWJGLUtil.log("Failed to load " + oalPaths[i] + ": " + e.getMessage());
@@ -131,10 +132,13 @@
 			// Try to load OpenAL from the framework instead
 			nCreateDefault();
 			created = true;
+			init(deviceArguments, contextFrequency, contextRefresh, contextSynchronized, openDevice);
 		}
 		if (!created)
 			throw new LWJGLException("Could not locate OpenAL library.");
+	}
 
+	private static void init(String deviceArguments, int contextFrequency, int contextRefresh, boolean contextSynchronized, boolean openDevice) throws LWJGLException {
 		try {
 			AL10.initNativeStubs();
 			ALC.initNativeStubs();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.