scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
| 22 +-
scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
| 21 +-
scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
| 35 ++--
scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
| 8 -
scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
| 30 ++-
scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
| 43 +++--
scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
| 8 -
scripting/java/com/sun/star/script/framework/container/Parcel.java
| 19 +-
scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
| 36 +++-
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
| 1
scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
| 4
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
| 20 +-
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
| 23 +-
scripting/java/com/sun/star/script/framework/container/XMLParser.java
| 3
scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
| 9 -
scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
| 25 ++-
scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
| 4
scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
| 3
scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
| 3
scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
| 33 ++--
scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
| 7
scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
| 10 -
scripting/java/com/sun/star/script/framework/provider/PathUtils.java
| 6
scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
| 16 +-
scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
| 2
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
| 77 ++++------
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
| 16 +-
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
| 28 +--
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
| 38 ++--
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
| 6
scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
| 2
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
| 29 ++-
scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
| 2
scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
| 4
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
| 26 +--
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
| 33 ++--
36 files changed, 370 insertions(+), 282 deletions(-)
New commits:
commit 4a0fc2fb026ee46f7ef8e75135e2ae9b411ae134
Author: Robert Antoni Buj i Gelonch <robert....@gmail.com>
Date: Thu Oct 2 17:38:29 2014 +0200
scripting: organize imports
Change-Id: I26a1164d44f464a44ed7deb93ac39465feb0541c
Reviewed-on: https://gerrit.libreoffice.org/11768
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git
a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index adcde1f..3a4f413 100644
---
a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++
b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -23,32 +23,38 @@ import com.sun.star.awt.ItemEvent;
import com.sun.star.awt.XButton;
import com.sun.star.awt.XCheckBox;
import com.sun.star.awt.XControl;
-import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XControlContainer;
+import com.sun.star.awt.XControlModel;
import com.sun.star.awt.XDialog;
import com.sun.star.awt.XToolkit;
import com.sun.star.awt.XWindow;
import com.sun.star.beans.XPropertySet;
+
import com.sun.star.comp.loader.FactoryHelper;
+
import com.sun.star.container.XNameContainer;
-import com.sun.star.lang.XComponent;
+
import com.sun.star.lang.EventObject;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XInitialization;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XSingleServiceFactory;
import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.lang.XSingleServiceFactory;
+
import com.sun.star.lib.uno.helper.WeakBase;
+
import com.sun.star.registry.XRegistryKey;
-import com.sun.star.uno.UnoRuntime;
+
+import com.sun.star.script.framework.log.LogUtils;
+
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.RuntimeException;
+import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
-import com.sun.star.script.framework.log.LogUtils;
-
public class SecurityDialog extends WeakBase implements XComponent,
XServiceInfo, XDialog,
XInitialization {
diff --git
a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
index 1883b0d..da0fa02 100644
--- a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
+++ b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java
@@ -18,18 +18,25 @@
package com.sun.star.script.framework.browse;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.EventObject;
+import com.sun.star.awt.XButton;
+import com.sun.star.awt.XControl;
+import com.sun.star.awt.XControlContainer;
+import com.sun.star.awt.XControlModel;
+import com.sun.star.awt.XDialog;
+import com.sun.star.awt.XTextComponent;
+import com.sun.star.awt.XToolkit;
+import com.sun.star.awt.XWindow;
import com.sun.star.beans.XPropertySet;
+
import com.sun.star.container.XNameContainer;
-import com.sun.star.awt.*;
+import com.sun.star.lang.EventObject;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
public class DialogFactory {
private static DialogFactory factory;
diff --git
a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index 0e4f2bde..076d638 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -20,33 +20,32 @@ package com.sun.star.script.framework.browse;
import com.sun.star.beans.XIntrospectionAccess;
-import com.sun.star.lib.uno.helper.PropertySet;
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.Any;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.XComponentContext;
-
-
import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lib.uno.helper.PropertySet;
import com.sun.star.script.XInvocation;
+import com.sun.star.script.browse.BrowseNodeTypes;
+import com.sun.star.script.browse.XBrowseNode;
+import com.sun.star.script.framework.container.Parcel;
+import com.sun.star.script.framework.container.ParcelContainer;
+import com.sun.star.script.framework.container.ScriptEntry;
+import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.script.framework.provider.ScriptProvider;
import com.sun.star.ucb.XSimpleFileAccess;
-import com.sun.star.script.browse.XBrowseNode;
-import com.sun.star.script.browse.BrowseNodeTypes;
+import com.sun.star.uno.Any;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
-import com.sun.star.script.framework.provider.ScriptProvider;
-import com.sun.star.script.framework.log.LogUtils;
-import com.sun.star.script.framework.container.ScriptMetaData;
-import com.sun.star.script.framework.container.ScriptEntry;
-import com.sun.star.script.framework.container.Parcel;
-import com.sun.star.script.framework.container.ParcelContainer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
-import java.util.*;
import javax.swing.JOptionPane;
public class ParcelBrowseNode extends PropertySet
diff --git
a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
index d611c07..c5abd3a 100644
---
a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
+++
b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java
@@ -18,11 +18,11 @@
package com.sun.star.script.framework.browse;
-import com.sun.star.uno.XComponentContext;
-
+import com.sun.star.script.framework.container.ParcelContainer;
+import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.ScriptProvider;
-import com.sun.star.script.framework.log.*;
-import com.sun.star.script.framework.container.*;
+
+import com.sun.star.uno.XComponentContext;
public class PkgProviderBrowseNode extends ProviderBrowseNode {
diff --git
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
index d9b74e5..b066895 100644
---
a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
+++
b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java
@@ -18,28 +18,30 @@
package com.sun.star.script.framework.browse;
-import com.sun.star.lib.uno.helper.PropertySet;
-import com.sun.star.uno.Any;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.UnoRuntime;
+import com.sun.star.beans.XIntrospectionAccess;
import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.ucb.XSimpleFileAccess;
+import com.sun.star.lib.uno.helper.PropertySet;
-import com.sun.star.beans.XIntrospectionAccess;
import com.sun.star.script.XInvocation;
-
-import com.sun.star.script.browse.XBrowseNode;
import com.sun.star.script.browse.BrowseNodeTypes;
-
+import com.sun.star.script.browse.XBrowseNode;
+import com.sun.star.script.framework.container.ParcelContainer;
+import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.ScriptProvider;
-import com.sun.star.script.framework.log.*;
-import com.sun.star.script.framework.container.*;
-import java.util.*;
+import com.sun.star.ucb.XSimpleFileAccess;
+
+import com.sun.star.uno.Any;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
import javax.swing.JOptionPane;
public class ProviderBrowseNode extends PropertySet
diff --git
a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index f259da9..346c8a9 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -17,33 +17,38 @@
*/
package com.sun.star.script.framework.browse;
-import com.sun.star.script.browse.XBrowseNode;
-import com.sun.star.script.browse.BrowseNodeTypes;
-import com.sun.star.script.provider.XScriptContext;
-
-import com.sun.star.lib.uno.helper.PropertySet;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Any;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.UnoRuntime;
-
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.ucb.XSimpleFileAccess;
import com.sun.star.beans.XIntrospectionAccess;
-import com.sun.star.script.XInvocation;
+
+import com.sun.star.container.ElementExistException;
+import com.sun.star.container.NoSuchElementException;
import com.sun.star.lang.NoSupportException;
import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.reflection.InvocationTargetException;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.container.ElementExistException;
+import com.sun.star.lang.XMultiComponentFactory;
-import java.util.*;
+import com.sun.star.lib.uno.helper.PropertySet;
+
+import com.sun.star.reflection.InvocationTargetException;
+import com.sun.star.script.XInvocation;
+import com.sun.star.script.browse.BrowseNodeTypes;
+import com.sun.star.script.browse.XBrowseNode;
+import com.sun.star.script.framework.container.Parcel;
+import com.sun.star.script.framework.container.ScriptEntry;
+import com.sun.star.script.framework.container.ScriptMetaData;
import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.ScriptProvider;
-import com.sun.star.script.framework.container.*;
+import com.sun.star.script.provider.XScriptContext;
+
+import com.sun.star.ucb.XSimpleFileAccess;
+
+import com.sun.star.uno.Any;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
+import java.util.HashMap;
public class ScriptBrowseNode extends PropertySet
implements XBrowseNode, XInvocation {
diff --git
a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
index 4ac9527..67a18e64 100644
---
a/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
+++
b/scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java
@@ -18,14 +18,16 @@
package com.sun.star.script.framework.container;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
-import java.io.ByteArrayInputStream;
import java.util.ArrayList;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
public class DeployedUnoPackagesDB {
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java
b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index bcc24b6..5d7f0ed 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -17,16 +17,21 @@
*/
package com.sun.star.script.framework.container;
-import com.sun.star.script.framework.log.*;
-import com.sun.star.script.framework.io.*;
-import com.sun.star.script.framework.provider.PathUtils;
-import com.sun.star.container.*;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
+import com.sun.star.container.ElementExistException;
+import com.sun.star.container.XNameContainer;
+
+import com.sun.star.script.framework.io.XInputStreamImpl;
+import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.script.framework.provider.PathUtils;
+
import com.sun.star.ucb.XSimpleFileAccess;
import com.sun.star.ucb.XSimpleFileAccess2;
-import java.io.*;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
public class Parcel implements XNameContainer {
private ParcelDescriptor m_descriptor;
diff --git
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index 75cd6ce..d5b97bd 100644
---
a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++
b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -18,26 +18,40 @@
package com.sun.star.script.framework.container;
-import com.sun.star.script.framework.log.*;
-import com.sun.star.script.framework.io.*;
-import com.sun.star.script.framework.provider.PathUtils;
-import com.sun.star.container.*;
-import com.sun.star.uno.Type;
-import com.sun.star.lang.*;
-import com.sun.star.io.*;
+import com.sun.star.container.ElementExistException;
+import com.sun.star.container.XNameAccess;
+import com.sun.star.container.XNameContainer;
+
+import com.sun.star.io.XInputStream;
+
+import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.lang.XMultiComponentFactory;
-import java.io.*;
-import java.util.*;
+import com.sun.star.script.framework.io.XInputStreamImpl;
+import com.sun.star.script.framework.io.XInputStreamWrapper;
+import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.script.framework.provider.PathUtils;
import com.sun.star.ucb.XSimpleFileAccess;
import com.sun.star.ucb.XSimpleFileAccess2;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.uno.XComponentContext;
+
+import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
import com.sun.star.uri.XUriReference;
import com.sun.star.uri.XUriReferenceFactory;
import com.sun.star.uri.XVndSunStarScriptUrl;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.StringTokenizer;
+
/**
* The <code>ParcelContainer</code> object is used to store the
* ScripingFramework specific Libraries.
diff --git
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index 77b2f9f..1bde7eb 100644
---
a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++
b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -23,6 +23,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
diff --git
a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index 6f0ae24..32bf9e5 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -17,8 +17,10 @@
*/
package com.sun.star.script.framework.container;
-import java.util.Map;
+
import java.util.HashMap;
+import java.util.Map;
+
public class ScriptEntry implements Cloneable {
private String language;
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 42d237d..78cbb2c 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -18,23 +18,23 @@
package com.sun.star.script.framework.container;
-import java.net.URL;
-
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
+import com.sun.star.script.framework.io.UCBStreamHandler;
+import com.sun.star.script.framework.io.XInputStreamImpl;
import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.PathUtils;
-import com.sun.star.script.framework.io.XInputStreamImpl;
-import com.sun.star.script.framework.io.UCBStreamHandler;
import com.sun.star.ucb.XSimpleFileAccess2;
import com.sun.star.uno.UnoRuntime;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import java.net.URL;
+
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
public class ScriptMetaData extends ScriptEntry {
private boolean hasSource = false;
private String locationPlaceHolder = "";
diff --git
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index 9a338e0..d14a2d7 100644
---
a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++
b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -17,21 +17,24 @@
*/
package com.sun.star.script.framework.container;
+import com.sun.star.deployment.XPackage;
+
+import com.sun.star.io.XOutputStream;
+import com.sun.star.io.XTruncate;
+
+import com.sun.star.script.framework.io.XInputStreamWrapper;
+import com.sun.star.script.framework.io.XOutputStreamWrapper;
import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.PathUtils;
-import com.sun.star.script.framework.io.XOutputStreamWrapper;
-import com.sun.star.script.framework.io.XInputStreamWrapper;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.OutputStream;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
import java.io.InputStream;
+import java.io.OutputStream;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.io.XOutputStream;
-import com.sun.star.io.XTruncate;
-import com.sun.star.deployment.XPackage;
+import java.util.HashMap;
+import java.util.Map;
public class UnoPkgContainer extends ParcelContainer {
diff --git
a/scripting/java/com/sun/star/script/framework/container/XMLParser.java
b/scripting/java/com/sun/star/script/framework/container/XMLParser.java
index b8b6409..0e06c88 100644
--- a/scripting/java/com/sun/star/script/framework/container/XMLParser.java
+++ b/scripting/java/com/sun/star/script/framework/container/XMLParser.java
@@ -18,9 +18,10 @@
package com.sun.star.script.framework.container;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
+
import org.w3c.dom.Document;
public interface XMLParser {
diff --git
a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
index 9e17b2c..4ad477d 100644
---
a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
+++
b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
@@ -18,13 +18,18 @@
package com.sun.star.script.framework.container;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
+
import java.lang.reflect.Method;
-import javax.xml.parsers.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.w3c.dom.Document;
+
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
diff --git
a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index e4a71506..69d7c82 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -18,19 +18,30 @@
package com.sun.star.script.framework.io;
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import java.util.zip.*;
-
-import com.sun.star.ucb.XSimpleFileAccess;
-import com.sun.star.uno.UnoRuntime;
import com.sun.star.io.XInputStream;
import com.sun.star.io.XOutputStream;
import com.sun.star.io.XTruncate;
+
import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.PathUtils;
+import com.sun.star.ucb.XSimpleFileAccess;
+
+import com.sun.star.uno.UnoRuntime;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+
+import java.util.HashMap;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
public class UCBStreamHandler extends URLStreamHandler {
public final static String separator = "/ucb/";
diff --git
a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
index 19d9c50..3fcc07c 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java
@@ -18,11 +18,11 @@
package com.sun.star.script.framework.io;
+import com.sun.star.io.XInputStream;
+
import java.io.IOException;
import java.io.InputStream;
-import com.sun.star.io.XInputStream;
-
public class XInputStreamImpl implements XInputStream {
private InputStream is;
public XInputStreamImpl(InputStream is) {
diff --git
a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
index 8da2bb2..8815025 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
@@ -17,9 +17,10 @@
*/
package com.sun.star.script.framework.io;
-import java.io.InputStream;
import com.sun.star.io.XInputStream;
+import java.io.InputStream;
+
public class XInputStreamWrapper extends InputStream {
private XInputStream m_xInputStream;
diff --git
a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
index 1d54b13..3f7e829 100644
--- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
@@ -16,9 +16,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.script.framework.io;
-import java.io.*;
+
import com.sun.star.io.XOutputStream;
+import java.io.OutputStream;
public class XOutputStreamWrapper extends OutputStream {
private XOutputStream m_xOutputStream;
diff --git
a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
index aed57ae..55710a2 100644
--- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
@@ -18,36 +18,37 @@
package com.sun.star.script.framework.io;
-import com.sun.star.frame.XModel;
+import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XNameAccess;
-import com.sun.star.uno.XInterface;
-import com.sun.star.uno.UnoRuntime;
-
-import com.sun.star.lang.XComponent;
-
-import com.sun.star.uno.AnyConverter;
-
-import com.sun.star.io.XStream;
-import com.sun.star.io.XInputStream;
-import com.sun.star.io.XOutputStream;
+import com.sun.star.document.XDocumentSubStorageSupplier;
import com.sun.star.embed.XStorage;
import com.sun.star.embed.XTransactedObject;
-import com.sun.star.document.XDocumentSubStorageSupplier;
+import com.sun.star.frame.XModel;
-import com.sun.star.beans.XPropertySet;
+import com.sun.star.io.XInputStream;
+import com.sun.star.io.XOutputStream;
+import com.sun.star.io.XStream;
-import com.sun.star.lang.XEventListener;
import com.sun.star.lang.EventObject;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XEventListener;
import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.PathUtils;
-import java.util.*;
-import java.io.*;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XInterface;
+
+import java.io.IOException;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
public class XStorageHelper implements XEventListener {
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 73f3f9c..2df0e54 100644
---
a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++
b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -18,10 +18,11 @@
package com.sun.star.script.framework.provider;
-import java.net.*;
-
-import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.script.framework.log.LogUtils;
+
+import java.net.URL;
+import java.net.URLClassLoader;
/**
* Class Loader Factory
diff --git
a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
index 5755e8c..f00697f8 100644
---
a/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
+++
b/scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java
@@ -17,14 +17,16 @@
*/
package com.sun.star.script.framework.provider;
-import com.sun.star.frame.XModel;
-import com.sun.star.frame.XDesktop;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.UnoRuntime;
import com.sun.star.document.XScriptInvocationContext;
+import com.sun.star.frame.XDesktop;
+import com.sun.star.frame.XModel;
+
import com.sun.star.script.provider.XScriptContext;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
public class EditorScriptContext implements XScriptContext {
private XDesktop m_xDeskTop;
private XComponentContext m_xComponentContext;
diff --git
a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
index 3cb88c9..97c2224 100644
--- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
+++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java
@@ -18,12 +18,12 @@
package com.sun.star.script.framework.provider;
-import java.util.StringTokenizer;
+import com.sun.star.frame.XModel;
+import com.sun.star.uno.IQueryInterface;
import java.lang.reflect.Method;
-import com.sun.star.frame.XModel;
-import com.sun.star.uno.IQueryInterface;
+import java.util.StringTokenizer;
public class PathUtils {
diff --git
a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index 546755e..c23f151 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -17,19 +17,23 @@
*/
package com.sun.star.script.framework.provider;
+import com.sun.star.beans.PropertyAttribute;
+
import com.sun.star.document.XScriptInvocationContext;
-import com.sun.star.frame.XModel;
+
import com.sun.star.frame.XDesktop;
-import com.sun.star.uno.XComponentContext;
+import com.sun.star.frame.XModel;
+
import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.beans.PropertyAttribute;
+
import com.sun.star.lib.uno.helper.PropertySet;
-import com.sun.star.uno.Type;
+import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.provider.XScriptContext;
-import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
public class ScriptContext extends PropertySet implements XScriptContext {
private final static String HM_DOC_REF = "DocumentReference";
diff --git
a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
index 8ae3b51..ff5113c 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java
@@ -18,8 +18,8 @@
package com.sun.star.script.framework.provider;
-import com.sun.star.script.provider.XScriptContext;
import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.script.provider.XScriptContext;
public interface ScriptEditor {
Object execute() throws Exception;
diff --git
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 3077ae6..bee5727 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -17,66 +17,61 @@
*/
package com.sun.star.script.framework.provider;
+import com.sun.star.beans.Property;
+import com.sun.star.beans.XIntrospectionAccess;
+import com.sun.star.beans.XPropertyChangeListener;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.XPropertySetInfo;
+import com.sun.star.beans.XVetoableChangeListener;
+
import com.sun.star.container.XNameContainer;
-import com.sun.star.uno.Exception;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.frame.XModel;
+import com.sun.star.deployment.XPackage;
-import com.sun.star.util.XMacroExpander;
+import com.sun.star.document.XScriptInvocationContext;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
+import com.sun.star.frame.XModel;
+import com.sun.star.frame.XTransientDocumentsDocumentContentFactory;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.beans.XVetoableChangeListener;
-import com.sun.star.beans.XPropertyChangeListener;
-import com.sun.star.beans.XPropertySetInfo;
-import com.sun.star.beans.Property;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XTypeProvider;
-import com.sun.star.beans.XIntrospectionAccess;
import com.sun.star.script.XInvocation;
-
-import com.sun.star.script.provider.XScriptContext;
-import com.sun.star.script.provider.XScriptProvider;
-import com.sun.star.script.provider.XScript;
-import com.sun.star.script.provider.ScriptFrameworkErrorException;
-import com.sun.star.script.provider.ScriptFrameworkErrorType;
-
-import com.sun.star.script.browse.XBrowseNode;
import com.sun.star.script.browse.BrowseNodeTypes;
-
-import com.sun.star.script.framework.log.LogUtils;
-
-import com.sun.star.script.framework.container.ScriptMetaData;
-import com.sun.star.script.framework.container.XMLParserFactory;
+import com.sun.star.script.browse.XBrowseNode;
+import com.sun.star.script.framework.browse.DialogFactory;
+import com.sun.star.script.framework.browse.ProviderBrowseNode;
import com.sun.star.script.framework.container.ParcelContainer;
import com.sun.star.script.framework.container.ParsedScriptUri;
+import com.sun.star.script.framework.container.ScriptMetaData;
import com.sun.star.script.framework.container.UnoPkgContainer;
+import com.sun.star.script.framework.container.XMLParserFactory;
+import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.script.provider.ScriptFrameworkErrorException;
+import com.sun.star.script.provider.ScriptFrameworkErrorType;
+import com.sun.star.script.provider.XScript;
+import com.sun.star.script.provider.XScriptContext;
+import com.sun.star.script.provider.XScriptProvider;
+
+import com.sun.star.sdbc.XRow;
import com.sun.star.ucb.Command;
import com.sun.star.ucb.UniversalContentBroker;
-import com.sun.star.ucb.XContent;
import com.sun.star.ucb.XCommandProcessor;
+import com.sun.star.ucb.XContent;
import com.sun.star.ucb.XContentIdentifier;
import com.sun.star.ucb.XUniversalContentBroker;
-import com.sun.star.sdbc.XRow;
-
-import com.sun.star.script.framework.browse.ProviderBrowseNode;
-import com.sun.star.script.framework.browse.DialogFactory;
-
-import com.sun.star.deployment.XPackage;
-
-
-import com.sun.star.document.XScriptInvocationContext;
-import com.sun.star.frame.XTransientDocumentsDocumentContentFactory;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.Exception;
+import com.sun.star.uno.Type;
import com.sun.star.uno.TypeClass;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
+import com.sun.star.util.XMacroExpander;
public abstract class ScriptProvider
implements XScriptProvider, XBrowseNode, XPropertySet, XInvocation,
diff --git
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
index f1f8e09..ff9525b 100644
---
a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
+++
b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java
@@ -17,19 +17,19 @@
*/
package com.sun.star.script.framework.provider.beanshell;
-import javax.swing.JTextArea;
-import javax.swing.JScrollPane;
-import javax.swing.JComponent;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.DocumentEvent;
-
-import java.awt.Graphics;
import java.awt.Color;
+import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
+import java.awt.Graphics;
import java.awt.Polygon;
import java.awt.Rectangle;
-import java.awt.Dimension;
+
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
public class PlainSourceView extends JScrollPane
implements ScriptSourceView, DocumentListener {
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 5991d22..f5ac82b 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
@@ -17,30 +17,32 @@
*/
package com.sun.star.script.framework.provider.beanshell;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
+import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.script.framework.provider.ClassLoaderFactory;
+import com.sun.star.script.framework.provider.ScriptEditor;
+import com.sun.star.script.framework.provider.SwingInvocation;
+import com.sun.star.script.provider.XScriptContext;
import java.awt.FlowLayout;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
+
import java.net.URL;
-import java.util.Map;
+
import java.util.HashMap;
+import java.util.Map;
-import com.sun.star.script.provider.XScriptContext;
-import com.sun.star.script.framework.provider.ScriptEditor;
-import com.sun.star.script.framework.provider.SwingInvocation;
-import com.sun.star.script.framework.container.ScriptMetaData;
-import com.sun.star.script.framework.provider.ClassLoaderFactory;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
public class ScriptEditorForBeanShell
implements ScriptEditor, ActionListener {
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 1f56cbe..d552446 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
@@ -17,35 +17,41 @@
*/
package com.sun.star.script.framework.provider.beanshell;
-import com.sun.star.uno.XComponentContext;
+import bsh.Interpreter;
+
+import com.sun.star.comp.loader.FactoryHelper;
+
+import com.sun.star.document.XScriptInvocationContext;
+
+import com.sun.star.frame.XModel;
+
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.comp.loader.FactoryHelper;
-import com.sun.star.frame.XModel;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.Any;
import com.sun.star.reflection.InvocationTargetException;
-import java.util.StringTokenizer;
-
-import java.net.URL;
-
-import bsh.Interpreter;
+import com.sun.star.registry.XRegistryKey;
-import com.sun.star.document.XScriptInvocationContext;
-import com.sun.star.script.provider.XScript;
+import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.script.framework.provider.ClassLoaderFactory;
+import com.sun.star.script.framework.provider.ScriptContext;
+import com.sun.star.script.framework.provider.ScriptEditor;
+import com.sun.star.script.framework.provider.ScriptProvider;
import com.sun.star.script.provider.ScriptErrorRaisedException;
import com.sun.star.script.provider.ScriptExceptionRaisedException;
import com.sun.star.script.provider.ScriptFrameworkErrorException;
import com.sun.star.script.provider.ScriptFrameworkErrorType;
+import com.sun.star.script.provider.XScript;
+import com.sun.star.uno.Any;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.XComponentContext;
-import com.sun.star.script.framework.provider.*;
-import com.sun.star.script.framework.log.*;
-import com.sun.star.script.framework.container.ScriptMetaData;
+import java.net.URL;
+
+import java.util.StringTokenizer;
public class ScriptProviderForBeanShell {
public static class ScriptProviderForBeanShell_2 extends ScriptProvider {
diff --git
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
index 9954c6b..df686bf 100644
---
a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
+++
b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java
@@ -17,13 +17,13 @@
*/
package com.sun.star.script.framework.provider.beanshell;
-import java.io.InputStream;
+import com.sun.star.script.provider.XScriptContext;
+
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
-import com.sun.star.script.provider.XScriptContext;
-
public class ScriptSourceModel {
private int currentPosition = -1;
diff --git
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
index cd2e417..5b38bc0 100644
---
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
+++
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java
@@ -18,8 +18,8 @@
package com.sun.star.script.framework.provider.java;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
/**
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 b09c530..5f51587 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
@@ -17,29 +17,36 @@
*/
package com.sun.star.script.framework.provider.java;
-import com.sun.star.frame.XModel;
import com.sun.star.comp.loader.FactoryHelper;
+
import com.sun.star.document.XScriptInvocationContext;
-import com.sun.star.uno.XComponentContext;
+
+import com.sun.star.frame.XModel;
+
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
+
import com.sun.star.registry.XRegistryKey;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.Any;
-import java.util.ArrayList;
-import java.util.Map;
-import com.sun.star.script.provider.XScriptContext;
-import com.sun.star.script.provider.XScript;
+import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.script.framework.provider.ClassLoaderFactory;
+import com.sun.star.script.framework.provider.ScriptContext;
+import com.sun.star.script.framework.provider.ScriptEditor;
+import com.sun.star.script.framework.provider.ScriptProvider;
import com.sun.star.script.provider.ScriptExceptionRaisedException;
import com.sun.star.script.provider.ScriptFrameworkErrorException;
import com.sun.star.script.provider.ScriptFrameworkErrorType;
+import com.sun.star.script.provider.XScript;
+import com.sun.star.script.provider.XScriptContext;
-import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.uno.Any;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.XComponentContext;
-import com.sun.star.script.framework.provider.*;
-import com.sun.star.script.framework.log.LogUtils;
+import java.util.ArrayList;
+import java.util.Map;
public class ScriptProviderForJava {
public static class _ScriptProviderForJava extends ScriptProvider {
diff --git
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
index a9bd272..7ca6de4 100644
---
a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
+++
b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java
@@ -18,8 +18,8 @@
package com.sun.star.script.framework.provider.java;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
/**
* A ScriptProxy object acts as a proxy for a Java <code>Method</code>
diff --git
a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
index 4ad0f4d..c530dc3 100644
---
a/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
+++
b/scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java
@@ -18,9 +18,11 @@
package com.sun.star.script.framework.provider.java;
-import java.lang.reflect.*;
import com.sun.star.script.framework.log.LogUtils;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
/**
* A StrictResolver can be used to get a ScriptProxy object for a given
* ScriptDescriptor and Class. The StrictResolver is an implementation of
diff --git
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index 89ebabd..94b2e57 100644
---
a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++
b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -18,27 +18,27 @@
package com.sun.star.script.framework.provider.javascript;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ImporterTopLevel;
-import org.mozilla.javascript.tools.debugger.Main;
-import org.mozilla.javascript.tools.debugger.ScopeProvider;
-
-import com.sun.star.script.provider.XScriptContext;
import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.provider.ScriptEditor;
import com.sun.star.script.framework.provider.SwingInvocation;
-import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.script.provider.XScriptContext;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
-import java.io.InputStream;
import java.io.IOException;
-import java.net.URL;
+import java.io.InputStream;
-import java.util.Map;
+import java.net.URL;
import java.util.HashMap;
+import java.util.Map;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.ImporterTopLevel;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.tools.debugger.Main;
+import org.mozilla.javascript.tools.debugger.ScopeProvider;
public class ScriptEditorForJavaScript implements ScriptEditor {
// global ScriptEditorForJavaScript instance
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 e5b7a95..e837818 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
@@ -17,36 +17,39 @@
*/
package com.sun.star.script.framework.provider.javascript;
-import com.sun.star.uno.XComponentContext;
+import com.sun.star.comp.loader.FactoryHelper;
+
+import com.sun.star.document.XScriptInvocationContext;
+
+import com.sun.star.frame.XModel;
+
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.frame.XModel;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.comp.loader.FactoryHelper;
-import com.sun.star.document.XScriptInvocationContext;
import com.sun.star.reflection.InvocationTargetException;
-import java.net.URL;
-
-import com.sun.star.script.provider.XScript;
+import com.sun.star.registry.XRegistryKey;
+import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.script.framework.log.LogUtils;
+import com.sun.star.script.framework.provider.ClassLoaderFactory;
+import com.sun.star.script.framework.provider.ScriptContext;
+import com.sun.star.script.framework.provider.ScriptEditor;
+import com.sun.star.script.framework.provider.ScriptProvider;
import com.sun.star.script.provider.ScriptExceptionRaisedException;
import com.sun.star.script.provider.ScriptFrameworkErrorException;
import com.sun.star.script.provider.ScriptFrameworkErrorType;
+import com.sun.star.script.provider.XScript;
-import com.sun.star.script.framework.log.LogUtils;
-import com.sun.star.script.framework.provider.ScriptContext;
-import com.sun.star.script.framework.provider.ClassLoaderFactory;
-import com.sun.star.script.framework.provider.ScriptProvider;
-import com.sun.star.script.framework.provider.ScriptEditor;
-import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.uno.XComponentContext;
+
+import java.net.URL;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ImporterTopLevel;
-import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.Scriptable;
public class ScriptProviderForJavaScript {
public static class ScriptProviderForJavaScript_2 extends ScriptProvider {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
