Skip to content

Commit e699598

Browse files
smehrbrodtthorstenb
smehrbrodt
authored and
thorstenb
committed
Rename packages to match new name #442 
1 parent db7752b commit e699598

File tree

527 files changed

+2536
-2399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

527 files changed

+2536
-2399
lines changed

Diff for: ‎core/.classpath

+10-13
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
1010
<attributes>
1111
<attribute name="maven.pomderived" value="true"/>
12+
<attribute name="optional" value="true"/>
1213
</attributes>
1314
</classpathentry>
1415
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@@ -20,12 +21,14 @@
2021
</classpathentry>
2122
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
2223
<attributes>
23-
<attribute name="maven.pomderived" value="true"/>
2424
<attribute name="test" value="true"/>
25+
<attribute name="maven.pomderived" value="true"/>
26+
<attribute name="optional" value="true"/>
2527
</attributes>
2628
</classpathentry>
2729
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
2830
<attributes>
31+
<attribute name="module" value="true"/>
2932
<attribute name="maven.pomderived" value="true"/>
3033
</attributes>
3134
</classpathentry>
@@ -34,32 +37,26 @@
3437
<attribute name="maven.pomderived" value="true"/>
3538
</attributes>
3639
</classpathentry>
37-
<classpathentry kind="src" path="target/generated-sources/annotations">
40+
<classpathentry kind="src" path=".apt_generated">
3841
<attributes>
3942
<attribute name="optional" value="true"/>
40-
<attribute name="maven.pomderived" value="true"/>
41-
<attribute name="ignore_optional_problems" value="true"/>
42-
<attribute name="m2e-apt" value="true"/>
4343
</attributes>
4444
</classpathentry>
45-
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
45+
<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
4646
<attributes>
47-
<attribute name="optional" value="true"/>
48-
<attribute name="maven.pomderived" value="true"/>
49-
<attribute name="ignore_optional_problems" value="true"/>
50-
<attribute name="m2e-apt" value="true"/>
5147
<attribute name="test" value="true"/>
48+
<attribute name="optional" value="true"/>
5249
</attributes>
5350
</classpathentry>
54-
<classpathentry kind="src" path=".apt_generated">
51+
<classpathentry kind="src" path="target/generated-sources/annotations">
5552
<attributes>
5653
<attribute name="optional" value="true"/>
5754
</attributes>
5855
</classpathentry>
59-
<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
56+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
6057
<attributes>
61-
<attribute name="optional" value="true"/>
6258
<attribute name="test" value="true"/>
59+
<attribute name="optional" value="true"/>
6360
</attributes>
6461
</classpathentry>
6562
<classpathentry kind="output" path="target/classes"/>

Diff for: ‎core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<configuration>
8383
<keysFile>wollmux.pot</keysFile>
8484
<poDirectory>${basedir}/i18n</poDirectory>
85-
<targetBundle>de.muenchen.allg.itd51.wollmux.i18n.Messages</targetBundle>
85+
<targetBundle>org.libreoffice.lots.i18n.Messages</targetBundle>
8686
<outputFormat>properties</outputFormat>
8787
</configuration>
8888
<executions>
@@ -105,7 +105,7 @@
105105
<addClasspath>true</addClasspath>
106106
</manifest>
107107
<manifestEntries>
108-
<RegistrationClassName>de.muenchen.allg.itd51.wollmux.ComponentRegistration</RegistrationClassName>
108+
<RegistrationClassName>org.libreoffice.lots.ComponentRegistration</RegistrationClassName>
109109
<UNO-Type-Path>&lt;&gt;</UNO-Type-Path>
110110
</manifestEntries>
111111
</archive>

Diff for: ‎core/src/main/java/module-info.java

