diff options
4 files changed, 6 insertions, 9 deletions
diff --git a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java index 73ba06938884..5434945ed41e 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java +++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java @@ -31,7 +31,7 @@ public class ClassLoaderFactory { private ClassLoaderFactory() {} - public static URLClassLoader getURLClassLoader(ScriptMetaData scriptData) { + public static ClassLoader getURLClassLoader(ScriptMetaData scriptData) { ClassLoader parent = scriptData.getClass().getClassLoader(); URL[] classPath = scriptData.getClassPath(); LogUtils.DEBUG("Classpath has length " + classPath.length); @@ -43,7 +43,7 @@ public class ClassLoaderFactory { return getURLClassLoader(parent, classPath); } - private static URLClassLoader getURLClassLoader(ClassLoader parent, + public static ClassLoader getURLClassLoader(ClassLoader parent, URL[] classpath) { return new URLClassLoader(classpath, parent); } diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java index 87553b7faaf0..32fa751351d0 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java @@ -35,7 +35,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URL; -import java.net.URLClassLoader; import java.util.HashMap; import java.util.Map; @@ -185,14 +184,14 @@ public class ScriptEditorForBeanShell implements ScriptEditor, ActionListener { public void edit(final XScriptContext context, ScriptMetaData entry) { if (entry != null) { try { - URLClassLoader cl = null; + ClassLoader cl = null; try { cl = ClassLoaderFactory.getURLClassLoader(entry); } catch (Exception ignore) { // TODO re-examine error handling } - final URLClassLoader theCl = cl; + final ClassLoader theCl = cl; final URL url = entry.getSourceURL(); SwingInvocation.invoke( new Runnable() { diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java index 4caf64578800..2aabba71242b 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java @@ -50,7 +50,6 @@ import com.sun.star.uno.Type; import com.sun.star.uno.XComponentContext; import java.net.URL; -import java.net.URLClassLoader; import java.util.StringTokenizer; @@ -183,7 +182,7 @@ class ScriptImpl implements XScript { aOutParamIndex[0] = new short[0]; aOutParam[0] = new Object[0]; - URLClassLoader cl = null; + ClassLoader cl = null; URL sourceUrl = null; try { diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java index fcd08cd2e9ca..9465a646f64d 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java @@ -45,7 +45,6 @@ import com.sun.star.script.provider.XScript; import com.sun.star.uno.XComponentContext; import java.net.URL; -import java.net.URLClassLoader; import org.mozilla.javascript.Context; import org.mozilla.javascript.ImporterTopLevel; @@ -182,7 +181,7 @@ class ScriptImpl implements XScript { aOutParamIndex[0] = new short[0]; aOutParam[0] = new Object[0]; - URLClassLoader cl = null; + ClassLoader cl = null; try { cl = ClassLoaderFactory.getURLClassLoader(metaData); |