Java cleanup, make package name match folder name

Change-Id: I4229ea7a4ad4d669db824e14ee6a8acb2ac205a0

qadevOOo/qa/unoapi/Test.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package org.openoffice.qadevOOo.qa.unoapi;
+package unoapi;
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;

qadevOOo/qa/unoapi/makefile.mk

@@ -25,7 +25,7 @@ PRJNAME = qadevOOo
 TARGET = qa_unoapi
 
 .IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/qadevOOo/qa/unoapi
+PACKAGE = unoapi
 JAVATESTFILES = Test.java
 JAVAFILES = $(JAVATESTFILES)
 JARFILES = OOoRunner.jar ridl.jar test.jar

sfx2/JunitTest_sfx2_unoapi.mk

@@ -39,7 +39,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_unoapi,\
 ))
 
 $(eval $(call gb_JunitTest_add_classes,sfx2_unoapi,\
-    org.openoffice.sfx2.qa.unoapi.Test \
+    unoapi.Test \
 ))
 
 # vim: set noet sw=4 ts=4:

sfx2/qa/unoapi/Test.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package org.openoffice.sfx2.qa.unoapi;
+package unoapi;
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;

testtools/source/servicetests/LocalServiceTest.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package testtools.servicetests;
+package servicetests;
 
 import com.sun.star.comp.helper.Bootstrap;
 import com.sun.star.container.XSet;

testtools/source/servicetests/RemoteServiceTest.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package testtools.servicetests;
+package servicetests;
 
 import com.sun.star.bridge.XBridgeFactory;
 import com.sun.star.bridge.XInstanceProvider;

testtools/source/servicetests/TestBase.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package testtools.servicetests;
+package servicetests;
 
 import com.sun.star.uno.UnoRuntime;
 import complexlib.ComplexTestCase;

testtools/source/servicetests/TestService.java

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-package testtools.servicetests;
+package servicetests;
 
 import com.sun.star.lang.NoSupportException;
 import com.sun.star.lang.XServiceInfo;

testtools/source/servicetests/TestService1.idl

@@ -21,7 +21,7 @@
 
 #include <XTestService1.idl>
 
-module testtools { module servicetests {
+module servicetests {
 
 interface TestService1 {
     interface XTestService1;
@@ -41,6 +41,6 @@ interface TestService1 {
     [attribute/*, optional*/] long Prop8Long;
 };
 
-}; };
+};
 
 #endif

testtools/source/servicetests/TestService2.idl

@@ -24,7 +24,7 @@
 #include <XTestService3.idl>
 #include <XTestService4.idl>
 
-module testtools { module servicetests {
+module servicetests {
 
 interface TestService2 {
     interface TestService1;
@@ -33,6 +33,6 @@ interface TestService2 {
     /*[optional] interface XTestService4;*/
 };
 
-}; };
+};
 
 #endif

testtools/source/servicetests/XTestService1.idl

@@ -21,12 +21,12 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 
-module testtools { module servicetests {
+module servicetests {
 
 interface XTestService1: com::sun::star::uno::XInterface {
     long fn1();
 };
 
-}; };
+};
 
 #endif

testtools/source/servicetests/XTestService2.idl

@@ -21,12 +21,12 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 
-module testtools { module servicetests {
+module servicetests {
 
 interface XTestService2: com::sun::star::uno::XInterface {
     long fn2();
 };
 
-}; };
+};
 
 #endif

testtools/source/servicetests/XTestService3.idl

@@ -21,12 +21,12 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 
-module testtools { module servicetests {
+module servicetests {
 
 interface XTestService3: com::sun::star::uno::XInterface {
     long fn3();
 };
 
-}; };
+};
 
 #endif

testtools/source/servicetests/XTestService4.idl

@@ -21,12 +21,12 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 
-module testtools { module servicetests {
+module servicetests {
 
 interface XTestService4: com::sun::star::uno::XInterface {
     long fn4();
 };
 
-}; };
+};
 
 #endif

testtools/source/servicetests/makefile.mk

@@ -20,7 +20,7 @@ PRJ := ..$/..
 PRJNAME := testtools
 TARGET := testtools_servicetests
 
-PACKAGE := testtools$/servicetests
+PACKAGE := servicetests
 JAVATESTFILES := LocalServiceTest.java RemoteServiceTest.java
 JAVAFILES := TestBase.java TestService.java
 IDLTESTFILES := \