aboutsummaryrefslogtreecommitdiffstats
path: root/src/newt
diff options
context:
space:
mode:
Diffstat (limited to 'src/newt')
-rw-r--r--src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java75
1 files changed, 0 insertions, 75 deletions
diff --git a/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java b/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
index 4283ef6dc..6316e750f 100644
--- a/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
+++ b/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java
@@ -60,79 +60,4 @@ public class NativeLibLoader extends NativeLibLoaderBase {
});
}
- //----------------------------------------------------------------------
- // Support for the new JNLPAppletLauncher
- //
-
- private static class NEWTAction implements NativeLibLoaderBase.LoaderAction {
- public void loadLibrary(String libname, String[] preload,
- boolean preloadIgnoreError) {
- if (null!=preload) {
- for (int i=0; i<preload.length; i++) {
- if(!isLoaded(preload[i])) {
- try {
- if(DEBUG) {
- System.err.println("NEWT NativeLibLoader preload "+preload[i]);
- }
- loadLibraryInternal(preload[i]);
- addLoaded(preload[i]);
- }
- catch (UnsatisfiedLinkError e) {
- if (!preloadIgnoreError && e.getMessage().indexOf("already loaded") < 0) {
- throw e;
- }
- }
- }
- }
- }
-
- if(DEBUG) {
- System.err.println("NEWT NativeLibLoader load "+libname);
- }
- loadLibraryInternal(libname);
- addLoaded(libname);
- }
- }
-
- private static boolean usingJNLPAppletLauncher;
- private static Method jnlpLoadLibraryMethod;
-
- static {
- NativeLibLoaderBase.setLoadingAction(new NEWTAction());
- String sunAppletLauncher = Debug.getProperty("sun.jnlp.applet.launcher", false);
- usingJNLPAppletLauncher = Boolean.valueOf(sunAppletLauncher).booleanValue();
- }
-
- // I hate the amount of delegation currently in this class
- private static void loadLibraryInternal(String libraryName) {
- // Note: special-casing JAWT which is built in to the JDK
- if (usingJNLPAppletLauncher && !libraryName.equals("jawt")) {
- try {
- if (jnlpLoadLibraryMethod == null) {
- Class jnlpAppletLauncherClass = Class.forName("org.jdesktop.applet.util.JNLPAppletLauncher");
- jnlpLoadLibraryMethod = jnlpAppletLauncherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
- }
- jnlpLoadLibraryMethod.invoke(null, new Object[] { libraryName });
- } catch (Exception e) {
- Throwable t = e;
- if (t instanceof InvocationTargetException) {
- t = ((InvocationTargetException) t).getTargetException();
- }
- if (t instanceof Error)
- throw (Error) t;
- if (t instanceof RuntimeException) {
- throw (RuntimeException) t;
- }
- // Throw UnsatisfiedLinkError for best compatibility with System.loadLibrary()
- throw (UnsatisfiedLinkError) new UnsatisfiedLinkError().initCause(e);
- }
- } else {
- // FIXME: remove
- // System.out.println("sun.boot.library.path=" + Debug.getProperty("sun.boot.library.path", false));
- System.loadLibrary(libraryName);
- if(DEBUG) {
- System.err.println("NEWT NativeLibLoader loaded "+libraryName);
- }
- }
- }
}