+78-78
Original file line numberDiff line numberDiff line change
@@ -20,87 +20,87 @@
2020
* limitations under the Licence.
2121
* #L%
2222
*/
23-
import de.muenchen.allg.itd51.wollmux.ComponentRegistration;
24-
import de.muenchen.allg.itd51.wollmux.comp.WollMuxRegistration;
25-
import de.muenchen.allg.itd51.wollmux.dispatch.Dispatcher;
26-
import de.muenchen.allg.itd51.wollmux.dispatch.WollMuxDispatcher;
27-
import de.muenchen.allg.itd51.wollmux.document.commands.OnProcessTextDocument;
28-
import de.muenchen.allg.itd51.wollmux.event.CheckInstallationListener;
29-
import de.muenchen.allg.itd51.wollmux.event.WollMuxEventListener;
30-
import de.muenchen.allg.itd51.wollmux.event.WollMuxEventListenerImpl;
31-
import de.muenchen.allg.itd51.wollmux.form.sidebar.FormSidebarRegistration;
32-
import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction;
33-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.SetFormValue;
34-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToOdtEmail;
35-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToOdtFile;
36-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPdfEmail;
37-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPdfFile;
38-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToPrinter;
39-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToShowOdtFile;
40-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToSingleODT;
41-
import de.muenchen.allg.itd51.wollmux.mailmerge.print.ToSinglePDF;
42-
import de.muenchen.allg.itd51.wollmux.mailmerge.sidebar.MailMergeRegistration;
43-
import de.muenchen.allg.itd51.wollmux.print.ShowDocument;
44-
import de.muenchen.allg.itd51.wollmux.sender.SenderEventListener;
45-
import de.muenchen.allg.itd51.wollmux.sender.dispatch.SenderDispatcher;
46-
import de.muenchen.allg.itd51.wollmux.sidebar.WollMuxBarRegistration;
47-
import de.muenchen.allg.itd51.wollmux.slv.dispatch.ContentBasedDirectiveDispatcher;
48-
import de.muenchen.allg.itd51.wollmux.slv.events.ContentBasedDirectiveEventListener;
49-
import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrint;
50-
import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrintCollect;
51-
import de.muenchen.allg.itd51.wollmux.slv.print.ContentBasedDirectivePrintOutput;
23+
import org.libreoffice.lots.ComponentRegistration;
24+
import org.libreoffice.lots.comp.WollMuxRegistration;
25+
import org.libreoffice.lots.dispatch.Dispatcher;
26+
import org.libreoffice.lots.dispatch.WollMuxDispatcher;
27+
import org.libreoffice.lots.document.commands.OnProcessTextDocument;
28+
import org.libreoffice.lots.event.CheckInstallationListener;
29+
import org.libreoffice.lots.event.WollMuxEventListener;
30+
import org.libreoffice.lots.event.WollMuxEventListenerImpl;
31+
import org.libreoffice.lots.form.sidebar.FormSidebarRegistration;
32+
import org.libreoffice.lots.func.print.PrintFunction;
33+
import org.libreoffice.lots.mailmerge.print.SetFormValue;
34+
import org.libreoffice.lots.mailmerge.print.ToOdtEmail;
35+
import org.libreoffice.lots.mailmerge.print.ToOdtFile;
36+
import org.libreoffice.lots.mailmerge.print.ToPdfEmail;
37+
import org.libreoffice.lots.mailmerge.print.ToPdfFile;
38+
import org.libreoffice.lots.mailmerge.print.ToPrinter;
39+
import org.libreoffice.lots.mailmerge.print.ToShowOdtFile;
40+
import org.libreoffice.lots.mailmerge.print.ToSingleODT;
41+
import org.libreoffice.lots.mailmerge.print.ToSinglePDF;
42+
import org.libreoffice.lots.mailmerge.sidebar.MailMergeRegistration;
43+
import org.libreoffice.lots.print.ShowDocument;
44+
import org.libreoffice.lots.sender.SenderEventListener;
45+
import org.libreoffice.lots.sender.dispatch.SenderDispatcher;
46+
import org.libreoffice.lots.sidebar.WollMuxBarRegistration;
47+
import org.libreoffice.lots.slv.dispatch.ContentBasedDirectiveDispatcher;
48+
import org.libreoffice.lots.slv.events.ContentBasedDirectiveEventListener;
49+
import org.libreoffice.lots.slv.print.ContentBasedDirectivePrint;
50+
import org.libreoffice.lots.slv.print.ContentBasedDirectivePrintCollect;
51+
import org.libreoffice.lots.slv.print.ContentBasedDirectivePrintOutput;
5252

