summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-09-21 20:53:08 +0200
committerSven Gothel <[email protected]>2011-09-21 20:53:08 +0200
commit8bdf543c561c8ddeb58cfd62c02debff333b8455 (patch)
tree0a1930730f28498402af8b4bf276c6b02b5edac3
parentf5807168950d74c96a3040fd1581ae93e71c4978 (diff)
Proper usage of loadLibrary
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java4
-rw-r--r--src/newt/classes/jogamp/newt/NEWTJNILibLoader.java9
2 files changed, 4 insertions, 9 deletions
diff --git a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
index 33e2905a0..d4ba27353 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
@@ -36,9 +36,9 @@ import com.jogamp.common.jvm.JNILibLoaderBase;
public class NWJNILibLoader extends JNILibLoaderBase {
public static void loadNativeWindow(final String ossuffix) {
- AccessController.doPrivileged(new PrivilegedAction() {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
- loadLibrary("nativewindow_"+ossuffix, null, false);
+ loadLibrary("nativewindow_"+ossuffix, false);
return null;
}
});
diff --git a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
index 7b89398db..a47079baf 100644
--- a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
+++ b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
@@ -39,21 +39,16 @@
package jogamp.newt;
-// FIXME: refactor Java SE dependencies
-//import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.HashSet;
import com.jogamp.common.jvm.JNILibLoaderBase;
public class NEWTJNILibLoader extends JNILibLoaderBase {
public static void loadNEWT() {
- AccessController.doPrivileged(new PrivilegedAction() {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
- loadLibrary("newt", null, true);
+ loadLibrary("newt", false);
return null;
}
});