diff --git a/core/.classpath b/core/.classpath index b44268cf5..715717a87 100644 --- a/core/.classpath +++ b/core/.classpath @@ -9,6 +9,7 @@ + @@ -20,12 +21,14 @@ - + + + @@ -34,32 +37,26 @@ - + - - - - + - - - - + - + - + - + diff --git a/core/pom.xml b/core/pom.xml index 78a36cc54..fd4373238 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -82,7 +82,7 @@ wollmux.pot ${basedir}/i18n - de.muenchen.allg.itd51.wollmux.i18n.Messages + org.libreoffice.lots.i18n.Messages properties @@ -105,7 +105,7 @@ true - de.muenchen.allg.itd51.wollmux.ComponentRegistration + org.libreoffice.lots.ComponentRegistration <> diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALChangeEventBroadcaster.java b/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALChangeEventBroadcaster.java deleted file mode 100644 index 6c801cd72..000000000 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALChangeEventBroadcaster.java +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * #%L - * WollMux - * %% - * Copyright (C) 2005 - 2023 Landeshauptstadt München and LibreOffice contributors - * %% - * Licensed under the EUPL, Version 1.1 or – as soon they will be - * approved by the European Commission - subsequent versions of the - * EUPL (the "Licence"); - * - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * - * http://ec.europa.eu/idabc/eupl5 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * #L% - */ -package de.muenchen.allg.itd51.wollmux; - -/** - * Support renaming of IDL interfaces. - * - * {@link de.muenchen.allg.itd51.wollmux.interfaces.XPALChangeEventBroadcaster} - * - * @deprecated - */ -@Deprecated(since = "18.2.0", forRemoval = true) -@SuppressWarnings("java:S2176") -public interface XPALChangeEventBroadcaster extends de.muenchen.allg.itd51.wollmux.interfaces.XPALChangeEventBroadcaster -{ - -} diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALChangeEventListener.java b/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALChangeEventListener.java deleted file mode 100644 index 7f5da4013..000000000 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALChangeEventListener.java +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * #%L - * WollMux - * %% - * Copyright (C) 2005 - 2023 Landeshauptstadt München and LibreOffice contributors - * %% - * Licensed under the EUPL, Version 1.1 or – as soon they will be - * approved by the European Commission - subsequent versions of the - * EUPL (the "Licence"); - * - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * - * http://ec.europa.eu/idabc/eupl5 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * #L% - */ -package de.muenchen.allg.itd51.wollmux; - -/** - * Support renaming of IDL interfaces. - * - * {@link de.muenchen.allg.itd51.wollmux.interfaces.XPALChangeEventListener} - * - * @deprecated - */ -@Deprecated(since = "18.2.0", forRemoval = true) -@SuppressWarnings("java:S2176") -public interface XPALChangeEventListener extends de.muenchen.allg.itd51.wollmux.interfaces.XPALChangeEventListener -{ - -} diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALProvider.java b/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALProvider.java deleted file mode 100644 index 3914af44d..000000000 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPALProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * #%L - * WollMux - * %% - * Copyright (C) 2005 - 2023 Landeshauptstadt München and LibreOffice contributors - * %% - * Licensed under the EUPL, Version 1.1 or – as soon they will be - * approved by the European Commission - subsequent versions of the - * EUPL (the "Licence"); - * - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * - * http://ec.europa.eu/idabc/eupl5 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * #L% - */ -package de.muenchen.allg.itd51.wollmux; - -/** - * Support renaming of IDL interfaces. - * - * {@link de.muenchen.allg.itd51.wollmux.interfaces.XPALProvider} - * - * @deprecated - */ -@Deprecated(since = "18.2.0", forRemoval = true) -@SuppressWarnings("java:S2176") -public interface XPALProvider extends de.muenchen.allg.itd51.wollmux.interfaces.XPALProvider -{ - -} diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPrintModel.java b/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPrintModel.java deleted file mode 100644 index ca985e8bb..000000000 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XPrintModel.java +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * #%L - * WollMux - * %% - * Copyright (C) 2005 - 2023 Landeshauptstadt München and LibreOffice contributors - * %% - * Licensed under the EUPL, Version 1.1 or – as soon they will be - * approved by the European Commission - subsequent versions of the - * EUPL (the "Licence"); - * - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * - * http://ec.europa.eu/idabc/eupl5 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * #L% - */ -package de.muenchen.allg.itd51.wollmux; - -/** - * Support renaming of IDL interfaces. - * - * {@link de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel} - * - * @deprecated - */ -@Deprecated(since = "18.2.0", forRemoval = true) -@SuppressWarnings("java:S2176") -public interface XPrintModel extends de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel -{ - -} diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XWollMux.java b/core/src/main/java/de/muenchen/allg/itd51/wollmux/XWollMux.java deleted file mode 100644 index d1b03062a..000000000 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XWollMux.java +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * #%L - * WollMux - * %% - * Copyright (C) 2005 - 2023 Landeshauptstadt München and LibreOffice contributors - * %% - * Licensed under the EUPL, Version 1.1 or – as soon they will be - * approved by the European Commission - subsequent versions of the - * EUPL (the "Licence"); - * - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * - * http://ec.europa.eu/idabc/eupl5 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * #L% - */ -package de.muenchen.allg.itd51.wollmux; - -/** - * Support renaming of IDL interfaces. - * - * {@link de.muenchen.allg.itd51.wollmux.interfaces.XWollMux} - * - * @deprecated - */ -@Deprecated(since = "18.2.0", forRemoval = true) -@SuppressWarnings("java:S2176") -public interface XWollMux extends de.muenchen.allg.itd51.wollmux.interfaces.XWollMux -{ - -} diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XWollMuxDocument.java b/core/src/main/java/de/muenchen/allg/itd51/wollmux/XWollMuxDocument.java deleted file mode 100644 index eb267ce85..000000000 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/XWollMuxDocument.java +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * #%L - * WollMux - * %% - * Copyright (C) 2005 - 2023 Landeshauptstadt München and LibreOffice contributors - * %% - * Licensed under the EUPL, Version 1.1 or – as soon they will be - * approved by the European Commission - subsequent versions of the - * EUPL (the "Licence"); - * - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * - * http://ec.europa.eu/idabc/eupl5 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * #L% - */ -package de.muenchen.allg.itd51.wollmux; - -/** - * Support renaming of IDL interfaces. - * - * {@link de.muenchen.allg.itd51.wollmux.interfaces.XWollMuxDocument} - * - * @deprecated - */ -@Deprecated(since = "18.2.0", forRemoval = true) -@SuppressWarnings("java:S2176") -public interface XWollMuxDocument extends de.muenchen.allg.itd51.wollmux.interfaces.XWollMuxDocument -{ - -} diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index 0b473016b..cdb2ea6fe 100644 --- a/core/src/main/java/module-info.java +++ b/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; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/ComponentRegistration.java b/core/src/main/java/org/libreoffice/lots/ComponentRegistration.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/ComponentRegistration.java rename to core/src/main/java/org/libreoffice/lots/ComponentRegistration.java index 4dd0713ec..6b67f0d2c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/ComponentRegistration.java +++ b/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. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/ConfClassLoader.java b/core/src/main/java/org/libreoffice/lots/ConfClassLoader.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/ConfClassLoader.java rename to core/src/main/java/org/libreoffice/lots/ConfClassLoader.java index 7200cffb2..48dcc398b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/ConfClassLoader.java +++ b/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. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/DebugExternalWollMux.java b/core/src/main/java/org/libreoffice/lots/DebugExternalWollMux.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/DebugExternalWollMux.java rename to core/src/main/java/org/libreoffice/lots/DebugExternalWollMux.java index 0f551e3d2..63ba11088 100755 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/DebugExternalWollMux.java +++ b/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 diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/GlobalFunctions.java b/core/src/main/java/org/libreoffice/lots/GlobalFunctions.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/GlobalFunctions.java rename to core/src/main/java/org/libreoffice/lots/GlobalFunctions.java index 48d2d1f25..7fd5cb88b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/GlobalFunctions.java +++ b/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. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/HashableComponent.java b/core/src/main/java/org/libreoffice/lots/HashableComponent.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/HashableComponent.java rename to core/src/main/java/org/libreoffice/lots/HashableComponent.java index c37bf8fe5..6e7f7a05b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/HashableComponent.java +++ b/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; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/OpenExt.java b/core/src/main/java/org/libreoffice/lots/OpenExt.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/OpenExt.java rename to core/src/main/java/org/libreoffice/lots/OpenExt.java index 3e752999a..615faac64 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/OpenExt.java +++ b/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. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/Shortcuts.java b/core/src/main/java/org/libreoffice/lots/Shortcuts.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/Shortcuts.java rename to core/src/main/java/org/libreoffice/lots/Shortcuts.java index 5fa958573..3bc10ebb2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/Shortcuts.java +++ b/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 { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/SyncActionListener.java b/core/src/main/java/org/libreoffice/lots/SyncActionListener.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/SyncActionListener.java rename to core/src/main/java/org/libreoffice/lots/SyncActionListener.java index 81df16a8d..4745350f9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/SyncActionListener.java +++ b/core/src/main/java/org/libreoffice/lots/SyncActionListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux; +package org.libreoffice.lots; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/TextModule.java b/core/src/main/java/org/libreoffice/lots/TextModule.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/TextModule.java rename to core/src/main/java/org/libreoffice/lots/TextModule.java index 5625dd12c..453ee86d9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/TextModule.java +++ b/core/src/main/java/org/libreoffice/lots/TextModule.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux; +package org.libreoffice.lots; import java.util.Iterator; import java.util.LinkedList; @@ -43,15 +43,15 @@ import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.document.TextRangeRelation; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommands; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnJumpToMark; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.common.TextDocument; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.document.TextRangeRelation; +import org.libreoffice.lots.document.commands.DocumentCommand; +import org.libreoffice.lots.document.commands.DocumentCommands; +import org.libreoffice.lots.event.handlers.OnJumpToMark; +import org.libreoffice.lots.util.L; /** * Class contains static methods that are required for the text block system diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxFehlerException.java b/core/src/main/java/org/libreoffice/lots/WollMuxFehlerException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxFehlerException.java rename to core/src/main/java/org/libreoffice/lots/WollMuxFehlerException.java index 163c5bbda..84a3bc0fb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxFehlerException.java +++ b/core/src/main/java/org/libreoffice/lots/WollMuxFehlerException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux; +package org.libreoffice.lots; /** * Represents an error that is displayed user-visibly in an error dialog diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxFiles.java b/core/src/main/java/org/libreoffice/lots/WollMuxFiles.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxFiles.java rename to core/src/main/java/org/libreoffice/lots/WollMuxFiles.java index 39fb30a90..5caa4dfa2 100755 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxFiles.java +++ b/core/src/main/java/org/libreoffice/lots/WollMuxFiles.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux; +package org.libreoffice.lots; import java.io.BufferedWriter; import java.io.File; @@ -78,14 +78,14 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoDictionary; import org.libreoffice.ext.unohelper.common.UnoProps; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoComponent; import org.libreoffice.ext.unohelper.util.UnoConfiguration; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * Collection of files used by WollMux. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxSingleton.java b/core/src/main/java/org/libreoffice/lots/WollMuxSingleton.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxSingleton.java rename to core/src/main/java/org/libreoffice/lots/WollMuxSingleton.java index 841125994..d776eb9f0 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/WollMuxSingleton.java +++ b/core/src/main/java/org/libreoffice/lots/WollMuxSingleton.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux; +package org.libreoffice.lots; import java.io.IOException; import java.net.URL; @@ -37,22 +37,22 @@ import org.libreoffice.ext.unohelper.common.UnoDictionary; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.common.UnoProps; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.LibreOfficeEventListener; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventHandler; -import de.muenchen.allg.itd51.wollmux.former.Common; -import de.muenchen.allg.itd51.wollmux.sender.SenderService; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.LogConfig; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoConfiguration; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.LibreOfficeEventListener; +import org.libreoffice.lots.event.WollMuxEventHandler; +import org.libreoffice.lots.former.Common; +import org.libreoffice.lots.sender.SenderService; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.LogConfig; +import org.libreoffice.lots.util.Utils; /** * This class is a singleton, which initializes the WollMux and all central * Provides WollMux methods. Even the WollMux service - * de.muenchen.allg.itd51.wollmux.comp.WollMux, which used to be the central contact point, is used + * org.libreoffice.lots.comp.WollMux, which used to be the central contact point, is used * mostly from the central methods of the singleton. */ public class WollMuxSingleton diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMux.java b/core/src/main/java/org/libreoffice/lots/comp/WollMux.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMux.java rename to core/src/main/java/org/libreoffice/lots/comp/WollMux.java index f7df7cea8..d598f4414 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMux.java +++ b/core/src/main/java/org/libreoffice/lots/comp/WollMux.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.comp; +package org.libreoffice.lots.comp; import java.util.Map; @@ -45,22 +45,22 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoList; import org.libreoffice.ext.unohelper.common.UnoProps; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.WollMuxSingleton; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.dispatch.AboutDispatch; -import de.muenchen.allg.itd51.wollmux.dispatch.DispatchProviderAndInterceptor; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnAddDocumentEventListener; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnRemoveDocumentEventListener; +import org.libreoffice.ext.unohelper.util.UnoComponent; +import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.WollMuxSingleton; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.dispatch.AboutDispatch; +import org.libreoffice.lots.dispatch.DispatchProviderAndInterceptor; +import org.libreoffice.lots.event.handlers.OnAddDocumentEventListener; +import org.libreoffice.lots.event.handlers.OnRemoveDocumentEventListener; import de.muenchen.allg.itd51.wollmux.interfaces.XPALChangeEventListener; import de.muenchen.allg.itd51.wollmux.interfaces.XWollMux; import de.muenchen.allg.itd51.wollmux.interfaces.XWollMuxDocument; -import de.muenchen.allg.itd51.wollmux.sender.SenderException; -import de.muenchen.allg.itd51.wollmux.sender.SenderService; -import de.muenchen.allg.itd51.wollmux.util.L; -import org.libreoffice.ext.unohelper.util.UnoComponent; -import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderService; +import org.libreoffice.lots.util.L; /** * The main service of WollMux. It treats all Dispatches starting with "wollmux:" and is the @@ -77,7 +77,7 @@ public class WollMux extends WeakBase implements XServiceInfo, XDispatchProvider /** * The FQDN of the implemented service. */ - public static final String SERVICENAME = "de.muenchen.allg.itd51.wollmux.WollMux"; + public static final String SERVICENAME = "org.libreoffice.lots.WollMux"; /** * Initialize WollMux and its menus. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMuxDocument.java b/core/src/main/java/org/libreoffice/lots/comp/WollMuxDocument.java similarity index 83% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMuxDocument.java rename to core/src/main/java/org/libreoffice/lots/comp/WollMuxDocument.java index ccda14267..0c38be9a3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMuxDocument.java +++ b/core/src/main/java/org/libreoffice/lots/comp/WollMuxDocument.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.comp; +package org.libreoffice.lots.comp; import java.awt.event.ActionListener; import java.util.HashMap; @@ -34,19 +34,20 @@ import com.sun.star.text.XTextDocument; import org.libreoffice.ext.unohelper.common.UnoProps; -import de.muenchen.allg.itd51.wollmux.SyncActionListener; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; -import de.muenchen.allg.itd51.wollmux.document.WMCommandsFailedException; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommandInterpreter; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnManagePrintFunction; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSetFormValue; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSetInsertValues; -import de.muenchen.allg.itd51.wollmux.form.model.Control; -import de.muenchen.allg.itd51.wollmux.form.model.FormModel; -import de.muenchen.allg.itd51.wollmux.form.model.FormModelException; +import org.libreoffice.lots.SyncActionListener; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.TextDocumentModel; +import org.libreoffice.lots.document.WMCommandsFailedException; +import org.libreoffice.lots.document.commands.DocumentCommandInterpreter; +import org.libreoffice.lots.event.handlers.OnManagePrintFunction; +import org.libreoffice.lots.event.handlers.OnSetFormValue; +import org.libreoffice.lots.event.handlers.OnSetInsertValues; +import org.libreoffice.lots.form.model.Control; +import org.libreoffice.lots.form.model.FormModel; +import org.libreoffice.lots.form.model.FormModelException; + import de.muenchen.allg.itd51.wollmux.interfaces.XWollMuxDocument; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMuxRegistration.java b/core/src/main/java/org/libreoffice/lots/comp/WollMuxRegistration.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMuxRegistration.java rename to core/src/main/java/org/libreoffice/lots/comp/WollMuxRegistration.java index 2a4d1cb0f..bf32aeb39 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/comp/WollMuxRegistration.java +++ b/core/src/main/java/org/libreoffice/lots/comp/WollMuxRegistration.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.comp; +package org.libreoffice.lots.comp; -import de.muenchen.allg.itd51.wollmux.ComponentRegistration; +import org.libreoffice.lots.ComponentRegistration; /** * Factory for {@link WollMux}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/ConfigThingy.java b/core/src/main/java/org/libreoffice/lots/config/ConfigThingy.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/ConfigThingy.java rename to core/src/main/java/org/libreoffice/lots/config/ConfigThingy.java index 654560579..0d6597128 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/ConfigThingy.java +++ b/core/src/main/java/org/libreoffice/lots/config/ConfigThingy.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config; +package org.libreoffice.lots.config; import java.io.BufferedReader; import java.io.IOException; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/ConfigurationErrorException.java b/core/src/main/java/org/libreoffice/lots/config/ConfigurationErrorException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/ConfigurationErrorException.java rename to core/src/main/java/org/libreoffice/lots/config/ConfigurationErrorException.java index 626a7f97a..55c1109f5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/ConfigurationErrorException.java +++ b/core/src/main/java/org/libreoffice/lots/config/ConfigurationErrorException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config; +package org.libreoffice.lots.config; /** * Is thrown when a misconfiguration is detected (user error) diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/InvalidIdentifierException.java b/core/src/main/java/org/libreoffice/lots/config/InvalidIdentifierException.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/InvalidIdentifierException.java rename to core/src/main/java/org/libreoffice/lots/config/InvalidIdentifierException.java index 96d4c759a..9211a152b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/InvalidIdentifierException.java +++ b/core/src/main/java/org/libreoffice/lots/config/InvalidIdentifierException.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config; +package org.libreoffice.lots.config; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; public class InvalidIdentifierException extends Exception { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/NodeNotFoundException.java b/core/src/main/java/org/libreoffice/lots/config/NodeNotFoundException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/NodeNotFoundException.java rename to core/src/main/java/org/libreoffice/lots/config/NodeNotFoundException.java index 975d4d07c..df27c537e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/NodeNotFoundException.java +++ b/core/src/main/java/org/libreoffice/lots/config/NodeNotFoundException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config; +package org.libreoffice.lots.config; /** * Signals that a searched node was not found. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/PathProcessor.java b/core/src/main/java/org/libreoffice/lots/config/PathProcessor.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/PathProcessor.java rename to core/src/main/java/org/libreoffice/lots/config/PathProcessor.java index 015fbba8e..15179d4c6 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/PathProcessor.java +++ b/core/src/main/java/org/libreoffice/lots/config/PathProcessor.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config; +package org.libreoffice.lots.config; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/SyntaxErrorException.java b/core/src/main/java/org/libreoffice/lots/config/SyntaxErrorException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/SyntaxErrorException.java rename to core/src/main/java/org/libreoffice/lots/config/SyntaxErrorException.java index 40d166341..d6f795ad2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/SyntaxErrorException.java +++ b/core/src/main/java/org/libreoffice/lots/config/SyntaxErrorException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config; +package org.libreoffice.lots.config; /** * Signalisiert einen Fehler in einer zu parsenden Zeichenfolge diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/Trimmer.java b/core/src/main/java/org/libreoffice/lots/config/Trimmer.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/Trimmer.java rename to core/src/main/java/org/libreoffice/lots/config/Trimmer.java index 7008c86b0..195d2a513 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/Trimmer.java +++ b/core/src/main/java/org/libreoffice/lots/config/Trimmer.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config; +package org.libreoffice.lots.config; /** * A Utility class for Strings. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/ConfGenerator.java b/core/src/main/java/org/libreoffice/lots/config/generator/xml/ConfGenerator.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/ConfGenerator.java rename to core/src/main/java/org/libreoffice/lots/config/generator/xml/ConfGenerator.java index 1c444771b..f1009edb9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/ConfGenerator.java +++ b/core/src/main/java/org/libreoffice/lots/config/generator/xml/ConfGenerator.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.generator.xml; +package org.libreoffice.lots.config.generator.xml; import java.io.ByteArrayOutputStream; import java.io.File; @@ -33,12 +33,11 @@ import java.util.LinkedHashMap; import java.util.Map; +import org.libreoffice.lots.config.Trimmer; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import de.muenchen.allg.itd51.wollmux.config.Trimmer; - /** * Generates a configuration out of a XML-document. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/PrettyPrinter.java b/core/src/main/java/org/libreoffice/lots/config/generator/xml/PrettyPrinter.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/PrettyPrinter.java rename to core/src/main/java/org/libreoffice/lots/config/generator/xml/PrettyPrinter.java index 444141e50..21f48febb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/PrettyPrinter.java +++ b/core/src/main/java/org/libreoffice/lots/config/generator/xml/PrettyPrinter.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.generator.xml; +package org.libreoffice.lots.config.generator.xml; import java.io.BufferedWriter; import java.io.IOException; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLGenerator.java b/core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLGenerator.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLGenerator.java rename to core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLGenerator.java index 74051f44e..ad37bc26c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLGenerator.java +++ b/core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLGenerator.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.generator.xml; +package org.libreoffice.lots.config.generator.xml; import java.io.InputStream; import java.io.OutputStream; @@ -42,17 +42,16 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.libreoffice.lots.config.PathProcessor; +import org.libreoffice.lots.config.Trimmer; +import org.libreoffice.lots.config.scanner.Scanner; +import org.libreoffice.lots.config.scanner.ScannerException; +import org.libreoffice.lots.config.scanner.Token; +import org.libreoffice.lots.config.scanner.TokenType; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import de.muenchen.allg.itd51.wollmux.config.PathProcessor; -import de.muenchen.allg.itd51.wollmux.config.Trimmer; -import de.muenchen.allg.itd51.wollmux.config.scanner.Scanner; -import de.muenchen.allg.itd51.wollmux.config.scanner.ScannerException; -import de.muenchen.allg.itd51.wollmux.config.scanner.Token; -import de.muenchen.allg.itd51.wollmux.config.scanner.TokenType; - /** * Generates a XML-document from a configuration. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLGeneratorException.java b/core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLGeneratorException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLGeneratorException.java rename to core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLGeneratorException.java index 613e2968d..55ef1829f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLGeneratorException.java +++ b/core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLGeneratorException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.generator.xml; +package org.libreoffice.lots.config.generator.xml; /** * A Exception produced by the generator. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLTags.java b/core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLTags.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLTags.java rename to core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLTags.java index 4553ff6e8..f79104269 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/XMLTags.java +++ b/core/src/main/java/org/libreoffice/lots/config/generator/xml/XMLTags.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.generator.xml; +package org.libreoffice.lots.config.generator.xml; /** * Enum for the XML-elements in the generated XML by the {@link XMLGenerator}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Scanner.java b/core/src/main/java/org/libreoffice/lots/config/scanner/Scanner.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Scanner.java rename to core/src/main/java/org/libreoffice/lots/config/scanner/Scanner.java index c167172c0..2d443206f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Scanner.java +++ b/core/src/main/java/org/libreoffice/lots/config/scanner/Scanner.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.scanner; +package org.libreoffice.lots.config.scanner; import java.io.Closeable; import java.io.IOException; @@ -31,11 +31,10 @@ import java.util.LinkedList; import java.util.NoSuchElementException; +import org.libreoffice.lots.config.PathProcessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.PathProcessor; - /** * Reads a file and included ones and and produces a list of tokens in order * with the appearance in the files. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/ScannerException.java b/core/src/main/java/org/libreoffice/lots/config/scanner/ScannerException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/ScannerException.java rename to core/src/main/java/org/libreoffice/lots/config/scanner/ScannerException.java index 3bb167394..1f92c9940 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/ScannerException.java +++ b/core/src/main/java/org/libreoffice/lots/config/scanner/ScannerException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.scanner; +package org.libreoffice.lots.config.scanner; import java.io.IOException; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Token.java b/core/src/main/java/org/libreoffice/lots/config/scanner/Token.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Token.java rename to core/src/main/java/org/libreoffice/lots/config/scanner/Token.java index 6c7eea501..72a787110 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Token.java +++ b/core/src/main/java/org/libreoffice/lots/config/scanner/Token.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.scanner; +package org.libreoffice.lots.config.scanner; /** * Tokens a generated by the scanner to build an internal representation of the diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/TokenType.java b/core/src/main/java/org/libreoffice/lots/config/scanner/TokenType.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/TokenType.java rename to core/src/main/java/org/libreoffice/lots/config/scanner/TokenType.java index b118b45fe..01fc8e7c5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/TokenType.java +++ b/core/src/main/java/org/libreoffice/lots/config/scanner/TokenType.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.scanner; +package org.libreoffice.lots.config.scanner; import java.util.regex.Pattern; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Tokenizer.java b/core/src/main/java/org/libreoffice/lots/config/scanner/Tokenizer.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Tokenizer.java rename to core/src/main/java/org/libreoffice/lots/config/scanner/Tokenizer.java index 4f4c8233b..a32a21ba9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/config/scanner/Tokenizer.java +++ b/core/src/main/java/org/libreoffice/lots/config/scanner/Tokenizer.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.scanner; +package org.libreoffice.lots.config.scanner; import java.io.BufferedReader; import java.io.Closeable; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/AsyncSearch.java b/core/src/main/java/org/libreoffice/lots/db/AsyncSearch.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/AsyncSearch.java rename to core/src/main/java/org/libreoffice/lots/db/AsyncSearch.java index b30d02317..7b5c4a990 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/AsyncSearch.java +++ b/core/src/main/java/org/libreoffice/lots/db/AsyncSearch.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/AttachDatasource.java b/core/src/main/java/org/libreoffice/lots/db/AttachDatasource.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/AttachDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/AttachDatasource.java index dd57405bc..d07608f2e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/AttachDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/AttachDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.net.URL; import java.util.ArrayList; @@ -31,14 +31,13 @@ import java.util.Vector; import java.util.function.Predicate; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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; - /** * Eine Datenquelle, die eine andere Datenquelle um Spalten ergänzt. Zur Erstellung der Menge der * Ergebnisdatensätze wird jeder Datensatz aus SOURCE1 genau einmal verwendet und jeder Datensatz @@ -180,7 +179,7 @@ public AttachDatasource(Map nameToDatasource, ConfigThingy s /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getSchema() + * @see org.libreoffice.lots.db.Datasource#getSchema() */ @Override public List getSchema() @@ -191,7 +190,7 @@ public List getSchema() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getDatasetsByKey(java.util. Collection, long) + * @see org.libreoffice.lots.db.Datasource#getDatasetsByKey(java.util. Collection, long) */ @Override public QueryResults getDatasetsByKey(Collection keys) @@ -208,7 +207,7 @@ public QueryResults getContents() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#find(java.util.List, long) + * @see org.libreoffice.lots.db.Datasource#find(java.util.List, long) */ @Override public QueryResults find(List query) @@ -248,7 +247,7 @@ public QueryResults find(List query) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getName() + * @see org.libreoffice.lots.db.Datasource#getName() */ @Override public String getName() diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ColumnNotFoundException.java b/core/src/main/java/org/libreoffice/lots/db/ColumnNotFoundException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ColumnNotFoundException.java rename to core/src/main/java/org/libreoffice/lots/db/ColumnNotFoundException.java index 69cd3ec41..8c3f529cc 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ColumnNotFoundException.java +++ b/core/src/main/java/org/libreoffice/lots/db/ColumnNotFoundException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; /** * Wird geworfen beim Versuch, auf eine Spalte zuzugreifen, die nicht existiert. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ColumnTransformer.java b/core/src/main/java/org/libreoffice/lots/db/ColumnTransformer.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ColumnTransformer.java rename to core/src/main/java/org/libreoffice/lots/db/ColumnTransformer.java index 1ba18576a..bc28f1a91 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ColumnTransformer.java +++ b/core/src/main/java/org/libreoffice/lots/db/ColumnTransformer.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.HashMap; @@ -30,12 +30,11 @@ import java.util.Map; import java.util.Set; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.Values; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.Values; - /** * Nimmt ein Dataset und stellt mit Hilfe von WollMux-Funktionen aus dessen Spalten * berechnete Pseudo-Spalten zur Verfügung. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Dataset.java b/core/src/main/java/org/libreoffice/lots/db/Dataset.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Dataset.java rename to core/src/main/java/org/libreoffice/lots/db/Dataset.java index 128072b97..bee0f316e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Dataset.java +++ b/core/src/main/java/org/libreoffice/lots/db/Dataset.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; /** * Interface für Datensätze einer Tabelle. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DatasetNotFoundException.java b/core/src/main/java/org/libreoffice/lots/db/DatasetNotFoundException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DatasetNotFoundException.java rename to core/src/main/java/org/libreoffice/lots/db/DatasetNotFoundException.java index a31a04ff9..49a252e34 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DatasetNotFoundException.java +++ b/core/src/main/java/org/libreoffice/lots/db/DatasetNotFoundException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; /** * Wird geworfen, falls kein passender Datensatz gefunden wurde und diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DatasetPredicate.java b/core/src/main/java/org/libreoffice/lots/db/DatasetPredicate.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DatasetPredicate.java rename to core/src/main/java/org/libreoffice/lots/db/DatasetPredicate.java index bcb220d90..cb80bc989 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DatasetPredicate.java +++ b/core/src/main/java/org/libreoffice/lots/db/DatasetPredicate.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.List; import java.util.function.Predicate; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Datasource.java b/core/src/main/java/org/libreoffice/lots/db/Datasource.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Datasource.java rename to core/src/main/java/org/libreoffice/lots/db/Datasource.java index e36ad0634..5fa347e6b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Datasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/Datasource.java @@ -20,20 +20,19 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.Collection; import java.util.List; import java.util.function.Supplier; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; - /** * Interface für Datenquellen, die der DJ verwalten kann. ACHTUNG! Die Konstruktoren dieser Klasse * dürfen keine potentiell lange blockierenden Aktionen (zum Beispiel Netzverbindung herstellen) diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Datasources.java b/core/src/main/java/org/libreoffice/lots/db/Datasources.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Datasources.java rename to core/src/main/java/org/libreoffice/lots/db/Datasources.java index d48f24ecb..e8e231fcc 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Datasources.java +++ b/core/src/main/java/org/libreoffice/lots/db/Datasources.java @@ -20,19 +20,18 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.net.URL; import java.util.HashMap; import java.util.Map; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Collection of all {@link Datasource} registered in WollMux. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DummyDatasourceWithMessagebox.java b/core/src/main/java/org/libreoffice/lots/db/DummyDatasourceWithMessagebox.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DummyDatasourceWithMessagebox.java rename to core/src/main/java/org/libreoffice/lots/db/DummyDatasourceWithMessagebox.java index 29e94c989..e16de49b7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/DummyDatasourceWithMessagebox.java +++ b/core/src/main/java/org/libreoffice/lots/db/DummyDatasourceWithMessagebox.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.Collection; import java.util.List; @@ -52,7 +52,7 @@ public DummyDatasourceWithMessagebox(List schema, String name) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getSchema() + * @see org.libreoffice.lots.db.Datasource#getSchema() */ @Override public List getSchema() @@ -64,7 +64,7 @@ public List getSchema() * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.db.Datasource#getDatasetsByKey(java.util.Collection + * org.libreoffice.lots.db.Datasource#getDatasetsByKey(java.util.Collection * , long) */ @Override diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/EmptyDatasource.java b/core/src/main/java/org/libreoffice/lots/db/EmptyDatasource.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/EmptyDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/EmptyDatasource.java index 1314f433c..4760e79af 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/EmptyDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/EmptyDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.Collection; import java.util.List; @@ -49,7 +49,7 @@ public EmptyDatasource(List schema, String name) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getSchema() + * @see org.libreoffice.lots.db.Datasource#getSchema() */ @Override public List getSchema() @@ -60,7 +60,7 @@ public List getSchema() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getDatasetsByKey(java.util.Collection, + * @see org.libreoffice.lots.db.Datasource#getDatasetsByKey(java.util.Collection, * long) */ @Override diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/FunkyDatasource.java b/core/src/main/java/org/libreoffice/lots/db/FunkyDatasource.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/FunkyDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/FunkyDatasource.java index 71f5a4fa8..07d14ed1b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/FunkyDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/FunkyDatasource.java @@ -20,20 +20,20 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -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.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -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.dialog.DialogLibrary; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.util.L; /** * Datasource, die mit WollMux-Funktionen berechnete Spalten ermöglicht. ACHTUNG! diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/LDAPDatasource.java b/core/src/main/java/org/libreoffice/lots/db/LDAPDatasource.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/LDAPDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/LDAPDatasource.java index 132a4968c..58b386be6 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/LDAPDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/LDAPDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.net.URI; import java.net.URISyntaxException; @@ -49,14 +49,13 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.InitialLdapContext; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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; - /** * Datasource für Zugriff auf ein LDAP-Verzeichnis * @@ -378,7 +377,7 @@ private static class ColumnDefinition /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getSchema() + * @see org.libreoffice.lots.db.Datasource#getSchema() */ @Override public List getSchema() @@ -417,7 +416,7 @@ public QueryResults getContents() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getDatasetsByKey(java.util.Collection , long) + * @see org.libreoffice.lots.db.Datasource#getDatasetsByKey(java.util.Collection , long) */ @Override public QueryResults getDatasetsByKey(Collection keys) @@ -609,7 +608,7 @@ private RelativePaths getPaths(String filter, int pathLength) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#find(java.util.List, long) + * @see org.libreoffice.lots.db.Datasource#find(java.util.List, long) */ @Override public QueryResults find(List query) @@ -1030,7 +1029,7 @@ private String ldapEscape(String value) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getName() + * @see org.libreoffice.lots.db.Datasource#getName() */ @Override public String getName() diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/NoBackingStoreException.java b/core/src/main/java/org/libreoffice/lots/db/NoBackingStoreException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/NoBackingStoreException.java rename to core/src/main/java/org/libreoffice/lots/db/NoBackingStoreException.java index 0f4f4eaca..4791f5fc1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/NoBackingStoreException.java +++ b/core/src/main/java/org/libreoffice/lots/db/NoBackingStoreException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; /** * Wird geworfen beim Versuch, auf eine Spalte zuzugreifen, die diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/OOoDatasource.java b/core/src/main/java/org/libreoffice/lots/db/OOoDatasource.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/OOoDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/OOoDatasource.java index 5a978e744..5004c3218 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/OOoDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/OOoDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.Collection; @@ -48,11 +48,11 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoDictionary; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoComponent; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.util.L; /** * Stellt eine OOo-Datenquelle als WollMux-Datenquelle zur Verfügung. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/OverlayDatasource.java b/core/src/main/java/org/libreoffice/lots/db/OverlayDatasource.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/OverlayDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/OverlayDatasource.java index d2aab1828..7b21ff19c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/OverlayDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/OverlayDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.net.URL; import java.util.ArrayList; @@ -33,14 +33,13 @@ import java.util.Vector; import java.util.function.Predicate; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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; - /** * Eine Datenquelle, die eine andere Datenquelle um Spalten ergänzt und einzelne Spaltenwerte * ersetzen kann. Zur Erstellung der Menge der Ergebnisdatensätze wird jeder Datensatz aus SOURCE1 @@ -201,7 +200,7 @@ else if ("os".equals(lcMode)) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getSchema() + * @see org.libreoffice.lots.db.Datasource#getSchema() */ @Override public List getSchema() @@ -212,7 +211,7 @@ public List getSchema() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getDatasetsByKey(java.util.Collection, long) + * @see org.libreoffice.lots.db.Datasource#getDatasetsByKey(java.util.Collection, long) */ @Override public QueryResults getDatasetsByKey(Collection keys) @@ -229,7 +228,7 @@ public QueryResults getContents() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#find(java.util.List, long) + * @see org.libreoffice.lots.db.Datasource#find(java.util.List, long) */ @Override public QueryResults find(List query) @@ -414,7 +413,7 @@ private QueryPart getMostRestrictingQueryPart(List query) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getName() + * @see org.libreoffice.lots.db.Datasource#getName() */ @Override public String getName() diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/PreferDatasource.java b/core/src/main/java/org/libreoffice/lots/db/PreferDatasource.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/PreferDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/PreferDatasource.java index 7e8eee316..e22208557 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/PreferDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/PreferDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.net.URL; import java.util.ArrayList; @@ -34,9 +34,9 @@ import java.util.Set; import java.util.Vector; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.util.L; /** * Datasource, die Daten einer Datenquelle A von Dateien einer anderen Datenquelle B diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Query.java b/core/src/main/java/org/libreoffice/lots/db/Query.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Query.java rename to core/src/main/java/org/libreoffice/lots/db/Query.java index efa75983d..4219feb74 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Query.java +++ b/core/src/main/java/org/libreoffice/lots/db/Query.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.Iterator; import java.util.List; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryPart.java b/core/src/main/java/org/libreoffice/lots/db/QueryPart.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryPart.java rename to core/src/main/java/org/libreoffice/lots/db/QueryPart.java index 970c6ca0a..4a6f5fc12 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryPart.java +++ b/core/src/main/java/org/libreoffice/lots/db/QueryPart.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResults.java b/core/src/main/java/org/libreoffice/lots/db/QueryResults.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResults.java rename to core/src/main/java/org/libreoffice/lots/db/QueryResults.java index 2810218eb..dc4417a8d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResults.java +++ b/core/src/main/java/org/libreoffice/lots/db/QueryResults.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; /** * Ergebnisse einer Datenbankanfrage. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsList.java b/core/src/main/java/org/libreoffice/lots/db/QueryResultsList.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsList.java rename to core/src/main/java/org/libreoffice/lots/db/QueryResultsList.java index 49f0ae079..8e6203fcb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsList.java +++ b/core/src/main/java/org/libreoffice/lots/db/QueryResultsList.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.Iterator; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsSet.java b/core/src/main/java/org/libreoffice/lots/db/QueryResultsSet.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsSet.java rename to core/src/main/java/org/libreoffice/lots/db/QueryResultsSet.java index e940fa306..2ac31a3d9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsSet.java +++ b/core/src/main/java/org/libreoffice/lots/db/QueryResultsSet.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.Comparator; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsWithSchema.java b/core/src/main/java/org/libreoffice/lots/db/QueryResultsWithSchema.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsWithSchema.java rename to core/src/main/java/org/libreoffice/lots/db/QueryResultsWithSchema.java index 295914e42..6f4884d28 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsWithSchema.java +++ b/core/src/main/java/org/libreoffice/lots/db/QueryResultsWithSchema.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.HashSet; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/RAMDatasource.java b/core/src/main/java/org/libreoffice/lots/db/RAMDatasource.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/RAMDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/RAMDatasource.java index 6854744b8..5a4c755e0 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/RAMDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/RAMDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.Collection; @@ -111,7 +111,7 @@ public QueryResults getDatasetsByKey(Collection keys) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#find(java.util.List, long) + * @see org.libreoffice.lots.db.Datasource#find(java.util.List, long) */ @Override public QueryResults find(List query) @@ -144,7 +144,7 @@ public QueryResults getContents() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Datasource#getName() + * @see org.libreoffice.lots.db.Datasource#getName() */ @Override public String getName() diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SchemaDatasource.java b/core/src/main/java/org/libreoffice/lots/db/SchemaDatasource.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SchemaDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/SchemaDatasource.java index 680b64add..a23007453 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SchemaDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/SchemaDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.net.URL; import java.util.ArrayList; @@ -32,14 +32,13 @@ import java.util.Vector; import java.util.regex.Pattern; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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; - /** * Datenquelle, die die Daten einer existierenden Datenquelle mit geänderten Spalten * zur Verfügung stellt. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Search.java b/core/src/main/java/org/libreoffice/lots/db/Search.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Search.java rename to core/src/main/java/org/libreoffice/lots/db/Search.java index 29de2ec6d..0358edcad 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/Search.java +++ b/core/src/main/java/org/libreoffice/lots/db/Search.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.Arrays; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.stream.Stream; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; /** * Diese Klasse stellt Methoden zur Verfügung um in Datenquellen Suchen durchzuführen. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SearchStrategy.java b/core/src/main/java/org/libreoffice/lots/db/SearchStrategy.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SearchStrategy.java rename to core/src/main/java/org/libreoffice/lots/db/SearchStrategy.java index c8c27a86c..e33548f0a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SearchStrategy.java +++ b/core/src/main/java/org/libreoffice/lots/db/SearchStrategy.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.ArrayList; import java.util.HashMap; @@ -29,7 +29,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; /** * Eine Suchstrategie liefert für eine gegebene Wortzahl eine Liste von Templates für diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SimpleDataset.java b/core/src/main/java/org/libreoffice/lots/db/SimpleDataset.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SimpleDataset.java rename to core/src/main/java/org/libreoffice/lots/db/SimpleDataset.java index 4b358bc68..bf80ab5e7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/SimpleDataset.java +++ b/core/src/main/java/org/libreoffice/lots/db/SimpleDataset.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * Eine simple Implementierung des Interfaces Dataset. @@ -74,7 +74,7 @@ public SimpleDataset(String key, Map data) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Dataset#get(java.lang.String) + * @see org.libreoffice.lots.db.Dataset#get(java.lang.String) */ @Override public String get(String columnName) throws ColumnNotFoundException @@ -88,7 +88,7 @@ public String get(String columnName) throws ColumnNotFoundException /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.db.Dataset#getKey() + * @see org.libreoffice.lots.db.Dataset#getKey() */ @Override public String getKey() diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ThingyDatasource.java b/core/src/main/java/org/libreoffice/lots/db/ThingyDatasource.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ThingyDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/ThingyDatasource.java index a87dc5d62..4fb8794bb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/ThingyDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/ThingyDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.io.IOException; import java.net.MalformedURLException; @@ -32,15 +32,14 @@ import java.util.Map; import java.util.regex.Pattern; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.util.L; - public class ThingyDatasource extends RAMDatasource { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/UnionDatasource.java b/core/src/main/java/org/libreoffice/lots/db/UnionDatasource.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/db/UnionDatasource.java rename to core/src/main/java/org/libreoffice/lots/db/UnionDatasource.java index 442abae70..db49b7c25 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/db/UnionDatasource.java +++ b/core/src/main/java/org/libreoffice/lots/db/UnionDatasource.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import java.net.URL; import java.util.ArrayList; @@ -33,10 +33,9 @@ import java.util.Vector; import org.apache.commons.collections4.CollectionUtils; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.util.L; /** * Datasource, die die Vereinigung 2er Datasources darstellt diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DatasourceSearchDialog.java b/core/src/main/java/org/libreoffice/lots/dialog/DatasourceSearchDialog.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DatasourceSearchDialog.java rename to core/src/main/java/org/libreoffice/lots/dialog/DatasourceSearchDialog.java index cbc864828..31315f080 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DatasourceSearchDialog.java +++ b/core/src/main/java/org/libreoffice/lots/dialog/DatasourceSearchDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dialog; +package org.libreoffice.lots.dialog; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -64,19 +64,6 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractItemListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTabPageContainerListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTopWindowListener; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.db.ColumnTransformer; -import de.muenchen.allg.itd51.wollmux.db.Dataset; -import de.muenchen.allg.itd51.wollmux.db.Datasource; -import de.muenchen.allg.itd51.wollmux.db.QueryResults; -import de.muenchen.allg.itd51.wollmux.db.Search; -import de.muenchen.allg.itd51.wollmux.db.SearchStrategy; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.ui.GuiFactory; import org.libreoffice.ext.unohelper.ui.layout.ControlLayout; import org.libreoffice.ext.unohelper.ui.layout.HorizontalLayout; @@ -84,6 +71,19 @@ import org.libreoffice.ext.unohelper.ui.layout.VerticalLayout; import org.libreoffice.ext.unohelper.util.UnoComponent; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.ColumnTransformer; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.Search; +import org.libreoffice.lots.db.SearchStrategy; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.ui.UIElementConfig; +import org.libreoffice.lots.util.L; /** * Dialog for searching data sources. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/Dialog.java b/core/src/main/java/org/libreoffice/lots/dialog/Dialog.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/Dialog.java rename to core/src/main/java/org/libreoffice/lots/dialog/Dialog.java index 483c2368d..76b0ea980 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/Dialog.java +++ b/core/src/main/java/org/libreoffice/lots/dialog/Dialog.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dialog; +package org.libreoffice.lots.dialog; import java.awt.event.ActionListener; import java.util.Collection; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.func.FunctionLibrary; /** * Ein Dialog, der dem Benutzer erlaubt verschiedenen Werte zu setzen. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DialogFactory.java b/core/src/main/java/org/libreoffice/lots/dialog/DialogFactory.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DialogFactory.java rename to core/src/main/java/org/libreoffice/lots/dialog/DialogFactory.java index c3a9b29d2..093408a79 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DialogFactory.java +++ b/core/src/main/java/org/libreoffice/lots/dialog/DialogFactory.java @@ -20,21 +20,20 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dialog; +package org.libreoffice.lots.dialog; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.Datasources; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.Datasources; -import de.muenchen.allg.itd51.wollmux.util.L; - public class DialogFactory { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DialogLibrary.java b/core/src/main/java/org/libreoffice/lots/dialog/DialogLibrary.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DialogLibrary.java rename to core/src/main/java/org/libreoffice/lots/dialog/DialogLibrary.java index ac2329a80..120fd38eb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/DialogLibrary.java +++ b/core/src/main/java/org/libreoffice/lots/dialog/DialogLibrary.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dialog; +package org.libreoffice.lots.dialog; import java.util.HashMap; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * Eine Bibliothek von benannten Dialogs. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/InfoDialog.java b/core/src/main/java/org/libreoffice/lots/dialog/InfoDialog.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/InfoDialog.java rename to core/src/main/java/org/libreoffice/lots/dialog/InfoDialog.java index e99816a67..758d359cd 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dialog/InfoDialog.java +++ b/core/src/main/java/org/libreoffice/lots/dialog/InfoDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dialog; +package org.libreoffice.lots.dialog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/AboutDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/AboutDispatch.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/AboutDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/AboutDispatch.java index be1396cbf..f293d643a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/AboutDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/AboutDispatch.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.event.handlers.OnAbout; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnAbout; - /** * Dispatch, which shows the about dialog. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/AbstractDispatchResultListener.java b/core/src/main/java/org/libreoffice/lots/dispatch/AbstractDispatchResultListener.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/AbstractDispatchResultListener.java rename to core/src/main/java/org/libreoffice/lots/dispatch/AbstractDispatchResultListener.java index 21e1ec353..965d0488f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/AbstractDispatchResultListener.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/AbstractDispatchResultListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import com.sun.star.frame.XDispatchResultListener; import com.sun.star.lang.EventObject; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DispatchHelper.java b/core/src/main/java/org/libreoffice/lots/dispatch/DispatchHelper.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DispatchHelper.java rename to core/src/main/java/org/libreoffice/lots/dispatch/DispatchHelper.java index e1be5c5c5..c5217b09a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DispatchHelper.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/DispatchHelper.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; /** * Perform operations on a dispatch. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DispatchProviderAndInterceptor.java b/core/src/main/java/org/libreoffice/lots/dispatch/DispatchProviderAndInterceptor.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DispatchProviderAndInterceptor.java rename to core/src/main/java/org/libreoffice/lots/dispatch/DispatchProviderAndInterceptor.java index e2503ecd8..e82246ca7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DispatchProviderAndInterceptor.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/DispatchProviderAndInterceptor.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import java.util.HashSet; import java.util.ServiceLoader; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/Dispatcher.java b/core/src/main/java/org/libreoffice/lots/dispatch/Dispatcher.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/Dispatcher.java rename to core/src/main/java/org/libreoffice/lots/dispatch/Dispatcher.java index b50192a78..9f4e6a82d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/Dispatcher.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/Dispatcher.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DumpInfoDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/DumpInfoDispatch.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DumpInfoDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/DumpInfoDispatch.java index c805e8f6b..2ec584d4b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/DumpInfoDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/DumpInfoDispatch.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.event.handlers.OnDumpInfo; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnDumpInfo; - /** * Dispatch for dumping additional information about WollMux. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/FormularMaxDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/FormularMaxDispatch.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/FormularMaxDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/FormularMaxDispatch.java index fd78f852f..74090061f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/FormularMaxDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/FormularMaxDispatch.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.OnFormularMax4000Show; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnFormularMax4000Show; - /** * Dispatch, which shows the GUI for creating or modifying a form. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/FunctionDialogDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/FunctionDialogDispatch.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/FunctionDialogDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/FunctionDialogDispatch.java index 30beac27d..c41d12b24 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/FunctionDialogDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/FunctionDialogDispatch.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.OnFunctionDialog; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnFunctionDialog; - /** * Dispatch for handling a function dialog. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/KillDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/KillDispatch.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/KillDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/KillDispatch.java index 86feda602..2bfe4e743 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/KillDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/KillDispatch.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.event.handlers.OnKill; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnKill; - /** * Dispatch for killing WollMux and LibreOffice. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/OpenTemplateDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/OpenTemplateDispatch.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/OpenTemplateDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/OpenTemplateDispatch.java index 18f89c650..7a7fe7163 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/OpenTemplateDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/OpenTemplateDispatch.java @@ -20,17 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import java.util.Arrays; +import org.libreoffice.lots.event.handlers.OnOpenDocument; + import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnOpenDocument; - /** * Dispatch for opening files as template or document. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PlatzhalterAnspringenDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/PlatzhalterAnspringenDispatch.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PlatzhalterAnspringenDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/PlatzhalterAnspringenDispatch.java index 74a6b7200..60168ef6e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PlatzhalterAnspringenDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/PlatzhalterAnspringenDispatch.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.OnJumpToPlaceholder; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnJumpToPlaceholder; - /** * Dispatch for jumping to the first placeholder in the document. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PrintDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/PrintDispatch.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PrintDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/PrintDispatch.java index af1bedeb5..31f222efd 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PrintDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/PrintDispatch.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.OnPrint; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnPrint; - /** * Dispatch, for printing. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PrintPageDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/PrintPageDispatch.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PrintPageDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/PrintPageDispatch.java index bdd3e88b2..2ac17b656 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/PrintPageDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/PrintPageDispatch.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.OnPrintPage; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnPrintPage; - /** * Dispatch for printing to page, where the cursor is located. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/SaveDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/SaveDispatch.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/SaveDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/SaveDispatch.java index 350c6f17a..3ea0f9043 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/SaveDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/SaveDispatch.java @@ -20,7 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.OnSaveAs; +import org.libreoffice.lots.event.handlers.WollMuxEvent; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; @@ -28,10 +32,6 @@ import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSaveAs; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; - /** * Dispatch for saving files. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/SeriendruckDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/SeriendruckDispatch.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/SeriendruckDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/SeriendruckDispatch.java index 42efc5f9a..a7edf6ef7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/SeriendruckDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/SeriendruckDispatch.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/TextbausteinDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/TextbausteinDispatch.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/TextbausteinDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/TextbausteinDispatch.java index a1a8bf685..3ecd3881f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/TextbausteinDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/TextbausteinDispatch.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; + +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.OnTextbausteinEinfuegen; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnTextbausteinEinfuegen; - /** * Dispatch for inserting boilerplates. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/UpdateInputFieldsDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/UpdateInputFieldsDispatch.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/UpdateInputFieldsDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/UpdateInputFieldsDispatch.java index 2ba6b3679..54a85a8d8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/UpdateInputFieldsDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/UpdateInputFieldsDispatch.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; @@ -29,8 +29,8 @@ import com.sun.star.util.URL; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnUpdateInputFields; +import org.libreoffice.lots.event.handlers.OnUpdateInputFields; +import org.libreoffice.lots.event.handlers.WollMuxEvent; /** * Dispatch for updating input fields. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/WollMuxDispatch.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/WollMuxDispatch.java index 6271536e2..fb4b39a22 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/WollMuxDispatch.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -38,8 +38,8 @@ import com.sun.star.util.URL; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.util.Utils; /** * A dispatch executed by WollMux. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxDispatcher.java b/core/src/main/java/org/libreoffice/lots/dispatch/WollMuxDispatcher.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxDispatcher.java rename to core/src/main/java/org/libreoffice/lots/dispatch/WollMuxDispatcher.java index 535e7504a..56591c4cf 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxDispatcher.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/WollMuxDispatcher.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxNotifyingDispatch.java b/core/src/main/java/org/libreoffice/lots/dispatch/WollMuxNotifyingDispatch.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxNotifyingDispatch.java rename to core/src/main/java/org/libreoffice/lots/dispatch/WollMuxNotifyingDispatch.java index 9bbfda58b..fe38187e9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/dispatch/WollMuxNotifyingDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/dispatch/WollMuxNotifyingDispatch.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.dispatch; +package org.libreoffice.lots.dispatch; import java.util.Arrays; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/AnnotationBasedPersistentDataContainer.java b/core/src/main/java/org/libreoffice/lots/document/AnnotationBasedPersistentDataContainer.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/AnnotationBasedPersistentDataContainer.java rename to core/src/main/java/org/libreoffice/lots/document/AnnotationBasedPersistentDataContainer.java index bacb7ac52..f3ef1e01a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/AnnotationBasedPersistentDataContainer.java +++ b/core/src/main/java/org/libreoffice/lots/document/AnnotationBasedPersistentDataContainer.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.ArrayList; import java.util.HashSet; @@ -48,9 +48,9 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoDictionary; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.util.Utils; /** * Implementiert die alte Zugriffsmethode auf persistente Daten in Notizen. @@ -315,7 +315,7 @@ public void removeData(DataID dataId) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.PersistentData.DataContainer#flush() + * @see org.libreoffice.lots.PersistentData.DataContainer#flush() * * TESTED */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/ByteBufferInputStream.java b/core/src/main/java/org/libreoffice/lots/document/ByteBufferInputStream.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/ByteBufferInputStream.java rename to core/src/main/java/org/libreoffice/lots/document/ByteBufferInputStream.java index 94b69375e..9858b9150 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/ByteBufferInputStream.java +++ b/core/src/main/java/org/libreoffice/lots/document/ByteBufferInputStream.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.nio.ByteBuffer; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentLoader.java b/core/src/main/java/org/libreoffice/lots/document/DocumentLoader.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentLoader.java rename to core/src/main/java/org/libreoffice/lots/document/DocumentLoader.java index fbc5ec417..ff85e6136 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentLoader.java +++ b/core/src/main/java/org/libreoffice/lots/document/DocumentLoader.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.io.IOException; import java.io.InputStream; @@ -45,7 +45,7 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * Funktionen zum Laden und Einfügen von Dokumenten. Geladene Dokumente werden diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentManager.java b/core/src/main/java/org/libreoffice/lots/document/DocumentManager.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentManager.java rename to core/src/main/java/org/libreoffice/lots/document/DocumentManager.java index 5551a9ad9..81f5762ff 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentManager.java +++ b/core/src/main/java/org/libreoffice/lots/document/DocumentManager.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.ArrayList; import java.util.Collection; @@ -40,14 +40,14 @@ import com.sun.star.uno.XInterface; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.GlobalFunctions; -import de.muenchen.allg.itd51.wollmux.HashableComponent; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnTextDocumentControllerInitialized; -import de.muenchen.allg.itd51.wollmux.form.control.FormController; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; +import org.libreoffice.lots.GlobalFunctions; +import org.libreoffice.lots.HashableComponent; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.event.handlers.OnTextDocumentControllerInitialized; +import org.libreoffice.lots.form.control.FormController; +import org.libreoffice.lots.former.FormularMax4kController; /** * Verwaltet Informationen zu allen offenen OOo-Dokumenten. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentTree.java b/core/src/main/java/org/libreoffice/lots/document/DocumentTree.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentTree.java rename to core/src/main/java/org/libreoffice/lots/document/DocumentTree.java index e87061c2d..07dd5b890 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentTree.java +++ b/core/src/main/java/org/libreoffice/lots/document/DocumentTree.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.io.StringReader; import java.util.ArrayList; @@ -51,19 +51,19 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoIterator; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommands; -import de.muenchen.allg.itd51.wollmux.document.nodes.CheckboxNode; -import de.muenchen.allg.itd51.wollmux.document.nodes.ContainerNode; -import de.muenchen.allg.itd51.wollmux.document.nodes.DropdownNode; -import de.muenchen.allg.itd51.wollmux.document.nodes.GroupBookmarkNode; -import de.muenchen.allg.itd51.wollmux.document.nodes.InputNode; -import de.muenchen.allg.itd51.wollmux.document.nodes.InsertionBookmarkNode; -import de.muenchen.allg.itd51.wollmux.document.nodes.Node; -import de.muenchen.allg.itd51.wollmux.document.nodes.ParagraphNode; -import de.muenchen.allg.itd51.wollmux.document.nodes.TextRangeNode; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.document.commands.DocumentCommands; +import org.libreoffice.lots.document.nodes.CheckboxNode; +import org.libreoffice.lots.document.nodes.ContainerNode; +import org.libreoffice.lots.document.nodes.DropdownNode; +import org.libreoffice.lots.document.nodes.GroupBookmarkNode; +import org.libreoffice.lots.document.nodes.InputNode; +import org.libreoffice.lots.document.nodes.InsertionBookmarkNode; +import org.libreoffice.lots.document.nodes.Node; +import org.libreoffice.lots.document.nodes.ParagraphNode; +import org.libreoffice.lots.document.nodes.TextRangeNode; +import org.libreoffice.lots.util.Utils; /** * Stellt die interessanten Teile eines Textdokuments als Baum zur Verfügung. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentTreeVisitor.java b/core/src/main/java/org/libreoffice/lots/document/DocumentTreeVisitor.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentTreeVisitor.java rename to core/src/main/java/org/libreoffice/lots/document/DocumentTreeVisitor.java index e6f93182d..d915f3cdb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/DocumentTreeVisitor.java +++ b/core/src/main/java/org/libreoffice/lots/document/DocumentTreeVisitor.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; -import com.sun.star.text.XTextDocument; +import org.libreoffice.lots.document.nodes.Container; +import org.libreoffice.lots.document.nodes.FormControl; -import de.muenchen.allg.itd51.wollmux.document.nodes.Container; -import de.muenchen.allg.itd51.wollmux.document.nodes.FormControl; +import com.sun.star.text.XTextDocument; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/EndlessLoopException.java b/core/src/main/java/org/libreoffice/lots/document/EndlessLoopException.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/EndlessLoopException.java rename to core/src/main/java/org/libreoffice/lots/document/EndlessLoopException.java index 8fb0a7082..eb5066591 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/EndlessLoopException.java +++ b/core/src/main/java/org/libreoffice/lots/document/EndlessLoopException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; /** * Bei einer Textersetzung (z.B. aus einer Variable oder beim insertFrag) kam es diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/FormFieldFactory.java b/core/src/main/java/org/libreoffice/lots/document/FormFieldFactory.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/FormFieldFactory.java rename to core/src/main/java/org/libreoffice/lots/document/FormFieldFactory.java index 64b97c0eb..8aac3a685 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/FormFieldFactory.java +++ b/core/src/main/java/org/libreoffice/lots/document/FormFieldFactory.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.Map; import java.util.regex.Pattern; @@ -46,10 +46,10 @@ import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoIterator; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertFormValue; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertFormValue; +import org.libreoffice.lots.util.Utils; /** * Factory for creating form fields from book marks with name WM(CMD 'insertFormValue' ...). diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/FrameController.java b/core/src/main/java/org/libreoffice/lots/document/FrameController.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/FrameController.java rename to core/src/main/java/org/libreoffice/lots/document/FrameController.java index 04f4700f9..cb67512b7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/FrameController.java +++ b/core/src/main/java/org/libreoffice/lots/document/FrameController.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,12 +33,12 @@ import com.sun.star.view.DocumentZoomType; 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 de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; public class FrameController { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/InsertionBookmark.java b/core/src/main/java/org/libreoffice/lots/document/InsertionBookmark.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/InsertionBookmark.java rename to core/src/main/java/org/libreoffice/lots/document/InsertionBookmark.java index 4bad7363c..775e9cd13 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/InsertionBookmark.java +++ b/core/src/main/java/org/libreoffice/lots/document/InsertionBookmark.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; /** * Wird von Nodes unterstützt, die ein Bookmark repräsentieren, das eine Einfügung diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/PersistentDataContainer.java b/core/src/main/java/org/libreoffice/lots/document/PersistentDataContainer.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/PersistentDataContainer.java rename to core/src/main/java/org/libreoffice/lots/document/PersistentDataContainer.java index f3af06e45..f679afc3a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/PersistentDataContainer.java +++ b/core/src/main/java/org/libreoffice/lots/document/PersistentDataContainer.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; /** * Beschreibt einen Container in dem dokumentgebundene Metadaten des WollMux diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFBasedPersistentDataContainer.java b/core/src/main/java/org/libreoffice/lots/document/RDFBasedPersistentDataContainer.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFBasedPersistentDataContainer.java rename to core/src/main/java/org/libreoffice/lots/document/RDFBasedPersistentDataContainer.java index 9ff91cbb5..09b1ec09a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFBasedPersistentDataContainer.java +++ b/core/src/main/java/org/libreoffice/lots/document/RDFBasedPersistentDataContainer.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.EnumMap; import java.util.Map; @@ -40,8 +40,8 @@ import com.sun.star.text.XTextDocument; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.WollMuxSingleton; import org.libreoffice.ext.unohelper.common.UnoIterator; +import org.libreoffice.lots.WollMuxSingleton; /** * Implementiert die neue Zugriffsmethode auf persistente Daten im neuen @@ -189,7 +189,7 @@ private XURI getDataIdURI(DataID dataId) * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentData.DataContainer#getData(java.lang + * org.libreoffice.lots.PersistentData.DataContainer#getData(java.lang * .String) * * TESTED @@ -227,7 +227,7 @@ public String getData(DataID dataId) * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentData.DataContainer#setData(java.lang + * org.libreoffice.lots.PersistentData.DataContainer#setData(java.lang * .String, java.lang.String) * * TESTED @@ -264,7 +264,7 @@ public void setData(DataID dataId, String dataValue) * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentData.DataContainer#removeData(java + * org.libreoffice.lots.PersistentData.DataContainer#removeData(java * .lang.String) * * TESTED @@ -294,7 +294,7 @@ public void removeData(DataID dataId) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.PersistentData.DataContainer#flush() + * @see org.libreoffice.lots.PersistentData.DataContainer#flush() * * TESTED */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFMetadataNotSupportedException.java b/core/src/main/java/org/libreoffice/lots/document/RDFMetadataNotSupportedException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFMetadataNotSupportedException.java rename to core/src/main/java/org/libreoffice/lots/document/RDFMetadataNotSupportedException.java index e1b69b6a7..31a2d045f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFMetadataNotSupportedException.java +++ b/core/src/main/java/org/libreoffice/lots/document/RDFMetadataNotSupportedException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; /** * Wird geworfen, wenn das verwendete OpenOffice.org das RDF-Metadaten-Interface diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFReadLegacyModeDataContainer.java b/core/src/main/java/org/libreoffice/lots/document/RDFReadLegacyModeDataContainer.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFReadLegacyModeDataContainer.java rename to core/src/main/java/org/libreoffice/lots/document/RDFReadLegacyModeDataContainer.java index f0c4eb3d7..c9e2df6d5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/RDFReadLegacyModeDataContainer.java +++ b/core/src/main/java/org/libreoffice/lots/document/RDFReadLegacyModeDataContainer.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.HashSet; @@ -80,7 +80,7 @@ public RDFReadLegacyModeDataContainer(XTextDocument doc) * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentDataContainer#getData(java.lang.String + * org.libreoffice.lots.PersistentDataContainer#getData(java.lang.String * ) * * TESTED @@ -166,7 +166,7 @@ private void copyOnRead(PersistentDataContainer c, DataID dataId, String data) * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentDataContainer#setData(java.lang.String + * org.libreoffice.lots.PersistentDataContainer#setData(java.lang.String * , java.lang.String) * * TESTED @@ -181,7 +181,7 @@ public void setData(DataID dataId, String dataValue) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.PersistentDataContainer#flush() + * @see org.libreoffice.lots.PersistentDataContainer#flush() * * TESTED */ @@ -196,7 +196,7 @@ public void flush() * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentDataContainer#removeData(java.lang. + * org.libreoffice.lots.PersistentDataContainer#removeData(java.lang. * String) */ @Override diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/SimulationResults.java b/core/src/main/java/org/libreoffice/lots/document/SimulationResults.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/SimulationResults.java rename to core/src/main/java/org/libreoffice/lots/document/SimulationResults.java index 605d57108..1eaf46d3d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/SimulationResults.java +++ b/core/src/main/java/org/libreoffice/lots/document/SimulationResults.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.HashMap; import java.util.Map; import java.util.Set; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory.FormField; +import org.libreoffice.lots.document.FormFieldFactory.FormField; /** * Enthält nach einem Simulationslauf über das {@link TextDocumentModel} (siehe diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextDocumentController.java b/core/src/main/java/org/libreoffice/lots/document/TextDocumentController.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextDocumentController.java rename to core/src/main/java/org/libreoffice/lots/document/TextDocumentController.java index e1baf50f2..b2aefe5ce 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextDocumentController.java +++ b/core/src/main/java/org/libreoffice/lots/document/TextDocumentController.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.ArrayList; import java.util.Arrays; @@ -54,31 +54,31 @@ import org.libreoffice.ext.unohelper.common.UnoDictionary; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.common.UnoProps; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -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.dialog.DialogFactory; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory.FormField; -import de.muenchen.allg.itd51.wollmux.document.PersistentDataContainer.DataID; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnFormValueChanged; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSetVisibleState; -import de.muenchen.allg.itd51.wollmux.form.config.FormConfig; -import de.muenchen.allg.itd51.wollmux.form.control.FormController; -import de.muenchen.allg.itd51.wollmux.form.model.FormModel; -import de.muenchen.allg.itd51.wollmux.form.model.FormModelException; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.func.Values; -import de.muenchen.allg.itd51.wollmux.func.Values.SimpleMap; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoConfiguration; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.dialog.DialogFactory; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.document.FormFieldFactory.FormField; +import org.libreoffice.lots.document.PersistentDataContainer.DataID; +import org.libreoffice.lots.document.commands.DocumentCommand; +import org.libreoffice.lots.event.handlers.OnFormValueChanged; +import org.libreoffice.lots.event.handlers.OnSetVisibleState; +import org.libreoffice.lots.form.config.FormConfig; +import org.libreoffice.lots.form.control.FormController; +import org.libreoffice.lots.form.model.FormModel; +import org.libreoffice.lots.form.model.FormModelException; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.Values; +import org.libreoffice.lots.func.Values.SimpleMap; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * Controller of the document. @@ -1517,7 +1517,7 @@ public void storeCurrentFormDescription() * The TRAFO of the for form field. Can be null. A TRAFO definition is in the form * "Name(FUNCTION_DEFINITION)", where Name is a valid identifier and FUNCTION_DEFINITION * a valid parameter for - * {@link de.muenchen.allg.itd51.wollmux.func.FunctionFactory#parse(ConfigThingy, FunctionLibrary, DialogLibrary, Map)}. + * {@link org.libreoffice.lots.func.FunctionFactory#parse(ConfigThingy, FunctionLibrary, DialogLibrary, Map)}. * The first child of FUNCTION_DEFINITION has to be a valid function name like "AND". * @param hint * Tooltip of the new form field. Can be null. @@ -1639,7 +1639,7 @@ public synchronized void setTrafo(String trafoName, ConfigThingy trafoConf) * @param funcConf * A definition of function in the form "Name(FUNCTION_DEFINITION)", where Name is a * valid identifier and FUNCTION_DEFINITION a valid parameter for - * {@link de.muenchen.allg.itd51.wollmux.func.FunctionFactory#parse(ConfigThingy, FunctionLibrary, DialogLibrary, Map)}. + * {@link org.libreoffice.lots.func.FunctionFactory#parse(ConfigThingy, FunctionLibrary, DialogLibrary, Map)}. * The first child of FUNCTION_DEFINITION has to be a valid function name like "AND". * * @return The name of the function or null if the definition is erroneous. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextDocumentModel.java b/core/src/main/java/org/libreoffice/lots/document/TextDocumentModel.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextDocumentModel.java rename to core/src/main/java/org/libreoffice/lots/document/TextDocumentModel.java index 1b5d62441..52ae46d80 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextDocumentModel.java +++ b/core/src/main/java/org/libreoffice/lots/document/TextDocumentModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.io.File; import java.io.IOException; @@ -77,21 +77,21 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoProps; -import de.muenchen.allg.itd51.wollmux.WollMuxSingleton; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.dispatch.PrintDispatch; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory.FormField; -import de.muenchen.allg.itd51.wollmux.document.PersistentDataContainer.DataID; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetJumpMark; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommands; -import de.muenchen.allg.itd51.wollmux.sender.SenderException; -import de.muenchen.allg.itd51.wollmux.sender.SenderService; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.WollMuxSingleton; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.dispatch.PrintDispatch; +import org.libreoffice.lots.document.FormFieldFactory.FormField; +import org.libreoffice.lots.document.PersistentDataContainer.DataID; +import org.libreoffice.lots.document.commands.DocumentCommands; +import org.libreoffice.lots.document.commands.DocumentCommand.SetJumpMark; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderService; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * Model of an opened text document. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextRange.java b/core/src/main/java/org/libreoffice/lots/document/TextRange.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextRange.java rename to core/src/main/java/org/libreoffice/lots/document/TextRange.java index 3117c08a2..f989b6ec4 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextRange.java +++ b/core/src/main/java/org/libreoffice/lots/document/TextRange.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; public interface TextRange { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextRangeRelation.java b/core/src/main/java/org/libreoffice/lots/document/TextRangeRelation.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextRangeRelation.java rename to core/src/main/java/org/libreoffice/lots/document/TextRangeRelation.java index d8c9a2206..6bdf8b7b1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextRangeRelation.java +++ b/core/src/main/java/org/libreoffice/lots/document/TextRangeRelation.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import com.sun.star.lang.IllegalArgumentException; import com.sun.star.text.XTextRange; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextSection.java b/core/src/main/java/org/libreoffice/lots/document/TextSection.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextSection.java rename to core/src/main/java/org/libreoffice/lots/document/TextSection.java index 68000bb2b..3fefafc83 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TextSection.java +++ b/core/src/main/java/org/libreoffice/lots/document/TextSection.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.Set; @@ -35,8 +35,8 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.util.Utils; /** * Diese Klasse repräsentiert einen Textbereich (TextSection), dessen Namen um den @@ -90,7 +90,7 @@ public TextSection(XTextSection section, Set groups) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.VisibilityElement#isVisible() + * @see org.libreoffice.lots.VisibilityElement#isVisible() */ @Override public boolean isVisible() @@ -109,7 +109,7 @@ public boolean isVisible() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.VisibilityElement#setVisible(boolean) + * @see org.libreoffice.lots.VisibilityElement#setVisible(boolean) */ @Override public void setVisible(boolean visible) @@ -128,7 +128,7 @@ public void setVisible(boolean visible) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.VisibilityElement#getGroups() + * @see org.libreoffice.lots.VisibilityElement#getGroups() */ @Override public Set getGroups() @@ -139,7 +139,7 @@ public Set getGroups() /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.VisibilityElement#addGroups(java.util.Set) + * @see org.libreoffice.lots.VisibilityElement#addGroups(java.util.Set) */ @Override public void addGroups(Set groups) @@ -150,7 +150,7 @@ public void addGroups(Set groups) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.VisibilityElement#getAnchor() + * @see org.libreoffice.lots.VisibilityElement#getAnchor() */ @Override public XTextRange getAnchor() diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TransitionModeDataContainer.java b/core/src/main/java/org/libreoffice/lots/document/TransitionModeDataContainer.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TransitionModeDataContainer.java rename to core/src/main/java/org/libreoffice/lots/document/TransitionModeDataContainer.java index 7cc3e881a..98bc92618 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TransitionModeDataContainer.java +++ b/core/src/main/java/org/libreoffice/lots/document/TransitionModeDataContainer.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,7 +72,7 @@ public TransitionModeDataContainer(XTextDocument doc) * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentDataContainer#getData(java.lang.String + * org.libreoffice.lots.PersistentDataContainer#getData(java.lang.String * ) * * TESTED @@ -127,7 +127,7 @@ private void copyOnRead(PersistentDataContainer c, DataID dataId, String data) * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentDataContainer#setData(java.lang.String + * org.libreoffice.lots.PersistentDataContainer#setData(java.lang.String * , java.lang.String) * * TESTED @@ -142,7 +142,7 @@ public void setData(DataID dataId, String dataValue) /* * (non-Javadoc) * - * @see de.muenchen.allg.itd51.wollmux.PersistentDataContainer#flush() + * @see org.libreoffice.lots.PersistentDataContainer#flush() * * TESTED */ @@ -157,7 +157,7 @@ public void flush() * (non-Javadoc) * * @see - * de.muenchen.allg.itd51.wollmux.PersistentDataContainer#removeData(java.lang. + * org.libreoffice.lots.PersistentDataContainer#removeData(java.lang. * String) */ @Override diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TreeRelation.java b/core/src/main/java/org/libreoffice/lots/document/TreeRelation.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TreeRelation.java rename to core/src/main/java/org/libreoffice/lots/document/TreeRelation.java index acb420607..2ae0801cc 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/TreeRelation.java +++ b/core/src/main/java/org/libreoffice/lots/document/TreeRelation.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import com.sun.star.text.XTextRange; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/VisibilityElement.java b/core/src/main/java/org/libreoffice/lots/document/VisibilityElement.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/VisibilityElement.java rename to core/src/main/java/org/libreoffice/lots/document/VisibilityElement.java index 3140c55ba..0a4c5bcb4 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/VisibilityElement.java +++ b/core/src/main/java/org/libreoffice/lots/document/VisibilityElement.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.Set; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/VisibleTextFragmentList.java b/core/src/main/java/org/libreoffice/lots/document/VisibleTextFragmentList.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/VisibleTextFragmentList.java rename to core/src/main/java/org/libreoffice/lots/document/VisibleTextFragmentList.java index 5d0d3be3d..d21d10b4f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/VisibleTextFragmentList.java +++ b/core/src/main/java/org/libreoffice/lots/document/VisibleTextFragmentList.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import java.util.ArrayList; import java.util.HashMap; @@ -31,14 +31,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.InvalidIdentifierException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.InvalidIdentifierException; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * TODO: überarbeiten! Die VisibleTextFragmentList repräsentiert die ausgewertete * Liste aller in den Konfigurationsdateien beschriebener "TextFragments" Abschnitte. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/WMCommandsFailedException.java b/core/src/main/java/org/libreoffice/lots/document/WMCommandsFailedException.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/WMCommandsFailedException.java rename to core/src/main/java/org/libreoffice/lots/document/WMCommandsFailedException.java index 959d338c3..4c985b714 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/WMCommandsFailedException.java +++ b/core/src/main/java/org/libreoffice/lots/document/WMCommandsFailedException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; /** * Beim Der Interpretation der WollMux-Kommandos traten Fehler auf, die eine diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/AbstractExecutor.java b/core/src/main/java/org/libreoffice/lots/document/commands/AbstractExecutor.java similarity index 80% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/AbstractExecutor.java rename to core/src/main/java/org/libreoffice/lots/document/commands/AbstractExecutor.java index 1de0f252e..39bb860e2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/AbstractExecutor.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/AbstractExecutor.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; import java.util.Iterator; @@ -34,23 +34,23 @@ import com.sun.star.text.XTextRange; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.Form; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertContent; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertFormValue; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertFrag; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertValue; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InvalidCommand; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.OverrideFrag; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetGroups; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetJumpMark; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetPrintFunction; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetType; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.UpdateFields; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockCommand; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.document.commands.DocumentCommand.Form; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertContent; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertFormValue; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertFrag; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertValue; +import org.libreoffice.lots.document.commands.DocumentCommand.InvalidCommand; +import org.libreoffice.lots.document.commands.DocumentCommand.OverrideFrag; +import org.libreoffice.lots.document.commands.DocumentCommand.SetGroups; +import org.libreoffice.lots.document.commands.DocumentCommand.SetJumpMark; +import org.libreoffice.lots.document.commands.DocumentCommand.SetPrintFunction; +import org.libreoffice.lots.document.commands.DocumentCommand.SetType; +import org.libreoffice.lots.document.commands.DocumentCommand.UpdateFields; +import org.libreoffice.lots.slv.PrintBlockCommand; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * Implementiert einen leer-Executor, von dem abgeleitet werden kann, um konkrete diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommand.java b/core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommand.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommand.java rename to core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommand.java index 78cf776ce..b1fc26d96 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommand.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommand.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; import java.util.HashSet; import java.util.Iterator; @@ -40,12 +40,12 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.document.VisibilityElement; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockCommand; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.document.VisibilityElement; +import org.libreoffice.lots.slv.PrintBlockCommand; +import org.libreoffice.lots.util.L; /** * A document command with its properties like visibility, execution state and groups. @@ -205,7 +205,7 @@ public XTextCursor getTextCursor() * * @return The TextRange of the book mark or null if the book mark doesn't exist. * - * @see de.muenchen.allg.itd51.wollmux.document.VisibilityElement#getAnchor() + * @see org.libreoffice.lots.document.VisibilityElement#getAnchor() */ public XTextRange getAnchor() { @@ -642,7 +642,7 @@ protected void setOrCreate(String key, String value) * Is the content of the command visible? * * @return True if it's visible, false otherwise. - * @see de.muenchen.allg.itd51.wollmux.document.VisibilityElement#isVisible() + * @see org.libreoffice.lots.document.VisibilityElement#isVisible() */ public boolean isVisible() { @@ -654,7 +654,7 @@ public boolean isVisible() * * @param visible * True if the content should be visible, false otherwise. - * @see de.muenchen.allg.itd51.wollmux.document.VisibilityElement#setVisible(boolean) + * @see org.libreoffice.lots.document.VisibilityElement#setVisible(boolean) */ public void setVisible(boolean visible) { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommandInterpreter.java b/core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommandInterpreter.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommandInterpreter.java rename to core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommandInterpreter.java index f72b97b71..cfa3c9bb3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommandInterpreter.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommandInterpreter.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; import java.util.HashSet; import java.util.Iterator; @@ -39,13 +39,13 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.document.text.StyleService; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; -import de.muenchen.allg.itd51.wollmux.document.WMCommandsFailedException; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockProcessor; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.TextDocumentModel; +import org.libreoffice.lots.document.WMCommandsFailedException; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; +import org.libreoffice.lots.slv.PrintBlockProcessor; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * Diese Klasse repräsentiert den Kommando-Interpreter zur Auswertung von diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommands.java b/core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommands.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommands.java rename to core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommands.java index a11890386..07efe7179 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentCommands.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/DocumentCommands.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; import java.io.IOException; import java.io.StringReader; @@ -46,17 +46,17 @@ import org.libreoffice.ext.unohelper.common.UnoDictionary; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.document.TextSection; -import de.muenchen.allg.itd51.wollmux.document.TreeRelation; -import de.muenchen.allg.itd51.wollmux.document.VisibilityElement; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InvalidCommand; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetGroups; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetJumpMark; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockCommand; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.document.TextSection; +import org.libreoffice.lots.document.TreeRelation; +import org.libreoffice.lots.document.VisibilityElement; +import org.libreoffice.lots.document.commands.DocumentCommand.InvalidCommand; +import org.libreoffice.lots.document.commands.DocumentCommand.SetGroups; +import org.libreoffice.lots.document.commands.DocumentCommand.SetJumpMark; +import org.libreoffice.lots.slv.PrintBlockCommand; +import org.libreoffice.lots.util.L; /** * Diese Klasse verwaltet die Dokumentkommandos eines Textdokuments und kann sich diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentExpander.java b/core/src/main/java/org/libreoffice/lots/document/commands/DocumentExpander.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentExpander.java rename to core/src/main/java/org/libreoffice/lots/document/commands/DocumentExpander.java index 2d959fb4b..45d08288f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/DocumentExpander.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/DocumentExpander.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; import java.net.URL; import java.util.ArrayList; @@ -44,22 +44,22 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoProps; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -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.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.DocumentLoader; -import de.muenchen.allg.itd51.wollmux.document.VisibleTextFragmentList; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel.OverrideFragChainException; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertContent; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertFrag; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.OverrideFrag; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnJumpToMark; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.DocumentLoader; +import org.libreoffice.lots.document.VisibleTextFragmentList; +import org.libreoffice.lots.document.TextDocumentModel.OverrideFragChainException; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertContent; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertFrag; +import org.libreoffice.lots.document.commands.DocumentCommand.OverrideFrag; +import org.libreoffice.lots.event.handlers.OnJumpToMark; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * Builds the whole document by expanding each text fragment. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/GlobalDocumentCommandsScanner.java b/core/src/main/java/org/libreoffice/lots/document/commands/GlobalDocumentCommandsScanner.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/GlobalDocumentCommandsScanner.java rename to core/src/main/java/org/libreoffice/lots/document/commands/GlobalDocumentCommandsScanner.java index 414cf600f..6813ac1ed 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/GlobalDocumentCommandsScanner.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/GlobalDocumentCommandsScanner.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetPrintFunction; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.SetType; +import org.libreoffice.lots.document.commands.DocumentCommand.SetPrintFunction; +import org.libreoffice.lots.document.commands.DocumentCommand.SetType; /** * Hierbei handelt es sich um einen minimalen Scanner, der zu aller erst abläuft diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/InsertFormValueCommandsScanner.java b/core/src/main/java/org/libreoffice/lots/document/commands/InsertFormValueCommandsScanner.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/InsertFormValueCommandsScanner.java rename to core/src/main/java/org/libreoffice/lots/document/commands/InsertFormValueCommandsScanner.java index c5ea932d7..1ae15cf80 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/InsertFormValueCommandsScanner.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/InsertFormValueCommandsScanner.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; import java.util.HashMap; import java.util.LinkedList; @@ -28,9 +28,9 @@ import java.util.ListIterator; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory.FormField; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertFormValue; +import org.libreoffice.lots.document.FormFieldFactory; +import org.libreoffice.lots.document.FormFieldFactory.FormField; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertFormValue; /** * Scanner, der die InsertFormValue-Kommandos des Dokuments abarbeitet und ein diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/MainProcessor.java b/core/src/main/java/org/libreoffice/lots/document/commands/MainProcessor.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/MainProcessor.java rename to core/src/main/java/org/libreoffice/lots/document/commands/MainProcessor.java index 792eb0e2d..0f3eed950 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/MainProcessor.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/MainProcessor.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; -import com.sun.star.text.XTextCursor; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderService; +import org.libreoffice.lots.util.L; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.sender.SenderException; -import de.muenchen.allg.itd51.wollmux.sender.SenderService; -import de.muenchen.allg.itd51.wollmux.util.L; +import com.sun.star.text.XTextCursor; /** * Der Hauptverarbeitungsschritt, in dem vor allem die Textinhalte gefüllt werden. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/OnProcessTextDocument.java b/core/src/main/java/org/libreoffice/lots/document/commands/OnProcessTextDocument.java similarity index 81% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/OnProcessTextDocument.java rename to core/src/main/java/org/libreoffice/lots/document/commands/OnProcessTextDocument.java index f79e231a6..24e7cf389 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/OnProcessTextDocument.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/OnProcessTextDocument.java @@ -20,24 +20,23 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; - +package org.libreoffice.lots.document.commands; + +import org.libreoffice.lots.GlobalFunctions; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.event.WollMuxEventHandler; +import org.libreoffice.lots.event.WollMuxEventListener; +import org.libreoffice.lots.event.handlers.OnActivateSidebar; +import org.libreoffice.lots.event.handlers.OnNotifyDocumentEventListener; +import org.libreoffice.lots.event.handlers.OnTextDocumentControllerInitialized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.eventbus.Subscribe; -import de.muenchen.allg.itd51.wollmux.GlobalFunctions; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventHandler; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnActivateSidebar; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnNotifyDocumentEventListener; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnTextDocumentControllerInitialized; - /** * Processes text documents. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/SurroundingGarbageCollector.java b/core/src/main/java/org/libreoffice/lots/document/commands/SurroundingGarbageCollector.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/SurroundingGarbageCollector.java rename to core/src/main/java/org/libreoffice/lots/document/commands/SurroundingGarbageCollector.java index 3b63fd303..eeb42224e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/SurroundingGarbageCollector.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/SurroundingGarbageCollector.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; import java.util.ArrayList; import java.util.Iterator; @@ -37,12 +37,12 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoDictionary; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertContent; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertFrag; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.common.TextDocument; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertContent; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertFrag; +import org.libreoffice.lots.util.Utils; /** * Der SurroundingGarbageCollector erfasst leere Absätze und Einfügemarker um diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/TextFieldUpdater.java b/core/src/main/java/org/libreoffice/lots/document/commands/TextFieldUpdater.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/TextFieldUpdater.java rename to core/src/main/java/org/libreoffice/lots/document/commands/TextFieldUpdater.java index 67da9afe1..0c622aec9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/commands/TextFieldUpdater.java +++ b/core/src/main/java/org/libreoffice/lots/document/commands/TextFieldUpdater.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.commands; +package org.libreoffice.lots.document.commands; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,8 +30,8 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.UpdateFields; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.document.commands.DocumentCommand.UpdateFields; /** * Dieser Executor hat die Aufgabe alle updateFields-Befehle zu verarbeiten. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/BookmarkNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/BookmarkNode.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/BookmarkNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/BookmarkNode.java index 3858af4d4..f491c4232 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/BookmarkNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/BookmarkNode.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import org.libreoffice.ext.unohelper.document.text.Bookmark; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/CheckboxNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/CheckboxNode.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/CheckboxNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/CheckboxNode.java index 7f75e49a9..f7c7dfc1a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/CheckboxNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/CheckboxNode.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,9 +34,9 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.document.DocumentTreeVisitor; +import org.libreoffice.lots.util.Utils; public class CheckboxNode implements FormControl, Node { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/Container.java b/core/src/main/java/org/libreoffice/lots/document/nodes/Container.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/Container.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/Container.java index 6fa12d7b4..488499bac 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/Container.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/Container.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; /** * Implementiert von Knoten, die Nachfahren haben können, z,B, Absätzen. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/ContainerNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/ContainerNode.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/ContainerNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/ContainerNode.java index cd5949fa7..e0d43c613 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/ContainerNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/ContainerNode.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import java.util.Collection; import java.util.Iterator; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; +import org.libreoffice.lots.document.DocumentTreeVisitor; /** * Oberklasse für Knoten, die Nachfahren haben können (z,B, Absätze). diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/DropdownFormControl.java b/core/src/main/java/org/libreoffice/lots/document/nodes/DropdownFormControl.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/DropdownFormControl.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/DropdownFormControl.java index b83278455..40e36ccdd 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/DropdownFormControl.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/DropdownFormControl.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; public interface DropdownFormControl extends FormControl { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/DropdownNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/DropdownNode.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/DropdownNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/DropdownNode.java index 49725e3dd..8ec443f60 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/DropdownNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/DropdownNode.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +32,8 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.document.DocumentTreeVisitor; public class DropdownNode extends TextFieldNode implements DropdownFormControl diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/FormControl.java b/core/src/main/java/org/libreoffice/lots/document/nodes/FormControl.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/FormControl.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/FormControl.java index 9a0f79020..9d9aa2e0e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/FormControl.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/FormControl.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import org.libreoffice.ext.unohelper.common.UnoHelperException; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/GroupBookmarkNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/GroupBookmarkNode.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/GroupBookmarkNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/GroupBookmarkNode.java index 967f73c82..44b321854 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/GroupBookmarkNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/GroupBookmarkNode.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; public class GroupBookmarkNode extends WollmuxBookmarkNode { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/InputNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/InputNode.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/InputNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/InputNode.java index 84169e404..769b235e1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/InputNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/InputNode.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,9 +32,9 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.document.DocumentTreeVisitor; +import org.libreoffice.lots.util.Utils; public class InputNode extends TextFieldNode implements FormControl { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/InsertionBookmarkNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/InsertionBookmarkNode.java similarity index 82% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/InsertionBookmarkNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/InsertionBookmarkNode.java index 07b691776..4aecef2b7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/InsertionBookmarkNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/InsertionBookmarkNode.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; -import de.muenchen.allg.itd51.wollmux.document.InsertionBookmark; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.document.DocumentTreeVisitor; +import org.libreoffice.lots.document.InsertionBookmark; public class InsertionBookmarkNode extends WollmuxBookmarkNode implements InsertionBookmark diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/Node.java b/core/src/main/java/org/libreoffice/lots/document/nodes/Node.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/Node.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/Node.java index 9806e73b0..68fe7f368 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/Node.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/Node.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import java.util.Collections; import java.util.Iterator; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; +import org.libreoffice.lots.document.DocumentTreeVisitor; /** * Oberklasse für die Knoten des Dokumentbaums. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/ParagraphNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/ParagraphNode.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/ParagraphNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/ParagraphNode.java index 6cf84d43a..cbaf61653 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/ParagraphNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/ParagraphNode.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import java.util.Collection; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/TextFieldNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/TextFieldNode.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/TextFieldNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/TextFieldNode.java index 4100a1691..9abc948a1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/TextFieldNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/TextFieldNode.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import com.sun.star.text.XDependentTextField; import com.sun.star.text.XTextDocument; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/TextRangeNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/TextRangeNode.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/TextRangeNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/TextRangeNode.java index 9120ec660..d713e4772 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/TextRangeNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/TextRangeNode.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; -import com.sun.star.text.XTextRange; +import org.libreoffice.lots.document.DocumentTreeVisitor; +import org.libreoffice.lots.document.TextRange; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; -import de.muenchen.allg.itd51.wollmux.document.TextRange; +import com.sun.star.text.XTextRange; public class TextRangeNode implements TextRange, Node { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/WollmuxBookmarkNode.java b/core/src/main/java/org/libreoffice/lots/document/nodes/WollmuxBookmarkNode.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/WollmuxBookmarkNode.java rename to core/src/main/java/org/libreoffice/lots/document/nodes/WollmuxBookmarkNode.java index f80267c61..193298a06 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/document/nodes/WollmuxBookmarkNode.java +++ b/core/src/main/java/org/libreoffice/lots/document/nodes/WollmuxBookmarkNode.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document.nodes; +package org.libreoffice.lots.document.nodes; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; public class WollmuxBookmarkNode extends BookmarkNode { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/CheckInstallationListener.java b/core/src/main/java/org/libreoffice/lots/event/CheckInstallationListener.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/CheckInstallationListener.java rename to core/src/main/java/org/libreoffice/lots/event/CheckInstallationListener.java index 0d8c37da1..7c266fd8f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/CheckInstallationListener.java +++ b/core/src/main/java/org/libreoffice/lots/event/CheckInstallationListener.java @@ -20,11 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event; +package org.libreoffice.lots.event; -import com.google.common.eventbus.Subscribe; +import org.libreoffice.lots.event.handlers.OnCheckInstallation; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnCheckInstallation; +import com.google.common.eventbus.Subscribe; /** * Event listener for installation check. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/LibreOfficeEventListener.java b/core/src/main/java/org/libreoffice/lots/event/LibreOfficeEventListener.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/LibreOfficeEventListener.java rename to core/src/main/java/org/libreoffice/lots/event/LibreOfficeEventListener.java index 381804359..c0c0d762b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/LibreOfficeEventListener.java +++ b/core/src/main/java/org/libreoffice/lots/event/LibreOfficeEventListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event; +package org.libreoffice.lots.event; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,13 +33,13 @@ import com.sun.star.text.XTextDocument; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.dispatch.DispatchProviderAndInterceptor; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager.Info; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnCheckInstallation; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnInitialize; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnNotifyDocumentEventListener; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnTextDocumentClosed; +import org.libreoffice.lots.dispatch.DispatchProviderAndInterceptor; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.DocumentManager.Info; +import org.libreoffice.lots.event.handlers.OnCheckInstallation; +import org.libreoffice.lots.event.handlers.OnInitialize; +import org.libreoffice.lots.event.handlers.OnNotifyDocumentEventListener; +import org.libreoffice.lots.event.handlers.OnTextDocumentClosed; /** * A listener for LibreOffice events of documents like OnNew or OnLoad. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSaveAs.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSaveAs.java similarity index 86% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSaveAs.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnSaveAs.java index 45443d91a..e4d370426 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSaveAs.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSaveAs.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; import java.io.File; import java.net.MalformedURLException; @@ -37,20 +37,20 @@ import com.sun.star.uno.AnyConverter; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.dispatch.DispatchHelper; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.func.Values; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoComponent; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.dispatch.DispatchHelper; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.Values; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * If a FilenameGeneratorFunction is present the default name of the file is set. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSaveTempAndOpenExt.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSaveTempAndOpenExt.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSaveTempAndOpenExt.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnSaveTempAndOpenExt.java index f1d6efe17..d9613c96c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSaveTempAndOpenExt.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSaveTempAndOpenExt.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.OpenExt; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; +import org.libreoffice.lots.OpenExt; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.document.TextDocumentController; /** * Event for saving a temporary file and opening it with an external application. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetFormValue.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetFormValue.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetFormValue.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnSetFormValue.java index 35fbd01eb..3e32e3c0a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetFormValue.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetFormValue.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; import java.awt.event.ActionListener; -import com.sun.star.text.XTextDocument; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.form.control.FormController; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.form.control.FormController; +import com.sun.star.text.XTextDocument; /** * Event for setting form values in a document. If the document is a form document processing is diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetFormValueFinished.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetFormValueFinished.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetFormValueFinished.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnSetFormValueFinished.java index b82688f7c..70706ef3c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetFormValueFinished.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetFormValueFinished.java @@ -20,11 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; import java.awt.event.ActionListener; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; +import org.libreoffice.lots.WollMuxFehlerException; /** * Event for notification that the form model as updated all fields. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetInsertValues.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetInsertValues.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetInsertValues.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnSetInsertValues.java index 377bf19bf..161f82857 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetInsertValues.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetInsertValues.java @@ -20,21 +20,20 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; import java.awt.event.ActionListener; import java.util.Map; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.commands.DocumentCommand; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.sun.star.text.XTextDocument; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand; - /** * Updates all insertValue commands, even already executed commands. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetVisibleState.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetVisibleState.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetVisibleState.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnSetVisibleState.java index fcc94a33b..a1424e213 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetVisibleState.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetVisibleState.java @@ -20,11 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; import java.awt.event.ActionListener; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; +import org.libreoffice.lots.document.TextDocumentController; /** * Event for updating visiblity states. Commands and sections are updated. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetWindowVisible.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetWindowVisible.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetWindowVisible.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnSetWindowVisible.java index c64ce09e8..358604df4 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnSetWindowVisible.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnSetWindowVisible.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; +import org.libreoffice.lots.document.TextDocumentController; /** * Shows or hides a document window. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextDocumentClosed.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnTextDocumentClosed.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextDocumentClosed.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnTextDocumentClosed.java index 56b19fce3..1ef8eb51e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextDocumentClosed.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnTextDocumentClosed.java @@ -20,11 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.TextDocumentModel; /** * Event for removing text documents from WollMux. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextDocumentControllerInitialized.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnTextDocumentControllerInitialized.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextDocumentControllerInitialized.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnTextDocumentControllerInitialized.java index cfd8c6415..f08573174 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextDocumentControllerInitialized.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnTextDocumentControllerInitialized.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.document.TextDocumentController; /** * Observer notifies sidebar instances when an instance of TextDocumentController is available. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextbausteinEinfuegen.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnTextbausteinEinfuegen.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextbausteinEinfuegen.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnTextbausteinEinfuegen.java index a88151efb..0ac101141 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnTextbausteinEinfuegen.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnTextbausteinEinfuegen.java @@ -20,19 +20,18 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; +import org.libreoffice.lots.TextModule; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.sun.star.text.XTextCursor; -import de.muenchen.allg.itd51.wollmux.TextModule; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Event for inserting a boilerplate. It can be inserted as a reference or the reference can be * resolved immediately. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnUpdateInputFields.java b/core/src/main/java/org/libreoffice/lots/event/handlers/OnUpdateInputFields.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnUpdateInputFields.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/OnUpdateInputFields.java index c3b751805..3f591b49c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/OnUpdateInputFields.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/OnUpdateInputFields.java @@ -20,17 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; + +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.dispatch.DispatchHelper; +import org.libreoffice.lots.event.WollMuxEventHandler; import com.sun.star.document.XEventListener; import com.sun.star.lang.EventObject; import com.sun.star.text.XTextDocument; import com.sun.star.uno.UnoRuntime; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.dispatch.DispatchHelper; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventHandler; - /** * Event for handling LibreOffice UpdateInputField dispatches. The LibreOffice own dialog isn't * shown. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/WollMuxEvent.java b/core/src/main/java/org/libreoffice/lots/event/handlers/WollMuxEvent.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/WollMuxEvent.java rename to core/src/main/java/org/libreoffice/lots/event/handlers/WollMuxEvent.java index a67a2d111..ccc1b3435 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/event/handlers/WollMuxEvent.java +++ b/core/src/main/java/org/libreoffice/lots/event/handlers/WollMuxEvent.java @@ -20,18 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.event.handlers; +package org.libreoffice.lots.event.handlers; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.event.WollMuxEventHandler; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.sun.star.uno.RuntimeException; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventHandler; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Basic implementation of {@link WollMuxEvent}. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/FormConfig.java b/core/src/main/java/org/libreoffice/lots/form/config/FormConfig.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/FormConfig.java rename to core/src/main/java/org/libreoffice/lots/form/config/FormConfig.java index a08861acc..c4bd29a62 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/FormConfig.java +++ b/core/src/main/java/org/libreoffice/lots/form/config/FormConfig.java @@ -20,22 +20,21 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.config; +package org.libreoffice.lots.form.config; import java.awt.Color; import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.form.model.FormModelException; +import org.libreoffice.lots.ui.UIElementConfig; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.form.model.FormModelException; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; - /** * Description of a form. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/TabConfig.java b/core/src/main/java/org/libreoffice/lots/form/config/TabConfig.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/TabConfig.java rename to core/src/main/java/org/libreoffice/lots/form/config/TabConfig.java index 787a5a0d3..fc453d698 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/TabConfig.java +++ b/core/src/main/java/org/libreoffice/lots/form/config/TabConfig.java @@ -20,17 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.config; +package org.libreoffice.lots.form.config; import java.util.ArrayList; import java.util.List; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.form.model.FormModelException; -import de.muenchen.allg.itd51.wollmux.former.FormMaxConstants; -import de.muenchen.allg.itd51.wollmux.ui.UIElementType; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.form.model.FormModelException; +import org.libreoffice.lots.former.FormMaxConstants; +import org.libreoffice.lots.ui.UIElementConfig; +import org.libreoffice.lots.ui.UIElementType; /** * A tab of a form. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/VisibilityGroupConfig.java b/core/src/main/java/org/libreoffice/lots/form/config/VisibilityGroupConfig.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/VisibilityGroupConfig.java rename to core/src/main/java/org/libreoffice/lots/form/config/VisibilityGroupConfig.java index ade16fb5f..04cfe8186 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/config/VisibilityGroupConfig.java +++ b/core/src/main/java/org/libreoffice/lots/form/config/VisibilityGroupConfig.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.config; +package org.libreoffice.lots.form.config; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; /** * A description of a visibility group. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/control/FormController.java b/core/src/main/java/org/libreoffice/lots/form/control/FormController.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/control/FormController.java rename to core/src/main/java/org/libreoffice/lots/form/control/FormController.java index 982f70de5..5b7668d6f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/control/FormController.java +++ b/core/src/main/java/org/libreoffice/lots/form/control/FormController.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.control; +package org.libreoffice.lots.form.control; import java.awt.event.ActionListener; import java.io.File; @@ -32,17 +32,17 @@ import org.slf4j.LoggerFactory; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.Dialog; -import de.muenchen.allg.itd51.wollmux.dispatch.PrintDispatch; -import de.muenchen.allg.itd51.wollmux.dispatch.SaveDispatch; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnCloseAndOpenExt; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnCloseTextDocument; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnOpenDocument; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnResetDocumentState; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSaveTempAndOpenExt; -import de.muenchen.allg.itd51.wollmux.form.model.FormModel; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.Dialog; +import org.libreoffice.lots.dispatch.PrintDispatch; +import org.libreoffice.lots.dispatch.SaveDispatch; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.event.handlers.OnCloseAndOpenExt; +import org.libreoffice.lots.event.handlers.OnCloseTextDocument; +import org.libreoffice.lots.event.handlers.OnOpenDocument; +import org.libreoffice.lots.event.handlers.OnResetDocumentState; +import org.libreoffice.lots.event.handlers.OnSaveTempAndOpenExt; +import org.libreoffice.lots.form.model.FormModel; /** * Der Controller für die FormularGUI. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/Control.java b/core/src/main/java/org/libreoffice/lots/form/model/Control.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/Control.java rename to core/src/main/java/org/libreoffice/lots/form/model/Control.java index a48796fe4..6b9220a61 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/Control.java +++ b/core/src/main/java/org/libreoffice/lots/form/model/Control.java @@ -20,22 +20,22 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.model; +package org.libreoffice.lots.form.model; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.func.Values; -import de.muenchen.allg.itd51.wollmux.func.Values.SimpleMap; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; -import de.muenchen.allg.itd51.wollmux.ui.UIElementType; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.Values; +import org.libreoffice.lots.func.Values.SimpleMap; +import org.libreoffice.lots.ui.UIElementConfig; +import org.libreoffice.lots.ui.UIElementType; /** * Representation of a form control. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormModel.java b/core/src/main/java/org/libreoffice/lots/form/model/FormModel.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormModel.java rename to core/src/main/java/org/libreoffice/lots/form/model/FormModel.java index 2d920ddbd..f1d4d7046 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormModel.java +++ b/core/src/main/java/org/libreoffice/lots/form/model/FormModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.model; +package org.libreoffice.lots.form.model; import java.util.ArrayList; import java.util.Collection; @@ -32,20 +32,19 @@ import java.util.Set; import java.util.stream.Stream; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.form.config.FormConfig; +import org.libreoffice.lots.form.config.TabConfig; +import org.libreoffice.lots.form.config.VisibilityGroupConfig; +import org.libreoffice.lots.form.sidebar.FormSidebarController; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.Values; +import org.libreoffice.lots.func.Values.SimpleMap; +import org.libreoffice.lots.ui.UIElementConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.form.config.FormConfig; -import de.muenchen.allg.itd51.wollmux.form.config.TabConfig; -import de.muenchen.allg.itd51.wollmux.form.config.VisibilityGroupConfig; -import de.muenchen.allg.itd51.wollmux.form.sidebar.FormSidebarController; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.func.Values; -import de.muenchen.allg.itd51.wollmux.func.Values.SimpleMap; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; - /** * Model of a form. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormModelException.java b/core/src/main/java/org/libreoffice/lots/form/model/FormModelException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormModelException.java rename to core/src/main/java/org/libreoffice/lots/form/model/FormModelException.java index e71763bbc..39d96a2a2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormModelException.java +++ b/core/src/main/java/org/libreoffice/lots/form/model/FormModelException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.model; +package org.libreoffice.lots.form.model; /** * An invalid form model. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormValueChangedListener.java b/core/src/main/java/org/libreoffice/lots/form/model/FormValueChangedListener.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormValueChangedListener.java rename to core/src/main/java/org/libreoffice/lots/form/model/FormValueChangedListener.java index 6c0fceab1..0c855bde5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/FormValueChangedListener.java +++ b/core/src/main/java/org/libreoffice/lots/form/model/FormValueChangedListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.model; +package org.libreoffice.lots.form.model; /** * Listener which is called when a form value or form field state has changed. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/VisibilityChangedListener.java b/core/src/main/java/org/libreoffice/lots/form/model/VisibilityChangedListener.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/VisibilityChangedListener.java rename to core/src/main/java/org/libreoffice/lots/form/model/VisibilityChangedListener.java index 767794938..c946459a7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/VisibilityChangedListener.java +++ b/core/src/main/java/org/libreoffice/lots/form/model/VisibilityChangedListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.model; +package org.libreoffice.lots.form.model; /** * Listener which is called when a visibility has changed. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/VisibilityGroup.java b/core/src/main/java/org/libreoffice/lots/form/model/VisibilityGroup.java similarity index 82% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/VisibilityGroup.java rename to core/src/main/java/org/libreoffice/lots/form/model/VisibilityGroup.java index 130b9be96..fffa2ec75 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/model/VisibilityGroup.java +++ b/core/src/main/java/org/libreoffice/lots/form/model/VisibilityGroup.java @@ -20,17 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.model; +package org.libreoffice.lots.form.model; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.form.config.VisibilityGroupConfig; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.func.Values; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.form.config.VisibilityGroupConfig; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.Values; /** * A visibility in a form. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormFactory.java b/core/src/main/java/org/libreoffice/lots/form/sidebar/FormFactory.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormFactory.java rename to core/src/main/java/org/libreoffice/lots/form/sidebar/FormFactory.java index 61e4d1ddb..df33679b8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormFactory.java +++ b/core/src/main/java/org/libreoffice/lots/form/sidebar/FormFactory.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.sidebar; +package org.libreoffice.lots.form.sidebar; import com.sun.star.awt.XWindow; import com.sun.star.beans.PropertyValue; @@ -38,7 +38,7 @@ public class FormFactory extends AbstractSidebarFactory { - public static final String SERVICE_NAME = "de.muenchen.allg.itd51.wollmux.form.sidebar.FormFactory"; + public static final String SERVICE_NAME = "org.libreoffice.lots.form.sidebar.FormFactory"; /** * Create the factory. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarController.java b/core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarController.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarController.java rename to core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarController.java index 948503a55..342616d25 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarController.java +++ b/core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarController.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.sidebar; +package org.libreoffice.lots.form.sidebar; import java.net.MalformedURLException; import java.util.ArrayList; @@ -52,26 +52,26 @@ import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractFocusListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractWindowListener; -import de.muenchen.allg.itd51.wollmux.OpenExt; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.db.ThingyDatasource; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.PersistentDataContainer.DataID; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommandInterpreter; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventHandler; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnTextDocumentControllerInitialized; -import de.muenchen.allg.itd51.wollmux.form.config.FormConfig; -import de.muenchen.allg.itd51.wollmux.form.control.FormController; -import de.muenchen.allg.itd51.wollmux.form.model.Control; -import de.muenchen.allg.itd51.wollmux.form.model.FormModel; -import de.muenchen.allg.itd51.wollmux.form.model.FormModelException; -import de.muenchen.allg.itd51.wollmux.form.model.VisibilityGroup; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.Values.SimpleMap; -import de.muenchen.allg.itd51.wollmux.mailmerge.ConnectionModel; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.OpenExt; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.db.ThingyDatasource; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.PersistentDataContainer.DataID; +import org.libreoffice.lots.document.commands.DocumentCommandInterpreter; +import org.libreoffice.lots.event.WollMuxEventHandler; +import org.libreoffice.lots.event.handlers.OnTextDocumentControllerInitialized; +import org.libreoffice.lots.form.config.FormConfig; +import org.libreoffice.lots.form.control.FormController; +import org.libreoffice.lots.form.model.Control; +import org.libreoffice.lots.form.model.FormModel; +import org.libreoffice.lots.form.model.FormModelException; +import org.libreoffice.lots.form.model.VisibilityGroup; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.Values.SimpleMap; +import org.libreoffice.lots.mailmerge.ConnectionModel; +import org.libreoffice.lots.ui.UIElementConfig; /** * The controller of the form sidebar. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarPanel.java b/core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarPanel.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarPanel.java rename to core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarPanel.java index 84ebf86cd..9e978f6e5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarPanel.java +++ b/core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarPanel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.sidebar; +package org.libreoffice.lots.form.sidebar; import java.util.ArrayList; import java.util.HashMap; @@ -63,11 +63,6 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractSidebarPanel; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTabPageContainerListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractWindowListener; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.form.config.FormConfig; -import de.muenchen.allg.itd51.wollmux.form.config.TabConfig; -import de.muenchen.allg.itd51.wollmux.form.model.Control; -import de.muenchen.allg.itd51.wollmux.form.model.FormModel; import org.libreoffice.ext.unohelper.ui.layout.ControlLayout; import org.libreoffice.ext.unohelper.ui.layout.FixedVerticalLayout; import org.libreoffice.ext.unohelper.ui.layout.HorizontalLayout; @@ -76,10 +71,15 @@ import org.libreoffice.ext.unohelper.ui.layout.VerticalLayout; import org.libreoffice.ext.unohelper.ui.GuiFactory; import org.libreoffice.ext.unohelper.ui.HTMLElement; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; -import de.muenchen.allg.itd51.wollmux.ui.UIElementType; import org.libreoffice.ext.unohelper.util.UnoConfiguration; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.form.config.FormConfig; +import org.libreoffice.lots.form.config.TabConfig; +import org.libreoffice.lots.form.model.Control; +import org.libreoffice.lots.form.model.FormModel; +import org.libreoffice.lots.ui.UIElementConfig; +import org.libreoffice.lots.ui.UIElementType; /** * form UI in sidebar. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarRegistration.java b/core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarRegistration.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarRegistration.java rename to core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarRegistration.java index c383ca4a5..001d00cc1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/form/sidebar/FormSidebarRegistration.java +++ b/core/src/main/java/org/libreoffice/lots/form/sidebar/FormSidebarRegistration.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.sidebar; +package org.libreoffice.lots.form.sidebar; -import de.muenchen.allg.itd51.wollmux.ComponentRegistration; +import org.libreoffice.lots.ComponentRegistration; /** * Factory for {@link FormFactory}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/Broadcast.java b/core/src/main/java/org/libreoffice/lots/former/Broadcast.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/Broadcast.java rename to core/src/main/java/org/libreoffice/lots/former/Broadcast.java index 88523c922..8a984a08a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/Broadcast.java +++ b/core/src/main/java/org/libreoffice/lots/former/Broadcast.java @@ -20,11 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; /** * Interface for sending a message on the global publishing subscribe channel. See also - * {@link de.muenchen.allg.itd51.wollmux.former.BroadcastListener}. + * {@link org.libreoffice.lots.former.BroadcastListener}. * * @author Matthias Benkmann (D-III-ITD 5.1) */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastListener.java b/core/src/main/java/org/libreoffice/lots/former/BroadcastListener.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastListener.java rename to core/src/main/java/org/libreoffice/lots/former/BroadcastListener.java index 9762fe844..e19cabd8c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastListener.java +++ b/core/src/main/java/org/libreoffice/lots/former/BroadcastListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.util.Set; @@ -38,28 +38,28 @@ public interface BroadcastListener { /** * getObject() ist ein - * {@link de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel}. + * {@link org.libreoffice.lots.former.control.model.FormControlModel}. */ public default void broadcastFormControlModelSelection(BroadcastObjectSelection b) {} /** * getObject() ist ein - * {@link de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel}. + * {@link org.libreoffice.lots.former.insertion.model.InsertionModel}. */ public default void broadcastInsertionModelSelection(BroadcastObjectSelection b) {} /** * getObject() ist ein - * {@link de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel}. + * {@link org.libreoffice.lots.former.group.model.GroupModel}. */ public default void broadcastGroupModelSelection(BroadcastObjectSelection b) {} /** * getObject() ist ein - * {@link de.muenchen.allg.itd51.wollmux.former.section.model.SectionModel}. + * {@link org.libreoffice.lots.former.section.model.SectionModel}. */ public default void broadcastSectionModelSelection(BroadcastObjectSelection b) {} diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastObjectSelection.java b/core/src/main/java/org/libreoffice/lots/former/BroadcastObjectSelection.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastObjectSelection.java rename to core/src/main/java/org/libreoffice/lots/former/BroadcastObjectSelection.java index d18c3be51..99fe1ca9a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastObjectSelection.java +++ b/core/src/main/java/org/libreoffice/lots/former/BroadcastObjectSelection.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; /** * Message for object selection in a View. This message will be diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastObjectSelectionByBookmarks.java b/core/src/main/java/org/libreoffice/lots/former/BroadcastObjectSelectionByBookmarks.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastObjectSelectionByBookmarks.java rename to core/src/main/java/org/libreoffice/lots/former/BroadcastObjectSelectionByBookmarks.java index efce5d36b..c7a385723 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastObjectSelectionByBookmarks.java +++ b/core/src/main/java/org/libreoffice/lots/former/BroadcastObjectSelectionByBookmarks.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.util.Set; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastViewVisibilitySettings.java b/core/src/main/java/org/libreoffice/lots/former/BroadcastViewVisibilitySettings.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastViewVisibilitySettings.java rename to core/src/main/java/org/libreoffice/lots/former/BroadcastViewVisibilitySettings.java index 208161f4d..019837d3f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/BroadcastViewVisibilitySettings.java +++ b/core/src/main/java/org/libreoffice/lots/former/BroadcastViewVisibilitySettings.java @@ -20,11 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; /** * Modification of the - * {@link de.muenchen.allg.itd51.wollmux.former.ViewVisibilityDescriptor}s. + * {@link org.libreoffice.lots.former.ViewVisibilityDescriptor}s. * * @author Matthias Benkmann (D-III-ITD 5.1) */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ComboboxMergeDescriptor.java b/core/src/main/java/org/libreoffice/lots/former/ComboboxMergeDescriptor.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ComboboxMergeDescriptor.java rename to core/src/main/java/org/libreoffice/lots/former/ComboboxMergeDescriptor.java index d3b2edcce..17d137aa5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ComboboxMergeDescriptor.java +++ b/core/src/main/java/org/libreoffice/lots/former/ComboboxMergeDescriptor.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.model.IdModel; /** * Information container for merging seperate checkboxes into diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/Common.java b/core/src/main/java/org/libreoffice/lots/former/Common.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/Common.java rename to core/src/main/java/org/libreoffice/lots/former/Common.java index 0513442fc..3b4b603c2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/Common.java +++ b/core/src/main/java/org/libreoffice/lots/former/Common.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.AWTEvent; import java.awt.Font; @@ -43,12 +43,11 @@ import javax.swing.UIDefaults; import javax.swing.UIManager; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; - /** * Enthält von den Dialogen gemeinsam genutzten Code. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ConfigEditor.java b/core/src/main/java/org/libreoffice/lots/former/ConfigEditor.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ConfigEditor.java rename to core/src/main/java/org/libreoffice/lots/former/ConfigEditor.java index 90994f29e..31e3e2a08 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ConfigEditor.java +++ b/core/src/main/java/org/libreoffice/lots/former/ConfigEditor.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.BorderLayout; import java.awt.Color; @@ -65,9 +65,8 @@ import org.fife.ui.rtextarea.SearchContext; import org.fife.ui.rtextarea.SearchEngine; import org.fife.ui.rtextarea.SearchResult; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.util.L; public class ConfigEditor extends JFrame implements SearchListener { @@ -158,7 +157,7 @@ private void createGui() AbstractTokenMakerFactory tokenMakerFactory = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance(); tokenMakerFactory.putMapping("text/conf", - "de.muenchen.allg.itd51.wollmux.former.ConfigTokenMaker"); + "org.libreoffice.lots.former.ConfigTokenMaker"); editor.setSyntaxEditingStyle("text/conf"); setJMenuBar(createMenu()); diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ConfigTokenMaker.java b/core/src/main/java/org/libreoffice/lots/former/ConfigTokenMaker.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ConfigTokenMaker.java rename to core/src/main/java/org/libreoffice/lots/former/ConfigTokenMaker.java index 5996ebaa8..59a8b5421 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ConfigTokenMaker.java +++ b/core/src/main/java/org/libreoffice/lots/former/ConfigTokenMaker.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import javax.swing.text.Segment; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ContextMenuMouseListener.java b/core/src/main/java/org/libreoffice/lots/former/ContextMenuMouseListener.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ContextMenuMouseListener.java rename to core/src/main/java/org/libreoffice/lots/former/ContextMenuMouseListener.java index 7fbf72d08..5bf92777e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ContextMenuMouseListener.java +++ b/core/src/main/java/org/libreoffice/lots/former/ContextMenuMouseListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.AWTEvent; import java.awt.Toolkit; @@ -37,7 +37,7 @@ import javax.swing.event.PopupMenuListener; import javax.swing.text.JTextComponent; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * Enthält ein MouseListener für das recht Mouse Klick. Das Mouse listener ist als AWTEventListener implementiert diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/DimAdjust.java b/core/src/main/java/org/libreoffice/lots/former/DimAdjust.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/DimAdjust.java rename to core/src/main/java/org/libreoffice/lots/former/DimAdjust.java index 6b8bdad88..f6cda88a9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/DimAdjust.java +++ b/core/src/main/java/org/libreoffice/lots/former/DimAdjust.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.Dimension; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/DuplicateIDException.java b/core/src/main/java/org/libreoffice/lots/former/DuplicateIDException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/DuplicateIDException.java rename to core/src/main/java/org/libreoffice/lots/former/DuplicateIDException.java index cb7ccce72..c8d83fdb5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/DuplicateIDException.java +++ b/core/src/main/java/org/libreoffice/lots/former/DuplicateIDException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; /** * Wird geworfen, wenn versucht wird, die ID eines Elementes auf einen bereits von diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FilenameGeneratorFunctionDialog.java b/core/src/main/java/org/libreoffice/lots/former/FilenameGeneratorFunctionDialog.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FilenameGeneratorFunctionDialog.java rename to core/src/main/java/org/libreoffice/lots/former/FilenameGeneratorFunctionDialog.java index 6ad603052..77c5345e5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FilenameGeneratorFunctionDialog.java +++ b/core/src/main/java/org/libreoffice/lots/former/FilenameGeneratorFunctionDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.BorderLayout; import java.awt.Color; @@ -44,15 +44,14 @@ import javax.swing.WindowConstants; import javax.swing.border.EmptyBorder; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.util.L; - public class FilenameGeneratorFunctionDialog extends JDialog { private static final long serialVersionUID = 1L; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormMaxConstants.java b/core/src/main/java/org/libreoffice/lots/former/FormMaxConstants.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormMaxConstants.java rename to core/src/main/java/org/libreoffice/lots/former/FormMaxConstants.java index b2e10c9da..cc21131f5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormMaxConstants.java +++ b/core/src/main/java/org/libreoffice/lots/former/FormMaxConstants.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; public class FormMaxConstants { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormularMax4kController.java b/core/src/main/java/org/libreoffice/lots/former/FormularMax4kController.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormularMax4kController.java rename to core/src/main/java/org/libreoffice/lots/former/FormularMax4kController.java index 0929ec319..a1d80bc2d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormularMax4kController.java +++ b/core/src/main/java/org/libreoffice/lots/former/FormularMax4kController.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -65,35 +65,35 @@ import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoDictionary; import org.libreoffice.ext.unohelper.common.UnoList; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommands; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModelList; -import de.muenchen.allg.itd51.wollmux.former.document.ScanVisitor; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelection; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionProvider; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionTester; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel4InputUser; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel4InsertXValue; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModelList; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModel; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModelList; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.print.PrintFunctionLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.document.DocumentTreeVisitor; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.TextDocumentModel; +import org.libreoffice.lots.document.commands.DocumentCommands; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.control.model.FormControlModelList; +import org.libreoffice.lots.former.document.ScanVisitor; +import org.libreoffice.lots.former.function.FunctionSelection; +import org.libreoffice.lots.former.function.FunctionSelectionProvider; +import org.libreoffice.lots.former.function.FunctionTester; +import org.libreoffice.lots.former.group.model.GroupModel; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.insertion.model.InsertionModel; +import org.libreoffice.lots.former.insertion.model.InsertionModel4InputUser; +import org.libreoffice.lots.former.insertion.model.InsertionModel4InsertXValue; +import org.libreoffice.lots.former.insertion.model.InsertionModelList; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.section.model.SectionModel; +import org.libreoffice.lots.former.section.model.SectionModelList; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.print.PrintFunctionLibrary; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; public class FormularMax4kController { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormularMax4kView.java b/core/src/main/java/org/libreoffice/lots/former/FormularMax4kView.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormularMax4kView.java rename to core/src/main/java/org/libreoffice/lots/former/FormularMax4kView.java index 0b30cf5cc..c82f5c452 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/FormularMax4kView.java +++ b/core/src/main/java/org/libreoffice/lots/former/FormularMax4kView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.Dimension; import java.awt.GraphicsEnvironment; @@ -43,14 +43,13 @@ import javax.swing.UIManager; import javax.swing.WindowConstants; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.util.L; - public class FormularMax4kView extends JFrame { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/IDManager.java b/core/src/main/java/org/libreoffice/lots/former/IDManager.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/IDManager.java rename to core/src/main/java/org/libreoffice/lots/former/IDManager.java index 5766ed48f..c49ad9752 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/IDManager.java +++ b/core/src/main/java/org/libreoffice/lots/former/IDManager.java @@ -20,14 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.TreeMap; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; + +import org.libreoffice.lots.former.model.IdModel; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/IndexList.java b/core/src/main/java/org/libreoffice/lots/former/IndexList.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/IndexList.java rename to core/src/main/java/org/libreoffice/lots/former/IndexList.java index da358c88a..932e585c8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/IndexList.java +++ b/core/src/main/java/org/libreoffice/lots/former/IndexList.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/JPotentiallyOverlongPopupMenuButton.java b/core/src/main/java/org/libreoffice/lots/former/JPotentiallyOverlongPopupMenuButton.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/JPotentiallyOverlongPopupMenuButton.java rename to core/src/main/java/org/libreoffice/lots/former/JPotentiallyOverlongPopupMenuButton.java index 5a49a5826..f5c9f77d2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/JPotentiallyOverlongPopupMenuButton.java +++ b/core/src/main/java/org/libreoffice/lots/former/JPotentiallyOverlongPopupMenuButton.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.Component; import java.awt.Dimension; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/LeftPanel.java b/core/src/main/java/org/libreoffice/lots/former/LeftPanel.java similarity index 81% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/LeftPanel.java rename to core/src/main/java/org/libreoffice/lots/former/LeftPanel.java index da1106a42..5d741b603 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/LeftPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/LeftPanel.java @@ -20,28 +20,28 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.SwingConstants; -import com.sun.star.text.XTextDocument; +import org.libreoffice.lots.former.control.AllFormControlLineViewsPanel; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.control.model.FormControlModelList; +import org.libreoffice.lots.former.group.AllGroupLineViewsPanel; +import org.libreoffice.lots.former.group.model.GroupModel; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.insertion.AllInsertionLineViewsPanel; +import org.libreoffice.lots.former.insertion.model.InsertionModel; +import org.libreoffice.lots.former.insertion.model.InsertionModelList; +import org.libreoffice.lots.former.section.AllSectionLineViewsPanel; +import org.libreoffice.lots.former.section.model.SectionModel; +import org.libreoffice.lots.former.section.model.SectionModelList; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.util.L; -import de.muenchen.allg.itd51.wollmux.former.control.AllFormControlLineViewsPanel; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModelList; -import de.muenchen.allg.itd51.wollmux.former.group.AllGroupLineViewsPanel; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.insertion.AllInsertionLineViewsPanel; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModelList; -import de.muenchen.allg.itd51.wollmux.former.section.AllSectionLineViewsPanel; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModel; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModelList; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.util.L; +import com.sun.star.text.XTextDocument; /** * Der Übercontainer für die linke Hälfte des FormularMax 4000. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/PrintFunctionDialog.java b/core/src/main/java/org/libreoffice/lots/former/PrintFunctionDialog.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/PrintFunctionDialog.java rename to core/src/main/java/org/libreoffice/lots/former/PrintFunctionDialog.java index 7c1bc940f..b6f5460ea 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/PrintFunctionDialog.java +++ b/core/src/main/java/org/libreoffice/lots/former/PrintFunctionDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.BorderLayout; import java.awt.Dimension; @@ -37,9 +37,9 @@ import javax.swing.JPanel; import javax.swing.WindowConstants; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.print.PrintFunctionLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.print.PrintFunctionLibrary; +import org.libreoffice.lots.util.L; public class PrintFunctionDialog extends JDialog { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/RightPanel.java b/core/src/main/java/org/libreoffice/lots/former/RightPanel.java similarity index 85% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/RightPanel.java rename to core/src/main/java/org/libreoffice/lots/former/RightPanel.java index fb2ca337e..72fa96f48 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/RightPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/RightPanel.java @@ -20,23 +20,23 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.CardLayout; import javax.swing.JComponent; import javax.swing.JPanel; -import de.muenchen.allg.itd51.wollmux.former.control.AllFormControlExtViewsPanel; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModelList; -import de.muenchen.allg.itd51.wollmux.former.group.AllGroupFuncViewsPanel; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.insertion.AllInsertionTrafoViewsPanel; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModelList; -import de.muenchen.allg.itd51.wollmux.former.section.AllSectionExtViewsPanel; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModelList; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.former.control.AllFormControlExtViewsPanel; +import org.libreoffice.lots.former.control.model.FormControlModelList; +import org.libreoffice.lots.former.group.AllGroupFuncViewsPanel; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.insertion.AllInsertionTrafoViewsPanel; +import org.libreoffice.lots.former.insertion.model.InsertionModelList; +import org.libreoffice.lots.former.section.AllSectionExtViewsPanel; +import org.libreoffice.lots.former.section.model.SectionModelList; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.func.FunctionLibrary; /** * Managet die rechte Hälfte des FM4000. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/TextComponentTags.java b/core/src/main/java/org/libreoffice/lots/former/TextComponentTags.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/TextComponentTags.java rename to core/src/main/java/org/libreoffice/lots/former/TextComponentTags.java index e4efe1870..9eef237b1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/TextComponentTags.java +++ b/core/src/main/java/org/libreoffice/lots/former/TextComponentTags.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.Color; import java.awt.event.ActionEvent; @@ -44,12 +44,11 @@ import javax.swing.text.Highlighter; import javax.swing.text.JTextComponent; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Erweiterte eine JTextComponent um die Fähigkeit, Tags, die als * "<tag>" angezeigt werden, wie atomare Elemente zu behandeln. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/VerticalFlowLayout.java b/core/src/main/java/org/libreoffice/lots/former/VerticalFlowLayout.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/VerticalFlowLayout.java rename to core/src/main/java/org/libreoffice/lots/former/VerticalFlowLayout.java index 9f3dea45b..2d25dfa3a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/VerticalFlowLayout.java +++ b/core/src/main/java/org/libreoffice/lots/former/VerticalFlowLayout.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; import java.awt.Component; import java.awt.Container; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ViewVisibilityDescriptor.java b/core/src/main/java/org/libreoffice/lots/former/ViewVisibilityDescriptor.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ViewVisibilityDescriptor.java rename to core/src/main/java/org/libreoffice/lots/former/ViewVisibilityDescriptor.java index 1dd78dc34..f7e9ff6e8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/ViewVisibilityDescriptor.java +++ b/core/src/main/java/org/libreoffice/lots/former/ViewVisibilityDescriptor.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former; +package org.libreoffice.lots.former; /** * Speichert Informationen dazu, welche Teile von Views sichtbar sein sollen. @@ -31,38 +31,38 @@ public class ViewVisibilityDescriptor { /** * Anzeigen der ID in der - * {@link de.muenchen.allg.itd51.wollmux.former.control.OneFormControlLineView}. + * {@link org.libreoffice.lots.former.control.OneFormControlLineView}. */ private boolean formControlLineViewId = true; /** * Anzeigen des LABELs in der - * {@link de.muenchen.allg.itd51.wollmux.former.control.OneFormControlLineView}. + * {@link org.libreoffice.lots.former.control.OneFormControlLineView}. */ private boolean formControlLineViewLabel = true; /** * Anzeigen des TYPEs in der - * {@link de.muenchen.allg.itd51.wollmux.former.control.OneFormControlLineView}. + * {@link org.libreoffice.lots.former.control.OneFormControlLineView}. */ private boolean formControlLineViewType = true; /** * Anzeigen zusätzlicher Elemente in der - * {@link de.muenchen.allg.itd51.wollmux.former.control.OneFormControlLineView}, + * {@link org.libreoffice.lots.former.control.OneFormControlLineView}, * die von der Art des Controls abhängen. */ private boolean formControlLineViewAdditional = true; /** * Anzeigen des TOOLTIPs in der - * {@link de.muenchen.allg.itd51.wollmux.former.control.OneFormControlLineView}. + * {@link org.libreoffice.lots.former.control.OneFormControlLineView}. */ private boolean formControlLineViewTooltip = false; /** * Anzeigen des READONLYs in der - * {@link de.muenchen.allg.itd51.wollmux.former.control.OneFormControlLineView}. + * {@link org.libreoffice.lots.former.control.OneFormControlLineView}. */ private boolean formControlLineViewReadonly = false; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/AllFormControlExtViewsPanel.java b/core/src/main/java/org/libreoffice/lots/former/control/AllFormControlExtViewsPanel.java similarity index 79% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/AllFormControlExtViewsPanel.java rename to core/src/main/java/org/libreoffice/lots/former/control/AllFormControlExtViewsPanel.java index bee046ac6..7c421eed4 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/AllFormControlExtViewsPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/control/AllFormControlExtViewsPanel.java @@ -20,25 +20,25 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.control; +package org.libreoffice.lots.former.control; import java.util.Iterator; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModelList; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.view.OnDemandCardView; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.control.model.FormControlModelList; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.view.OnDemandCardView; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.util.L; /** * Eine View, die alle - * {@link de.muenchen.allg.itd51.wollmux.former.control.OneFormControlExtView}s + * {@link org.libreoffice.lots.former.control.OneFormControlExtView}s * enthält. * * @author Matthias Benkmann (D-III-ITD 5.1) diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/AllFormControlLineViewsPanel.java b/core/src/main/java/org/libreoffice/lots/former/control/AllFormControlLineViewsPanel.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/AllFormControlLineViewsPanel.java rename to core/src/main/java/org/libreoffice/lots/former/control/AllFormControlLineViewsPanel.java index 1f21a0b8f..6963a07a3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/AllFormControlLineViewsPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/control/AllFormControlLineViewsPanel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.control; +package org.libreoffice.lots.former.control; import java.awt.Color; import java.awt.GridBagConstraints; @@ -44,27 +44,26 @@ import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.ComboboxMergeDescriptor; +import org.libreoffice.lots.former.Common; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.IndexList; +import org.libreoffice.lots.former.ViewVisibilityDescriptor; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.control.model.FormControlModelList; +import org.libreoffice.lots.former.control.model.FormControlModelList.ItemListener; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.ComboboxMergeDescriptor; -import de.muenchen.allg.itd51.wollmux.former.Common; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.IndexList; -import de.muenchen.allg.itd51.wollmux.former.ViewVisibilityDescriptor; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModelList; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModelList.ItemListener; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Hält in einem Panel FormControlModelLineViews für alle - * {@link de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel} einer - * {@link de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModelList}. + * {@link org.libreoffice.lots.former.control.model.FormControlModel} einer + * {@link org.libreoffice.lots.former.control.model.FormControlModelList}. * * @author Matthias Benkmann (D-III-ITD 5.1) */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlAutofillEditView.java b/core/src/main/java/org/libreoffice/lots/former/control/OneFormControlAutofillEditView.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlAutofillEditView.java rename to core/src/main/java/org/libreoffice/lots/former/control/OneFormControlAutofillEditView.java index d022e438a..5f87be43c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlAutofillEditView.java +++ b/core/src/main/java/org/libreoffice/lots/former/control/OneFormControlAutofillEditView.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.control; +package org.libreoffice.lots.former.control; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionAccessView; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.function.FunctionSelectionAccessView; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; /** * Stellt das AUTOFILL-Attribut eines FormControlModels dar und erlaubt seine diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlExtView.java b/core/src/main/java/org/libreoffice/lots/former/control/OneFormControlExtView.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlExtView.java rename to core/src/main/java/org/libreoffice/lots/former/control/OneFormControlExtView.java index 19cba6a57..517a5da25 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlExtView.java +++ b/core/src/main/java/org/libreoffice/lots/former/control/OneFormControlExtView.java @@ -20,19 +20,19 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.control; +package org.libreoffice.lots.former.control; import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.event.ChangeListener; -import de.muenchen.allg.itd51.wollmux.former.FormMaxConstants; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.group.OneGroupsProviderGroupsEditView; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.view.LazyView; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.former.FormMaxConstants; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.group.OneGroupsProviderGroupsEditView; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.view.LazyView; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; /** * Anzeige erweiterter Eigenschaften eines FormControlModels. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlLineView.java b/core/src/main/java/org/libreoffice/lots/former/control/OneFormControlLineView.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlLineView.java rename to core/src/main/java/org/libreoffice/lots/former/control/OneFormControlLineView.java index c902d548c..89072d5e5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlLineView.java +++ b/core/src/main/java/org/libreoffice/lots/former/control/OneFormControlLineView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.control; +package org.libreoffice.lots.former.control; import java.awt.Color; import java.awt.Font; @@ -45,18 +45,17 @@ import javax.swing.text.Document; import javax.swing.text.JTextComponent; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.ViewVisibilityDescriptor; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.view.LineView; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.ViewVisibilityDescriptor; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.view.LineView; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Eine einzeilige Sicht auf ein einzelnes Formularsteuerelement. * @@ -867,7 +866,7 @@ public FormControlModel getModel() * @author Matthias Benkmann (D-III-ITD 5.1) */ public static interface ViewChangeListener - extends de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener + extends org.libreoffice.lots.former.view.ViewChangeListener { /** * Wird aufgerufen, wenn sich das Label des Tabs, das das Model von view ist diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlPlausiEditView.java b/core/src/main/java/org/libreoffice/lots/former/control/OneFormControlPlausiEditView.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlPlausiEditView.java rename to core/src/main/java/org/libreoffice/lots/former/control/OneFormControlPlausiEditView.java index 38ac9d583..7024b55c2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/OneFormControlPlausiEditView.java +++ b/core/src/main/java/org/libreoffice/lots/former/control/OneFormControlPlausiEditView.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.control; +package org.libreoffice.lots.former.control; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionAccessView; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.function.FunctionSelectionAccessView; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; /** * Stellt das PLAUSI-Attribut eines FormControlModels dar und erlaubt seine diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/model/FormControlModel.java b/core/src/main/java/org/libreoffice/lots/former/control/model/FormControlModel.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/model/FormControlModel.java rename to core/src/main/java/org/libreoffice/lots/former/control/model/FormControlModel.java index 724ad7e28..95b4aab10 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/model/FormControlModel.java +++ b/core/src/main/java/org/libreoffice/lots/former/control/model/FormControlModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.control.model; +package org.libreoffice.lots.former.control.model; import java.util.ArrayList; import java.util.Arrays; @@ -31,23 +31,22 @@ import java.util.Vector; import java.util.regex.Pattern; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.former.DuplicateIDException; +import org.libreoffice.lots.former.FormMaxConstants; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.IDManager; +import org.libreoffice.lots.former.function.FunctionSelection; +import org.libreoffice.lots.former.function.FunctionSelectionAccess; +import org.libreoffice.lots.former.function.FunctionSelectionProvider; +import org.libreoffice.lots.former.function.ParamValue; +import org.libreoffice.lots.former.group.GroupsProvider; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.former.DuplicateIDException; -import de.muenchen.allg.itd51.wollmux.former.FormMaxConstants; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.IDManager; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelection; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionAccess; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionProvider; -import de.muenchen.allg.itd51.wollmux.former.function.ParamValue; -import de.muenchen.allg.itd51.wollmux.former.group.GroupsProvider; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Repräsentiert ein Formularsteuerelement. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/model/FormControlModelList.java b/core/src/main/java/org/libreoffice/lots/former/control/model/FormControlModelList.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/model/FormControlModelList.java rename to core/src/main/java/org/libreoffice/lots/former/control/model/FormControlModelList.java index a68572348..4442dcd12 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/control/model/FormControlModelList.java +++ b/core/src/main/java/org/libreoffice/lots/former/control/model/FormControlModelList.java @@ -20,21 +20,20 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.control.model; +package org.libreoffice.lots.former.control.model; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.ListIterator; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.former.FormMaxConstants; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.model.IdModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.former.FormMaxConstants; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; - /** * Verwaltet eine Liste von FormControlModels. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/document/ScanVisitor.java b/core/src/main/java/org/libreoffice/lots/former/document/ScanVisitor.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/document/ScanVisitor.java rename to core/src/main/java/org/libreoffice/lots/former/document/ScanVisitor.java index 9fbd71f64..c41b9bf22 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/document/ScanVisitor.java +++ b/core/src/main/java/org/libreoffice/lots/former/document/ScanVisitor.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.document; +package org.libreoffice.lots.former.document; import java.util.HashMap; import java.util.Map; @@ -31,21 +31,21 @@ import org.slf4j.LoggerFactory; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.document.DocumentTreeVisitor; -import de.muenchen.allg.itd51.wollmux.document.InsertionBookmark; -import de.muenchen.allg.itd51.wollmux.document.TextRange; -import de.muenchen.allg.itd51.wollmux.document.nodes.Container; -import de.muenchen.allg.itd51.wollmux.document.nodes.DropdownFormControl; -import de.muenchen.allg.itd51.wollmux.document.nodes.FormControl; -import de.muenchen.allg.itd51.wollmux.former.FormMaxConstants; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelection; -import de.muenchen.allg.itd51.wollmux.former.function.ParamValue; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel4InsertXValue; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.document.DocumentTreeVisitor; +import org.libreoffice.lots.document.InsertionBookmark; +import org.libreoffice.lots.document.TextRange; +import org.libreoffice.lots.document.nodes.Container; +import org.libreoffice.lots.document.nodes.DropdownFormControl; +import org.libreoffice.lots.document.nodes.FormControl; +import org.libreoffice.lots.former.FormMaxConstants; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.function.FunctionSelection; +import org.libreoffice.lots.former.function.ParamValue; +import org.libreoffice.lots.former.insertion.model.InsertionModel; +import org.libreoffice.lots.former.insertion.model.InsertionModel4InsertXValue; +import org.libreoffice.lots.util.L; public class ScanVisitor implements DocumentTreeVisitor { @@ -206,7 +206,7 @@ public boolean formControl(FormControl control) /** * Fügt der {@link #formControlModelList} ein neues {@link FormControlModel} hinzu - * für das {@link de.muenchen.allg.itd51.wollmux.document.nodes.FormControl} + * für das {@link org.libreoffice.lots.document.nodes.FormControl} * control, wobei text der Text sein sollte, der im Dokument vor control steht. * Dieser Text wird zur Generierung des Labels herangezogen. Es wird ebenfalls der * {@link #insertionModelList} ein entsprechendes {@link InsertionModel} @@ -315,7 +315,7 @@ else if (id.startsWith(GENDER_PREFIX)) * * @param control * das entsprechende - * {@link de.muenchen.allg.itd51.wollmux.document.nodes.FormControl} + * {@link org.libreoffice.lots.document.nodes.FormControl} * @param label * das Label * @param id @@ -343,7 +343,7 @@ private FormControlModel registerCheckbox(FormControl control, String label, * * @param control * das entsprechende - * {@link de.muenchen.allg.itd51.wollmux.document.nodes.FormControl} + * {@link org.libreoffice.lots.document.nodes.FormControl} * @param label * das Label * @param id @@ -387,7 +387,7 @@ private FormControlModel registerDropdown(DropdownFormControl control, * * @param control * das entsprechende - * {@link de.muenchen.allg.itd51.wollmux.document.nodes.FormControl} + * {@link org.libreoffice.lots.document.nodes.FormControl} * @param label * das Label * @param id diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelection.java b/core/src/main/java/org/libreoffice/lots/former/function/FunctionSelection.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelection.java rename to core/src/main/java/org/libreoffice/lots/former/function/FunctionSelection.java index 877db67c2..d7c1c5b56 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelection.java +++ b/core/src/main/java/org/libreoffice/lots/former/function/FunctionSelection.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.function; +package org.libreoffice.lots.former.function; import java.util.HashMap; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.util.L; public class FunctionSelection implements FunctionSelectionAccess { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionAccess.java b/core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionAccess.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionAccess.java rename to core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionAccess.java index 9bd2da0b6..c06719fbf 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionAccess.java +++ b/core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionAccess.java @@ -20,11 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.function; +package org.libreoffice.lots.former.function; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; /** * Interface zum Zugriff auf eine FunctionSelection. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionAccessView.java b/core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionAccessView.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionAccessView.java rename to core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionAccessView.java index fb5510ef6..a6b45ccad 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionAccessView.java +++ b/core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionAccessView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.function; +package org.libreoffice.lots.former.function; import java.awt.Color; import java.awt.Component; @@ -51,18 +51,17 @@ import javax.swing.text.Document; import javax.swing.text.JTextComponent; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.former.IDManager; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.former.IDManager; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Eine Sicht, die das Bearbeiten von {@link FunctionSelectionAccess} Objekten * erlaubt. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionProvider.java b/core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionProvider.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionProvider.java rename to core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionProvider.java index a1c9b56c8..363c2cc1f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionSelectionProvider.java +++ b/core/src/main/java/org/libreoffice/lots/former/function/FunctionSelectionProvider.java @@ -20,17 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.function; +package org.libreoffice.lots.former.function; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.former.IDManager; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.former.IDManager; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; /** * Liefert {@link FunctionSelection}s. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionTester.java b/core/src/main/java/org/libreoffice/lots/former/function/FunctionTester.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionTester.java rename to core/src/main/java/org/libreoffice/lots/former/function/FunctionTester.java index ad99e077f..1c6a59394 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/FunctionTester.java +++ b/core/src/main/java/org/libreoffice/lots/former/function/FunctionTester.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.function; +package org.libreoffice.lots.former.function; import java.awt.BorderLayout; import java.awt.Dimension; @@ -54,20 +54,19 @@ import javax.swing.text.Document; import javax.swing.text.JTextComponent; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.former.Common; +import org.libreoffice.lots.former.IDManager; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.Values; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.former.Common; -import de.muenchen.allg.itd51.wollmux.former.IDManager; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.func.Values; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * GUI zum interaktiven Zusammenbauen und Testen von WollMux-Funktionen. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/ParamValue.java b/core/src/main/java/org/libreoffice/lots/former/function/ParamValue.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/ParamValue.java rename to core/src/main/java/org/libreoffice/lots/former/function/ParamValue.java index f0235d356..bcb435895 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/function/ParamValue.java +++ b/core/src/main/java/org/libreoffice/lots/former/function/ParamValue.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.function; +package org.libreoffice.lots.former.function; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; +import org.libreoffice.lots.former.model.IdModel; /** * Repräsentiert einen vom Benutzer konfigurierten Parameter für eine Funktion. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/AllGroupFuncViewsPanel.java b/core/src/main/java/org/libreoffice/lots/former/group/AllGroupFuncViewsPanel.java similarity index 78% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/AllGroupFuncViewsPanel.java rename to core/src/main/java/org/libreoffice/lots/former/group/AllGroupFuncViewsPanel.java index a4b1ae145..aad22c5e0 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/AllGroupFuncViewsPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/group/AllGroupFuncViewsPanel.java @@ -20,22 +20,22 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.group; +package org.libreoffice.lots.former.group; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.view.OnDemandCardView; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.group.model.GroupModel; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.view.OnDemandCardView; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.util.L; /** * Eine View, die alle - * {@link de.muenchen.allg.itd51.wollmux.former.group.OneGroupFuncView}s enthält. + * {@link org.libreoffice.lots.former.group.OneGroupFuncView}s enthält. * * @author Matthias Benkmann (D-III-ITD 5.1) */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/AllGroupLineViewsPanel.java b/core/src/main/java/org/libreoffice/lots/former/group/AllGroupLineViewsPanel.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/AllGroupLineViewsPanel.java rename to core/src/main/java/org/libreoffice/lots/former/group/AllGroupLineViewsPanel.java index ddf650fbd..8a6561e64 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/AllGroupLineViewsPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/group/AllGroupLineViewsPanel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.group; +package org.libreoffice.lots.former.group; import java.awt.BorderLayout; import java.awt.GridBagConstraints; @@ -38,24 +38,23 @@ import javax.swing.JScrollPane; import javax.swing.ScrollPaneConstants; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.Common; +import org.libreoffice.lots.former.DuplicateIDException; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.IndexList; +import org.libreoffice.lots.former.function.FunctionSelection; +import org.libreoffice.lots.former.group.model.GroupModel; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.Common; -import de.muenchen.allg.itd51.wollmux.former.DuplicateIDException; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.IndexList; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelection; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Enthält alle OneInsertionLineViews. * @@ -88,7 +87,7 @@ public class AllGroupLineViewsPanel implements View /** * Das JPanel, das die - * {@link de.muenchen.allg.itd51.wollmux.former.group.OneGroupLineView}s enthält. + * {@link org.libreoffice.lots.former.group.OneGroupLineView}s enthält. */ private JPanel mainPanel; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/GroupsProvider.java b/core/src/main/java/org/libreoffice/lots/former/group/GroupsProvider.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/GroupsProvider.java rename to core/src/main/java/org/libreoffice/lots/former/group/GroupsProvider.java index 911513f21..678b3f1cb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/GroupsProvider.java +++ b/core/src/main/java/org/libreoffice/lots/former/group/GroupsProvider.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.group; +package org.libreoffice.lots.former.group; import java.lang.ref.Reference; import java.lang.ref.WeakReference; @@ -30,8 +30,8 @@ import java.util.List; import java.util.Set; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.model.IdModel; /** * Ein Ding, das GROUPS über ihre IDs referenziert. @@ -60,8 +60,8 @@ public GroupsProvider() * Liefert die Menge der GROUPS-Werte dieses FormControlModels. Die gelieferte * Liste ist keine Referenz auf die interne Datenstruktur. Hinzufügen und Löschen * von Einträgen muss über - * {@link #addGroup(de.muenchen.allg.itd51.wollmux.former.IdModel)} bzw. - * {@link #removeGroup(de.muenchen.allg.itd51.wollmux.former.IdModel)} + * {@link #addGroup(org.libreoffice.lots.former.IdModel)} bzw. + * {@link #removeGroup(org.libreoffice.lots.former.IdModel)} * erfolgen. */ public Set getGroups() diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupFuncView.java b/core/src/main/java/org/libreoffice/lots/former/group/OneGroupFuncView.java similarity index 83% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupFuncView.java rename to core/src/main/java/org/libreoffice/lots/former/group/OneGroupFuncView.java index 7c01e30ef..688a6bb4c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupFuncView.java +++ b/core/src/main/java/org/libreoffice/lots/former/group/OneGroupFuncView.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.group; +package org.libreoffice.lots.former.group; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionAccessView; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.function.FunctionSelectionAccessView; +import org.libreoffice.lots.former.group.model.GroupModel; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; /** * Stellt die Sichtbarkeitsfunktion einer Sichtbarkeitsgruppe dar und erlaubt deren diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupLineView.java b/core/src/main/java/org/libreoffice/lots/former/group/OneGroupLineView.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupLineView.java rename to core/src/main/java/org/libreoffice/lots/former/group/OneGroupLineView.java index 628e772e1..ee3093895 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupLineView.java +++ b/core/src/main/java/org/libreoffice/lots/former/group/OneGroupLineView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.group; +package org.libreoffice.lots.former.group; import java.awt.Color; import java.awt.Dimension; @@ -39,17 +39,16 @@ import javax.swing.text.Document; import javax.swing.text.JTextComponent; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.group.model.GroupModel; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.view.LineView; +import org.libreoffice.lots.former.view.ViewChangeListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.view.LineView; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; - public class OneGroupLineView extends LineView { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupsProviderGroupsEditView.java b/core/src/main/java/org/libreoffice/lots/former/group/OneGroupsProviderGroupsEditView.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupsProviderGroupsEditView.java rename to core/src/main/java/org/libreoffice/lots/former/group/OneGroupsProviderGroupsEditView.java index 36eccfd7c..45d5dc0e4 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/OneGroupsProviderGroupsEditView.java +++ b/core/src/main/java/org/libreoffice/lots/former/group/OneGroupsProviderGroupsEditView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.group; +package org.libreoffice.lots.former.group; import java.awt.GridLayout; import java.util.Iterator; @@ -37,11 +37,11 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel.IDChangeListener; -import de.muenchen.allg.itd51.wollmux.former.view.View; +import org.libreoffice.lots.former.group.model.GroupModel; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.model.IdModel.IDChangeListener; +import org.libreoffice.lots.former.view.View; /** * Lässt die Liste der Gruppen eines {@link GroupsProvider} bearbeiten. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/model/GroupModel.java b/core/src/main/java/org/libreoffice/lots/former/group/model/GroupModel.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/model/GroupModel.java rename to core/src/main/java/org/libreoffice/lots/former/group/model/GroupModel.java index bc39fc211..1db9cce2c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/model/GroupModel.java +++ b/core/src/main/java/org/libreoffice/lots/former/group/model/GroupModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.group.model; +package org.libreoffice.lots.former.group.model; import java.util.ArrayList; import java.util.Iterator; @@ -28,16 +28,16 @@ import java.util.Map; import java.util.regex.Pattern; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.former.DuplicateIDException; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelection; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionAccess; -import de.muenchen.allg.itd51.wollmux.former.function.ParamValue; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel.IDChangeListener; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.former.DuplicateIDException; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.function.FunctionSelection; +import org.libreoffice.lots.former.function.FunctionSelectionAccess; +import org.libreoffice.lots.former.function.ParamValue; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.model.IdModel.IDChangeListener; +import org.libreoffice.lots.util.L; /** * Eine Sichtbarkeitsgruppe. @@ -160,7 +160,7 @@ public IdModel getID() /** * Setzt newID als neuen Namen für diese Sichtbarkeitsgruppe und benachrichtigt * alle mittels - * {@link #addListener(de.muenchen.allg.itd51.wollmux.former.group.model.GroupModel.ModelChangeListener)} + * {@link #addListener(org.libreoffice.lots.former.group.model.GroupModel.ModelChangeListener)} * registrierten Listener. * * @throws DuplicateIDException diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/model/GroupModelList.java b/core/src/main/java/org/libreoffice/lots/former/group/model/GroupModelList.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/model/GroupModelList.java rename to core/src/main/java/org/libreoffice/lots/former/group/model/GroupModelList.java index 96fb4ee57..3e345c4b6 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/group/model/GroupModelList.java +++ b/core/src/main/java/org/libreoffice/lots/former/group/model/GroupModelList.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.group.model; +package org.libreoffice.lots.former.group.model; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; /** * Verwaltet eine Liste von GroupModels diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/AllInsertionLineViewsPanel.java b/core/src/main/java/org/libreoffice/lots/former/insertion/AllInsertionLineViewsPanel.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/AllInsertionLineViewsPanel.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/AllInsertionLineViewsPanel.java index 9b4b506f5..a8c1c96d5 100755 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/AllInsertionLineViewsPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/AllInsertionLineViewsPanel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion; +package org.libreoffice.lots.former.insertion; import java.awt.BorderLayout; import java.awt.GridBagConstraints; @@ -39,17 +39,17 @@ import javax.swing.ScrollPaneConstants; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.Common; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.IndexList; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel4InsertXValue; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModelList; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.Common; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.IndexList; +import org.libreoffice.lots.former.insertion.model.InsertionModel; +import org.libreoffice.lots.former.insertion.model.InsertionModel4InsertXValue; +import org.libreoffice.lots.former.insertion.model.InsertionModelList; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.util.L; /** * Enthält alle OneInsertionLineViews. @@ -80,7 +80,7 @@ public class AllInsertionLineViewsPanel implements View /** * Das JPanel, das die - * {@link de.muenchen.allg.itd51.wollmux.former.insertion.OneInsertionLineView}s + * {@link org.libreoffice.lots.former.insertion.OneInsertionLineView}s * enthält. */ private JPanel mainPanel; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/AllInsertionTrafoViewsPanel.java b/core/src/main/java/org/libreoffice/lots/former/insertion/AllInsertionTrafoViewsPanel.java similarity index 78% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/AllInsertionTrafoViewsPanel.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/AllInsertionTrafoViewsPanel.java index 8aeb65cd5..1e383452d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/AllInsertionTrafoViewsPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/AllInsertionTrafoViewsPanel.java @@ -20,24 +20,24 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion; +package org.libreoffice.lots.former.insertion; import java.util.Iterator; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModelList; -import de.muenchen.allg.itd51.wollmux.former.view.OnDemandCardView; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.insertion.model.InsertionModel; +import org.libreoffice.lots.former.insertion.model.InsertionModelList; +import org.libreoffice.lots.former.view.OnDemandCardView; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.util.L; /** * Eine View, die alle - * {@link de.muenchen.allg.itd51.wollmux.former.insertion.OneInsertionExtView}s + * {@link org.libreoffice.lots.former.insertion.OneInsertionExtView}s * enthält. * * @author Matthias Benkmann (D-III-ITD 5.1) diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionExtView.java b/core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionExtView.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionExtView.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionExtView.java index c13d16a88..97a15dbee 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionExtView.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionExtView.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion; +package org.libreoffice.lots.former.insertion; import javax.swing.JComponent; import javax.swing.JTabbedPane; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.former.insertion.model.InsertionModel; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; /** * Anzeige erweiterter Eigenschaften eines InsertionModels. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionLineView.java b/core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionLineView.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionLineView.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionLineView.java index a9f4f08ed..84b9bafc3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionLineView.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionLineView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion; +package org.libreoffice.lots.former.insertion; import java.awt.Color; import java.awt.Dimension; @@ -43,14 +43,14 @@ import org.slf4j.LoggerFactory; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel4InsertXValue; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; -import de.muenchen.allg.itd51.wollmux.former.view.LineView; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.insertion.model.InsertionModel; +import org.libreoffice.lots.former.insertion.model.InsertionModel4InsertXValue; +import org.libreoffice.lots.former.model.IdModel; +import org.libreoffice.lots.former.view.LineView; +import org.libreoffice.lots.former.view.ViewChangeListener; public class OneInsertionLineView extends LineView { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionTrafoView.java b/core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionTrafoView.java similarity index 83% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionTrafoView.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionTrafoView.java index e33e0fb98..a0dccd146 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/OneInsertionTrafoView.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/OneInsertionTrafoView.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion; +package org.libreoffice.lots.former.insertion; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionAccessView; -import de.muenchen.allg.itd51.wollmux.former.insertion.model.InsertionModel; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.function.FunctionSelectionAccessView; +import org.libreoffice.lots.former.insertion.model.InsertionModel; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.func.FunctionLibrary; /** * Stellt die TRAFO eines InsertionModels dar und erlaubt ihre Bearbeitung. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/UnknownIDException.java b/core/src/main/java/org/libreoffice/lots/former/insertion/UnknownIDException.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/UnknownIDException.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/UnknownIDException.java index a5b7d3133..65fb54c7c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/UnknownIDException.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/UnknownIDException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion; +package org.libreoffice.lots.former.insertion; /** * Wird geworfen, wenn versucht wird, eine ID zu verwenden, die dem System nicht bekannt ist. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel.java b/core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel.java index bfc2ba4df..f6532ce16 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion.model; +package org.libreoffice.lots.former.insertion.model; import java.util.ArrayList; import java.util.Iterator; @@ -28,11 +28,11 @@ import java.util.Map; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelection; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionAccess; -import de.muenchen.allg.itd51.wollmux.former.function.ParamValue; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.function.FunctionSelection; +import org.libreoffice.lots.former.function.FunctionSelectionAccess; +import org.libreoffice.lots.former.function.ParamValue; public abstract class InsertionModel { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel4InputUser.java b/core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel4InputUser.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel4InputUser.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel4InputUser.java index ba3b613b8..7785f5627 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel4InputUser.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel4InputUser.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion.model; +package org.libreoffice.lots.former.insertion.model; import java.io.IOException; import java.util.Map; @@ -38,14 +38,14 @@ 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.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionProvider; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.document.TextDocumentModel; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.function.FunctionSelectionProvider; +import org.libreoffice.lots.util.L; public class InsertionModel4InputUser extends InsertionModel { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel4InsertXValue.java b/core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel4InsertXValue.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel4InsertXValue.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel4InsertXValue.java index b6ded15c6..826e2ee6f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModel4InsertXValue.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModel4InsertXValue.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion.model; +package org.libreoffice.lots.former.insertion.model; import java.io.IOException; import java.io.StringReader; @@ -40,13 +40,13 @@ import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelection; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionProvider; -import de.muenchen.allg.itd51.wollmux.former.insertion.UnknownIDException; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.function.FunctionSelection; +import org.libreoffice.lots.former.function.FunctionSelectionProvider; +import org.libreoffice.lots.former.insertion.UnknownIDException; +import org.libreoffice.lots.former.model.IdModel; /** * Stellt eine Einfügestelle im Dokument (insertValue oder insertFormValue) dar. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModelList.java b/core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModelList.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModelList.java rename to core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModelList.java index 5b9825994..9c6761e8e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/insertion/model/InsertionModelList.java +++ b/core/src/main/java/org/libreoffice/lots/former/insertion/model/InsertionModelList.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.insertion.model; +package org.libreoffice.lots.former.insertion.model; import java.util.ArrayList; import java.util.Collection; @@ -32,20 +32,19 @@ import java.util.Set; import java.util.regex.Pattern; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.ComboboxMergeDescriptor; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.control.model.FormControlModel; +import org.libreoffice.lots.former.function.FunctionSelectionAccess; +import org.libreoffice.lots.former.insertion.UnknownIDException; +import org.libreoffice.lots.former.model.IdModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.ComboboxMergeDescriptor; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.control.model.FormControlModel; -import de.muenchen.allg.itd51.wollmux.former.function.FunctionSelectionAccess; -import de.muenchen.allg.itd51.wollmux.former.insertion.UnknownIDException; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; - /** * Verwaltet eine Liste von InsertionModels * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/model/IdModel.java b/core/src/main/java/org/libreoffice/lots/former/model/IdModel.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/model/IdModel.java rename to core/src/main/java/org/libreoffice/lots/former/model/IdModel.java index 33189137b..cb32c3ec2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/model/IdModel.java +++ b/core/src/main/java/org/libreoffice/lots/former/model/IdModel.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.model; +package org.libreoffice.lots.former.model; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.former.DuplicateIDException; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.former.DuplicateIDException; +import org.libreoffice.lots.util.L; public class IdModel { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/AllSectionExtViewsPanel.java b/core/src/main/java/org/libreoffice/lots/former/section/AllSectionExtViewsPanel.java similarity index 78% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/AllSectionExtViewsPanel.java rename to core/src/main/java/org/libreoffice/lots/former/section/AllSectionExtViewsPanel.java index 6f1bd4487..f4ec4bbf5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/AllSectionExtViewsPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/section/AllSectionExtViewsPanel.java @@ -20,24 +20,24 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.section; +package org.libreoffice.lots.former.section; import java.util.Iterator; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModel; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModelList; -import de.muenchen.allg.itd51.wollmux.former.view.OnDemandCardView; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.section.model.SectionModel; +import org.libreoffice.lots.former.section.model.SectionModelList; +import org.libreoffice.lots.former.view.OnDemandCardView; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.util.L; /** * Eine View, die alle - * {@link de.muenchen.allg.itd51.wollmux.former.section.OneSectionExtView}s enthält. + * {@link org.libreoffice.lots.former.section.OneSectionExtView}s enthält. * * @author Matthias Benkmann (D-III-ITD 5.1) */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/AllSectionLineViewsPanel.java b/core/src/main/java/org/libreoffice/lots/former/section/AllSectionLineViewsPanel.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/AllSectionLineViewsPanel.java rename to core/src/main/java/org/libreoffice/lots/former/section/AllSectionLineViewsPanel.java index 686cabcfa..201d920aa 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/AllSectionLineViewsPanel.java +++ b/core/src/main/java/org/libreoffice/lots/former/section/AllSectionLineViewsPanel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.section; +package org.libreoffice.lots.former.section; import java.awt.BorderLayout; import java.awt.GridBagConstraints; @@ -52,18 +52,18 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoDictionary; import org.libreoffice.ext.unohelper.common.UnoList; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.Common; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.IndexList; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModel; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModelList; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.Common; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.IndexList; +import org.libreoffice.lots.former.section.model.SectionModel; +import org.libreoffice.lots.former.section.model.SectionModelList; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; +import org.libreoffice.lots.util.L; /** * Enthält alle OneSectionLineViews. @@ -98,7 +98,7 @@ public class AllSectionLineViewsPanel implements View /** * Das JPanel, das die - * {@link de.muenchen.allg.itd51.wollmux.former.section.OneSectionLineView}s + * {@link org.libreoffice.lots.former.section.OneSectionLineView}s * enthält. */ private JPanel mainPanel; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/OneSectionExtView.java b/core/src/main/java/org/libreoffice/lots/former/section/OneSectionExtView.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/OneSectionExtView.java rename to core/src/main/java/org/libreoffice/lots/former/section/OneSectionExtView.java index 112daea53..bfc47a3b4 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/OneSectionExtView.java +++ b/core/src/main/java/org/libreoffice/lots/former/section/OneSectionExtView.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.section; +package org.libreoffice.lots.former.section; import javax.swing.JComponent; import javax.swing.JTabbedPane; -import de.muenchen.allg.itd51.wollmux.former.group.OneGroupsProviderGroupsEditView; -import de.muenchen.allg.itd51.wollmux.former.group.model.GroupModelList; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModel; -import de.muenchen.allg.itd51.wollmux.former.view.View; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; +import org.libreoffice.lots.former.group.OneGroupsProviderGroupsEditView; +import org.libreoffice.lots.former.group.model.GroupModelList; +import org.libreoffice.lots.former.section.model.SectionModel; +import org.libreoffice.lots.former.view.View; +import org.libreoffice.lots.former.view.ViewChangeListener; /** * Anzeige erweiterter Eigenschaften eines {@link SectionModel}s. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/OneSectionLineView.java b/core/src/main/java/org/libreoffice/lots/former/section/OneSectionLineView.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/OneSectionLineView.java rename to core/src/main/java/org/libreoffice/lots/former/section/OneSectionLineView.java index c40280640..5363dcb70 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/OneSectionLineView.java +++ b/core/src/main/java/org/libreoffice/lots/former/section/OneSectionLineView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.section; +package org.libreoffice.lots.former.section; import java.awt.Color; import java.awt.Dimension; @@ -40,16 +40,15 @@ import javax.swing.text.Document; import javax.swing.text.JTextComponent; +import org.libreoffice.lots.former.BroadcastListener; +import org.libreoffice.lots.former.BroadcastObjectSelection; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.section.model.SectionModel; +import org.libreoffice.lots.former.view.LineView; +import org.libreoffice.lots.former.view.ViewChangeListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.former.BroadcastListener; -import de.muenchen.allg.itd51.wollmux.former.BroadcastObjectSelection; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.section.model.SectionModel; -import de.muenchen.allg.itd51.wollmux.former.view.LineView; -import de.muenchen.allg.itd51.wollmux.former.view.ViewChangeListener; - /** * Eine einzeilige Sicht auf einen Bereich im Dokument. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/model/SectionModel.java b/core/src/main/java/org/libreoffice/lots/former/section/model/SectionModel.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/model/SectionModel.java rename to core/src/main/java/org/libreoffice/lots/former/section/model/SectionModel.java index 1694e81eb..d03492bdd 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/model/SectionModel.java +++ b/core/src/main/java/org/libreoffice/lots/former/section/model/SectionModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.section.model; +package org.libreoffice.lots.former.section.model; import java.util.ArrayList; import java.util.HashSet; @@ -39,11 +39,11 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoDictionary; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; -import de.muenchen.allg.itd51.wollmux.former.group.GroupsProvider; -import de.muenchen.allg.itd51.wollmux.former.model.IdModel; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.former.FormularMax4kController; +import org.libreoffice.lots.former.group.GroupsProvider; +import org.libreoffice.lots.former.model.IdModel; /** * Stellt einen Bereich da (Format/Bereiche...) diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/model/SectionModelList.java b/core/src/main/java/org/libreoffice/lots/former/section/model/SectionModelList.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/model/SectionModelList.java rename to core/src/main/java/org/libreoffice/lots/former/section/model/SectionModelList.java index 9496c5173..0bbf891b1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/section/model/SectionModelList.java +++ b/core/src/main/java/org/libreoffice/lots/former/section/model/SectionModelList.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.section.model; +package org.libreoffice.lots.former.section.model; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; +import org.libreoffice.lots.former.FormularMax4kController; /** * Verwaltet eine Liste von SectionModels. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/LazyView.java b/core/src/main/java/org/libreoffice/lots/former/view/LazyView.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/LazyView.java rename to core/src/main/java/org/libreoffice/lots/former/view/LazyView.java index 92aadb2fc..a3ab03e3e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/LazyView.java +++ b/core/src/main/java/org/libreoffice/lots/former/view/LazyView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.view; +package org.libreoffice.lots.former.view; /** * Eine View die erst wenn sie das erste mal angezeigt wird initialisiert wird. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/LineView.java b/core/src/main/java/org/libreoffice/lots/former/view/LineView.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/LineView.java rename to core/src/main/java/org/libreoffice/lots/former/view/LineView.java index 1cdcd5458..f488f2048 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/LineView.java +++ b/core/src/main/java/org/libreoffice/lots/former/view/LineView.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.view; +package org.libreoffice.lots.former.view; import java.awt.Color; import javax.swing.JComponent; import javax.swing.JPanel; -import de.muenchen.allg.itd51.wollmux.former.FormularMax4kController; +import org.libreoffice.lots.former.FormularMax4kController; public abstract class LineView implements View { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/OnDemandCardView.java b/core/src/main/java/org/libreoffice/lots/former/view/OnDemandCardView.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/OnDemandCardView.java rename to core/src/main/java/org/libreoffice/lots/former/view/OnDemandCardView.java index ee86f58d7..7b2f92b02 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/OnDemandCardView.java +++ b/core/src/main/java/org/libreoffice/lots/former/view/OnDemandCardView.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.view; +package org.libreoffice.lots.former.view; import java.awt.CardLayout; import java.util.HashMap; @@ -34,7 +34,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * Basisklasse für Views mit CardLayout für eine Menge von Objekten, wobei die diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/View.java b/core/src/main/java/org/libreoffice/lots/former/view/View.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/View.java rename to core/src/main/java/org/libreoffice/lots/former/view/View.java index 96979017a..cac02ece5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/View.java +++ b/core/src/main/java/org/libreoffice/lots/former/view/View.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.view; +package org.libreoffice.lots.former.view; import javax.swing.JComponent; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/ViewChangeListener.java b/core/src/main/java/org/libreoffice/lots/former/view/ViewChangeListener.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/ViewChangeListener.java rename to core/src/main/java/org/libreoffice/lots/former/view/ViewChangeListener.java index 32afd02ab..1d33b28a3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/former/view/ViewChangeListener.java +++ b/core/src/main/java/org/libreoffice/lots/former/view/ViewChangeListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.former.view; +package org.libreoffice.lots.former.view; /** * Interface für Klassen, die an Änderungen einer View interessiert sind. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AbsFunction.java b/core/src/main/java/org/libreoffice/lots/func/AbsFunction.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AbsFunction.java rename to core/src/main/java/org/libreoffice/lots/func/AbsFunction.java index d86d27089..c54bd0aa0 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AbsFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/AbsFunction.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class AbsFunction extends SumFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AlwaysTrueFunction.java b/core/src/main/java/org/libreoffice/lots/func/AlwaysTrueFunction.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AlwaysTrueFunction.java rename to core/src/main/java/org/libreoffice/lots/func/AlwaysTrueFunction.java index e8976847b..df71d879c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AlwaysTrueFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/AlwaysTrueFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AndFunction.java b/core/src/main/java/org/libreoffice/lots/func/AndFunction.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AndFunction.java rename to core/src/main/java/org/libreoffice/lots/func/AndFunction.java index 843da25a0..dd0b530d3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/AndFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/AndFunction.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.Iterator; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class AndFunction extends MultiFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/BindFunction.java b/core/src/main/java/org/libreoffice/lots/func/BindFunction.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/BindFunction.java rename to core/src/main/java/org/libreoffice/lots/func/BindFunction.java index 9a3064fce..f62ea387f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/BindFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/BindFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Arrays; import java.util.Collection; @@ -30,11 +30,11 @@ import java.util.Map; import java.util.Set; -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.dialog.DialogLibrary; -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.dialog.DialogLibrary; +import org.libreoffice.lots.util.L; public class BindFunction implements Function { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/CatFunction.java b/core/src/main/java/org/libreoffice/lots/func/CatFunction.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/CatFunction.java rename to core/src/main/java/org/libreoffice/lots/func/CatFunction.java index a83274554..82b4c8d27 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/CatFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/CatFunction.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.Iterator; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class CatFunction extends MultiFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Dateinamensanpassungen.java b/core/src/main/java/org/libreoffice/lots/func/Dateinamensanpassungen.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Dateinamensanpassungen.java rename to core/src/main/java/org/libreoffice/lots/func/Dateinamensanpassungen.java index 801620a20..92b26b821 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Dateinamensanpassungen.java +++ b/core/src/main/java/org/libreoffice/lots/func/Dateinamensanpassungen.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.io.File; import java.net.MalformedURLException; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DialogFunction.java b/core/src/main/java/org/libreoffice/lots/func/DialogFunction.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DialogFunction.java rename to core/src/main/java/org/libreoffice/lots/func/DialogFunction.java index 01d031c3e..c0a45503a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DialogFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/DialogFunction.java @@ -20,14 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.Map; import org.apache.commons.lang3.ArrayUtils; - -import de.muenchen.allg.itd51.wollmux.dialog.Dialog; +import org.libreoffice.lots.dialog.Dialog; public class DialogFunction implements Function { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DiffFunction.java b/core/src/main/java/org/libreoffice/lots/func/DiffFunction.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DiffFunction.java rename to core/src/main/java/org/libreoffice/lots/func/DiffFunction.java index a9857f124..3e1469c80 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DiffFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/DiffFunction.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.math.BigDecimal; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class DiffFunction extends NumberFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DivideFunction.java b/core/src/main/java/org/libreoffice/lots/func/DivideFunction.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DivideFunction.java rename to core/src/main/java/org/libreoffice/lots/func/DivideFunction.java index fc8b3c58a..86df7828f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/DivideFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/DivideFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunction.java b/core/src/main/java/org/libreoffice/lots/func/ExternalFunction.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunction.java rename to core/src/main/java/org/libreoffice/lots/func/ExternalFunction.java index ebe2c2f6a..3de23b0a6 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/ExternalFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -35,9 +35,9 @@ import com.sun.star.uno.AnyConverter; 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.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.util.L; /** * An external described by a ConfigThingy (i.e. not as a ConfigThingy diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionFunction.java b/core/src/main/java/org/libreoffice/lots/func/ExternalFunctionFunction.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionFunction.java rename to core/src/main/java/org/libreoffice/lots/func/ExternalFunctionFunction.java index 03e56b919..4b5c116e9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/ExternalFunctionFunction.java @@ -20,17 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; +import org.libreoffice.lots.ConfClassLoader; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.ConfClassLoader; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.util.L; - public class ExternalFunctionFunction implements Function { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Function.java b/core/src/main/java/org/libreoffice/lots/func/Function.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Function.java rename to core/src/main/java/org/libreoffice/lots/func/Function.java index 7555142fa..7cdc55a90 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Function.java +++ b/core/src/main/java/org/libreoffice/lots/func/Function.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/FunctionFactory.java b/core/src/main/java/org/libreoffice/lots/func/FunctionFactory.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/FunctionFactory.java rename to core/src/main/java/org/libreoffice/lots/func/FunctionFactory.java index fb78e6ca4..7ec60aff8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/FunctionFactory.java +++ b/core/src/main/java/org/libreoffice/lots/func/FunctionFactory.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.ArrayList; import java.util.HashMap; @@ -30,16 +30,15 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.dialog.Dialog; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.dialog.Dialog; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Generates functions from ConfigThingys. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/FunctionLibrary.java b/core/src/main/java/org/libreoffice/lots/func/FunctionLibrary.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/FunctionLibrary.java rename to core/src/main/java/org/libreoffice/lots/func/FunctionLibrary.java index 07744dac2..5f0452a2a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/FunctionLibrary.java +++ b/core/src/main/java/org/libreoffice/lots/func/FunctionLibrary.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.HashMap; import java.util.HashSet; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * A library of named functions diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/IfFunction.java b/core/src/main/java/org/libreoffice/lots/func/IfFunction.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/IfFunction.java rename to core/src/main/java/org/libreoffice/lots/func/IfFunction.java index bc8822a37..66a3f8ec5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/IfFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/IfFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Arrays; import java.util.Collection; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/IsErrorFunction.java b/core/src/main/java/org/libreoffice/lots/func/IsErrorFunction.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/IsErrorFunction.java rename to core/src/main/java/org/libreoffice/lots/func/IsErrorFunction.java index 1b03f6f53..fe999aab6 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/IsErrorFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/IsErrorFunction.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.util.L; public class IsErrorFunction implements Function { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/LengthFunction.java b/core/src/main/java/org/libreoffice/lots/func/LengthFunction.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/LengthFunction.java rename to core/src/main/java/org/libreoffice/lots/func/LengthFunction.java index 245700d3f..b3f7a6f76 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/LengthFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/LengthFunction.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class LengthFunction extends CatFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MatchFunction.java b/core/src/main/java/org/libreoffice/lots/func/MatchFunction.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MatchFunction.java rename to core/src/main/java/org/libreoffice/lots/func/MatchFunction.java index 8186da78c..f54079e79 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MatchFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/MatchFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.regex.Pattern; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MinusFunction.java b/core/src/main/java/org/libreoffice/lots/func/MinusFunction.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MinusFunction.java rename to core/src/main/java/org/libreoffice/lots/func/MinusFunction.java index 3ae7a0b64..cb46f9775 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MinusFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/MinusFunction.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class MinusFunction extends SumFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MultiFunction.java b/core/src/main/java/org/libreoffice/lots/func/MultiFunction.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MultiFunction.java rename to core/src/main/java/org/libreoffice/lots/func/MultiFunction.java index 56382840a..ba396a1f8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/MultiFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/MultiFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.ArrayList; import java.util.Collection; @@ -29,11 +29,10 @@ import java.util.Map; import org.apache.commons.lang3.ArrayUtils; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.util.L; public abstract class MultiFunction implements Function { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NotFunction.java b/core/src/main/java/org/libreoffice/lots/func/NotFunction.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NotFunction.java rename to core/src/main/java/org/libreoffice/lots/func/NotFunction.java index fd98b5bfb..c72b3eb79 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NotFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/NotFunction.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.Iterator; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class NotFunction extends MultiFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NumberCompareFunction.java b/core/src/main/java/org/libreoffice/lots/func/NumberCompareFunction.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NumberCompareFunction.java rename to core/src/main/java/org/libreoffice/lots/func/NumberCompareFunction.java index 76cae5854..0d8eae70d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NumberCompareFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/NumberCompareFunction.java @@ -20,18 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.math.BigDecimal; import java.util.Collection; import java.util.Map; import org.apache.commons.lang3.ArrayUtils; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.util.L; public class NumberCompareFunction extends NumberFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NumberFunction.java b/core/src/main/java/org/libreoffice/lots/func/NumberFunction.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NumberFunction.java rename to core/src/main/java/org/libreoffice/lots/func/NumberFunction.java index 5ad7e5632..51b289c1d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/NumberFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/NumberFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.math.BigDecimal; import java.text.DecimalFormat; @@ -28,8 +28,8 @@ import java.util.Iterator; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; abstract class NumberFunction extends MultiFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/OrFunction.java b/core/src/main/java/org/libreoffice/lots/func/OrFunction.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/OrFunction.java rename to core/src/main/java/org/libreoffice/lots/func/OrFunction.java index 83a267123..9886f55a9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/OrFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/OrFunction.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.Iterator; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class OrFunction extends MultiFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ProductFunction.java b/core/src/main/java/org/libreoffice/lots/func/ProductFunction.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ProductFunction.java rename to core/src/main/java/org/libreoffice/lots/func/ProductFunction.java index bd18f5808..895d7a0f1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ProductFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/ProductFunction.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.math.BigDecimal; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class ProductFunction extends NumberFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ReplaceFunction.java b/core/src/main/java/org/libreoffice/lots/func/ReplaceFunction.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ReplaceFunction.java rename to core/src/main/java/org/libreoffice/lots/func/ReplaceFunction.java index eca3646c1..9175a2a91 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ReplaceFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/ReplaceFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Arrays; import java.util.Collection; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SelectFunction.java b/core/src/main/java/org/libreoffice/lots/func/SelectFunction.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SelectFunction.java rename to core/src/main/java/org/libreoffice/lots/func/SelectFunction.java index e00c37e73..91e9c7f1a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SelectFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/SelectFunction.java @@ -20,16 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.Iterator; import java.util.Map; import org.apache.commons.lang3.ArrayUtils; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class SelectFunction extends MultiFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SignFunction.java b/core/src/main/java/org/libreoffice/lots/func/SignFunction.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SignFunction.java rename to core/src/main/java/org/libreoffice/lots/func/SignFunction.java index f47dfaeee..8b1c5d8c6 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SignFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/SignFunction.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class SignFunction extends SumFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SplitFunction.java b/core/src/main/java/org/libreoffice/lots/func/SplitFunction.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SplitFunction.java rename to core/src/main/java/org/libreoffice/lots/func/SplitFunction.java index a53ba15e3..41bee6320 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SplitFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/SplitFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; import java.util.regex.Pattern; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/StrCmpFunction.java b/core/src/main/java/org/libreoffice/lots/func/StrCmpFunction.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/StrCmpFunction.java rename to core/src/main/java/org/libreoffice/lots/func/StrCmpFunction.java index 411f32d76..82435cbbd 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/StrCmpFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/StrCmpFunction.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Iterator; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.util.L; public class StrCmpFunction extends MultiFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/StringLiteralFunction.java b/core/src/main/java/org/libreoffice/lots/func/StringLiteralFunction.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/StringLiteralFunction.java rename to core/src/main/java/org/libreoffice/lots/func/StringLiteralFunction.java index 629a6bf51..9a6b02e2f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/StringLiteralFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/StringLiteralFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SumFunction.java b/core/src/main/java/org/libreoffice/lots/func/SumFunction.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SumFunction.java rename to core/src/main/java/org/libreoffice/lots/func/SumFunction.java index fa08107fd..27a591b75 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/SumFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/SumFunction.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.math.BigDecimal; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; public class SumFunction extends NumberFunction { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Value.java b/core/src/main/java/org/libreoffice/lots/func/Value.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Value.java rename to core/src/main/java/org/libreoffice/lots/func/Value.java index 80fbad1fd..3989bafe9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Value.java +++ b/core/src/main/java/org/libreoffice/lots/func/Value.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; /** * A value that is available as different data types diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ValueFunction.java b/core/src/main/java/org/libreoffice/lots/func/ValueFunction.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ValueFunction.java rename to core/src/main/java/org/libreoffice/lots/func/ValueFunction.java index 271e8fdc6..462159104 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/ValueFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/ValueFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.Collection; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Values.java b/core/src/main/java/org/libreoffice/lots/func/Values.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Values.java rename to core/src/main/java/org/libreoffice/lots/func/Values.java index 7e656b7eb..ca9f7a3bc 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/Values.java +++ b/core/src/main/java/org/libreoffice/lots/func/Values.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import java.util.HashMap; import java.util.Iterator; @@ -28,7 +28,7 @@ import java.util.Map.Entry; /** - * A lot of named {@link de.muenchen.allg.itd51.wollmux.func.Value}s. + * A lot of named {@link org.libreoffice.lots.func.Value}s. * * @author Matthias Benkmann (D-III-ITD 5.1) */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/print/PrintException.java b/core/src/main/java/org/libreoffice/lots/func/print/PrintException.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/print/PrintException.java rename to core/src/main/java/org/libreoffice/lots/func/print/PrintException.java index 5429eaa1f..0906f5ca8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/print/PrintException.java +++ b/core/src/main/java/org/libreoffice/lots/func/print/PrintException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func.print; +package org.libreoffice.lots.func.print; /** * Exception for indicating any error during printing. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/print/PrintFunction.java b/core/src/main/java/org/libreoffice/lots/func/print/PrintFunction.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/func/print/PrintFunction.java rename to core/src/main/java/org/libreoffice/lots/func/print/PrintFunction.java index 9525c8bb9..55f8c8a85 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/func/print/PrintFunction.java +++ b/core/src/main/java/org/libreoffice/lots/func/print/PrintFunction.java @@ -20,22 +20,22 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func.print; +package org.libreoffice.lots.func.print; import java.util.Objects; import java.util.ServiceLoader; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; + +import org.libreoffice.lots.print.PrintFunctionLibrary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.print.PrintFunctionLibrary; - /** * Definition of print functions. Each print function is a service. * * All subclasses are automatically registered as a print function if they're mentioned in - * META-INF/services/de.muenchen.allg.itd51.wollmux.func.print. + * META-INF/services/org.libreoffice.lots.func.print. * * Print functions are ordered by {@link #order}. * diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ConnectionModel.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ConnectionModel.java index 341af11ab..9a2e822df 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ConnectionModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge; +package org.libreoffice.lots.mailmerge; import java.util.ArrayList; import java.util.HashMap; @@ -41,10 +41,10 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractCloseListener; -import de.muenchen.allg.itd51.wollmux.HashableComponent; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.CalcModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DBModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.HashableComponent; +import org.libreoffice.lots.mailmerge.ds.CalcModel; +import org.libreoffice.lots.mailmerge.ds.DBModel; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; /** * The model of the mail merge. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModelListener.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ConnectionModelListener.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModelListener.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ConnectionModelListener.java index 35124d2ee..9c66ec5a1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModelListener.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ConnectionModelListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge; +package org.libreoffice.lots.mailmerge; /** * Listener for changes of {@link ConnectionModel}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/FieldSubstitution.java b/core/src/main/java/org/libreoffice/lots/mailmerge/FieldSubstitution.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/FieldSubstitution.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/FieldSubstitution.java index 60b79d5bc..46e85b9fa 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/FieldSubstitution.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/FieldSubstitution.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge; +package org.libreoffice.lots.mailmerge; import java.util.ArrayList; import java.util.Iterator; @@ -34,14 +34,14 @@ import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -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.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory.FormField; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.FormFieldFactory.FormField; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; /** * Description of a replacement of a form field by new fields or text. A description can be combined diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/MailMergeRunner.java b/core/src/main/java/org/libreoffice/lots/mailmerge/MailMergeRunner.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/MailMergeRunner.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/MailMergeRunner.java index 1ac77485f..d704ba90d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/MailMergeRunner.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/MailMergeRunner.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge; +package org.libreoffice.lots.mailmerge; import java.util.List; import java.util.Set; @@ -29,6 +29,19 @@ import javax.mail.MessagingException; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.func.print.PrintFunction; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.mailmerge.mail.EMailSender; +import org.libreoffice.lots.mailmerge.mail.MailServerSettings; +import org.libreoffice.lots.mailmerge.print.MailMergePrintFunction; +import org.libreoffice.lots.mailmerge.print.PrintToEmail; +import org.libreoffice.lots.mailmerge.print.SetFormValue; +import org.libreoffice.lots.mailmerge.printsettings.PrintSettings; +import org.libreoffice.lots.print.PrintModels; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,20 +51,6 @@ import com.sun.star.lang.NoSuchMethodException; import com.sun.star.lang.WrappedTargetException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.mail.EMailSender; -import de.muenchen.allg.itd51.wollmux.mailmerge.mail.MailServerSettings; -import de.muenchen.allg.itd51.wollmux.mailmerge.print.MailMergePrintFunction; -import de.muenchen.allg.itd51.wollmux.mailmerge.print.PrintToEmail; -import de.muenchen.allg.itd51.wollmux.mailmerge.print.SetFormValue; -import de.muenchen.allg.itd51.wollmux.mailmerge.printsettings.PrintSettings; -import de.muenchen.allg.itd51.wollmux.print.PrintModels; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Configures and performs a mail merge. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/NoTableSelectedException.java b/core/src/main/java/org/libreoffice/lots/mailmerge/NoTableSelectedException.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/NoTableSelectedException.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/NoTableSelectedException.java index f98db7a21..eb42d9b2f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/NoTableSelectedException.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/NoTableSelectedException.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge; +package org.libreoffice.lots.mailmerge; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; /** * Exception for accessing a {@link DatasourceModel} without selection of a table. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/CalcModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/CalcModel.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/CalcModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ds/CalcModel.java index ba4d60d2e..77cce5614 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/CalcModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/CalcModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ds; +package org.libreoffice.lots.mailmerge.ds; import java.util.ArrayList; import java.util.Arrays; @@ -58,10 +58,10 @@ import com.sun.star.util.XModifyListener; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.mailmerge.FieldSubstitution; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.mailmerge.FieldSubstitution; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; /** * A {@link DatasourceModel} using a calc file as source. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBDatasourceDialog.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/DBDatasourceDialog.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBDatasourceDialog.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ds/DBDatasourceDialog.java index 949e9f08a..6f2cf708b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBDatasourceDialog.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/DBDatasourceDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ds; +package org.libreoffice.lots.mailmerge.ds; import java.util.Collections; import java.util.Set; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/DBModel.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ds/DBModel.java index 916c321dd..50fedbc9b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/DBModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ds; +package org.libreoffice.lots.mailmerge.ds; import java.util.ArrayList; import java.util.Collections; @@ -51,11 +51,11 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoDictionary; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.mailmerge.FieldSubstitution; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; import org.libreoffice.ext.unohelper.util.UnoComponent; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.mailmerge.FieldSubstitution; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; /** * A data source model based on LibreOffice Base. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DatasourceModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/DatasourceModel.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DatasourceModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ds/DatasourceModel.java index 95311d98c..f413f8d0b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DatasourceModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/DatasourceModel.java @@ -20,19 +20,19 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ds; +package org.libreoffice.lots.mailmerge.ds; import java.util.List; import java.util.Map; import java.util.Set; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.mailmerge.FieldSubstitution; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; + import com.google.common.collect.Table; import com.sun.star.util.XCloseBroadcaster; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.mailmerge.FieldSubstitution; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; - /** * This model provides access to the records and meta data of a data source. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DatasourceModelListener.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/DatasourceModelListener.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DatasourceModelListener.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ds/DatasourceModelListener.java index b72498cd9..1003c4528 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DatasourceModelListener.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ds/DatasourceModelListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ds; +package org.libreoffice.lots.mailmerge.ds; /** * Listener for changes in a data source. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderDialog.java b/core/src/main/java/org/libreoffice/lots/mailmerge/gender/GenderDialog.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderDialog.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/gender/GenderDialog.java index 41e11ec9f..b2a3aac16 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderDialog.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/gender/GenderDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.gender; +package org.libreoffice.lots.mailmerge.gender; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderTrafoModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/gender/GenderTrafoModel.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderTrafoModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/gender/GenderTrafoModel.java index 1c4904c99..b04aaf283 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderTrafoModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/gender/GenderTrafoModel.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.gender; +package org.libreoffice.lots.mailmerge.gender; -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; /** * A model for Gender-TRAFOs. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ElseModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/ElseModel.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ElseModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/ElseModel.java index 18cc35cb6..1daa0343e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ElseModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/ElseModel.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; -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; /** * The model of an "ELSE" node in an "IF" function. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfModel.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfModel.java index 9ab00229d..ecafbaec5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfModel.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; import java.util.Arrays; import java.util.Iterator; import java.util.Optional; -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; /** * The model of an "IF" node. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseBaseModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseBaseModel.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseBaseModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseBaseModel.java index d446b0a02..bcb42b46c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseBaseModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseBaseModel.java @@ -20,12 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; import java.util.UUID; -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; /** * Base model for "IF" function nodes. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseDialog.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseDialog.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseDialog.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseDialog.java index 3d73fd94d..68d413baa 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseDialog.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; import java.util.ArrayList; import java.util.Arrays; @@ -65,10 +65,10 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractKeyHandler; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractMouseListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTextListener; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.ui.GuiFactory; import org.libreoffice.ext.unohelper.util.UnoComponent; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.util.Utils; /** * Dialog for creating if-then-else fields. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseModel.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseModel.java index b6747e1ba..99d3fa2c4 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseModel.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; -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; /** * The model for the If-Then-Else-Dialog. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/TestType.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/TestType.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/TestType.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/TestType.java index 3555ee0a9..8f117ee4c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/TestType.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/TestType.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; /** * Comparator which can be used in If-Then-Else functions. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ThenModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/ThenModel.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ThenModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/ThenModel.java index bf402ade3..23684a10f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ThenModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ifthenelse/ThenModel.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; -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; /** * The model of a "THEN" node in an "IF" function. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/AuthenticationDialog.java b/core/src/main/java/org/libreoffice/lots/mailmerge/mail/AuthenticationDialog.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/AuthenticationDialog.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/mail/AuthenticationDialog.java index 774077303..3c73e074e 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/AuthenticationDialog.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/mail/AuthenticationDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.mail; +package org.libreoffice.lots.mailmerge.mail; import java.util.function.BiConsumer; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/EMailSender.java b/core/src/main/java/org/libreoffice/lots/mailmerge/mail/EMailSender.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/EMailSender.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/mail/EMailSender.java index c94a4449e..fd7fe18c1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/EMailSender.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/mail/EMailSender.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.mail; +package org.libreoffice.lots.mailmerge.mail; import java.io.File; import java.io.IOException; @@ -38,14 +38,13 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; - /** * Service for sending mails. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/MailServerSettings.java b/core/src/main/java/org/libreoffice/lots/mailmerge/mail/MailServerSettings.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/MailServerSettings.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/mail/MailServerSettings.java index a829e1e5f..d08ec5042 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/mail/MailServerSettings.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/mail/MailServerSettings.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.mail; +package org.libreoffice.lots.mailmerge.mail; /** * Settings of the mail server used by mail merge. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/MailMergePrintFunction.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/MailMergePrintFunction.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/MailMergePrintFunction.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/MailMergePrintFunction.java index 8525ca813..490451521 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/MailMergePrintFunction.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/MailMergePrintFunction.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; import java.io.File; import java.net.URI; @@ -37,7 +37,7 @@ import com.sun.star.text.XTextDocument; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/OOoBasedMailMerge.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/OOoBasedMailMerge.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/OOoBasedMailMerge.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/OOoBasedMailMerge.java index 735720eec..f8ce52782 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/OOoBasedMailMerge.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/OOoBasedMailMerge.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; import java.io.File; import java.io.FileOutputStream; @@ -86,31 +86,31 @@ import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.common.UnoProps; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory.FormField; -import de.muenchen.allg.itd51.wollmux.document.FormFieldFactory.FormFieldType; -import de.muenchen.allg.itd51.wollmux.document.PersistentDataContainer; -import de.muenchen.allg.itd51.wollmux.document.PersistentDataContainer.DataID; -import de.muenchen.allg.itd51.wollmux.document.SimulationResults; -import de.muenchen.allg.itd51.wollmux.document.SimulationResults.SimulationResultsProcessor; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InsertFormValue; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommands; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.print.PrintModels; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoConfiguration; import org.libreoffice.ext.unohelper.util.UnoProperty; import org.libreoffice.ext.unohelper.util.UnoService; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.FormFieldFactory; +import org.libreoffice.lots.document.PersistentDataContainer; +import org.libreoffice.lots.document.SimulationResults; +import org.libreoffice.lots.document.TextDocumentModel; +import org.libreoffice.lots.document.FormFieldFactory.FormField; +import org.libreoffice.lots.document.FormFieldFactory.FormFieldType; +import org.libreoffice.lots.document.PersistentDataContainer.DataID; +import org.libreoffice.lots.document.SimulationResults.SimulationResultsProcessor; +import org.libreoffice.lots.document.commands.DocumentCommand; +import org.libreoffice.lots.document.commands.DocumentCommands; +import org.libreoffice.lots.document.commands.DocumentCommand.InsertFormValue; +import org.libreoffice.lots.func.print.PrintFunction; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.print.PrintModels; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * Performs a mail merge with LibreOffice. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/PrintToEmail.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/PrintToEmail.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/PrintToEmail.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/PrintToEmail.java index 33790b339..9572334d6 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/PrintToEmail.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/PrintToEmail.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; import java.io.File; import java.io.IOException; @@ -34,6 +34,15 @@ import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.func.print.PrintException; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.mailmerge.mail.AuthenticationDialog; +import org.libreoffice.lots.mailmerge.mail.EMailSender; +import org.libreoffice.lots.mailmerge.mail.MailServerSettings; +import org.libreoffice.lots.print.PrintModels; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,16 +51,6 @@ import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lang.WrappedTargetException; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.func.print.PrintException; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.mail.AuthenticationDialog; -import de.muenchen.allg.itd51.wollmux.mailmerge.mail.EMailSender; -import de.muenchen.allg.itd51.wollmux.mailmerge.mail.MailServerSettings; -import de.muenchen.allg.itd51.wollmux.print.PrintModels; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * An abstract print function for sending files with LibreOffice mailmerge. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/SetFormValue.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/SetFormValue.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/SetFormValue.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/SetFormValue.java index 0cfb4a3b9..ab50f8fe2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/SetFormValue.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/SetFormValue.java @@ -20,13 +20,20 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.SimulationResults.SimulationResultsProcessor; +import org.libreoffice.lots.func.print.PrintException; +import org.libreoffice.lots.func.print.PrintFunction; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,14 +44,6 @@ import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lang.WrappedTargetException; -import de.muenchen.allg.itd51.wollmux.db.QueryResults; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.SimulationResults.SimulationResultsProcessor; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.func.print.PrintException; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; - /** * A print function, which sets the mail merge fields to the values of the next mail merge data. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToOdtEmail.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToOdtEmail.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToOdtEmail.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/ToOdtEmail.java index 4b5bb0ba0..debb06bf6 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToOdtEmail.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToOdtEmail.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToOdtFile.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToOdtFile.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToOdtFile.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/ToOdtFile.java index 59e239412..1f5c2657a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToOdtFile.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToOdtFile.java @@ -20,20 +20,19 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; import javax.print.PrintException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.func.print.PrintFunction; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.sun.star.text.MailMergeType; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Print function for mailmerge by LibreOffice mailmerge with type {@link MailMergeType#SHELL}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPdfEmail.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPdfEmail.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPdfEmail.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPdfEmail.java index 4c85a43e4..fdf40865d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPdfEmail.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPdfEmail.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPdfFile.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPdfFile.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPdfFile.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPdfFile.java index 063e9685b..e54d99e53 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPdfFile.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPdfFile.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; import java.io.File; @@ -36,7 +36,7 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.TextDocument; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPrinter.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPrinter.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPrinter.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPrinter.java index a054b5fca..8dda17f91 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToPrinter.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToPrinter.java @@ -20,20 +20,19 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; import javax.print.PrintException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.func.print.PrintFunction; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.sun.star.text.MailMergeType; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Print function for mailmerge by LibreOffice mailmerge with type {@link MailMergeType#PRINTER}. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToShowOdtFile.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToShowOdtFile.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToShowOdtFile.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/ToShowOdtFile.java index b90f33ae6..e923b08bf 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToShowOdtFile.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToShowOdtFile.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; import com.sun.star.text.XTextDocument; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.dispatch.DispatchProviderAndInterceptor; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.dispatch.DispatchProviderAndInterceptor; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * Open a mail merge result as LibreOffice document. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToSingleODT.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToSingleODT.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToSingleODT.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/ToSingleODT.java index fd17ca984..7f9985313 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToSingleODT.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToSingleODT.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToSinglePDF.java b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToSinglePDF.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToSinglePDF.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/print/ToSinglePDF.java index e1cb1dcbf..d0f62ca4d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/print/ToSinglePDF.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/print/ToSinglePDF.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.print; +package org.libreoffice.lots.mailmerge.print; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/FormatWizardPage.java b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/FormatWizardPage.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/FormatWizardPage.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/FormatWizardPage.java index 193770f81..d7fd301eb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/FormatWizardPage.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/FormatWizardPage.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.printsettings; +package org.libreoffice.lots.mailmerge.printsettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,11 +38,11 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractItemListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTextListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractXWizardPage; -import de.muenchen.allg.itd51.wollmux.mailmerge.print.MailMergePrintFunction; -import de.muenchen.allg.itd51.wollmux.mailmerge.print.SetFormValue; -import de.muenchen.allg.itd51.wollmux.mailmerge.printsettings.PrintSettings.FORMAT; -import de.muenchen.allg.itd51.wollmux.mailmerge.ui.MailMergeField; -import de.muenchen.allg.itd51.wollmux.mailmerge.ui.SpecialField; +import org.libreoffice.lots.mailmerge.print.MailMergePrintFunction; +import org.libreoffice.lots.mailmerge.print.SetFormValue; +import org.libreoffice.lots.mailmerge.printsettings.PrintSettings.FORMAT; +import org.libreoffice.lots.mailmerge.ui.MailMergeField; +import org.libreoffice.lots.mailmerge.ui.SpecialField; /** * A page of the mail merge wizard. Settings for creating files can be done here. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/MailWizardPage.java b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/MailWizardPage.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/MailWizardPage.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/MailWizardPage.java index 3db57d605..e26595dbf 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/MailWizardPage.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/MailWizardPage.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.printsettings; +package org.libreoffice.lots.mailmerge.printsettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,12 +38,12 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractItemListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTextListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractXWizardPage; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; -import de.muenchen.allg.itd51.wollmux.mailmerge.print.MailMergePrintFunction; -import de.muenchen.allg.itd51.wollmux.mailmerge.ui.MailMergeField; -import de.muenchen.allg.itd51.wollmux.sender.SenderException; -import de.muenchen.allg.itd51.wollmux.sender.SenderService; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.print.MailMergePrintFunction; +import org.libreoffice.lots.mailmerge.ui.MailMergeField; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderService; /** * A page of the mail merge wizard. Settings for mails can be done here. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/MailmergeWizardController.java b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/MailmergeWizardController.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/MailmergeWizardController.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/MailmergeWizardController.java index b975a7fbc..43f36fa6a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/MailmergeWizardController.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/MailmergeWizardController.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.printsettings; +package org.libreoffice.lots.mailmerge.printsettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,12 +37,12 @@ import com.sun.star.util.InvalidStateException; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.mailmerge.MailMergeRunner; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.mailmerge.MailMergeRunner; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.util.L; /** * Handles the wizard for configuring mail merge. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintSettings.java b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/PrintSettings.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintSettings.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/PrintSettings.java index e1fb6620d..4b48b5405 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintSettings.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/PrintSettings.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.printsettings; +package org.libreoffice.lots.mailmerge.printsettings; import java.util.Optional; import java.util.Set; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintWizardPage.java b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/PrintWizardPage.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintWizardPage.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/PrintWizardPage.java index d9800bf78..a0b45f434 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintWizardPage.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/PrintWizardPage.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.printsettings; +package org.libreoffice.lots.mailmerge.printsettings; import com.sun.star.awt.XButton; import com.sun.star.awt.XControlContainer; @@ -31,8 +31,8 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractActionListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractXWizardPage; -import de.muenchen.allg.itd51.wollmux.dispatch.AbstractDispatchResultListener; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; +import org.libreoffice.lots.dispatch.AbstractDispatchResultListener; +import org.libreoffice.lots.document.TextDocumentModel; /** * A page of the mail merge wizard. Settings of the printer can be done here. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/SingleWizardPage.java b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/SingleWizardPage.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/SingleWizardPage.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/SingleWizardPage.java index 00757d673..704c52aaa 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/SingleWizardPage.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/SingleWizardPage.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.printsettings; +package org.libreoffice.lots.mailmerge.printsettings; import java.io.File; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/StartWizardPage.java b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/StartWizardPage.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/StartWizardPage.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/StartWizardPage.java index 4a3c97ab8..865d7848f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/StartWizardPage.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/printsettings/StartWizardPage.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.printsettings; +package org.libreoffice.lots.mailmerge.printsettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,10 +35,10 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractItemListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractXWizardPage; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; -import de.muenchen.allg.itd51.wollmux.mailmerge.printsettings.MailmergeWizardController.PATH; -import de.muenchen.allg.itd51.wollmux.mailmerge.printsettings.PrintSettings.ACTION; -import de.muenchen.allg.itd51.wollmux.mailmerge.printsettings.PrintSettings.DatasetSelectionType; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.printsettings.MailmergeWizardController.PATH; +import org.libreoffice.lots.mailmerge.printsettings.PrintSettings.ACTION; +import org.libreoffice.lots.mailmerge.printsettings.PrintSettings.DatasetSelectionType; /** * The first page of the mail merge wizard. Some basic settings can be done here. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/AdjustFields.java b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/AdjustFields.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/AdjustFields.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/AdjustFields.java index 2b91707e1..3c10f1f76 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/AdjustFields.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/AdjustFields.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -58,8 +58,8 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractFocusListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractItemListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTextListener; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel.ReferencedFieldID; -import de.muenchen.allg.itd51.wollmux.mailmerge.FieldSubstitution; +import org.libreoffice.lots.document.TextDocumentModel.ReferencedFieldID; +import org.libreoffice.lots.mailmerge.FieldSubstitution; /** * Dialogs for manipulating the mapping of fields to data source columns. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeController.java b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeController.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeController.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeController.java index f26774e99..e8d885940 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeController.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeController.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; import java.awt.event.ActionListener; import java.net.MalformedURLException; @@ -60,32 +60,32 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoCollection; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel.ReferencedFieldID; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommandInterpreter; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventHandler; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSetFormValue; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnTextDocumentControllerInitialized; -import de.muenchen.allg.itd51.wollmux.form.model.FormModelException; -import de.muenchen.allg.itd51.wollmux.mailmerge.ConnectionModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.FieldSubstitution; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DBDatasourceDialog; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModelListener; -import de.muenchen.allg.itd51.wollmux.mailmerge.gender.GenderDialog; -import de.muenchen.allg.itd51.wollmux.mailmerge.gender.GenderTrafoModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse.IfThenElseDialog; -import de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse.IfThenElseModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.print.SetFormValue; -import de.muenchen.allg.itd51.wollmux.mailmerge.printsettings.MailmergeWizardController; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.TextDocumentModel.ReferencedFieldID; +import org.libreoffice.lots.document.commands.DocumentCommandInterpreter; +import org.libreoffice.lots.event.WollMuxEventHandler; +import org.libreoffice.lots.event.handlers.OnSetFormValue; +import org.libreoffice.lots.event.handlers.OnTextDocumentControllerInitialized; +import org.libreoffice.lots.form.model.FormModelException; +import org.libreoffice.lots.mailmerge.ConnectionModel; +import org.libreoffice.lots.mailmerge.FieldSubstitution; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.ds.DBDatasourceDialog; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.mailmerge.ds.DatasourceModelListener; +import org.libreoffice.lots.mailmerge.gender.GenderDialog; +import org.libreoffice.lots.mailmerge.gender.GenderTrafoModel; +import org.libreoffice.lots.mailmerge.ifthenelse.IfThenElseDialog; +import org.libreoffice.lots.mailmerge.ifthenelse.IfThenElseModel; +import org.libreoffice.lots.mailmerge.print.SetFormValue; +import org.libreoffice.lots.mailmerge.printsettings.MailmergeWizardController; +import org.libreoffice.lots.util.L; /** * Controller of the sidebar. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeFactory.java b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeFactory.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeFactory.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeFactory.java index 631c18d84..1d2d1aecf 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeFactory.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeFactory.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; import com.sun.star.awt.XWindow; import com.sun.star.beans.PropertyValue; @@ -39,7 +39,7 @@ public class MailMergeFactory extends AbstractSidebarFactory { @SuppressWarnings("java:S115") - public static final String SERVICE_NAME = "de.muenchen.allg.itd51.wollmux.mailmerge.sidebar." + public static final String SERVICE_NAME = "org.libreoffice.lots.mailmerge.sidebar." + "SeriendruckSidebarFactory"; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeGUI.java b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeGUI.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeGUI.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeGUI.java index 740e12a65..8138f110b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeGUI.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeGUI.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; import java.util.List; import java.util.SortedMap; @@ -49,19 +49,19 @@ import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractSidebarPanel; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractWindowListener; -import de.muenchen.allg.itd51.wollmux.mailmerge.ConnectionModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.ConnectionModelListener; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.ui.MailMergeField; -import de.muenchen.allg.itd51.wollmux.mailmerge.ui.SpecialField; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.ui.layout.HorizontalLayout; import org.libreoffice.ext.unohelper.ui.layout.Layout; import org.libreoffice.ext.unohelper.ui.layout.VerticalLayout; import org.libreoffice.ext.unohelper.ui.GuiFactory; import org.libreoffice.ext.unohelper.util.UnoConfiguration; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.mailmerge.ConnectionModel; +import org.libreoffice.lots.mailmerge.ConnectionModelListener; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.mailmerge.ui.MailMergeField; +import org.libreoffice.lots.mailmerge.ui.SpecialField; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** * The content of the sidebar. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeRegistration.java b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeRegistration.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeRegistration.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeRegistration.java index 580172bf0..0114c410c 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MailMergeRegistration.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/MailMergeRegistration.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; -import de.muenchen.allg.itd51.wollmux.ComponentRegistration; +import org.libreoffice.lots.ComponentRegistration; /** * Factory for {@link MailMergeFactory}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModel.java b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModel.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModel.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModel.java index 27176382f..f62bed632 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModel.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; import java.util.ArrayList; import java.util.HashMap; @@ -28,9 +28,9 @@ import java.util.Map; import java.util.Optional; -import de.muenchen.allg.itd51.wollmux.mailmerge.ConnectionModelListener; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.mailmerge.ConnectionModelListener; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; /** * Model of the preview mode of mail merge. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModelListener.java b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModelListener.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModelListener.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModelListener.java index 6ea36d6a0..12f9e9b2d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModelListener.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModelListener.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; /** * Listener for changes of {@link PreviewModel}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ui/MailMergeField.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ui/MailMergeField.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ui/MailMergeField.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ui/MailMergeField.java index 620df9bb7..3055c21f5 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ui/MailMergeField.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ui/MailMergeField.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ui; +package org.libreoffice.lots.mailmerge.ui; import java.util.Arrays; import com.sun.star.awt.XComboBox; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; /** * A wrapper for adding mail merge fields to a {@link XComboBox}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ui/SpecialField.java b/core/src/main/java/org/libreoffice/lots/mailmerge/ui/SpecialField.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ui/SpecialField.java rename to core/src/main/java/org/libreoffice/lots/mailmerge/ui/SpecialField.java index fa80cdff4..233bfa1f9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/mailmerge/ui/SpecialField.java +++ b/core/src/main/java/org/libreoffice/lots/mailmerge/ui/SpecialField.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ui; +package org.libreoffice.lots.mailmerge.ui; import com.sun.star.awt.XComboBox; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PageRange.java b/core/src/main/java/org/libreoffice/lots/print/PageRange.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PageRange.java rename to core/src/main/java/org/libreoffice/lots/print/PageRange.java index 9ea673963..646348c8f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PageRange.java +++ b/core/src/main/java/org/libreoffice/lots/print/PageRange.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; /** * Definition of a page range. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrimaryPrintModel.java b/core/src/main/java/org/libreoffice/lots/print/PrimaryPrintModel.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrimaryPrintModel.java rename to core/src/main/java/org/libreoffice/lots/print/PrimaryPrintModel.java index 8420ce41b..048ce330f 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrimaryPrintModel.java +++ b/core/src/main/java/org/libreoffice/lots/print/PrimaryPrintModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; import java.util.HashMap; import java.util.HashSet; @@ -45,18 +45,18 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoProps; -import de.muenchen.allg.itd51.wollmux.GlobalFunctions; -import de.muenchen.allg.itd51.wollmux.SyncActionListener; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnCollectNonWollMuxFormFieldsViaPrintModel; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSetFormValue; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSetVisibleState; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.print.PageRange.PageRangeType; -import de.muenchen.allg.itd51.wollmux.slv.events.OnSetPrintBlocksPropsViaPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.GlobalFunctions; +import org.libreoffice.lots.SyncActionListener; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.event.handlers.OnCollectNonWollMuxFormFieldsViaPrintModel; +import org.libreoffice.lots.event.handlers.OnSetFormValue; +import org.libreoffice.lots.event.handlers.OnSetVisibleState; +import org.libreoffice.lots.func.print.PrintFunction; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.print.PageRange.PageRangeType; +import org.libreoffice.lots.slv.events.OnSetPrintBlocksPropsViaPrintModel; +import org.libreoffice.lots.util.L; /** * This model maintains the call hierarchy of all print functions. The hierarchy is defined by the diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintFunctionLibrary.java b/core/src/main/java/org/libreoffice/lots/print/PrintFunctionLibrary.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintFunctionLibrary.java rename to core/src/main/java/org/libreoffice/lots/print/PrintFunctionLibrary.java index ea5c749e4..1cad7affb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintFunctionLibrary.java +++ b/core/src/main/java/org/libreoffice/lots/print/PrintFunctionLibrary.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; import java.util.HashMap; import java.util.HashSet; @@ -28,19 +28,18 @@ import java.util.Objects; import java.util.Set; +import org.libreoffice.lots.ConfClassLoader; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.func.ExternalFunction; +import org.libreoffice.lots.func.print.PrintException; +import org.libreoffice.lots.func.print.PrintFunction; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.ConfClassLoader; -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.func.ExternalFunction; -import de.muenchen.allg.itd51.wollmux.func.print.PrintException; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Library of {@link PrintFunction}. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintModels.java b/core/src/main/java/org/libreoffice/lots/print/PrintModels.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintModels.java rename to core/src/main/java/org/libreoffice/lots/print/PrintModels.java index 4b47468d4..c92731582 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintModels.java +++ b/core/src/main/java/org/libreoffice/lots/print/PrintModels.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,10 +28,10 @@ import com.sun.star.lang.NoSuchMethodException; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.document.TextDocumentController; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.util.L; /** * Factory for {@link XPrintModel}s. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintParametersDialog.java b/core/src/main/java/org/libreoffice/lots/print/PrintParametersDialog.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintParametersDialog.java rename to core/src/main/java/org/libreoffice/lots/print/PrintParametersDialog.java index d60b93c11..b0e40e1ab 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintParametersDialog.java +++ b/core/src/main/java/org/libreoffice/lots/print/PrintParametersDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; import org.apache.commons.lang3.tuple.Pair; @@ -43,9 +43,9 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractActionListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractItemListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTextListener; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; -import de.muenchen.allg.itd51.wollmux.print.PageRange.PageRangeType; import org.libreoffice.ext.unohelper.util.UnoComponent; +import org.libreoffice.lots.document.TextDocumentModel; +import org.libreoffice.lots.print.PageRange.PageRangeType; /** * Dialog for configuring a print. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintProgressBar.java b/core/src/main/java/org/libreoffice/lots/print/PrintProgressBar.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintProgressBar.java rename to core/src/main/java/org/libreoffice/lots/print/PrintProgressBar.java index 4a9e67092..0b909cd02 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/PrintProgressBar.java +++ b/core/src/main/java/org/libreoffice/lots/print/PrintProgressBar.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -39,8 +39,8 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractActionListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractWindowListener; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoComponent; +import org.libreoffice.lots.util.L; /** * Progress bar of prints. If there are several print functions chained, the progress bar shows how diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/SecondaryPrintModel.java b/core/src/main/java/org/libreoffice/lots/print/SecondaryPrintModel.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/print/SecondaryPrintModel.java rename to core/src/main/java/org/libreoffice/lots/print/SecondaryPrintModel.java index e592eef9b..b2146c421 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/SecondaryPrintModel.java +++ b/core/src/main/java/org/libreoffice/lots/print/SecondaryPrintModel.java @@ -20,7 +20,11 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; + +import org.libreoffice.lots.GlobalFunctions; +import org.libreoffice.lots.func.print.PrintFunction; +import org.libreoffice.lots.util.L; import com.sun.star.beans.PropertyVetoException; import com.sun.star.beans.UnknownPropertyException; @@ -32,10 +36,7 @@ import com.sun.star.lib.uno.helper.WeakBase; import com.sun.star.text.XTextDocument; -import de.muenchen.allg.itd51.wollmux.GlobalFunctions; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; /** * A print model for the print functions maintained by {@link PrimaryPrintModel}. Each print @@ -82,7 +83,7 @@ public void print(short numberOfCopies) /** * Call the next print function in the hierarchy. * - * @see de.muenchen.allg.itd51.wollmux.XPrintModel#printWithProps() + * @see org.libreoffice.lots.XPrintModel#printWithProps() */ @Override public void printWithProps() @@ -203,7 +204,7 @@ public void removeVetoableChangeListener(String arg0, XVetoableChangeListener ar /** * Only print functions with an ORDER-value that is higher than its own ORDER value are accepted. * - * @see de.muenchen.allg.itd51.wollmux.XPrintModel#usePrintFunction(java.lang.String) + * @see org.libreoffice.lots.XPrintModel#usePrintFunction(java.lang.String) */ @Override public void usePrintFunction(String functionName) throws NoSuchMethodException diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/ShowDocument.java b/core/src/main/java/org/libreoffice/lots/print/ShowDocument.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/print/ShowDocument.java rename to core/src/main/java/org/libreoffice/lots/print/ShowDocument.java index c4b75da32..337c03ac3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/print/ShowDocument.java +++ b/core/src/main/java/org/libreoffice/lots/print/ShowDocument.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; import java.awt.Desktop; import java.io.File; @@ -40,10 +40,10 @@ import com.sun.star.ui.dialogs.XFilePicker3; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * Show a document with OS default view for the MIME-Type. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/ByJavaPropertyFinder.java b/core/src/main/java/org/libreoffice/lots/sender/ByJavaPropertyFinder.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/ByJavaPropertyFinder.java rename to core/src/main/java/org/libreoffice/lots/sender/ByJavaPropertyFinder.java index 0844da21c..97b0560f0 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/ByJavaPropertyFinder.java +++ b/core/src/main/java/org/libreoffice/lots/sender/ByJavaPropertyFinder.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * A {@link SenderFinder} using Java properties. */ -class ByJavaPropertyFinder extends SenderFinder +public class ByJavaPropertyFinder extends SenderFinder { public ByJavaPropertyFinder(SenderService senderList) diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/ByOOoUserProfileFinder.java b/core/src/main/java/org/libreoffice/lots/sender/ByOOoUserProfileFinder.java similarity index 90% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/ByOOoUserProfileFinder.java rename to core/src/main/java/org/libreoffice/lots/sender/ByOOoUserProfileFinder.java index 2cb7de576..524754c00 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/ByOOoUserProfileFinder.java +++ b/core/src/main/java/org/libreoffice/lots/sender/ByOOoUserProfileFinder.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoConfiguration; +import org.libreoffice.lots.util.L; /** * A {@link SenderFinder} using LibreOffice's user data. */ -class ByOOoUserProfileFinder extends SenderFinder +public class ByOOoUserProfileFinder extends SenderFinder { public ByOOoUserProfileFinder(SenderService senderList) { diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/FileCache.java b/core/src/main/java/org/libreoffice/lots/sender/FileCache.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/FileCache.java rename to core/src/main/java/org/libreoffice/lots/sender/FileCache.java index a1cb01921..7c21cb33b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/FileCache.java +++ b/core/src/main/java/org/libreoffice/lots/sender/FileCache.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import java.io.File; import java.io.FileInputStream; @@ -38,17 +38,16 @@ import java.util.Map; import org.apache.commons.lang3.tuple.Pair; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.sun.star.lang.EventObject; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * A sender cache using a file as persistence. The file is in ConfigThingy format. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/Sender.java b/core/src/main/java/org/libreoffice/lots/sender/Sender.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/Sender.java rename to core/src/main/java/org/libreoffice/lots/sender/Sender.java index e52ca1d49..7cd382c1a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/Sender.java +++ b/core/src/main/java/org/libreoffice/lots/sender/Sender.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import java.util.Comparator; import java.util.HashMap; @@ -28,9 +28,9 @@ import java.util.Objects; import java.util.UUID; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.db.Dataset; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.util.L; /** * A sender, which provides information to fill documents. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderCache.java b/core/src/main/java/org/libreoffice/lots/sender/SenderCache.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderCache.java rename to core/src/main/java/org/libreoffice/lots/sender/SenderCache.java index 3271b4596..fd51e468d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderCache.java +++ b/core/src/main/java/org/libreoffice/lots/sender/SenderCache.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import java.util.List; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderConf.java b/core/src/main/java/org/libreoffice/lots/sender/SenderConf.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderConf.java rename to core/src/main/java/org/libreoffice/lots/sender/SenderConf.java index 6162d2a4d..fccc97540 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderConf.java +++ b/core/src/main/java/org/libreoffice/lots/sender/SenderConf.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import java.util.Map; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderEventListener.java b/core/src/main/java/org/libreoffice/lots/sender/SenderEventListener.java similarity index 86% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderEventListener.java rename to core/src/main/java/org/libreoffice/lots/sender/SenderEventListener.java index a9dcb13cf..cbad36913 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderEventListener.java +++ b/core/src/main/java/org/libreoffice/lots/sender/SenderEventListener.java @@ -20,18 +20,18 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import java.util.List; -import com.google.common.eventbus.Subscribe; +import org.libreoffice.lots.WollMuxSingleton; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.event.WollMuxEventHandler; +import org.libreoffice.lots.event.WollMuxEventListener; +import org.libreoffice.lots.event.handlers.OnInitialize; +import org.libreoffice.lots.util.L; -import de.muenchen.allg.itd51.wollmux.WollMuxSingleton; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventHandler; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnInitialize; -import de.muenchen.allg.itd51.wollmux.util.L; +import com.google.common.eventbus.Subscribe; /** * An event listener for all unspecified events. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderException.java b/core/src/main/java/org/libreoffice/lots/sender/SenderException.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderException.java rename to core/src/main/java/org/libreoffice/lots/sender/SenderException.java index be6ff07fc..7e8491fdf 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderException.java +++ b/core/src/main/java/org/libreoffice/lots/sender/SenderException.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; @SuppressWarnings({ "java:S1176", "serial" }) public class SenderException extends Exception diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderFinder.java b/core/src/main/java/org/libreoffice/lots/sender/SenderFinder.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderFinder.java rename to core/src/main/java/org/libreoffice/lots/sender/SenderFinder.java index c38eb83cf..63eb41415 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderFinder.java +++ b/core/src/main/java/org/libreoffice/lots/sender/SenderFinder.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import java.util.ArrayList; import java.util.Collections; @@ -33,11 +33,10 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import org.libreoffice.lots.config.ConfigThingy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; - /** * Search for sender. The query can have variables like {@code ${variable}} which get replaced * according to the strategy of the DataFinder. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderService.java b/core/src/main/java/org/libreoffice/lots/sender/SenderService.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderService.java rename to core/src/main/java/org/libreoffice/lots/sender/SenderService.java index a036c0b24..5e8fab95b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/SenderService.java +++ b/core/src/main/java/org/libreoffice/lots/sender/SenderService.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import java.io.IOException; import java.util.ArrayList; @@ -45,28 +45,28 @@ import com.sun.star.uno.XInterface; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -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.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.db.AsyncSearch; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.db.ColumnTransformer; -import de.muenchen.allg.itd51.wollmux.db.Dataset; -import de.muenchen.allg.itd51.wollmux.db.Datasource; -import de.muenchen.allg.itd51.wollmux.db.Datasources; -import de.muenchen.allg.itd51.wollmux.db.DummyDatasourceWithMessagebox; -import de.muenchen.allg.itd51.wollmux.db.QueryPart; -import de.muenchen.allg.itd51.wollmux.db.QueryResults; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.func.FunctionFactory; -import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.db.AsyncSearch; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.ColumnTransformer; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.Datasources; +import org.libreoffice.lots.db.DummyDatasourceWithMessagebox; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; import de.muenchen.allg.itd51.wollmux.interfaces.XPALChangeEventListener; import de.muenchen.allg.itd51.wollmux.interfaces.XPALProvider; -import de.muenchen.allg.itd51.wollmux.sender.dialog.PersoenlicheAbsenderlisteVerwalten; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.sender.dialog.PersoenlicheAbsenderlisteVerwalten; +import org.libreoffice.lots.util.L; /** * Entry point for editing or selecting sender and adding or removing sender from the list. @@ -322,7 +322,7 @@ public long searchDefaultSender() * the method returns the empty string "". * This special case should of course be handled accordingly by the calling method. * - * @see de.muenchen.allg.itd51.wollmux.XPALProvider#getCurrentSender() + * @see org.libreoffice.lots.XPALProvider#getCurrentSender() * * @return the sender currently selected from the PAL as a string. * If no sender is selected the empty string "" is returned. @@ -395,7 +395,7 @@ void notifyListener() * Each PAL entry always contains the string "§§%=%§§" at the end * followed by the key of the corresponding entry! * - * @see de.muenchen.allg.itd51.wollmux.XPALProvider#getPALEntries() + * @see org.libreoffice.lots.XPALProvider#getPALEntries() * @return Sender names */ @Override diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/DatensatzBearbeitenWizard.java b/core/src/main/java/org/libreoffice/lots/sender/dialog/DatensatzBearbeitenWizard.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/DatensatzBearbeitenWizard.java rename to core/src/main/java/org/libreoffice/lots/sender/dialog/DatensatzBearbeitenWizard.java index 84aa1a553..054ca69d9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/DatensatzBearbeitenWizard.java +++ b/core/src/main/java/org/libreoffice/lots/sender/dialog/DatensatzBearbeitenWizard.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender.dialog; +package org.libreoffice.lots.sender.dialog; import java.util.List; @@ -36,7 +36,7 @@ import com.sun.star.ui.dialogs.XWizardPage; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.sender.Sender; +import org.libreoffice.lots.sender.Sender; /** * Wizard for modifying data sets. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/DatensatzBearbeitenWizardPage.java b/core/src/main/java/org/libreoffice/lots/sender/dialog/DatensatzBearbeitenWizardPage.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/DatensatzBearbeitenWizardPage.java rename to core/src/main/java/org/libreoffice/lots/sender/dialog/DatensatzBearbeitenWizardPage.java index 7195a41ea..5c44f2fbc 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/DatensatzBearbeitenWizardPage.java +++ b/core/src/main/java/org/libreoffice/lots/sender/dialog/DatensatzBearbeitenWizardPage.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender.dialog; +package org.libreoffice.lots.sender.dialog; import java.util.List; @@ -45,11 +45,11 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractActionListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTextListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractXWizardPage; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.sender.Sender; -import de.muenchen.allg.itd51.wollmux.sender.SenderException; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.sender.Sender; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.util.Utils; /** * Pages for modifying the content of a data set. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/PersoenlicheAbsenderlisteVerwalten.java b/core/src/main/java/org/libreoffice/lots/sender/dialog/PersoenlicheAbsenderlisteVerwalten.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/PersoenlicheAbsenderlisteVerwalten.java rename to core/src/main/java/org/libreoffice/lots/sender/dialog/PersoenlicheAbsenderlisteVerwalten.java index 92afbdf5a..c7b4bbae1 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dialog/PersoenlicheAbsenderlisteVerwalten.java +++ b/core/src/main/java/org/libreoffice/lots/sender/dialog/PersoenlicheAbsenderlisteVerwalten.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender.dialog; +package org.libreoffice.lots.sender.dialog; import java.util.ArrayList; import java.util.Collections; @@ -49,12 +49,12 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractActionListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractKeyListener; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.sender.Sender; -import de.muenchen.allg.itd51.wollmux.sender.SenderException; -import de.muenchen.allg.itd51.wollmux.sender.SenderService; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoComponent; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.sender.Sender; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderService; +import org.libreoffice.lots.util.L; /** * Dialog for adding, removing, editing of senders. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dispatch/PALVerwaltenDispatch.java b/core/src/main/java/org/libreoffice/lots/sender/dispatch/PALVerwaltenDispatch.java similarity index 89% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dispatch/PALVerwaltenDispatch.java rename to core/src/main/java/org/libreoffice/lots/sender/dispatch/PALVerwaltenDispatch.java index daf1a9a59..1b2584015 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dispatch/PALVerwaltenDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/sender/dispatch/PALVerwaltenDispatch.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender.dispatch; +package org.libreoffice.lots.sender.dispatch; + +import org.libreoffice.lots.dispatch.WollMuxDispatch; +import org.libreoffice.lots.sender.SenderService; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatch; -import de.muenchen.allg.itd51.wollmux.sender.SenderService; - /** * Dispatch, which shows the sender list. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dispatch/SenderDispatcher.java b/core/src/main/java/org/libreoffice/lots/sender/dispatch/SenderDispatcher.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dispatch/SenderDispatcher.java rename to core/src/main/java/org/libreoffice/lots/sender/dispatch/SenderDispatcher.java index d10e4c5f0..720188a6a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sender/dispatch/SenderDispatcher.java +++ b/core/src/main/java/org/libreoffice/lots/sender/dispatch/SenderDispatcher.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender.dispatch; +package org.libreoffice.lots.sender.dispatch; + +import org.libreoffice.lots.dispatch.Dispatcher; +import org.libreoffice.lots.dispatch.WollMuxDispatch; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.dispatch.Dispatcher; -import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatch; - /** * Dispatcher for all sender dispatches. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxBarRegistration.java b/core/src/main/java/org/libreoffice/lots/sidebar/WollMuxBarRegistration.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxBarRegistration.java rename to core/src/main/java/org/libreoffice/lots/sidebar/WollMuxBarRegistration.java index 2b39dadb5..1e500b97b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxBarRegistration.java +++ b/core/src/main/java/org/libreoffice/lots/sidebar/WollMuxBarRegistration.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sidebar; +package org.libreoffice.lots.sidebar; -import de.muenchen.allg.itd51.wollmux.ComponentRegistration; +import org.libreoffice.lots.ComponentRegistration; /** * Factory for {@link WollMuxSidebarFactory}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarContent.java b/core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarContent.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarContent.java rename to core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarContent.java index 62de58f7e..671989aa7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarContent.java +++ b/core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarContent.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sidebar; +package org.libreoffice.lots.sidebar; import java.awt.Desktop; import java.awt.SystemColor; @@ -84,26 +84,26 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractMouseListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTextListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractWindowListener; -import de.muenchen.allg.itd51.wollmux.OpenExt; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.WollMuxSingleton; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnAbout; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnDumpInfo; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnKill; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnOpenDocument; -import de.muenchen.allg.itd51.wollmux.interfaces.XPALChangeEventListener; -import de.muenchen.allg.itd51.wollmux.sender.SenderService; import org.libreoffice.ext.unohelper.ui.layout.Layout; import org.libreoffice.ext.unohelper.ui.layout.VerticalLayout; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.ui.GuiFactory; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; -import de.muenchen.allg.itd51.wollmux.ui.UIElementType; import org.libreoffice.ext.unohelper.util.UnoComponent; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.OpenExt; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.WollMuxSingleton; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.event.handlers.OnAbout; +import org.libreoffice.lots.event.handlers.OnDumpInfo; +import org.libreoffice.lots.event.handlers.OnKill; +import org.libreoffice.lots.event.handlers.OnOpenDocument; +import de.muenchen.allg.itd51.wollmux.interfaces.XPALChangeEventListener; +import org.libreoffice.lots.sender.SenderService; +import org.libreoffice.lots.ui.UIElementConfig; +import org.libreoffice.lots.ui.UIElementType; +import org.libreoffice.lots.util.L; /** * Create the window of the WollMuxBar. It contains the tree to access the templates and several diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarFactory.java b/core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarFactory.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarFactory.java rename to core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarFactory.java index 506eaaaca..0a44f6b0a 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarFactory.java +++ b/core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarFactory.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sidebar; +package org.libreoffice.lots.sidebar; import com.sun.star.awt.XWindow; import com.sun.star.beans.PropertyValue; @@ -37,7 +37,7 @@ public class WollMuxSidebarFactory extends AbstractSidebarFactory { - public static final String SERVICE_NAME = "de.muenchen.allg.itd51.wollmux.sidebar.WollMuxSidebarFactory"; + public static final String SERVICE_NAME = "org.libreoffice.lots.sidebar.WollMuxSidebarFactory"; /** * Create the WollMux bar. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarPanel.java b/core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarPanel.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarPanel.java rename to core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarPanel.java index 1f4916694..987734a92 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/sidebar/WollMuxSidebarPanel.java +++ b/core/src/main/java/org/libreoffice/lots/sidebar/WollMuxSidebarPanel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sidebar; +package org.libreoffice.lots.sidebar; import com.sun.star.awt.XWindow; import com.sun.star.uno.XComponentContext; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveConfig.java b/core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveConfig.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveConfig.java rename to core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveConfig.java index 5e2805c00..63b4dd0d9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveConfig.java +++ b/core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveConfig.java @@ -20,11 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; import java.util.EnumMap; import java.util.Map; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,10 +35,6 @@ import com.github.chaosfirebolt.converter.constants.IntegerType; import com.sun.star.lang.IllegalArgumentException; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; - /** * The configuration for content based directives. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveItem.java b/core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveItem.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveItem.java rename to core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveItem.java index d248d8b41..a5cae1fcb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveItem.java +++ b/core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveItem.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -36,8 +36,8 @@ import com.sun.star.uno.AnyConverter; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.util.Utils; /** * A content based directive line. This class provides utility functions for modifying the diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveModel.java b/core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveModel.java similarity index 97% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveModel.java rename to core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveModel.java index 2feeb1da9..4254c3fe8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveModel.java +++ b/core/src/main/java/org/libreoffice/lots/slv/ContentBasedDirectiveModel.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; import java.util.ArrayList; import java.util.HashMap; @@ -53,17 +53,17 @@ import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; import org.libreoffice.ext.unohelper.document.text.StyleService; -import de.muenchen.allg.itd51.wollmux.HashableComponent; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommands; -import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirective; -import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrint; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.common.TextDocument; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.HashableComponent; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.commands.DocumentCommands; +import org.libreoffice.lots.slv.print.ContentBasedDirective; +import org.libreoffice.lots.slv.print.ContentBasedDirectivePrint; +import org.libreoffice.lots.util.L; +import org.libreoffice.lots.util.Utils; /** diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockCommand.java b/core/src/main/java/org/libreoffice/lots/slv/PrintBlockCommand.java similarity index 92% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockCommand.java rename to core/src/main/java/org/libreoffice/lots/slv/PrintBlockCommand.java index bd9e91c32..4514b7cb9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockCommand.java +++ b/core/src/main/java/org/libreoffice/lots/slv/PrintBlockCommand.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,11 +29,11 @@ import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.document.commands.DocumentCommand; +import org.libreoffice.lots.util.Utils; /** * Implementation of print block commands {@link PrintBlockSignature}. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockProcessor.java b/core/src/main/java/org/libreoffice/lots/slv/PrintBlockProcessor.java similarity index 87% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockProcessor.java rename to core/src/main/java/org/libreoffice/lots/slv/PrintBlockProcessor.java index 2929641c7..1adab1aa3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockProcessor.java +++ b/core/src/main/java/org/libreoffice/lots/slv/PrintBlockProcessor.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; -import de.muenchen.allg.itd51.wollmux.document.commands.AbstractExecutor; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommands; +import org.libreoffice.lots.document.commands.AbstractExecutor; +import org.libreoffice.lots.document.commands.DocumentCommands; /** * Processing step for print block commands. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockSignature.java b/core/src/main/java/org/libreoffice/lots/slv/PrintBlockSignature.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockSignature.java rename to core/src/main/java/org/libreoffice/lots/slv/PrintBlockSignature.java index 393f8a8d1..154d346ee 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockSignature.java +++ b/core/src/main/java/org/libreoffice/lots/slv/PrintBlockSignature.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * The command names of print block commands. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dialog/ContentBasedDirectiveDialog.java b/core/src/main/java/org/libreoffice/lots/slv/dialog/ContentBasedDirectiveDialog.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dialog/ContentBasedDirectiveDialog.java rename to core/src/main/java/org/libreoffice/lots/slv/dialog/ContentBasedDirectiveDialog.java index d05a89802..9b85fe7d7 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dialog/ContentBasedDirectiveDialog.java +++ b/core/src/main/java/org/libreoffice/lots/slv/dialog/ContentBasedDirectiveDialog.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.dialog; +package org.libreoffice.lots.slv.dialog; import java.util.ArrayList; import java.util.Collections; @@ -54,8 +54,8 @@ import org.libreoffice.ext.unohelper.dialog.adapter.AbstractItemListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractSpinListener; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractTextListener; -import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirective; import org.libreoffice.ext.unohelper.util.UnoComponent; +import org.libreoffice.lots.slv.print.ContentBasedDirective; /** * A dialog for printing documents with content based directives. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dialog/ContentBasedDirectiveSettings.java b/core/src/main/java/org/libreoffice/lots/slv/dialog/ContentBasedDirectiveSettings.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dialog/ContentBasedDirectiveSettings.java rename to core/src/main/java/org/libreoffice/lots/slv/dialog/ContentBasedDirectiveSettings.java index 4e24e38cc..e7a88ab57 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dialog/ContentBasedDirectiveSettings.java +++ b/core/src/main/java/org/libreoffice/lots/slv/dialog/ContentBasedDirectiveSettings.java @@ -20,9 +20,9 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.dialog; +package org.libreoffice.lots.slv.dialog; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockSignature; +import org.libreoffice.lots.slv.PrintBlockSignature; /** * Print settings of a directive. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/ContentBasedDirectiveDispatcher.java b/core/src/main/java/org/libreoffice/lots/slv/dispatch/ContentBasedDirectiveDispatcher.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/ContentBasedDirectiveDispatcher.java rename to core/src/main/java/org/libreoffice/lots/slv/dispatch/ContentBasedDirectiveDispatcher.java index e1a7008b2..78661764d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/ContentBasedDirectiveDispatcher.java +++ b/core/src/main/java/org/libreoffice/lots/slv/dispatch/ContentBasedDirectiveDispatcher.java @@ -20,15 +20,15 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.dispatch; +package org.libreoffice.lots.slv.dispatch; + +import org.libreoffice.lots.dispatch.Dispatcher; +import org.libreoffice.lots.dispatch.WollMuxDispatch; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.dispatch.Dispatcher; -import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatch; - /** * Dispatcher for content based directive commands. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/CopyDispatch.java b/core/src/main/java/org/libreoffice/lots/slv/dispatch/CopyDispatch.java similarity index 81% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/CopyDispatch.java rename to core/src/main/java/org/libreoffice/lots/slv/dispatch/CopyDispatch.java index 2bd86fae7..ec7433e07 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/CopyDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/slv/dispatch/CopyDispatch.java @@ -20,18 +20,18 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.dispatch; +package org.libreoffice.lots.slv.dispatch; + +import org.libreoffice.lots.dispatch.WollMuxDispatch; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.WollMuxEvent; +import org.libreoffice.lots.slv.events.OnChangeCopy; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatch; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.slv.events.OnChangeCopy; - /** * Dispatch for creating a new copy. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/DirectiveDispatch.java b/core/src/main/java/org/libreoffice/lots/slv/dispatch/DirectiveDispatch.java similarity index 82% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/DirectiveDispatch.java rename to core/src/main/java/org/libreoffice/lots/slv/dispatch/DirectiveDispatch.java index 688026cf7..5576d6e55 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/DirectiveDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/slv/dispatch/DirectiveDispatch.java @@ -20,18 +20,18 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.dispatch; +package org.libreoffice.lots.slv.dispatch; + +import org.libreoffice.lots.dispatch.WollMuxDispatch; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.WollMuxEvent; +import org.libreoffice.lots.slv.events.OnChangeDirective; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatch; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.slv.events.OnChangeDirective; - /** * Dispatch for creating a new content based directive. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/MarkBlockDispatch.java b/core/src/main/java/org/libreoffice/lots/slv/dispatch/MarkBlockDispatch.java similarity index 82% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/MarkBlockDispatch.java rename to core/src/main/java/org/libreoffice/lots/slv/dispatch/MarkBlockDispatch.java index cdbc4cd4a..bee1ac03d 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/MarkBlockDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/slv/dispatch/MarkBlockDispatch.java @@ -20,18 +20,18 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.dispatch; +package org.libreoffice.lots.slv.dispatch; + +import org.libreoffice.lots.dispatch.WollMuxDispatch; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.WollMuxEvent; +import org.libreoffice.lots.slv.events.OnMarkBlock; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatch; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.slv.events.OnMarkBlock; - /** * Dispatch for marking a block as print block. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/RecipientDispatch.java b/core/src/main/java/org/libreoffice/lots/slv/dispatch/RecipientDispatch.java similarity index 82% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/RecipientDispatch.java rename to core/src/main/java/org/libreoffice/lots/slv/dispatch/RecipientDispatch.java index 24dcc5fc8..7dc4d6506 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/RecipientDispatch.java +++ b/core/src/main/java/org/libreoffice/lots/slv/dispatch/RecipientDispatch.java @@ -20,18 +20,18 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.dispatch; +package org.libreoffice.lots.slv.dispatch; + +import org.libreoffice.lots.dispatch.WollMuxDispatch; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.event.handlers.WollMuxEvent; +import org.libreoffice.lots.slv.events.OnChangeRecipient; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XFrame; import com.sun.star.util.URL; -import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatch; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.slv.events.OnChangeRecipient; - /** * Dispatch for creatig a recipient line. */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/ContentBasedDirectiveEventListener.java b/core/src/main/java/org/libreoffice/lots/slv/events/ContentBasedDirectiveEventListener.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/ContentBasedDirectiveEventListener.java rename to core/src/main/java/org/libreoffice/lots/slv/events/ContentBasedDirectiveEventListener.java index 5862b0687..9677f9356 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/ContentBasedDirectiveEventListener.java +++ b/core/src/main/java/org/libreoffice/lots/slv/events/ContentBasedDirectiveEventListener.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.events; +package org.libreoffice.lots.slv.events; -import com.google.common.eventbus.Subscribe; +import org.libreoffice.lots.event.WollMuxEventListener; +import org.libreoffice.lots.event.handlers.OnSetVisibleState; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener; -import de.muenchen.allg.itd51.wollmux.event.handlers.OnSetVisibleState; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; +import com.google.common.eventbus.Subscribe; /** * Event listener for content based directive events. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeCopy.java b/core/src/main/java/org/libreoffice/lots/slv/events/OnChangeCopy.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeCopy.java rename to core/src/main/java/org/libreoffice/lots/slv/events/OnChangeCopy.java index 48d659450..367b256eb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeCopy.java +++ b/core/src/main/java/org/libreoffice/lots/slv/events/OnChangeCopy.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.events; +package org.libreoffice.lots.slv.events; import java.util.List; @@ -28,11 +28,11 @@ import com.sun.star.text.XTextCursor; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveItem; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.event.handlers.WollMuxEvent; +import org.libreoffice.lots.slv.ContentBasedDirectiveItem; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; /** * An event for adding or deleting a copy of a directive. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeDirective.java b/core/src/main/java/org/libreoffice/lots/slv/events/OnChangeDirective.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeDirective.java rename to core/src/main/java/org/libreoffice/lots/slv/events/OnChangeDirective.java index 87d33dc99..352e29773 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeDirective.java +++ b/core/src/main/java/org/libreoffice/lots/slv/events/OnChangeDirective.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.events; +package org.libreoffice.lots.slv.events; import java.util.List; @@ -28,11 +28,11 @@ import com.sun.star.text.XTextCursor; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveItem; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.event.handlers.WollMuxEvent; +import org.libreoffice.lots.slv.ContentBasedDirectiveItem; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; /** * An event for creating or deleting a directive. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeRecipient.java b/core/src/main/java/org/libreoffice/lots/slv/events/OnChangeRecipient.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeRecipient.java rename to core/src/main/java/org/libreoffice/lots/slv/events/OnChangeRecipient.java index 1ae91bbdc..f43442957 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnChangeRecipient.java +++ b/core/src/main/java/org/libreoffice/lots/slv/events/OnChangeRecipient.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.events; +package org.libreoffice.lots.slv.events; import java.util.List; @@ -28,11 +28,11 @@ import com.sun.star.text.XTextCursor; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveItem; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.event.handlers.WollMuxEvent; +import org.libreoffice.lots.slv.ContentBasedDirectiveItem; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; /** * An event for changing recipients of content based directives. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnMarkBlock.java b/core/src/main/java/org/libreoffice/lots/slv/events/OnMarkBlock.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnMarkBlock.java rename to core/src/main/java/org/libreoffice/lots/slv/events/OnMarkBlock.java index 62b07d8af..cd506b539 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnMarkBlock.java +++ b/core/src/main/java/org/libreoffice/lots/slv/events/OnMarkBlock.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.events; +package org.libreoffice.lots.slv.events; import java.util.ArrayList; import java.util.List; @@ -37,17 +37,17 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.WollMuxFiles; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommandInterpreter; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveConfig; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockSignature; -import de.muenchen.allg.itd51.wollmux.util.L; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.commands.DocumentCommandInterpreter; +import org.libreoffice.lots.event.handlers.WollMuxEvent; +import org.libreoffice.lots.slv.ContentBasedDirectiveConfig; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; +import org.libreoffice.lots.slv.PrintBlockSignature; +import org.libreoffice.lots.util.L; /** * An event that inserts a bookmark with name {@code WM(CMD '')}at the current cursor diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnSetPrintBlocksPropsViaPrintModel.java b/core/src/main/java/org/libreoffice/lots/slv/events/OnSetPrintBlocksPropsViaPrintModel.java similarity index 88% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnSetPrintBlocksPropsViaPrintModel.java rename to core/src/main/java/org/libreoffice/lots/slv/events/OnSetPrintBlocksPropsViaPrintModel.java index aeafc2512..9a37b2146 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/events/OnSetPrintBlocksPropsViaPrintModel.java +++ b/core/src/main/java/org/libreoffice/lots/slv/events/OnSetPrintBlocksPropsViaPrintModel.java @@ -20,17 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.events; +package org.libreoffice.lots.slv.events; import java.awt.event.ActionListener; import java.util.Set; -import de.muenchen.allg.itd51.wollmux.WollMuxFehlerException; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentController; -import de.muenchen.allg.itd51.wollmux.document.TextDocumentModel; -import de.muenchen.allg.itd51.wollmux.event.handlers.WollMuxEvent; +import org.libreoffice.lots.WollMuxFehlerException; +import org.libreoffice.lots.document.TextDocumentController; +import org.libreoffice.lots.document.TextDocumentModel; +import org.libreoffice.lots.event.handlers.WollMuxEvent; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockCommand; +import org.libreoffice.lots.slv.PrintBlockCommand; /** * Creates a new event for setting properties of print blocks (e.g. allVersions). diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirective.java b/core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirective.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirective.java rename to core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirective.java index bf66dff05..be875cbb2 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirective.java +++ b/core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirective.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.print; +package org.libreoffice.lots.slv.print; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrint.java b/core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrint.java similarity index 91% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrint.java rename to core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrint.java index 0dcee18dc..00a7acfc3 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrint.java +++ b/core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrint.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.print; +package org.libreoffice.lots.slv.print; import java.io.File; import java.io.IOException; @@ -31,6 +31,17 @@ import java.util.Objects; import org.apache.pdfbox.multipdf.PDFMergerUtility; +import org.libreoffice.lots.GlobalFunctions; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.func.print.PrintException; +import org.libreoffice.lots.func.print.PrintFunction; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; +import org.libreoffice.lots.slv.dialog.ContentBasedDirectiveDialog; +import org.libreoffice.lots.slv.dialog.ContentBasedDirectiveSettings; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,18 +52,6 @@ import com.sun.star.lang.WrappedTargetException; import com.sun.star.ui.dialogs.ExecutableDialogResults; -import de.muenchen.allg.itd51.wollmux.GlobalFunctions; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.func.print.PrintException; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; -import de.muenchen.allg.itd51.wollmux.slv.dialog.ContentBasedDirectiveDialog; -import de.muenchen.allg.itd51.wollmux.slv.dialog.ContentBasedDirectiveSettings; -import de.muenchen.allg.itd51.wollmux.util.L; - /** * Print function for configuration of the content based directive print. It creates a GUI and * passes the settings as a property called {@link #PROP_SLV_SETTINGS} of the {@link XPrintModel} to diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrintCollect.java b/core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrintCollect.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrintCollect.java rename to core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrintCollect.java index fb39c6401..3e32fb0af 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrintCollect.java +++ b/core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrintCollect.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.print; +package org.libreoffice.lots.slv.print; import java.io.File; import java.io.IOException; @@ -38,10 +38,10 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.TextDocument; -import de.muenchen.allg.itd51.wollmux.dialog.InfoDialog; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.dialog.InfoDialog; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.util.L; +import org.libreoffice.lots.util.L; /** * Print function for collecting all content based directive prints. Each content based directive is diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrintOutput.java b/core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrintOutput.java similarity index 95% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrintOutput.java rename to core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrintOutput.java index cbedb1f48..6c0bac1c9 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/slv/print/ContentBasedDirectivePrintOutput.java +++ b/core/src/main/java/org/libreoffice/lots/slv/print/ContentBasedDirectivePrintOutput.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv.print; +package org.libreoffice.lots.slv.print; import java.util.ArrayList; import java.util.HashMap; @@ -44,15 +44,15 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoDictionary; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.document.DocumentManager; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; -import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveItem; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveModel; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockSignature; -import de.muenchen.allg.itd51.wollmux.slv.dialog.ContentBasedDirectiveSettings; -import de.muenchen.allg.itd51.wollmux.util.Utils; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.document.DocumentManager; +import org.libreoffice.lots.func.print.PrintFunction; +import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.slv.ContentBasedDirectiveItem; +import org.libreoffice.lots.slv.ContentBasedDirectiveModel; +import org.libreoffice.lots.slv.PrintBlockSignature; +import org.libreoffice.lots.slv.dialog.ContentBasedDirectiveSettings; +import org.libreoffice.lots.util.Utils; /** * Print function for printing the directives specified in the property {link diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/ui/UIElementConfig.java b/core/src/main/java/org/libreoffice/lots/ui/UIElementConfig.java similarity index 94% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/ui/UIElementConfig.java rename to core/src/main/java/org/libreoffice/lots/ui/UIElementConfig.java index a52e5ff12..a03592ca8 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/ui/UIElementConfig.java +++ b/core/src/main/java/org/libreoffice/lots/ui/UIElementConfig.java @@ -20,24 +20,23 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.ui; +package org.libreoffice.lots.ui; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.apache.commons.lang3.RandomStringUtils; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.config.NodeNotFoundException; +import org.libreoffice.lots.former.FormMaxConstants; +import org.libreoffice.lots.ui.UIElementConfig; +import org.libreoffice.lots.ui.UIElementType; +import org.libreoffice.lots.util.L; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.former.FormMaxConstants; -import de.muenchen.allg.itd51.wollmux.util.L; -import de.muenchen.allg.itd51.wollmux.ui.UIElementConfig; -import de.muenchen.allg.itd51.wollmux.ui.UIElementType; - /** * Description of a control element (menu entry, button, input field, ...) */ diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/ui/UIElementType.java b/core/src/main/java/org/libreoffice/lots/ui/UIElementType.java similarity index 93% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/ui/UIElementType.java rename to core/src/main/java/org/libreoffice/lots/ui/UIElementType.java index 0f9569f4c..1bb1e98d4 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/ui/UIElementType.java +++ b/core/src/main/java/org/libreoffice/lots/ui/UIElementType.java @@ -20,10 +20,10 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.ui; +package org.libreoffice.lots.ui; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.ui.UIElementType; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.ui.UIElementType; /** * Types of control elements. diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/util/L.java b/core/src/main/java/org/libreoffice/lots/util/L.java similarity index 98% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/util/L.java rename to core/src/main/java/org/libreoffice/lots/util/L.java index 606fc5f38..75638affb 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/util/L.java +++ b/core/src/main/java/org/libreoffice/lots/util/L.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.util; +package org.libreoffice.lots.util; import java.text.MessageFormat; import java.util.HashMap; @@ -28,12 +28,11 @@ import java.util.Locale; import java.util.Map; +import org.libreoffice.lots.config.ConfigThingy; import org.slf4j.LoggerFactory; import org.xnap.commons.i18n.I18n; import org.xnap.commons.i18n.I18nFactory; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; - /** * Localization functions diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/util/LogConfig.java b/core/src/main/java/org/libreoffice/lots/util/LogConfig.java similarity index 99% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/util/LogConfig.java rename to core/src/main/java/org/libreoffice/lots/util/LogConfig.java index 58acbbc06..969bf480b 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/util/LogConfig.java +++ b/core/src/main/java/org/libreoffice/lots/util/LogConfig.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.util; +package org.libreoffice.lots.util; import java.io.File; import java.io.Writer; diff --git a/core/src/main/java/de/muenchen/allg/itd51/wollmux/util/Utils.java b/core/src/main/java/org/libreoffice/lots/util/Utils.java similarity index 96% rename from core/src/main/java/de/muenchen/allg/itd51/wollmux/util/Utils.java rename to core/src/main/java/org/libreoffice/lots/util/Utils.java index 641b28792..f86f1a5dc 100644 --- a/core/src/main/java/de/muenchen/allg/itd51/wollmux/util/Utils.java +++ b/core/src/main/java/org/libreoffice/lots/util/Utils.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.util; +package org.libreoffice.lots.util; import java.io.IOException; import java.util.Properties; @@ -32,8 +32,8 @@ import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.common.UnoIterator; -import de.muenchen.allg.itd51.wollmux.WollMuxSingleton; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.WollMuxSingleton; public class Utils { diff --git a/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.ComponentRegistration b/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.ComponentRegistration index 425321a26..77a4d1d7b 100644 --- a/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.ComponentRegistration +++ b/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.ComponentRegistration @@ -1,4 +1,4 @@ -de.muenchen.allg.itd51.wollmux.comp.WollMuxRegistration -de.muenchen.allg.itd51.wollmux.sidebar.WollMuxBarRegistration -de.muenchen.allg.itd51.wollmux.mailmerge.sidebar.MailMergeRegistration -de.muenchen.allg.itd51.wollmux.form.sidebar.FormSidebarRegistration +org.libreoffice.lots.comp.WollMuxRegistration +org.libreoffice.lots.sidebar.WollMuxBarRegistration +org.libreoffice.lots.mailmerge.sidebar.MailMergeRegistration +org.libreoffice.lots.form.sidebar.FormSidebarRegistration diff --git a/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.dispatch.Dispatcher b/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.dispatch.Dispatcher index fc30527f9..813dc51d6 100644 --- a/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.dispatch.Dispatcher +++ b/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.dispatch.Dispatcher @@ -1,3 +1,3 @@ -de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatcher -de.muenchen.allg.itd51.wollmux.slv.dispatch.ContentBasedDirectiveDispatcher -de.muenchen.allg.itd51.wollmux.sender.dispatch.SenderDispatcher \ No newline at end of file +org.libreoffice.lots.dispatch.WollMuxDispatcher +org.libreoffice.lots.slv.dispatch.ContentBasedDirectiveDispatcher +org.libreoffice.lots.sender.dispatch.SenderDispatcher \ No newline at end of file diff --git a/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener b/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener index 16e34d213..ad78063d2 100644 --- a/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener +++ b/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener @@ -1,5 +1,5 @@ -de.muenchen.allg.itd51.wollmux.event.WollMuxEventListenerImpl -de.muenchen.allg.itd51.wollmux.event.CheckInstallationListener -de.muenchen.allg.itd51.wollmux.document.commands.OnProcessTextDocument -de.muenchen.allg.itd51.wollmux.sender.SenderEventListener -de.muenchen.allg.itd51.wollmux.slv.events.ContentBasedDirectiveEventListener \ No newline at end of file +org.libreoffice.lots.event.WollMuxEventListenerImpl +org.libreoffice.lots.event.CheckInstallationListener +org.libreoffice.lots.document.commands.OnProcessTextDocument +org.libreoffice.lots.sender.SenderEventListener +org.libreoffice.lots.slv.events.ContentBasedDirectiveEventListener \ No newline at end of file diff --git a/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.func.print.PrintFunction b/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.func.print.PrintFunction index 5aee4c84d..edd97b802 100644 --- a/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.func.print.PrintFunction +++ b/core/src/main/resources/META-INF/services/de.muenchen.allg.itd51.wollmux.func.print.PrintFunction @@ -1,13 +1,13 @@ -de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrint -de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrintCollect -de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrintOutput -de.muenchen.allg.itd51.wollmux.mailmerge.print.SetFormValue -de.muenchen.allg.itd51.wollmux.mailmerge.print.ToOdtEmail -de.muenchen.allg.itd51.wollmux.mailmerge.print.ToOdtFile -de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPdfFile -de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPdfEmail -de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPrinter -de.muenchen.allg.itd51.wollmux.mailmerge.print.ToShowOdtFile -de.muenchen.allg.itd51.wollmux.mailmerge.print.ToSingleODT -de.muenchen.allg.itd51.wollmux.mailmerge.print.ToSinglePDF -de.muenchen.allg.itd51.wollmux.print.ShowDocument +org.libreoffice.lots.slv.print.ContentBasedDirectivePrint +org.libreoffice.lots.slv.print.ContentBasedDirectivePrintCollect +org.libreoffice.lots.slv.print.ContentBasedDirectivePrintOutput +org.libreoffice.lots.mailmerge.print.SetFormValue +org.libreoffice.lots.mailmerge.print.ToOdtEmail +org.libreoffice.lots.mailmerge.print.ToOdtFile +org.libreoffice.lots.mailmerge.print.ToPdfFile +org.libreoffice.lots.mailmerge.print.ToPdfEmail +org.libreoffice.lots.mailmerge.print.ToPrinter +org.libreoffice.lots.mailmerge.print.ToShowOdtFile +org.libreoffice.lots.mailmerge.print.ToSingleODT +org.libreoffice.lots.mailmerge.print.ToSinglePDF +org.libreoffice.lots.print.ShowDocument diff --git a/core/src/main/resources/i18n.properties b/core/src/main/resources/i18n.properties index 582ff325b..e88f2e666 100644 --- a/core/src/main/resources/i18n.properties +++ b/core/src/main/resources/i18n.properties @@ -20,4 +20,4 @@ # limitations under the Licence. # #L% ### -basename=de.muenchen.allg.itd51.wollmux.i18n.Messages +basename=org.libreoffice.lots.i18n.Messages diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/WollMuxFilesTest.java b/core/src/test/java/org/libreoffice/lots/WollMuxFilesTest.java similarity index 97% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/WollMuxFilesTest.java rename to core/src/test/java/org/libreoffice/lots/WollMuxFilesTest.java index be8c29280..6ebd660b5 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/WollMuxFilesTest.java +++ b/core/src/test/java/org/libreoffice/lots/WollMuxFilesTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux; +package org.libreoffice.lots; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -31,6 +31,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.WollMuxFiles; +import org.libreoffice.lots.config.ConfigThingy; import org.mockserver.client.MockServerClient; import org.mockserver.integration.ClientAndServer; import org.mockserver.model.Header; @@ -39,8 +41,6 @@ import org.mockserver.model.StringBody; import org.mockserver.verify.VerificationTimes; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; - public class WollMuxFilesTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/TestXMLGenerator.java b/core/src/test/java/org/libreoffice/lots/config/generator/xml/TestXMLGenerator.java similarity index 97% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/TestXMLGenerator.java rename to core/src/test/java/org/libreoffice/lots/config/generator/xml/TestXMLGenerator.java index 1d50873d7..a41cd8ce6 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/config/generator/xml/TestXMLGenerator.java +++ b/core/src/test/java/org/libreoffice/lots/config/generator/xml/TestXMLGenerator.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.generator.xml; +package org.libreoffice.lots.config.generator.xml; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -50,6 +50,9 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.config.generator.xml.ConfGenerator; +import org.libreoffice.lots.config.generator.xml.XMLGenerator; +import org.libreoffice.lots.config.generator.xml.XMLGeneratorException; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/config/scanner/TestScanner.java b/core/src/test/java/org/libreoffice/lots/config/scanner/TestScanner.java similarity index 95% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/config/scanner/TestScanner.java rename to core/src/test/java/org/libreoffice/lots/config/scanner/TestScanner.java index aef60fa3f..bbd5caa1c 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/config/scanner/TestScanner.java +++ b/core/src/test/java/org/libreoffice/lots/config/scanner/TestScanner.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.config.scanner; +package org.libreoffice.lots.config.scanner; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -28,6 +28,10 @@ import java.net.MalformedURLException; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.config.scanner.Scanner; +import org.libreoffice.lots.config.scanner.ScannerException; +import org.libreoffice.lots.config.scanner.Token; +import org.libreoffice.lots.config.scanner.TokenType; /** * A Test class to verify that the scanner works correctly with includes. diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/AsyncSearchTest.java b/core/src/test/java/org/libreoffice/lots/db/AsyncSearchTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/AsyncSearchTest.java rename to core/src/test/java/org/libreoffice/lots/db/AsyncSearchTest.java index 5089c2145..3573ca603 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/AsyncSearchTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/AsyncSearchTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -29,8 +29,9 @@ import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; +import org.libreoffice.lots.db.AsyncSearch; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.mock.MockDatasource; public class AsyncSearchTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/AttachDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/AttachDatasourceTest.java similarity index 92% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/AttachDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/AttachDatasourceTest.java index 6b7346c6f..c9f55cc70 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/AttachDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/AttachDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -31,11 +31,16 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.AttachDatasource; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockDatasource; public class AttachDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/ColumnTransformerTest.java b/core/src/test/java/org/libreoffice/lots/db/ColumnTransformerTest.java similarity index 88% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/ColumnTransformerTest.java rename to core/src/test/java/org/libreoffice/lots/db/ColumnTransformerTest.java index 1d0521e6f..ca54fac9f 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/ColumnTransformerTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/ColumnTransformerTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -33,12 +33,14 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockQueryResults; -import de.muenchen.allg.itd51.wollmux.func.Function; -import de.muenchen.allg.itd51.wollmux.func.StringLiteralFunction; -import de.muenchen.allg.itd51.wollmux.func.Values; +import org.libreoffice.lots.db.ColumnTransformer; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockQueryResults; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.StringLiteralFunction; +import org.libreoffice.lots.func.Values; public class ColumnTransformerTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/DatasetPredicateTest.java b/core/src/test/java/org/libreoffice/lots/db/DatasetPredicateTest.java similarity index 95% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/DatasetPredicateTest.java rename to core/src/test/java/org/libreoffice/lots/db/DatasetPredicateTest.java index 78c67ff2e..1d7874131 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/DatasetPredicateTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/DatasetPredicateTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,6 +31,10 @@ import java.util.function.Predicate; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.DatasetPredicate; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.SimpleDataset; public class DatasetPredicateTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/EmptyDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/EmptyDatasourceTest.java similarity index 92% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/EmptyDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/EmptyDatasourceTest.java index bac672743..a72440ddb 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/EmptyDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/EmptyDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -29,6 +29,8 @@ import java.util.List; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.EmptyDatasource; public class EmptyDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/FunkyDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/FunkyDatasourceTest.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/FunkyDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/FunkyDatasourceTest.java index fc23c5fde..419cc505b 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/FunkyDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/FunkyDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -30,11 +30,14 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.FunkyDatasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockDatasource; public class FunkyDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/LDAPDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/LDAPDatasourceTest.java similarity index 92% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/LDAPDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/LDAPDatasourceTest.java index 34029bcaf..e1db79e20 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/LDAPDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/LDAPDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -31,13 +31,18 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.LDAPDatasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; import com.unboundid.ldap.listener.InMemoryDirectoryServer; import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig; import com.unboundid.ldap.listener.InMemoryListenerConfig; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; - public class LDAPDatasourceTest { public static InMemoryDirectoryServer server; diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/OOoDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/OOoDatasourceTest.java similarity index 82% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/OOoDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/OOoDatasourceTest.java index 246a4a947..e30229fe8 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/OOoDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/OOoDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -29,9 +29,14 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.test.OfficeTest; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.OOoDatasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.test.OfficeTest; public class OOoDatasourceTest extends OfficeTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/OverlayDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/OverlayDatasourceTest.java similarity index 92% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/OverlayDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/OverlayDatasourceTest.java index 0d97a52dc..0d5881373 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/OverlayDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/OverlayDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -32,11 +32,17 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.AttachDatasource; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.OverlayDatasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockDatasource; public class OverlayDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/PreferDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/PreferDatasourceTest.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/PreferDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/PreferDatasourceTest.java index d26db6b26..403b19c01 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/PreferDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/PreferDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -34,11 +34,15 @@ import java.util.NoSuchElementException; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.PreferDatasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockDatasource; public class PreferDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryPartTest.java b/core/src/test/java/org/libreoffice/lots/db/QueryPartTest.java similarity index 94% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryPartTest.java rename to core/src/test/java/org/libreoffice/lots/db/QueryPartTest.java index fcf11821f..be8f1f526 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryPartTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/QueryPartTest.java @@ -20,12 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.db.QueryPart; public class QueryPartTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsListTest.java b/core/src/test/java/org/libreoffice/lots/db/QueryResultsListTest.java similarity index 86% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsListTest.java rename to core/src/test/java/org/libreoffice/lots/db/QueryResultsListTest.java index 323fa941b..47c1acc92 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsListTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/QueryResultsListTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,8 +30,10 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.QueryResultsList; +import org.libreoffice.lots.db.mock.MockDataset; public class QueryResultsListTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsSetTest.java b/core/src/test/java/org/libreoffice/lots/db/QueryResultsSetTest.java similarity index 86% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsSetTest.java rename to core/src/test/java/org/libreoffice/lots/db/QueryResultsSetTest.java index 0b27a6e76..f73645a34 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsSetTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/QueryResultsSetTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -29,9 +29,11 @@ import java.util.Comparator; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockQueryResults; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.QueryResultsSet; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockQueryResults; public class QueryResultsSetTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsWithSchemaTest.java b/core/src/test/java/org/libreoffice/lots/db/QueryResultsWithSchemaTest.java similarity index 90% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsWithSchemaTest.java rename to core/src/test/java/org/libreoffice/lots/db/QueryResultsWithSchemaTest.java index 0cd074f50..1ced51281 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryResultsWithSchemaTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/QueryResultsWithSchemaTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -28,8 +28,8 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.db.mock.MockQueryResults; +import org.libreoffice.lots.db.QueryResultsWithSchema; +import org.libreoffice.lots.db.mock.MockQueryResults; public class QueryResultsWithSchemaTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryTest.java b/core/src/test/java/org/libreoffice/lots/db/QueryTest.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryTest.java rename to core/src/test/java/org/libreoffice/lots/db/QueryTest.java index 40c94dc58..76271097f 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/QueryTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/QueryTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -28,6 +28,8 @@ import java.util.List; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.db.Query; +import org.libreoffice.lots.db.QueryPart; public class QueryTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/RAMDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/RAMDatasourceTest.java similarity index 88% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/RAMDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/RAMDatasourceTest.java index 1168354c3..7ada80364 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/RAMDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/RAMDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -29,8 +29,11 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.RAMDatasource; +import org.libreoffice.lots.db.mock.MockDataset; public class RAMDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SchemaDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/SchemaDatasourceTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SchemaDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/SchemaDatasourceTest.java index 5f0bc409f..1d15f17af 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SchemaDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/SchemaDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -33,11 +33,16 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.SchemaDatasource; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockDatasource; public class SchemaDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SearchStrategyTest.java b/core/src/test/java/org/libreoffice/lots/db/SearchStrategyTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SearchStrategyTest.java rename to core/src/test/java/org/libreoffice/lots/db/SearchStrategyTest.java index 6bfa54fd4..f231491e8 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SearchStrategyTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/SearchStrategyTest.java @@ -20,15 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.db.Query; +import org.libreoffice.lots.db.SearchStrategy; public class SearchStrategyTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SearchTest.java b/core/src/test/java/org/libreoffice/lots/db/SearchTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SearchTest.java rename to core/src/test/java/org/libreoffice/lots/db/SearchTest.java index 44d827e6f..9284337da 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SearchTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/SearchTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -29,10 +29,13 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.Search; +import org.libreoffice.lots.db.SearchStrategy; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockDatasource; public class SearchTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SimpleDatasetTest.java b/core/src/test/java/org/libreoffice/lots/db/SimpleDatasetTest.java similarity index 90% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SimpleDatasetTest.java rename to core/src/test/java/org/libreoffice/lots/db/SimpleDatasetTest.java index 84e1b690e..91b6cc0dc 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/SimpleDatasetTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/SimpleDatasetTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -30,6 +30,9 @@ import java.util.Map; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.SimpleDataset; public class SimpleDatasetTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/ThingyDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/ThingyDatasourceTest.java similarity index 84% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/ThingyDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/ThingyDatasourceTest.java index 25c15d4c7..bb8e26410 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/ThingyDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/ThingyDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -30,8 +30,12 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.ThingyDatasource; public class ThingyDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/UnionDatasourceTest.java b/core/src/test/java/org/libreoffice/lots/db/UnionDatasourceTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/UnionDatasourceTest.java rename to core/src/test/java/org/libreoffice/lots/db/UnionDatasourceTest.java index b278efb6c..801b85b3b 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/UnionDatasourceTest.java +++ b/core/src/test/java/org/libreoffice/lots/db/UnionDatasourceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db; +package org.libreoffice.lots.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -30,11 +30,14 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; +import org.libreoffice.lots.db.UnionDatasource; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockDatasource; public class UnionDatasourceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockDataset.java b/core/src/test/java/org/libreoffice/lots/db/mock/MockDataset.java similarity index 90% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockDataset.java rename to core/src/test/java/org/libreoffice/lots/db/mock/MockDataset.java index a0cb4cedc..db1b4e3ff 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockDataset.java +++ b/core/src/test/java/org/libreoffice/lots/db/mock/MockDataset.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db.mock; +package org.libreoffice.lots.db.mock; import java.util.HashMap; import java.util.Map; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.db.Dataset; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; public class MockDataset implements Dataset { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockDatasource.java b/core/src/test/java/org/libreoffice/lots/db/mock/MockDatasource.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockDatasource.java rename to core/src/test/java/org/libreoffice/lots/db/mock/MockDatasource.java index 95bdcc866..ceaf2d6ef 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockDatasource.java +++ b/core/src/test/java/org/libreoffice/lots/db/mock/MockDatasource.java @@ -20,17 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db.mock; +package org.libreoffice.lots.db.mock; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.db.Dataset; -import de.muenchen.allg.itd51.wollmux.db.Datasource; -import de.muenchen.allg.itd51.wollmux.db.QueryPart; -import de.muenchen.allg.itd51.wollmux.db.QueryResults; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.QueryPart; +import org.libreoffice.lots.db.QueryResults; public class MockDatasource extends Datasource { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockQueryResults.java b/core/src/test/java/org/libreoffice/lots/db/mock/MockQueryResults.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockQueryResults.java rename to core/src/test/java/org/libreoffice/lots/db/mock/MockQueryResults.java index 31243151d..a1e03ecc8 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/db/mock/MockQueryResults.java +++ b/core/src/test/java/org/libreoffice/lots/db/mock/MockQueryResults.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.db.mock; +package org.libreoffice.lots.db.mock; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import de.muenchen.allg.itd51.wollmux.db.Dataset; -import de.muenchen.allg.itd51.wollmux.db.QueryResults; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.QueryResults; public class MockQueryResults implements QueryResults { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/document/DocumentTreeTest.java b/core/src/test/java/org/libreoffice/lots/document/DocumentTreeTest.java similarity index 93% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/document/DocumentTreeTest.java rename to core/src/test/java/org/libreoffice/lots/document/DocumentTreeTest.java index 31ac26ddf..1467dce8c 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/document/DocumentTreeTest.java +++ b/core/src/test/java/org/libreoffice/lots/document/DocumentTreeTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.document; +package org.libreoffice.lots.document; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -34,7 +34,8 @@ import com.sun.star.text.XTextDocument; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.test.OfficeTest; +import org.libreoffice.lots.document.DocumentTree; +import org.libreoffice.lots.test.OfficeTest; public class DocumentTreeTest extends OfficeTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestFormConfig.java b/core/src/test/java/org/libreoffice/lots/form/config/TestFormConfig.java similarity index 94% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestFormConfig.java rename to core/src/test/java/org/libreoffice/lots/form/config/TestFormConfig.java index d638ef884..bce5ca740 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestFormConfig.java +++ b/core/src/test/java/org/libreoffice/lots/form/config/TestFormConfig.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.config; +package org.libreoffice.lots.form.config; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -29,9 +29,9 @@ import java.awt.Color; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.form.model.FormModelException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.form.config.FormConfig; +import org.libreoffice.lots.form.model.FormModelException; public class TestFormConfig { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestTabConfig.java b/core/src/test/java/org/libreoffice/lots/form/config/TestTabConfig.java similarity index 92% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestTabConfig.java rename to core/src/test/java/org/libreoffice/lots/form/config/TestTabConfig.java index 1135cb97f..6a960b303 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestTabConfig.java +++ b/core/src/test/java/org/libreoffice/lots/form/config/TestTabConfig.java @@ -20,14 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.config; +package org.libreoffice.lots.form.config; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.form.config.TabConfig; public class TestTabConfig { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestVisibilityGroupConfig.java b/core/src/test/java/org/libreoffice/lots/form/config/TestVisibilityGroupConfig.java similarity index 88% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestVisibilityGroupConfig.java rename to core/src/test/java/org/libreoffice/lots/form/config/TestVisibilityGroupConfig.java index c2b063125..e654ae39f 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/form/config/TestVisibilityGroupConfig.java +++ b/core/src/test/java/org/libreoffice/lots/form/config/TestVisibilityGroupConfig.java @@ -20,13 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.form.config; +package org.libreoffice.lots.form.config; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.form.config.VisibilityGroupConfig; public class TestVisibilityGroupConfig { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AbsFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/AbsFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AbsFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/AbsFunctionTest.java index 2c19001fa..2b3beee15 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AbsFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/AbsFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,9 +31,11 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.AbsFunction; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; public class AbsFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AlwaysTrueFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/AlwaysTrueFunctionTest.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AlwaysTrueFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/AlwaysTrueFunctionTest.java index 3b17c688b..78e952405 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AlwaysTrueFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/AlwaysTrueFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -29,6 +29,8 @@ import java.util.Collection; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.AlwaysTrueFunction; +import org.libreoffice.lots.func.Function; public class AlwaysTrueFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AndFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/AndFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AndFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/AndFunctionTest.java index 0115cffbb..92974b005 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/AndFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/AndFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,9 +32,12 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.AndFunction; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.StringLiteralFunction; public class AndFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/BindFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/BindFunctionTest.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/BindFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/BindFunctionTest.java index dbba2e4a1..f0ad59860 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/BindFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/BindFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,10 +32,14 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.BindFunction; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.ValueFunction; +import org.libreoffice.lots.func.Values; public class BindFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/CatFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/CatFunctionTest.java similarity index 84% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/CatFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/CatFunctionTest.java index b7c986da6..54aac4e13 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/CatFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/CatFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,9 +32,12 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.CatFunction; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.StringLiteralFunction; public class CatFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/DiffFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/DiffFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/DiffFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/DiffFunctionTest.java index 1e0031ca1..b3e2930ad 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/DiffFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/DiffFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,9 +31,11 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.DiffFunction; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; public class DiffFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/DivideFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/DivideFunctionTest.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/DivideFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/DivideFunctionTest.java index 611f2beec..107a086cf 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/DivideFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/DivideFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,6 +31,10 @@ import java.util.Collection; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.DivideFunction; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.StringLiteralFunction; public class DivideFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/ExternalFunctionFunctionTest.java similarity index 80% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/ExternalFunctionFunctionTest.java index fc1c0701c..0c32735cb 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/ExternalFunctionFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,8 +30,10 @@ import java.util.Collection; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.func.ExternalFunctionFunction; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; public class ExternalFunctionFunctionTest { @@ -40,7 +42,7 @@ public class ExternalFunctionFunctionTest public void testExternalFunctionFunction() throws Exception { Function f = new ExternalFunctionFunction(new ConfigThingy("", - "URL \"java:de.muenchen.allg.itd51.wollmux.func.ExternalFunctionFunctionTest.extMethod\"")); + "URL \"java:org.libreoffice.lots.func.ExternalFunctionFunctionTest.extMethod\"")); assertEquals(0, f.parameters().length); assertEquals("extMethod", f.getResult(null)); assertFalse(f.getBoolean(null)); @@ -49,7 +51,7 @@ public void testExternalFunctionFunction() throws Exception assertTrue(dialogFunctions.isEmpty()); f = new ExternalFunctionFunction(new ConfigThingy("", - "URL \"java:de.muenchen.allg.itd51.wollmux.func.ExternalFunctionFunctionTest.extMethod2\"")); + "URL \"java:org.libreoffice.lots.func.ExternalFunctionFunctionTest.extMethod2\"")); assertEquals(FunctionLibrary.ERROR, f.getResult(null)); } diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/ExternalFunctionTest.java similarity index 74% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/ExternalFunctionTest.java index 8f8df8d23..a1cdea096 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ExternalFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/ExternalFunctionTest.java @@ -20,15 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.func.ExternalFunction; +import org.libreoffice.lots.func.Values; public class ExternalFunctionTest { @@ -37,24 +38,24 @@ public class ExternalFunctionTest public void testExternalFunction() throws Exception { ExternalFunction f = new ExternalFunction(new ConfigThingy("", - "URL \"java:de.muenchen.allg.itd51.wollmux.func.ExternalFunctionTest.extMethod\"")); + "URL \"java:org.libreoffice.lots.func.ExternalFunctionTest.extMethod\"")); assertEquals(0, f.parameters().length); assertEquals("extMethod", f.invoke(new Values.None())); f = new ExternalFunction(new ConfigThingy("", - "URL \"java:de.muenchen.allg.itd51.wollmux.func.ExternalFunctionTest.extMethod2\" PARAMS(\"param\")")); + "URL \"java:org.libreoffice.lots.func.ExternalFunctionTest.extMethod2\" PARAMS(\"param\")")); Values.SimpleMap values = new Values.SimpleMap(); values.put("param", "value"); assertEquals(1, f.parameters().length); assertEquals("value", f.invoke(values)); assertThrows(ConfigurationErrorException.class, () -> new ExternalFunction(new ConfigThingy("", - "URL \"java:de.muenchen.allg.itd51.wollmux.func.ExternalFunctionTest.extMethod4\""))); + "URL \"java:org.libreoffice.lots.func.ExternalFunctionTest.extMethod4\""))); assertThrows(ConfigurationErrorException.class, () -> new ExternalFunction( - new ConfigThingy("", "URL \"java:de.muenchen.allg.itd51.wollmux.func.UnknownClass.extMethod4\""))); + new ConfigThingy("", "URL \"java:org.libreoffice.lots.func.UnknownClass.extMethod4\""))); new ExternalFunction(new ConfigThingy("", - "URL \"java:de.muenchen.allg.itd51.wollmux.func.ExternalFunctionTest.extMethod3\"")); + "URL \"java:org.libreoffice.lots.func.ExternalFunctionTest.extMethod3\"")); } public static String extMethod() diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/FunctionFactoryTest.java b/core/src/test/java/org/libreoffice/lots/func/FunctionFactoryTest.java similarity index 90% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/FunctionFactoryTest.java rename to core/src/test/java/org/libreoffice/lots/func/FunctionFactoryTest.java index c6999d786..cb9841e91 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/FunctionFactoryTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/FunctionFactoryTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; @@ -36,11 +36,39 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.Dialog; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.Dialog; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.AbsFunction; +import org.libreoffice.lots.func.AlwaysTrueFunction; +import org.libreoffice.lots.func.AndFunction; +import org.libreoffice.lots.func.BindFunction; +import org.libreoffice.lots.func.CatFunction; +import org.libreoffice.lots.func.DialogFunction; +import org.libreoffice.lots.func.DiffFunction; +import org.libreoffice.lots.func.DivideFunction; +import org.libreoffice.lots.func.ExternalFunctionFunction; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionFactory; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.IfFunction; +import org.libreoffice.lots.func.IsErrorFunction; +import org.libreoffice.lots.func.LengthFunction; +import org.libreoffice.lots.func.MatchFunction; +import org.libreoffice.lots.func.MinusFunction; +import org.libreoffice.lots.func.NotFunction; +import org.libreoffice.lots.func.NumberCompareFunction; +import org.libreoffice.lots.func.OrFunction; +import org.libreoffice.lots.func.ProductFunction; +import org.libreoffice.lots.func.ReplaceFunction; +import org.libreoffice.lots.func.SelectFunction; +import org.libreoffice.lots.func.SignFunction; +import org.libreoffice.lots.func.SplitFunction; +import org.libreoffice.lots.func.StrCmpFunction; +import org.libreoffice.lots.func.StringLiteralFunction; +import org.libreoffice.lots.func.SumFunction; +import org.libreoffice.lots.func.ValueFunction; public class FunctionFactoryTest { @@ -117,7 +145,7 @@ public void testParse() throws Exception f = FunctionFactory.parse( new ConfigThingy("EXTERN", - "URL \"java:de.muenchen.allg.itd51.wollmux.func.FunctionFactoryTest.extMethod\""), + "URL \"java:org.libreoffice.lots.func.FunctionFactoryTest.extMethod\""), funcLib, dialogLib, context); assertTrue(f instanceof ExternalFunctionFunction); diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/FunctionLibraryTest.java b/core/src/test/java/org/libreoffice/lots/func/FunctionLibraryTest.java similarity index 92% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/FunctionLibraryTest.java rename to core/src/test/java/org/libreoffice/lots/func/FunctionLibraryTest.java index 3a1354db5..83e2f5637 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/FunctionLibraryTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/FunctionLibraryTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,6 +31,9 @@ import java.util.Iterator; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.StringLiteralFunction; public class FunctionLibraryTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/IfFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/IfFunctionTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/IfFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/IfFunctionTest.java index ca977a5e2..e0bbb4ae1 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/IfFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/IfFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,6 +30,10 @@ import java.util.Collection; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.IfFunction; +import org.libreoffice.lots.func.StringLiteralFunction; public class IfFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/IsErrorFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/IsErrorFunctionTest.java similarity index 86% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/IsErrorFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/IsErrorFunctionTest.java index d796879be..b2d6fe15c 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/IsErrorFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/IsErrorFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,10 +32,12 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.IsErrorFunction; public class IsErrorFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/LengthFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/LengthFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/LengthFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/LengthFunctionTest.java index 5ca9abecb..4891e6da2 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/LengthFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/LengthFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,9 +31,11 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.LengthFunction; public class LengthFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/MatchFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/MatchFunctionTest.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/MatchFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/MatchFunctionTest.java index 4919eda3d..384d9b1d4 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/MatchFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/MatchFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,6 +30,10 @@ import java.util.regex.Pattern; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.MatchFunction; +import org.libreoffice.lots.func.StringLiteralFunction; public class MatchFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/MinusFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/MinusFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/MinusFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/MinusFunctionTest.java index ccfeef37b..a58349917 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/MinusFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/MinusFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,9 +31,11 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.MinusFunction; public class MinusFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/NotFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/NotFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/NotFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/NotFunctionTest.java index e668f9b8b..ecd533185 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/NotFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/NotFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,9 +32,12 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.NotFunction; +import org.libreoffice.lots.func.StringLiteralFunction; public class NotFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/NumberCompareFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/NumberCompareFunctionTest.java similarity index 93% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/NumberCompareFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/NumberCompareFunctionTest.java index a11ee0889..565942e90 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/NumberCompareFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/NumberCompareFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -33,10 +33,11 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.NumberCompareFunction; public class NumberCompareFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/OrFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/OrFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/OrFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/OrFunctionTest.java index 75b347025..4c2549029 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/OrFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/OrFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -32,9 +32,12 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.OrFunction; +import org.libreoffice.lots.func.StringLiteralFunction; public class OrFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ProductFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/ProductFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ProductFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/ProductFunctionTest.java index 3b175cc4f..2307b2d98 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ProductFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/ProductFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,9 +31,11 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.ProductFunction; public class ProductFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ReplaceFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/ReplaceFunctionTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ReplaceFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/ReplaceFunctionTest.java index 8254daf25..884f21ddb 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ReplaceFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/ReplaceFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,6 +31,10 @@ import java.util.regex.Pattern; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.ReplaceFunction; +import org.libreoffice.lots.func.StringLiteralFunction; public class ReplaceFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SelectFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/SelectFunctionTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SelectFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/SelectFunctionTest.java index f5c5ea142..854e880ba 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SelectFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/SelectFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -33,9 +33,12 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.SelectFunction; +import org.libreoffice.lots.func.StringLiteralFunction; public class SelectFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SignFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/SignFunctionTest.java similarity index 85% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SignFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/SignFunctionTest.java index 098c55ccf..21137dbac 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SignFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/SignFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,9 +31,11 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.SignFunction; public class SignFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SplitFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/SplitFunctionTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SplitFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/SplitFunctionTest.java index 09f3a6736..cb42cea71 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SplitFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/SplitFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,6 +31,10 @@ import java.util.regex.Pattern; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.SplitFunction; +import org.libreoffice.lots.func.StringLiteralFunction; public class SplitFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/StrCmpFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/StrCmpFunctionTest.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/StrCmpFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/StrCmpFunctionTest.java index be33e1037..3c8090a7f 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/StrCmpFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/StrCmpFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -31,10 +31,12 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigurationErrorException; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.StrCmpFunction; public class StrCmpFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/StringLiteralFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/StringLiteralFunctionTest.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/StringLiteralFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/StringLiteralFunctionTest.java index cbb58104d..423d10459 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/StringLiteralFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/StringLiteralFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,6 +30,8 @@ import java.util.Collection; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.StringLiteralFunction; public class StringLiteralFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SumFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/SumFunctionTest.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SumFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/SumFunctionTest.java index 321e95b51..6dc4244bc 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/SumFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/SumFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -31,9 +31,11 @@ import java.util.HashMap; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.dialog.DialogLibrary; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.SumFunction; public class SumFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ValueFunctionTest.java b/core/src/test/java/org/libreoffice/lots/func/ValueFunctionTest.java similarity index 88% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ValueFunctionTest.java rename to core/src/test/java/org/libreoffice/lots/func/ValueFunctionTest.java index 8488c4ce8..e74b03e83 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ValueFunctionTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/ValueFunctionTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,6 +30,10 @@ import java.util.Collection; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.Function; +import org.libreoffice.lots.func.FunctionLibrary; +import org.libreoffice.lots.func.ValueFunction; +import org.libreoffice.lots.func.Values; public class ValueFunctionTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ValuesTest.java b/core/src/test/java/org/libreoffice/lots/func/ValuesTest.java similarity index 95% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ValuesTest.java rename to core/src/test/java/org/libreoffice/lots/func/ValuesTest.java index 29c145249..8e7dfe5ef 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/func/ValuesTest.java +++ b/core/src/test/java/org/libreoffice/lots/func/ValuesTest.java @@ -20,13 +20,14 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.func; +package org.libreoffice.lots.func; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.func.Values; public class ValuesTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/ConnectionModelTest.java similarity index 88% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/ConnectionModelTest.java index 51308e3f9..ac03a9ca1 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ConnectionModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/ConnectionModelTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge; +package org.libreoffice.lots.mailmerge; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -35,8 +35,11 @@ import com.sun.star.sheet.XSpreadsheetDocument; import org.libreoffice.ext.unohelper.common.UNO; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; -import de.muenchen.allg.itd51.wollmux.test.OfficeTest; +import org.libreoffice.lots.mailmerge.ConnectionModel; +import org.libreoffice.lots.mailmerge.ConnectionModelListener; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.test.OfficeTest; public class ConnectionModelTest extends OfficeTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/CalcModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/ds/CalcModelTest.java similarity index 95% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/CalcModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/ds/CalcModelTest.java index 895e1f7d7..4a87142bf 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/CalcModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/ds/CalcModelTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ds; +package org.libreoffice.lots.mailmerge.ds; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,8 +43,10 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractCloseListener; -import de.muenchen.allg.itd51.wollmux.mailmerge.FieldSubstitution; -import de.muenchen.allg.itd51.wollmux.test.OfficeTest; +import org.libreoffice.lots.mailmerge.FieldSubstitution; +import org.libreoffice.lots.mailmerge.ds.CalcModel; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.test.OfficeTest; public class CalcModelTest extends OfficeTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/ds/DBModelTest.java similarity index 95% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/ds/DBModelTest.java index 606552476..24aa7b276 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ds/DBModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/ds/DBModelTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ds; +package org.libreoffice.lots.mailmerge.ds; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -42,7 +42,9 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.dialog.adapter.AbstractCloseListener; -import de.muenchen.allg.itd51.wollmux.test.OfficeTest; +import org.libreoffice.lots.mailmerge.ds.DBModel; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.test.OfficeTest; public class DBModelTest extends OfficeTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderTrafoModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/gender/GenderTrafoModelTest.java similarity index 96% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderTrafoModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/gender/GenderTrafoModelTest.java index 3cd92572c..d40a044f8 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/gender/GenderTrafoModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/gender/GenderTrafoModelTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.gender; +package org.libreoffice.lots.mailmerge.gender; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -28,9 +28,9 @@ import java.io.IOException; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.mailmerge.gender.GenderTrafoModel; public class GenderTrafoModelTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ElseModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/ElseModelTest.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ElseModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/ElseModelTest.java index 13b8860b9..6fd6d4c27 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ElseModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/ElseModelTest.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.mailmerge.ifthenelse.ElseModel; public class ElseModelTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfModelTest.java similarity index 93% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfModelTest.java index 4b01ec800..5bd00b824 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfModelTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,9 +30,12 @@ import java.io.IOException; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.mailmerge.ifthenelse.ElseModel; +import org.libreoffice.lots.mailmerge.ifthenelse.IfModel; +import org.libreoffice.lots.mailmerge.ifthenelse.TestType; +import org.libreoffice.lots.mailmerge.ifthenelse.ThenModel; public class IfModelTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseBaseModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseBaseModelTest.java similarity index 92% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseBaseModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseBaseModelTest.java index e8e9a06a0..51963bf52 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseBaseModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseBaseModelTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -28,9 +28,9 @@ import java.io.IOException; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.mailmerge.ifthenelse.IfThenElseBaseModel; public class IfThenElseBaseModelTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseModelTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseModelTest.java index 53972fc1e..ddcbd801e 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/IfThenElseModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/IfThenElseModelTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -29,9 +29,12 @@ import java.io.IOException; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.mailmerge.ifthenelse.ElseModel; +import org.libreoffice.lots.mailmerge.ifthenelse.IfModel; +import org.libreoffice.lots.mailmerge.ifthenelse.IfThenElseModel; +import org.libreoffice.lots.mailmerge.ifthenelse.ThenModel; public class IfThenElseModelTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ThenModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/ThenModelTest.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ThenModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/ThenModelTest.java index 0985e415e..03bc0d9f7 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/ifthenelse/ThenModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/ifthenelse/ThenModelTest.java @@ -20,16 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.ifthenelse; +package org.libreoffice.lots.mailmerge.ifthenelse; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.mailmerge.ifthenelse.ThenModel; public class ThenModelTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintSettingsTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/printsettings/PrintSettingsTest.java similarity index 95% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintSettingsTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/printsettings/PrintSettingsTest.java index 624d32fa2..894223a03 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/printsettings/PrintSettingsTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/printsettings/PrintSettingsTest.java @@ -21,12 +21,13 @@ * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.printsettings; +package org.libreoffice.lots.mailmerge.printsettings; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.mailmerge.printsettings.PrintSettings; public class PrintSettingsTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MockDatasourceModel.java b/core/src/test/java/org/libreoffice/lots/mailmerge/sidebar/MockDatasourceModel.java similarity index 86% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MockDatasourceModel.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/sidebar/MockDatasourceModel.java index eaff03697..7c2c3f0c8 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/MockDatasourceModel.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/sidebar/MockDatasourceModel.java @@ -20,22 +20,22 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.mailmerge.FieldSubstitution; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.ds.DatasourceModel; +import org.libreoffice.lots.mailmerge.ds.DatasourceModelListener; + import com.google.common.collect.Table; import com.sun.star.util.XCloseListener; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.mailmerge.FieldSubstitution; -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModel; -import de.muenchen.allg.itd51.wollmux.mailmerge.ds.DatasourceModelListener; - public class MockDatasourceModel implements DatasourceModel { @Override diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModelTest.java b/core/src/test/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModelTest.java similarity index 88% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModelTest.java rename to core/src/test/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModelTest.java index 3edf071be..0e09f57d1 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/mailmerge/sidebar/PreviewModelTest.java +++ b/core/src/test/java/org/libreoffice/lots/mailmerge/sidebar/PreviewModelTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.mailmerge.sidebar; +package org.libreoffice.lots.mailmerge.sidebar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -29,8 +29,9 @@ import java.util.Optional; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.NoTableSelectedException; +import org.libreoffice.lots.mailmerge.sidebar.PreviewModel; +import org.libreoffice.lots.mailmerge.sidebar.PreviewModelListener; public class PreviewModelTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/print/PrintFunctionLibraryTest.java b/core/src/test/java/org/libreoffice/lots/print/PrintFunctionLibraryTest.java similarity index 89% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/print/PrintFunctionLibraryTest.java rename to core/src/test/java/org/libreoffice/lots/print/PrintFunctionLibraryTest.java index 3799c5604..34be3fdc2 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/print/PrintFunctionLibraryTest.java +++ b/core/src/test/java/org/libreoffice/lots/print/PrintFunctionLibraryTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.print; +package org.libreoffice.lots.print; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -31,15 +31,15 @@ import java.util.Set; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.func.print.PrintException; -import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.func.print.PrintException; +import org.libreoffice.lots.func.print.PrintFunction; import de.muenchen.allg.itd51.wollmux.interfaces.XPrintModel; +import org.libreoffice.lots.print.PrintFunctionLibrary; public class PrintFunctionLibraryTest { - private static final String functionString = "TestFunction(EXTERN(URL \"java:de.muenchen.allg.itd51.wollmux.print.PrintFunctionLibraryTest.testDefaultPrintFunctions\") ORDER \"50\")"; + private static final String functionString = "TestFunction(EXTERN(URL \"java:org.libreoffice.lots.print.PrintFunctionLibraryTest.testDefaultPrintFunctions\") ORDER \"50\")"; private static final String confString = "PrintFunctions(" + functionString + ")"; private static PrintFunction testFunction = new PrintFunction("test", 300) { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/ByJavaPropertyFinderTest.java b/core/src/test/java/org/libreoffice/lots/sender/ByJavaPropertyFinderTest.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/ByJavaPropertyFinderTest.java rename to core/src/test/java/org/libreoffice/lots/sender/ByJavaPropertyFinderTest.java index 8c6e5aa80..dfad0e952 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/ByJavaPropertyFinderTest.java +++ b/core/src/test/java/org/libreoffice/lots/sender/ByJavaPropertyFinderTest.java @@ -20,13 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.sender.ByJavaPropertyFinder; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderFinder; public class ByJavaPropertyFinderTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/ByOOoUserPropertyFinderTest.java b/core/src/test/java/org/libreoffice/lots/sender/ByOOoUserPropertyFinderTest.java similarity index 84% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/ByOOoUserPropertyFinderTest.java rename to core/src/test/java/org/libreoffice/lots/sender/ByOOoUserPropertyFinderTest.java index 6290e26db..6c18fd125 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/ByOOoUserPropertyFinderTest.java +++ b/core/src/test/java/org/libreoffice/lots/sender/ByOOoUserPropertyFinderTest.java @@ -20,14 +20,16 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.test.OfficeTest; +import org.libreoffice.lots.sender.ByOOoUserProfileFinder; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderFinder; +import org.libreoffice.lots.test.OfficeTest; public class ByOOoUserPropertyFinderTest extends OfficeTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/FileCacheTest.java b/core/src/test/java/org/libreoffice/lots/sender/FileCacheTest.java similarity index 93% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/FileCacheTest.java rename to core/src/test/java/org/libreoffice/lots/sender/FileCacheTest.java index c6539d7ef..919b2d8ff 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/FileCacheTest.java +++ b/core/src/test/java/org/libreoffice/lots/sender/FileCacheTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -40,9 +40,12 @@ import java.util.Map; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.sender.FileCache; +import org.libreoffice.lots.sender.Sender; +import org.libreoffice.lots.sender.SenderConf; +import org.libreoffice.lots.sender.SenderException; public class FileCacheTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderFinderTest.java b/core/src/test/java/org/libreoffice/lots/sender/SenderFinderTest.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderFinderTest.java rename to core/src/test/java/org/libreoffice/lots/sender/SenderFinderTest.java index c4fbd3d2c..753d7f7ca 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderFinderTest.java +++ b/core/src/test/java/org/libreoffice/lots/sender/SenderFinderTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -32,11 +32,14 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; -import de.muenchen.allg.itd51.wollmux.sender.mock.MockCache; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.db.mock.MockDatasource; +import org.libreoffice.lots.sender.Sender; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderFinder; +import org.libreoffice.lots.sender.SenderService; +import org.libreoffice.lots.sender.mock.MockCache; public class SenderFinderTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderServiceTest.java b/core/src/test/java/org/libreoffice/lots/sender/SenderServiceTest.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderServiceTest.java rename to core/src/test/java/org/libreoffice/lots/sender/SenderServiceTest.java index 964078690..48cf125b1 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderServiceTest.java +++ b/core/src/test/java/org/libreoffice/lots/sender/SenderServiceTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -37,16 +37,18 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.db.ColumnTransformer; -import de.muenchen.allg.itd51.wollmux.db.Dataset; -import de.muenchen.allg.itd51.wollmux.db.Datasource; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDatasource; -import de.muenchen.allg.itd51.wollmux.func.StringLiteralFunction; -import de.muenchen.allg.itd51.wollmux.sender.mock.MockCache; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.ColumnTransformer; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.Datasource; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.db.mock.MockDatasource; +import org.libreoffice.lots.func.StringLiteralFunction; +import org.libreoffice.lots.sender.Sender; +import org.libreoffice.lots.sender.SenderException; +import org.libreoffice.lots.sender.SenderService; +import org.libreoffice.lots.sender.mock.MockCache; public class SenderServiceTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderTest.java b/core/src/test/java/org/libreoffice/lots/sender/SenderTest.java similarity index 95% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderTest.java rename to core/src/test/java/org/libreoffice/lots/sender/SenderTest.java index 10214ddf7..9f8fb9d2e 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/SenderTest.java +++ b/core/src/test/java/org/libreoffice/lots/sender/SenderTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender; +package org.libreoffice.lots.sender; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -37,10 +37,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.db.ColumnNotFoundException; -import de.muenchen.allg.itd51.wollmux.db.Dataset; -import de.muenchen.allg.itd51.wollmux.db.mock.MockDataset; +import org.libreoffice.lots.db.ColumnNotFoundException; +import org.libreoffice.lots.db.Dataset; +import org.libreoffice.lots.db.mock.MockDataset; +import org.libreoffice.lots.sender.Sender; +import org.libreoffice.lots.sender.SenderException; public class SenderTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/mock/MockCache.java b/core/src/test/java/org/libreoffice/lots/sender/mock/MockCache.java similarity index 91% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/mock/MockCache.java rename to core/src/test/java/org/libreoffice/lots/sender/mock/MockCache.java index ac328c5ed..911f53676 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/sender/mock/MockCache.java +++ b/core/src/test/java/org/libreoffice/lots/sender/mock/MockCache.java @@ -20,17 +20,17 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.sender.mock; +package org.libreoffice.lots.sender.mock; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.sun.star.lang.EventObject; +import org.libreoffice.lots.sender.SenderCache; +import org.libreoffice.lots.sender.SenderConf; -import de.muenchen.allg.itd51.wollmux.sender.SenderCache; -import de.muenchen.allg.itd51.wollmux.sender.SenderConf; +import com.sun.star.lang.EventObject; public class MockCache implements SenderCache { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveConfigTest.java b/core/src/test/java/org/libreoffice/lots/slv/ContentBasedDirectiveConfigTest.java similarity index 92% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveConfigTest.java rename to core/src/test/java/org/libreoffice/lots/slv/ContentBasedDirectiveConfigTest.java index eb274f9bd..75239595b 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/ContentBasedDirectiveConfigTest.java +++ b/core/src/test/java/org/libreoffice/lots/slv/ContentBasedDirectiveConfigTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -29,9 +29,10 @@ import java.io.StringReader; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.slv.ContentBasedDirectiveConfig; +import org.libreoffice.lots.slv.PrintBlockSignature; public class ContentBasedDirectiveConfigTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockCommandTest.java b/core/src/test/java/org/libreoffice/lots/slv/PrintBlockCommandTest.java similarity index 87% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockCommandTest.java rename to core/src/test/java/org/libreoffice/lots/slv/PrintBlockCommandTest.java index 43d5ff2c4..b02e3c8b3 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockCommandTest.java +++ b/core/src/test/java/org/libreoffice/lots/slv/PrintBlockCommandTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -39,11 +39,14 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; import org.libreoffice.ext.unohelper.document.text.Bookmark; -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; -import de.muenchen.allg.itd51.wollmux.config.SyntaxErrorException; -import de.muenchen.allg.itd51.wollmux.document.commands.DocumentCommand.InvalidCommandException; -import de.muenchen.allg.itd51.wollmux.test.OfficeTest; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.config.SyntaxErrorException; +import org.libreoffice.lots.document.commands.DocumentCommand.InvalidCommandException; +import org.libreoffice.lots.slv.PrintBlockCommand; +import org.libreoffice.lots.slv.PrintBlockProcessor; +import org.libreoffice.lots.slv.PrintBlockSignature; +import org.libreoffice.lots.test.OfficeTest; public class PrintBlockCommandTest extends OfficeTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockSignatureTest.java b/core/src/test/java/org/libreoffice/lots/slv/PrintBlockSignatureTest.java similarity index 94% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockSignatureTest.java rename to core/src/test/java/org/libreoffice/lots/slv/PrintBlockSignatureTest.java index e9506e955..337b69fff 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/slv/PrintBlockSignatureTest.java +++ b/core/src/test/java/org/libreoffice/lots/slv/PrintBlockSignatureTest.java @@ -20,12 +20,13 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.slv; +package org.libreoffice.lots.slv; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.slv.PrintBlockSignature; public class PrintBlockSignatureTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/test/OfficeTest.java b/core/src/test/java/org/libreoffice/lots/test/OfficeTest.java similarity index 96% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/test/OfficeTest.java rename to core/src/test/java/org/libreoffice/lots/test/OfficeTest.java index 0b0c33d4a..81eee6109 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/test/OfficeTest.java +++ b/core/src/test/java/org/libreoffice/lots/test/OfficeTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.test; +package org.libreoffice.lots.test; import static org.junit.jupiter.api.Assertions.fail; @@ -36,7 +36,7 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; -@Tag("de.muenchen.allg.itd51.wollmux.test.OfficeTest") +@Tag("org.libreoffice.lots.test.OfficeTest") public abstract class OfficeTest { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/HTMLElementTest.java b/core/src/test/java/org/libreoffice/lots/ui/HTMLElementTest.java similarity index 99% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/HTMLElementTest.java rename to core/src/test/java/org/libreoffice/lots/ui/HTMLElementTest.java index 65019bdf8..5172c1099 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/HTMLElementTest.java +++ b/core/src/test/java/org/libreoffice/lots/ui/HTMLElementTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.ui; +package org.libreoffice.lots.ui; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/TestUIElementConfig.java b/core/src/test/java/org/libreoffice/lots/ui/TestUIElementConfig.java similarity index 95% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/TestUIElementConfig.java rename to core/src/test/java/org/libreoffice/lots/ui/TestUIElementConfig.java index 7f57f9f8f..a2fed3077 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/TestUIElementConfig.java +++ b/core/src/test/java/org/libreoffice/lots/ui/TestUIElementConfig.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.ui; +package org.libreoffice.lots.ui; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -28,8 +28,9 @@ import java.util.List; import org.junit.jupiter.api.Test; - -import de.muenchen.allg.itd51.wollmux.config.ConfigThingy; +import org.libreoffice.lots.config.ConfigThingy; +import org.libreoffice.lots.ui.UIElementConfig; +import org.libreoffice.lots.ui.UIElementType; public class TestUIElementConfig { diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/DummyLayout.java b/core/src/test/java/org/libreoffice/lots/ui/layout/DummyLayout.java similarity index 97% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/DummyLayout.java rename to core/src/test/java/org/libreoffice/lots/ui/layout/DummyLayout.java index 37f0e3067..72900bab5 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/DummyLayout.java +++ b/core/src/test/java/org/libreoffice/lots/ui/layout/DummyLayout.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.ui.layout; +package org.libreoffice.lots.ui.layout; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/HorizontalLayoutTest.java b/core/src/test/java/org/libreoffice/lots/ui/layout/HorizontalLayoutTest.java similarity index 98% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/HorizontalLayoutTest.java rename to core/src/test/java/org/libreoffice/lots/ui/layout/HorizontalLayoutTest.java index 53a72d1d8..f8263eaf9 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/HorizontalLayoutTest.java +++ b/core/src/test/java/org/libreoffice/lots/ui/layout/HorizontalLayoutTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.ui.layout; +package org.libreoffice.lots.ui.layout; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/VerticalLayoutTest.java b/core/src/test/java/org/libreoffice/lots/ui/layout/VerticalLayoutTest.java similarity index 98% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/VerticalLayoutTest.java rename to core/src/test/java/org/libreoffice/lots/ui/layout/VerticalLayoutTest.java index b51cdd79c..809544ec3 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/ui/layout/VerticalLayoutTest.java +++ b/core/src/test/java/org/libreoffice/lots/ui/layout/VerticalLayoutTest.java @@ -20,7 +20,7 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.ui.layout; +package org.libreoffice.lots.ui.layout; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/core/src/test/java/de/muenchen/allg/itd51/wollmux/util/UtilsTest.java b/core/src/test/java/org/libreoffice/lots/util/UtilsTest.java similarity index 93% rename from core/src/test/java/de/muenchen/allg/itd51/wollmux/util/UtilsTest.java rename to core/src/test/java/org/libreoffice/lots/util/UtilsTest.java index 6eeed61f3..b479c0472 100644 --- a/core/src/test/java/de/muenchen/allg/itd51/wollmux/util/UtilsTest.java +++ b/core/src/test/java/org/libreoffice/lots/util/UtilsTest.java @@ -20,11 +20,12 @@ * limitations under the Licence. * #L% */ -package de.muenchen.allg.itd51.wollmux.util; +package org.libreoffice.lots.util; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import org.libreoffice.lots.util.Utils; public class UtilsTest { diff --git a/idl/.classpath b/idl/.classpath index 6c49d7bbe..8cb698d10 100644 --- a/idl/.classpath +++ b/idl/.classpath @@ -29,14 +29,6 @@ - - - - - - - - @@ -44,14 +36,5 @@ - - - - - - - - - diff --git a/idl/.settings/org.eclipse.core.resources.prefs b/idl/.settings/org.eclipse.core.resources.prefs index f9fe34593..e9318cfa5 100644 --- a/idl/.settings/org.eclipse.core.resources.prefs +++ b/idl/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/test/java=UTF-8 +encoding//target/generated-sources/idl=UTF-8 encoding/=UTF-8 diff --git a/oxt/src/test/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/MarkBlockDispatchTest.java b/oxt/src/test/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/MarkBlockDispatchTest.java index 8639f8cde..ca7934915 100644 --- a/oxt/src/test/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/MarkBlockDispatchTest.java +++ b/oxt/src/test/java/de/muenchen/allg/itd51/wollmux/slv/dispatch/MarkBlockDispatchTest.java @@ -37,10 +37,12 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoDictionary; -import de.muenchen.allg.itd51.wollmux.slv.ContentBasedDirectiveConfig; -import de.muenchen.allg.itd51.wollmux.slv.PrintBlockSignature; + import de.muenchen.allg.itd51.wollmux.test.WollMuxTest; import org.libreoffice.ext.unohelper.util.UnoProperty; +import org.libreoffice.lots.slv.ContentBasedDirectiveConfig; +import org.libreoffice.lots.slv.PrintBlockSignature; +import org.libreoffice.lots.slv.dispatch.MarkBlockDispatch; public class MarkBlockDispatchTest extends WollMuxTest { diff --git a/oxt/src/test/java/de/muenchen/allg/itd51/wollmux/test/WollMuxTest.java b/oxt/src/test/java/de/muenchen/allg/itd51/wollmux/test/WollMuxTest.java index eb5fa659d..bff2d08d4 100644 --- a/oxt/src/test/java/de/muenchen/allg/itd51/wollmux/test/WollMuxTest.java +++ b/oxt/src/test/java/de/muenchen/allg/itd51/wollmux/test/WollMuxTest.java @@ -47,11 +47,11 @@ import org.libreoffice.ext.unohelper.common.UNO; import org.libreoffice.ext.unohelper.common.UnoHelperException; -import de.muenchen.allg.itd51.wollmux.event.WollMuxEventHandler; -import de.muenchen.allg.itd51.wollmux.interfaces.XWollMux; import org.libreoffice.ext.unohelper.util.UnoComponent; +import org.libreoffice.lots.event.WollMuxEventHandler; +import de.muenchen.allg.itd51.wollmux.interfaces.XWollMux; -@Tag("de.muenchen.allg.itd51.wollmux.test.WollMuxTest") +@Tag("org.libreoffice.lots.test.WollMuxTest") public abstract class WollMuxTest { @@ -73,7 +73,7 @@ public static void initUNO() throws Exception options.add("-env:UserInstallation=file://" + prop.getProperty("office.profile")); UNO.init(options); wollmux = UnoRuntime.queryInterface(XWollMux.class, - UnoComponent.createComponentWithContext("de.muenchen.allg.itd51.wollmux.WollMux")); + UnoComponent.createComponentWithContext("org.libreoffice.lots.WollMux")); } catch (Exception e) { fail("Can't start office", e);