5353
module wollmux
5454
{
55-
exports de.muenchen.allg.itd51.wollmux;
56-
exports de.muenchen.allg.itd51.wollmux.comp;
57-
exports de.muenchen.allg.itd51.wollmux.config;
58-
exports de.muenchen.allg.itd51.wollmux.config.generator.xml;
59-
exports de.muenchen.allg.itd51.wollmux.config.scanner;
60-
exports de.muenchen.allg.itd51.wollmux.db;
61-
exports de.muenchen.allg.itd51.wollmux.dialog;
62-
exports de.muenchen.allg.itd51.wollmux.dispatch;
63-
exports de.muenchen.allg.itd51.wollmux.document;
64-
exports de.muenchen.allg.itd51.wollmux.document.commands;
65-
exports de.muenchen.allg.itd51.wollmux.document.nodes;
66-
exports de.muenchen.allg.itd51.wollmux.event;
67-
exports de.muenchen.allg.itd51.wollmux.event.handlers;
68-
exports de.muenchen.allg.itd51.wollmux.form.config;
69-
exports de.muenchen.allg.itd51.wollmux.form.control;
70-
exports de.muenchen.allg.itd51.wollmux.form.model;
71-
exports de.muenchen.allg.itd51.wollmux.form.sidebar;
72-
exports de.muenchen.allg.itd51.wollmux.former;
73-
exports de.muenchen.allg.itd51.wollmux.former.model;
74-
exports de.muenchen.allg.itd51.wollmux.former.control;
75-
exports de.muenchen.allg.itd51.wollmux.former.control.model;
76-
exports de.muenchen.allg.itd51.wollmux.former.document;
77-
exports de.muenchen.allg.itd51.wollmux.former.function;
78-
exports de.muenchen.allg.itd51.wollmux.former.group;
79-
exports de.muenchen.allg.itd51.wollmux.former.group.model;
80-
exports de.muenchen.allg.itd51.wollmux.former.insertion;
81-
exports de.muenchen.allg.itd51.wollmux.former.insertion.model;
82-
exports de.muenchen.allg.itd51.wollmux.former.section;
83-
exports de.muenchen.allg.itd51.wollmux.former.section.model;
84-
exports de.muenchen.allg.itd51.wollmux.former.view;
85-
exports de.muenchen.allg.itd51.wollmux.func;
86-
exports de.muenchen.allg.itd51.wollmux.func.print;
87-
exports de.muenchen.allg.itd51.wollmux.mailmerge;
88-
exports de.muenchen.allg.itd51.wollmux.mailmerge.ds;
89-
exports de.muenchen.allg.itd51.wollmux.mailmerge.mail;
90-
exports de.muenchen.allg.itd51.wollmux.mailmerge.print;
91-
exports de.muenchen.allg.itd51.wollmux.mailmerge.printsettings;
92-
exports de.muenchen.allg.itd51.wollmux.mailmerge.sidebar;
93-
exports de.muenchen.allg.itd51.wollmux.mailmerge.ui;
94-
exports de.muenchen.allg.itd51.wollmux.print;
95-
exports de.muenchen.allg.itd51.wollmux.sender;
96-
exports de.muenchen.allg.itd51.wollmux.sidebar;
97-
exports de.muenchen.allg.itd51.wollmux.slv;
98-
exports de.muenchen.allg.itd51.wollmux.slv.dialog;
99-
exports de.muenchen.allg.itd51.wollmux.slv.dispatch;
100-
exports de.muenchen.allg.itd51.wollmux.slv.events;
101-
exports de.muenchen.allg.itd51.wollmux.slv.print;
102-
exports de.muenchen.allg.itd51.wollmux.ui;
103-
exports de.muenchen.allg.itd51.wollmux.util;
55+
exports org.libreoffice.lots;
56+
exports org.libreoffice.lots.comp;
57+
exports org.libreoffice.lots.config;
58+
exports org.libreoffice.lots.config.generator.xml;
59+
exports org.libreoffice.lots.config.scanner;
60+
exports org.libreoffice.lots.db;
61+
exports org.libreoffice.lots.dialog;
62+
exports org.libreoffice.lots.dispatch;
63+
exports org.libreoffice.lots.document;
64+
exports org.libreoffice.lots.document.commands;
65+
exports org.libreoffice.lots.document.nodes;
66+
exports org.libreoffice.lots.event;
67+
exports org.libreoffice.lots.event.handlers;
68+
exports org.libreoffice.lots.form.config;
69+
exports org.libreoffice.lots.form.control;
70+
exports org.libreoffice.lots.form.model;
71+
exports org.libreoffice.lots.form.sidebar;
72+
exports org.libreoffice.lots.former;
73+
exports org.libreoffice.lots.former.model;
74+
exports org.libreoffice.lots.former.control;
75+
exports org.libreoffice.lots.former.control.model;
76+
exports org.libreoffice.lots.former.document;
77+
exports org.libreoffice.lots.former.function;
78+
exports org.libreoffice.lots.former.group;
79+
exports org.libreoffice.lots.former.group.model;
80+
exports org.libreoffice.lots.former.insertion;
81+
exports org.libreoffice.lots.former.insertion.model;
82+
exports org.libreoffice.lots.former.section;
83+
exports org.libreoffice.lots.former.section.model;
84+
exports org.libreoffice.lots.former.view;
85+
exports org.libreoffice.lots.func;
86+
exports org.libreoffice.lots.func.print;
87+
exports org.libreoffice.lots.mailmerge;
88+
exports org.libreoffice.lots.mailmerge.ds;
89+
exports org.libreoffice.lots.mailmerge.mail;
90+
exports org.libreoffice.lots.mailmerge.print;
91+
exports org.libreoffice.lots.mailmerge.printsettings;
92+
exports org.libreoffice.lots.mailmerge.sidebar;
93+
exports org.libreoffice.lots.mailmerge.ui;
94+
exports org.libreoffice.lots.print;
95+
exports org.libreoffice.lots.sender;
96+
exports org.libreoffice.lots.sidebar;
97+
exports org.libreoffice.lots.slv;
98+
exports org.libreoffice.lots.slv.dialog;
99+
exports org.libreoffice.lots.slv.dispatch;
100+
exports org.libreoffice.lots.slv.events;
101+
exports org.libreoffice.lots.slv.print;
102+
exports org.libreoffice.lots.ui;
103+
exports org.libreoffice.lots.util;
104104

105105
requires transitive org.libreoffice.uno;
106106
requires transitive org.libreoffice.unoloader;

Diff for: ‎core/src/main/java/de/muenchen/allg/itd51/wollmux/ComponentRegistration.java renamed to ‎core/src/main/java/org/libreoffice/lots/ComponentRegistration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
* limitations under the Licence.
2121
* #L%
2222
*/
23-
package de.muenchen.allg.itd51.wollmux;
23+
package org.libreoffice.lots;
2424

2525
import java.util.ServiceLoader;
2626

27+
import org.libreoffice.lots.comp.WollMux;
28+
2729
import com.sun.star.comp.loader.FactoryHelper;
2830
import com.sun.star.comp.loader.JavaLoader;
2931
import com.sun.star.lang.XSingleComponentFactory;
3032
import com.sun.star.lib.uno.helper.Factory;
3133
import com.sun.star.registry.XRegistryKey;
3234

33-
import de.muenchen.allg.itd51.wollmux.comp.WollMux;
34-
3535
/**
3636
* A service for registering and creating UNO Service components.
3737
*

Diff for: ‎core/src/main/java/de/muenchen/allg/itd51/wollmux/ConfClassLoader.java renamed to ‎core/src/main/java/org/libreoffice/lots/ConfClassLoader.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,17 @@
2020
* limitations under the Licence.
2121
* #L%
2222
*/
23-
package de.muenchen.allg.itd51.wollmux;
23+
package org.libreoffice.lots;
2424

2525
import java.net.MalformedURLException;
2626
import java.net.URL;
2727
import java.net.URLClassLoader;
2828
import java.util.ArrayList;
2929

30+
import org.libreoffice.lots.config.ConfigThingy;
3031
import org.slf4j.Logger;
3132
import org.slf4j.LoggerFactory;
3233

33-
import de.muenchen.allg.itd51.wollmux.config.ConfigThingy;
34-
3534
/**
3635
* ClassLoader which uses the classpath defined in the WollMux configuration. It's implemented as a
3736
* singleton.

Diff for: ‎core/src/main/java/de/muenchen/allg/itd51/wollmux/DebugExternalWollMux.java renamed to ‎core/src/main/java/org/libreoffice/lots/DebugExternalWollMux.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* limitations under the Licence.
2121
* #L%
2222
*/
23-
package de.muenchen.allg.itd51.wollmux;
23+
package org.libreoffice.lots;
2424

2525
import java.io.OutputStreamWriter;
2626

@@ -36,12 +36,12 @@
3636
import com.sun.star.uno.UnoRuntime;
3737

3838
import org.libreoffice.ext.unohelper.common.UNO;
39-
import de.muenchen.allg.itd51.wollmux.comp.WollMux;
40-
import de.muenchen.allg.itd51.wollmux.form.sidebar.FormFactory;
41-
import de.muenchen.allg.itd51.wollmux.mailmerge.sidebar.MailMergeFactory;
42-
import de.muenchen.allg.itd51.wollmux.sidebar.WollMuxSidebarFactory;
43-
import de.muenchen.allg.itd51.wollmux.util.LogConfig;
4439
import org.libreoffice.ext.unohelper.util.UnoComponent;
40+
import org.libreoffice.lots.comp.WollMux;
41+
import org.libreoffice.lots.form.sidebar.FormFactory;
42+
import org.libreoffice.lots.mailmerge.sidebar.MailMergeFactory;
43+
import org.libreoffice.lots.sidebar.WollMuxSidebarFactory;
44+
import org.libreoffice.lots.util.LogConfig;
4545

4646
/**
4747
* With this class, WollMux can be started for debugging in the local JVM

Diff for: ‎core/src/main/java/de/muenchen/allg/itd51/wollmux/GlobalFunctions.java renamed to ‎core/src/main/java/org/libreoffice/lots/GlobalFunctions.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
* limitations under the Licence.
2121
* #L%
2222
*/
23-
package de.muenchen.allg.itd51.wollmux;
23+
package org.libreoffice.lots;
2424

25-
import de.muenchen.allg.itd51.wollmux.dialog.DialogFactory;
26-
import de.muenchen.allg.itd51.wollmux.dialog.DialogLibrary;
27-
import de.muenchen.allg.itd51.wollmux.func.FunctionFactory;
28-
import de.muenchen.allg.itd51.wollmux.func.FunctionLibrary;
29-
import de.muenchen.allg.itd51.wollmux.func.print.PrintFunction;
30-
import de.muenchen.allg.itd51.wollmux.print.PrintFunctionLibrary;
25+
import org.libreoffice.lots.dialog.DialogFactory;
26+
import org.libreoffice.lots.dialog.DialogLibrary;
27+
import org.libreoffice.lots.func.FunctionFactory;
28+
import org.libreoffice.lots.func.FunctionLibrary;
29+
import org.libreoffice.lots.func.print.PrintFunction;
30+
import org.libreoffice.lots.print.PrintFunctionLibrary;
3131

3232
/**
3333
* Collection of all globally defined functions.

Diff for: ‎core/src/main/java/de/muenchen/allg/itd51/wollmux/HashableComponent.java renamed to ‎core/src/main/java/org/libreoffice/lots/HashableComponent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* limitations under the Licence.
2121
* #L%
2222
*/
23-
package de.muenchen.allg.itd51.wollmux;
23+
package org.libreoffice.lots;
2424

2525
import com.sun.star.uno.UnoRuntime;
2626
import com.sun.star.uno.XInterface;

Diff for: ‎core/src/main/java/de/muenchen/allg/itd51/wollmux/OpenExt.java renamed to ‎core/src/main/java/org/libreoffice/lots/OpenExt.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* limitations under the Licence.
2121
* #L%
2222
*/
23-
package de.muenchen.allg.itd51.wollmux;
23+
package org.libreoffice.lots;
2424

2525
import java.io.File;
2626
import java.io.FileOutputStream;
@@ -42,10 +42,10 @@
4242
import com.sun.star.frame.XStorable;
4343

4444
import org.libreoffice.ext.unohelper.common.UNO;
45-
import de.muenchen.allg.itd51.wollmux.config.ConfigThingy;
46-
import de.muenchen.allg.itd51.wollmux.config.ConfigurationErrorException;
47-
import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException;
48-
import de.muenchen.allg.itd51.wollmux.util.L;
45+
import org.libreoffice.lots.config.ConfigThingy;
46+
import org.libreoffice.lots.config.ConfigurationErrorException;
47+
import org.libreoffice.lots.config.NodeNotFoundException;
48+
import org.libreoffice.lots.util.L;
4949

5050
/**
5151
* Class that facilitates calling external applications.

Diff for: ‎core/src/main/java/de/muenchen/allg/itd51/wollmux/Shortcuts.java renamed to ‎core/src/main/java/org/libreoffice/lots/Shortcuts.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* limitations under the Licence.
2121
* #L%
2222
*/
23-
package de.muenchen.allg.itd51.wollmux;
23+
package org.libreoffice.lots;
2424

2525
import java.util.HashMap;
2626
import java.util.Iterator;
@@ -38,8 +38,8 @@
3838

3939
import org.libreoffice.ext.unohelper.common.UNO;
4040
import org.libreoffice.ext.unohelper.common.UnoHelperException;
41-
import de.muenchen.allg.itd51.wollmux.config.ConfigThingy;
42-
import de.muenchen.allg.itd51.wollmux.config.NodeNotFoundException;
41+
import org.libreoffice.lots.config.ConfigThingy;
42+
import org.libreoffice.lots.config.NodeNotFoundException;
4343

4444
public class Shortcuts
4545
{

0 commit comments

Comments
 (0)