michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed AL.getPathFromJWS to AL.getPathFromClassLoader and made it access protected methods too

This commit is contained in:
Elias Naur 2005-01-28 15:47:29 +00:00
parent 81400b269f
commit 1446c78b76
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/java/org/lwjgl/openal/AL.java
View File

@ -145,15 +145,15 @@ public final class AL {
throw new LWJGLException("Unknown platform: "+osName); throw new LWJGLException("Unknown platform: "+osName);
} }
String jwsPath = getPathFromJWS(jwsLibname); String jwsPath = getPathFromClassLoader(jwsLibname);
if (jwsPath != null) { if (jwsPath != null) {
Sys.log("getPathFromJWS: Path found: " + jwsPath); Sys.log("getPathFromClassLoader: Path found: " + jwsPath);
libpath += seperator libpath += seperator
+ jwsPath.substring(0, jwsPath.lastIndexOf(File.separator)); + jwsPath.substring(0, jwsPath.lastIndexOf(File.separator));
} }
String lwjgl_jws_path = getPathFromJWS("lwjgl"); String lwjgl_jws_path = getPathFromClassLoader("lwjgl");
if (lwjgl_jws_path != null) { if (lwjgl_jws_path != null) {
Sys.log("getPathFromJWS: Path found: " + lwjgl_jws_path); Sys.log("getPathFromClassLoader: Path found: " + lwjgl_jws_path);
libpath += seperator libpath += seperator
+ lwjgl_jws_path.substring(0, lwjgl_jws_path.lastIndexOf(File.separator)); + lwjgl_jws_path.substring(0, lwjgl_jws_path.lastIndexOf(File.separator));
} }
@ -237,25 +237,29 @@ public final class AL {
} }
/** /**
* Tries to locate OpenAL from the JWS Library path * Tries to locate OpenAL from the current ClassLoader
* This method exists because OpenAL is loaded from native code, and as such * This method exists because OpenAL is loaded from native code, and as such
* is exempt from JWS library loading rutines. OpenAL therefore always fails. * is exempt from ClassLoader library loading rutines. OpenAL therefore always fails.
* We therefore invoke the protected method of the JWS classloader to see if it can * We therefore invoke the protected method of the ClassLoader to see if it can
* locate it. * locate it.
* *
* @param libname Name of library to search for * @param libname Name of library to search for
* @return Absolute path to library if found, otherwise null * @return Absolute path to library if found, otherwise null
*/ */
private static String getPathFromJWS(String libname) { private static String getPathFromClassLoader(String libname) {
try { try {
Sys.log("getPathFromJWS: searching for: " + libname); Sys.log("getPathFromClassLoader: searching for: " + libname);
Object o = AL.class.getClassLoader(); Object o = AL.class.getClassLoader();
Class c = o.getClass(); Class c = o.getClass();
Method findLibrary = while (c != null) {
c.getMethod("findLibrary", new Class[] { String.class }); try {
Object[] arguments = new Object[] { libname }; Method findLibrary = c.getDeclaredMethod("findLibrary", new Class[] { String.class });
return (String) findLibrary.invoke(o, arguments); Object[] arguments = new Object[] { libname };
return (String)findLibrary.invoke(o, arguments);
} catch (NoSuchMethodException e) {
c = c.getSuperclass();
}
}
} catch (Exception e) { } catch (Exception e) {
Sys.log("Failure locating OpenAL using classloader:" + e); Sys.log("Failure locating OpenAL using classloader:" + e);
} }