Rename packages to match new name #442

core/.classpath

@@ -9,6 +9,7 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@@ -20,12 +21,14 @@
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -34,32 +37,26 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
+	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+	<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
 		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path=".apt_generated">
+	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

core/pom.xml

@@ -82,7 +82,7 @@
         <configuration>
           <keysFile>wollmux.pot</keysFile>
           <poDirectory>${basedir}/i18n</poDirectory>
-          <targetBundle>de.muenchen.allg.itd51.wollmux.i18n.Messages</targetBundle>
+          <targetBundle>org.libreoffice.lots.i18n.Messages</targetBundle>
           <outputFormat>properties</outputFormat>
         </configuration>
         <executions>
@@ -105,7 +105,7 @@
               <addClasspath>true</addClasspath>
             </manifest>
             <manifestEntries>
-              <RegistrationClassName>de.muenchen.allg.itd51.wollmux.ComponentRegistration</RegistrationClassName>
+              <RegistrationClassName>org.libreoffice.lots.ComponentRegistration</RegistrationClassName>
               <UNO-Type-Path>&lt;&gt;</UNO-Type-Path>
             </manifestEntries>
           </archive>

core/src/main/java/module-info.java

@@ -20,87 +20,87 @@
  * limitations under the Licence.
  * #L%
  */
