Java cleanup, make the package name match the folder name

Note that the code doesn't compile after this change, it is still
very out of date with respect to changes in the UNO framework

Change-Id: I5a001002a3fcf20496bba4367b9f2da4ceba9f88

11 files changed, 11 insertions, 15 deletions

diff --git a/scripting/workben/ifc/scripting/ScriptingUtils.java b/scripting/workben/ifc/scripting/ScriptingUtils.java
index 7cedc29a8e17..cc75fd16da08 100644
--- a/scripting/workben/ifc/scripting/ScriptingUtils.java
+++ b/scripting/workben/ifc/scripting/ScriptingUtils.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework;
+package ifc.scripting;
 
 import java.io.File;
 import drafts.com.sun.star.script.framework.storage.XScriptStorageManager;
diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
index 8edb9a9083d3..90bb94a9ef87 100644
--- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java
+++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java
@@ -15,7 +15,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-package ifc.script.framework;
+package ifc.scripting;
 
 import com.sun.star.awt.*;
 import com.sun.star.lang.XMultiServiceFactory;
diff --git a/scripting/workben/ifc/scripting/_XFunction.java b/scripting/workben/ifc/scripting/_XFunction.java
index dd8a21da6a5a..4db6f295a487 100644
--- a/scripting/workben/ifc/scripting/_XFunction.java
+++ b/scripting/workben/ifc/scripting/_XFunction.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.provider;
+package ifc.scripting;
 
 import drafts.com.sun.star.script.framework.provider.XFunction;
 import drafts.com.sun.star.script.framework.provider.XFunctionProvider;
diff --git a/scripting/workben/ifc/scripting/_XFunctionProvider.java b/scripting/workben/ifc/scripting/_XFunctionProvider.java
index e0ae0c068dfc..63ddb974394d 100644
--- a/scripting/workben/ifc/scripting/_XFunctionProvider.java
+++ b/scripting/workben/ifc/scripting/_XFunctionProvider.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.provider;
+package ifc.scripting;
 
 import drafts.com.sun.star.script.framework.provider.XFunctionProvider;
 import drafts.com.sun.star.script.framework.provider.XFunction;
diff --git a/scripting/workben/ifc/scripting/_XScriptInfo.java b/scripting/workben/ifc/scripting/_XScriptInfo.java
index da93ee836e27..ac6f852f0ac0 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfo.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfo.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.storage;
+package ifc.scripting;
 
 import drafts.com.sun.star.script.framework.storage.XScriptStorageManager;
 import drafts.com.sun.star.script.framework.storage.XScriptInfoAccess;
diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
index 879622971069..31cc4113641c 100644
--- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
+++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java
@@ -16,9 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.storage;
-
-import ifc.script.framework.ScriptingUtils;
+package ifc.scripting;
 
 import drafts.com.sun.star.script.framework.storage.XScriptInfoAccess;
 import drafts.com.sun.star.script.framework.storage.XScriptInfo;
diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java
index 3ba78a2e27af..09bde39c43ae 100644
--- a/scripting/workben/ifc/scripting/_XScriptInvocation.java
+++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.runtime;
+package ifc.scripting;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
index d44785c09fc5..a67148c3538b 100644
--- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java
+++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.runtime;
+package ifc.scripting;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java
index d30d8c359135..2ee623392d9e 100644
--- a/scripting/workben/ifc/scripting/_XScriptSecurity.java
+++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.security;
+package ifc.scripting;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -37,8 +37,6 @@ import com.sun.star.container.XNameReplace;
 import com.sun.star.util.XChangesBatch;
 import com.sun.star.reflection.InvocationTargetException;
 
-import ifc.script.framework.SecurityDialogUtil;
-
 import lib.MultiMethodTest;
 import lib.StatusException;
 import lib.Parameters;
diff --git a/scripting/workben/ifc/scripting/_XScriptStorageManager.java b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
index e4350116a95a..6ec3b5cb2851 100644
--- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.storage;
+package ifc.scripting;
 
 import drafts.com.sun.star.script.framework.storage.XScriptStorageManager;
 import drafts.com.sun.star.script.framework.storage.XScriptInfoAccess;
diff --git a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
index 7924bf874d41..1ea6864a5555 100644
--- a/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
+++ b/scripting/workben/ifc/scripting/_XScriptStorageRefresh.java
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package ifc.script.framework.storage;
+package ifc.scripting;
 
 import drafts.com.sun.star.script.framework.storage.XScriptStorageRefresh;