diff options
Diffstat (limited to 'scripting/java')
6 files changed, 9 insertions, 54 deletions
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index f39e8b92f6e8..eb1e560355c2 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -41,14 +41,7 @@ import com.sun.star.script.framework.io.UCBStreamHandler; import com.sun.star.ucb.XSimpleFileAccess2; -import com.sun.star.uno.AnyConverter; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; - -import com.sun.star.uri.UriReferenceFactory; -import com.sun.star.uri.XVndSunStarExpandUrl; - -import com.sun.star.util.XMacroExpander; public class ScriptMetaData extends ScriptEntry implements Cloneable { private boolean hasSource = false; @@ -244,8 +237,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable { return "\nParcelLocation = " + getParcelLocation() + "\nLocationPlaceHolder = " + locationPlaceHolder + super.toString(); } - public URL[] getClassPath(XComponentContext context) - throws java.net.MalformedURLException + public URL[] getClassPath() throws java.net.MalformedURLException { try { @@ -272,7 +264,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable { { String relativeClasspath = stk.nextToken(); String pathToProcess = PathUtils.make_url( parcelPath, relativeClasspath); - URL url = expandURL( context, pathToProcess ); + URL url = createURL( pathToProcess ); if ( url != null ) { classPathVec.add ( url ); @@ -281,7 +273,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable { } if ( classPathVec.size() == 0) { - URL url = expandURL( context, parcelPath ); + URL url = createURL( parcelPath ); if ( url != null ) { classPathVec.add(url); @@ -298,38 +290,6 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable { } } - - private URL expandURL(XComponentContext context, String url) - throws java.net.MalformedURLException - { - XVndSunStarExpandUrl exp = UnoRuntime.queryInterface( - XVndSunStarExpandUrl.class, - UriReferenceFactory.create(context).parse(url)); - String expurl; - if (exp == null) { - expurl = url; - } else { - XMacroExpander expander; - try { - expander = (XMacroExpander) AnyConverter.toObject( - XMacroExpander.class, - context.getValueByName( - "/singletons/com.sun.star.util.theMacroExpander")); - } catch (com.sun.star.lang.IllegalArgumentException e) { - throw new RuntimeException(e); - } - try { - expurl = exp.expand(expander); - } catch (com.sun.star.lang.IllegalArgumentException e) { - java.net.MalformedURLException e2 = - new java.net.MalformedURLException(e.toString()); - e2.initCause(e); - throw e2; - } - } - return new URL(expurl); - } - private URL createURL( String path ) throws java.net.MalformedURLException { URL url = null; 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 a83191986376..4086a3c29741 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java +++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java @@ -22,7 +22,6 @@ import java.net.*; import com.sun.star.script.framework.log.LogUtils; import com.sun.star.script.framework.container.ScriptMetaData; -import com.sun.star.uno.XComponentContext; /** * Class Loader Factory @@ -31,12 +30,11 @@ public class ClassLoaderFactory { private ClassLoaderFactory() {} - public static ClassLoader getURLClassLoader( - XComponentContext context, ScriptMetaData scriptData ) + public static ClassLoader getURLClassLoader( ScriptMetaData scriptData ) throws NoSuitableClassLoaderException, MalformedURLException { ClassLoader parent = scriptData.getClass().getClassLoader(); - URL[] classPath = scriptData.getClassPath(context); + URL[] classPath = scriptData.getClassPath(); LogUtils.DEBUG("Classpath has length " + classPath.length ); for ( int i=0; i < classPath.length; i++ ) { 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 4fd6a9400c13..0497bd91bcf5 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 @@ -192,8 +192,7 @@ public class ScriptEditorForBeanShell try { ClassLoader cl = null; try { - cl = ClassLoaderFactory.getURLClassLoader( - context.getComponentContext(), entry ); + cl = ClassLoaderFactory.getURLClassLoader( entry ); } catch (Exception ignore) // TODO re-examine error handling { 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 bed3c7a86d13..ea23768e75e6 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 @@ -187,8 +187,7 @@ class ScriptImpl implements XScript ClassLoader cl = null; URL sourceUrl = null; try { - cl = ClassLoaderFactory.getURLClassLoader( - m_xContext, metaData ); + cl = ClassLoaderFactory.getURLClassLoader( metaData ); sourceUrl = metaData.getSourceURL(); } catch ( java.net.MalformedURLException mfu ) diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index 6c5024b5f199..090f1626e0d7 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -191,7 +191,7 @@ class ScriptImpl implements XScript try { LogUtils.DEBUG( "Classloader starting..." ); scriptLoader = ClassLoaderFactory.getURLClassLoader( - m_xContext, metaData ); + metaData ); LogUtils.DEBUG( "Classloader finished..." ); } catch (MalformedURLException mfe ) 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 aa36af86a176..73ce9c59505c 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 @@ -186,8 +186,7 @@ class ScriptImpl implements XScript ClassLoader cl = null; URL sourceUrl = null; try { - cl = ClassLoaderFactory.getURLClassLoader( - m_xContext, metaData ); + cl = ClassLoaderFactory.getURLClassLoader( metaData ); sourceUrl = metaData.getSourceURL(); } catch ( java.net.MalformedURLException mfu ) |