-import de.muenchen.allg.itd51.wollmux.ComponentRegistration;
-import de.muenchen.allg.itd51.wollmux.comp.WollMuxRegistration;
-import de.muenchen.allg.itd51.wollmux.dispatch.Dispatcher;
-import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatcher;
-import de.muenchen.allg.itd51.wollmux.document.commands.OnProcessTextDocument;
-import de.muenchen.allg.itd51.wollmux.event.CheckInstallationListener;
-import de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener;
-import de.muenchen.allg.itd51.wollmux.event.WollMuxEventListenerImpl;
-import de.muenchen.allg.itd51.wollmux.form.sidebar.FormSidebarRegistration;
-import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.SetFormValue;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToOdtEmail;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToOdtFile;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPdfEmail;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPdfFile;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPrinter;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToShowOdtFile;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToSingleODT;
-import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToSinglePDF;
-import de.muenchen.allg.itd51.wollmux.mailmerge.sidebar.MailMergeRegistration;
-import de.muenchen.allg.itd51.wollmux.print.ShowDocument;
-import de.muenchen.allg.itd51.wollmux.sender.SenderEventListener;
-import de.muenchen.allg.itd51.wollmux.sender.dispatch.SenderDispatcher;
-import de.muenchen.allg.itd51.wollmux.sidebar.WollMuxBarRegistration;
-import de.muenchen.allg.itd51.wollmux.slv.dispatch.ContentBasedDirectiveDispatcher;
-import de.muenchen.allg.itd51.wollmux.slv.events.ContentBasedDirectiveEventListener;
-import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrint;
-import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrintCollect;
-import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrintOutput;
+import org.libreoffice.lots.ComponentRegistration;
+import org.libreoffice.lots.comp.WollMuxRegistration;
+import org.libreoffice.lots.dispatch.Dispatcher;
+import org.libreoffice.lots.dispatch.WollMuxDispatcher;
+import org.libreoffice.lots.document.commands.OnProcessTextDocument;
+import org.libreoffice.lots.event.CheckInstallationListener;
+import org.libreoffice.lots.event.WollMuxEventListener;
+import org.libreoffice.lots.event.WollMuxEventListenerImpl;
+import org.libreoffice.lots.form.sidebar.FormSidebarRegistration;
+import org.libreoffice.lots.func.print.PrintFunction;
+import org.libreoffice.lots.mailmerge.print.SetFormValue;
+import org.libreoffice.lots.mailmerge.print.ToOdtEmail;
+import org.libreoffice.lots.mailmerge.print.ToOdtFile;
+import org.libreoffice.lots.mailmerge.print.ToPdfEmail;
+import org.libreoffice.lots.mailmerge.print.ToPdfFile;
+import org.libreoffice.lots.mailmerge.print.ToPrinter;
+import org.libreoffice.lots.mailmerge.print.ToShowOdtFile;
+import org.libreoffice.lots.mailmerge.print.ToSingleODT;
+import org.libreoffice.lots.mailmerge.print.ToSinglePDF;
+import org.libreoffice.lots.mailmerge.sidebar.MailMergeRegistration;
+import org.libreoffice.lots.print.ShowDocument;
+import org.libreoffice.lots.sender.SenderEventListener;
+import org.libreoffice.lots.sender.dispatch.SenderDispatcher;
+import org.libreoffice.lots.sidebar.WollMuxBarRegistration;
+import org.libreoffice.lots.slv.dispatch.ContentBasedDirectiveDispatcher;
+import org.libreoffice.lots.slv.events.ContentBasedDirectiveEventListener;
+import org.libreoffice.lots.slv.print.ContentBasedDirectivePrint;
+import org.libreoffice.lots.slv.print.ContentBasedDirectivePrintCollect;
+import org.libreoffice.lots.slv.print.ContentBasedDirectivePrintOutput;
 
 module wollmux
 {
-  exports de.muenchen.allg.itd51.wollmux;
-  exports de.muenchen.allg.itd51.wollmux.comp;
-  exports de.muenchen.allg.itd51.wollmux.config;
-  exports de.muenchen.allg.itd51.wollmux.config.generator.xml;
-  exports de.muenchen.allg.itd51.wollmux.config.scanner;
-  exports de.muenchen.allg.itd51.wollmux.db;
-  exports de.muenchen.allg.itd51.wollmux.dialog;
-  exports de.muenchen.allg.itd51.wollmux.dispatch;
-  exports de.muenchen.allg.itd51.wollmux.document;
-  exports de.muenchen.allg.itd51.wollmux.document.commands;
-  exports de.muenchen.allg.itd51.wollmux.document.nodes;
-  exports de.muenchen.allg.itd51.wollmux.event;
-  exports de.muenchen.allg.itd51.wollmux.event.handlers;
-  exports de.muenchen.allg.itd51.wollmux.form.config;
-  exports de.muenchen.allg.itd51.wollmux.form.control;
-  exports de.muenchen.allg.itd51.wollmux.form.model;
-  exports de.muenchen.allg.itd51.wollmux.form.sidebar;
-  exports de.muenchen.allg.itd51.wollmux.former;
-  exports de.muenchen.allg.itd51.wollmux.former.model;
-  exports de.muenchen.allg.itd51.wollmux.former.control;
-  exports de.muenchen.allg.itd51.wollmux.former.control.model;
-  exports de.muenchen.allg.itd51.wollmux.former.document;
-  exports de.muenchen.allg.itd51.wollmux.former.function;
-  exports de.muenchen.allg.itd51.wollmux.former.group;
-  exports de.muenchen.allg.itd51.wollmux.former.group.model;
-  exports de.muenchen.allg.itd51.wollmux.former.insertion;
-  exports de.muenchen.allg.itd51.wollmux.former.insertion.model;
-  exports de.muenchen.allg.itd51.wollmux.former.section;
-  exports de.muenchen.allg.itd51.wollmux.former.section.model;
-  exports de.muenchen.allg.itd51.wollmux.former.view;
-  exports de.muenchen.allg.itd51.wollmux.func;
-  exports de.muenchen.allg.itd51.wollmux.func.print;
-  exports de.muenchen.allg.itd51.wollmux.mailmerge;
-  exports de.muenchen.allg.itd51.wollmux.mailmerge.ds;
-  exports de.muenchen.allg.itd51.wollmux.mailmerge.mail;
-  exports de.muenchen.allg.itd51.wollmux.mailmerge.print;
-  exports de.muenchen.allg.itd51.wollmux.mailmerge.printsettings;
-  exports de.muenchen.allg.itd51.wollmux.mailmerge.sidebar;
-  exports de.muenchen.allg.itd51.wollmux.mailmerge.ui;
-  exports de.muenchen.allg.itd51.wollmux.print;
-  exports de.muenchen.allg.itd51.wollmux.sender;
-  exports de.muenchen.allg.itd51.wollmux.sidebar;
-  exports de.muenchen.allg.itd51.wollmux.slv;
-  exports de.muenchen.allg.itd51.wollmux.slv.dialog;
-  exports de.muenchen.allg.itd51.wollmux.slv.dispatch;
-  exports de.muenchen.allg.itd51.wollmux.slv.events;
-  exports de.muenchen.allg.itd51.wollmux.slv.print;
-  exports de.muenchen.allg.itd51.wollmux.ui;
-  exports de.muenchen.allg.itd51.wollmux.util;
+  exports org.libreoffice.lots;
+  exports org.libreoffice.lots.comp;
+  exports org.libreoffice.lots.config;
+  exports org.libreoffice.lots.config.generator.xml;
+  exports org.libreoffice.lots.config.scanner;
+  exports org.libreoffice.lots.db;
+  exports org.libreoffice.lots.dialog;
+  exports org.libreoffice.lots.dispatch;
+  exports org.libreoffice.lots.document;
+  exports org.libreoffice.lots.document.commands;
+  exports org.libreoffice.lots.document.nodes;
+  exports org.libreoffice.lots.event;
+  exports org.libreoffice.lots.event.handlers;
+  exports org.libreoffice.lots.form.config;
+  exports org.libreoffice.lots.form.control;
+  exports org.libreoffice.lots.form.model;
+  exports org.libreoffice.lots.form.sidebar;
+  exports org.libreoffice.lots.former;
+  exports org.libreoffice.lots.former.model;
+  exports org.libreoffice.lots.former.control;
+  exports org.libreoffice.lots.former.control.model;
+  exports org.libreoffice.lots.former.document;
+  exports org.libreoffice.lots.former.function;
+  exports org.libreoffice.lots.former.group;
+  exports org.libreoffice.lots.former.group.model;
+  exports org.libreoffice.lots.former.insertion;
+  exports org.libreoffice.lots.former.insertion.model;
+  exports org.libreoffice.lots.former.section;
+  exports org.libreoffice.lots.former.section.model;
+  exports org.libreoffice.lots.former.view;
+  exports org.libreoffice.lots.func;
+  exports org.libreoffice.lots.func.print;
+  exports org.libreoffice.lots.mailmerge;
+  exports org.libreoffice.lots.mailmerge.ds;
+  exports org.libreoffice.lots.mailmerge.mail;
+  exports org.libreoffice.lots.mailmerge.print;
+  exports org.libreoffice.lots.mailmerge.printsettings;
+  exports org.libreoffice.lots.mailmerge.sidebar;
+  exports org.libreoffice.lots.mailmerge.ui;
+  exports org.libreoffice.lots.print;
+  exports org.libreoffice.lots.sender;
+  exports org.libreoffice.lots.sidebar;
+  exports org.libreoffice.lots.slv;
+  exports org.libreoffice.lots.slv.dialog;
+  exports org.libreoffice.lots.slv.dispatch;
+  exports org.libreoffice.lots.slv.events;
+  exports org.libreoffice.lots.slv.print;
+  exports org.libreoffice.lots.ui;
+  exports org.libreoffice.lots.util;
 
   requires transitive org.libreoffice.uno;
   requires transitive org.libreoffice.unoloader;

core/src/main/java/de/muenchen/allg/itd51/wollmux/ComponentRegistration.java → core/src/main/java/org/libreoffice/lots/ComponentRegistration.java

@@ -20,18 +20,18 @@
  * limitations under the Licence.
  * #L%
  */
-package de.muenchen.allg.itd51.wollmux;
+package org.libreoffice.lots;
 
 import java.util.ServiceLoader;
 
+import org.libreoffice.lots.comp.WollMux;
+
 import com.sun.star.comp.loader.FactoryHelper;
 import com.sun.star.comp.loader.JavaLoader;
 import com.sun.star.lang.XSingleComponentFactory;
 import com.sun.star.lib.uno.helper.Factory;
 import com.sun.star.registry.XRegistryKey;
 
-import de.muenchen.allg.itd51.wollmux.comp.WollMux;
-
 /**
  * A service for registering and creating UNO Service components.
  *

core/src/main/java/de/muenchen/allg/itd51/wollmux/ConfClassLoader.java → core/src/main/java/org/libreoffice/lots/ConfClassLoader.java

@@ -20,18 +20,17 @@
  * limitations under the Licence.
  * #L%
  */
-package de.muenchen.allg.itd51.wollmux;
+package org.libreoffice.lots;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
 
+import org.libreoffice.lots.config.ConfigThingy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.muenchen.allg.itd51.wollmux.config.ConfigThingy;
-
 /**
  * ClassLoader which uses the classpath defined in the WollMux configuration. It's implemented as a
  * singleton.

core/src/main/java/de/muenchen/allg/itd51/wollmux/DebugExternalWollMux.java → core/src/main/java/org/libreoffice/lots/DebugExternalWollMux.java

@@ -20,7 +20,7 @@
  * limitations under the Licence.
  * #L%
  */
-package de.muenchen.allg.itd51.wollmux;
+package org.libreoffice.lots;
 
 import java.io.OutputStreamWriter;
 
@@ -36,12 +36,12 @@
 import com.sun.star.uno.UnoRuntime;
 
 import org.libreoffice.ext.unohelper.common.UNO;
-import de.muenchen.allg.itd51.wollmux.comp.WollMux;
-import de.muenchen.allg.itd51.wollmux.form.sidebar.FormFactory;
-import de.muenchen.allg.itd51.wollmux.mailmerge.sidebar.MailMergeFactory;
-import de.muenchen.allg.itd51.wollmux.sidebar.WollMuxSidebarFactory;
-import de.muenchen.allg.itd51.wollmux.util.LogConfig;
 import org.libreoffice.ext.unohelper.util.UnoComponent;
+import org.libreoffice.lots.comp.WollMux;
+import org.libreoffice.lots.form.sidebar.FormFactory;
+import org.libreoffice.lots.mailmerge.sidebar.MailMergeFactory;
+import org.libreoffice.lots.sidebar.WollMuxSidebarFactory;
+import org.libreoffice.lots.util.LogConfig;
 
 /**
  * With this class, WollMux can be started for debugging in the local JVM

core/src/main/java/de/muenchen/allg/itd51/wollmux/GlobalFunctions.java → core/src/main/java/org/libreoffice/lots/GlobalFunctions.java

@@ -20,14 +20,14 @@
  * limitations under the Licence.
  * #L%
  */
-package de.muenchen.allg.itd51.wollmux;
+package org.libreoffice.lots;
 
-import de.muenchen.allg.itd51.wollmux.dialog.DialogFactory;
-import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary;
-import de.muenchen.allg.itd51.wollmux.func.FunctionFactory;
-import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary;
-import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction;
-import de.muenchen.allg.itd51.wollmux.print.PrintFunctionLibrary;
+import org.libreoffice.lots.dialog.DialogFactory;
+import org.libreoffice.lots.dialog.DialogLibrary;
+import org.libreoffice.lots.func.FunctionFactory;
+import org.libreoffice.lots.func.FunctionLibrary;
+import org.libreoffice.lots.func.print.PrintFunction;
+import org.libreoffice.lots.print.PrintFunctionLibrary;
 
 /**
  * Collection of all globally defined functions.

core/src/main/java/de/muenchen/allg/itd51/wollmux/HashableComponent.java → core/src/main/java/org/libreoffice/lots/HashableComponent.java

@@ -20,7 +20,7 @@
  * limitations under the Licence.
  * #L%
  */
-package de.muenchen.allg.itd51.wollmux;
+package org.libreoffice.lots;
 
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;

core/src/main/java/de/muenchen/allg/itd51/wollmux/OpenExt.java → core/src/main/java/org/libreoffice/lots/OpenExt.java

@@ -20,7 +20,7 @@
  * limitations under the Licence.
  * #L%
  */
-package de.muenchen.allg.itd51.wollmux;
+package org.libreoffice.lots;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -42,10 +42,10 @@
 import com.sun.star.frame.XStorable;
 
 import org.libreoffice.ext.unohelper.common.UNO;
-import de.muenchen.allg.itd51.wollmux.config.ConfigThingy;
-import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException;
-import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException;
-import de.muenchen.allg.itd51.wollmux.util.L;
+import org.libreoffice.lots.config.ConfigThingy;
+import org.libreoffice.lots.config.ConfigurationErrorException;
+import org.libreoffice.lots.config.NodeNotFoundException;
+import org.libreoffice.lots.util.L;
 
 /**
  * Class that facilitates calling external applications.

core/src/main/java/de/muenchen/allg/itd51/wollmux/Shortcuts.java → core/src/main/java/org/libreoffice/lots/Shortcuts.java

@@ -20,7 +20,7 @@
  * limitations under the Licence.
  * #L%
  */
-package de.muenchen.allg.itd51.wollmux;
+package org.libreoffice.lots;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -38,8 +38,8 @@
 
 import org.libreoffice.ext.unohelper.common.UNO;
 import org.libreoffice.ext.unohelper.common.UnoHelperException;
-import de.muenchen.allg.itd51.wollmux.config.ConfigThingy;
-import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException;
+import org.libreoffice.lots.config.ConfigThingy;
+import org.libreoffice.lots.config.NodeNotFoundException;
 
 public class Shortcuts
 {