scripting: organize imports

Change-Id: I26a1164d44f464a44ed7deb93ac39465feb0541c
Reviewed-on: https://gerrit.libreoffice.org/11768
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

36 files changed, 370 insertions, 282 deletions

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 adcde1fce8ba..3a4f413e9a0a 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 1883b0d2e05a..da0fa02294aa 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 0e4f2bdea05e..076d63810d7b 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 d611c074acfe..c5abd3a5412d 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 d9b74e5a7807..b06689541b39 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 f259da90f097..346c8a9bc607 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 4ac952778c87..67a18e647c71 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 bcc24b66c2e3..5d7f0ed628f9 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 75cd6ce542ed..d5b97bd0f3b2 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 77b2f9fb3810..1bde7eba9c62 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 6f0ae24e9647..32bf9e57a3ef 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 42d237d44ec5..78cbb2cf7784 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 9a338e06e35f..d14a2d73f3a0 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 b8b64096c06e..0e06c883bc05 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 9e17b2c68822..4ad477d6f6a5 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 e4a715060d73..69d7c82db66e 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 19d9c508923e..3fcc07ca2a57 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 8da2bb27ff1b..881502500a8b 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 1d54b136811f..3f7e8296b194 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 aed57aee66f7..55710a2cca52 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 73f3f9c38fd9..2df0e5459ce5 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 5755e8cd6a28..f00697f8738e 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 3cb88c929d2a..97c222445f1e 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 546755e9e93a..c23f15123e5a 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 8ae3b510fdf2..ff5113c49bb5 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 3077ae6da3ec..bee5727bf02f 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 f1f8e09561cb..ff9525be9204 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 5991d2285e42..f5ac82b8ae4e 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 1f56cbe325d4..d552446e43d5 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 9954c6b550c9..df686bf2b857 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 cd2e417695b6..5b38bc0c2e1f 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 b09c530b570d..5f51587a29c8 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 a9bd27293f54..7ca6de411167 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 4ad0f4d52fa7..c530dc36ee08 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 89ebabd62b82..94b2e570efd4 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 e5b7a95cf46e..e837818c95bd 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 {