step0 : start model/openoffice, logic/openoffice/style (#7772)

* step0 : start model/openoffice, logic/openoffice/style * correction: import order
JabRef · Jun 3, 2021 · ebed223 · ebed223
1 parent b499e06
commit ebed223
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 21 deletions.
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
@@ -3,7 +3,7 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import org.jabref.logic.openoffice.CitationEntry;
+import org.jabref.model.openoffice.CitationEntry;
 
 public class CitationEntryViewModel {
 

diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -10,7 +10,7 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.openoffice.CitationEntry;
+import org.jabref.model.openoffice.CitationEntry;
 
 import com.sun.star.beans.IllegalTypeException;
 import com.sun.star.beans.NotRemoveableException;

diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -28,11 +28,11 @@
 import org.jabref.logic.bibtex.comparator.FieldComparatorStack;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.Layout;
-import org.jabref.logic.openoffice.OOBibStyle;
-import org.jabref.logic.openoffice.OOPreFormatter;
 import org.jabref.logic.openoffice.OOUtil;
 import org.jabref.logic.openoffice.UndefinedBibtexEntry;
 import org.jabref.logic.openoffice.UndefinedParagraphFormatException;
+import org.jabref.logic.openoffice.style.OOBibStyle;
+import org.jabref.logic.openoffice.style.OOPreFormatter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;

diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -44,11 +44,11 @@
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.openoffice.OOBibStyle;
 import org.jabref.logic.openoffice.OpenOfficeFileSearch;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
-import org.jabref.logic.openoffice.StyleLoader;
 import org.jabref.logic.openoffice.UndefinedParagraphFormatException;
+import org.jabref.logic.openoffice.style.OOBibStyle;
+import org.jabref.logic.openoffice.style.StyleLoader;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -20,8 +20,8 @@
 import org.jabref.gui.util.ViewModelTableRowFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.TextBasedPreviewLayout;
-import org.jabref.logic.openoffice.OOBibStyle;
-import org.jabref.logic.openoffice.StyleLoader;
+import org.jabref.logic.openoffice.style.OOBibStyle;
+import org.jabref.logic.openoffice.style.StyleLoader;
 import org.jabref.logic.util.TestEntry;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.types.StandardEntryType;

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -22,9 +22,9 @@
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.openoffice.OOBibStyle;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
-import org.jabref.logic.openoffice.StyleLoader;
+import org.jabref.logic.openoffice.style.OOBibStyle;
+import org.jabref.logic.openoffice.style.StyleLoader;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;

diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
@@ -9,7 +9,7 @@
 import javafx.scene.Node;
 
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.logic.openoffice.OOBibStyle;
+import org.jabref.logic.openoffice.style.OOBibStyle;
 
 public class StyleSelectItemViewModel {
 

diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -80,7 +80,7 @@
 import org.jabref.logic.layout.format.WrapContent;
 import org.jabref.logic.layout.format.WrapFileLinks;
 import org.jabref.logic.layout.format.XMLChars;
-import org.jabref.logic.openoffice.OOPreFormatter;
+import org.jabref.logic.openoffice.style.OOPreFormatter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;

diff --git a/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java b/src/main/java/org/jabref/logic/openoffice/UndefinedBibtexEntry.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.openoffice;
 
+import org.jabref.logic.openoffice.style.OOBibStyle;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 

diff --git a/...g/jabref/logic/openoffice/OOBibStyle.java → ...ef/logic/openoffice/style/OOBibStyle.java b/...g/jabref/logic/openoffice/OOBibStyle.java → ...ef/logic/openoffice/style/OOBibStyle.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.openoffice;
+package org.jabref.logic.openoffice.style;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/...bref/logic/openoffice/OOPreFormatter.java → ...ogic/openoffice/style/OOPreFormatter.java b/...bref/logic/openoffice/OOPreFormatter.java → ...ogic/openoffice/style/OOPreFormatter.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.openoffice;
+package org.jabref.logic.openoffice.style;
 
 import java.util.Map;
 import java.util.Objects;

diff --git a/.../jabref/logic/openoffice/StyleLoader.java → ...f/logic/openoffice/style/StyleLoader.java b/.../jabref/logic/openoffice/StyleLoader.java → ...f/logic/openoffice/style/StyleLoader.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.openoffice;
+package org.jabref.logic.openoffice.style;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -10,6 +10,7 @@
 import java.util.Objects;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.openoffice.OpenOfficePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...abref/logic/openoffice/CitationEntry.java → ...abref/model/openoffice/CitationEntry.java b/...abref/logic/openoffice/CitationEntry.java → ...abref/model/openoffice/CitationEntry.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.openoffice;
+package org.jabref.model.openoffice;
 
 import java.util.Objects;
 import java.util.Optional;

diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -87,7 +87,7 @@
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.logic.net.ProxyPreferences;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
-import org.jabref.logic.openoffice.StyleLoader;
+import org.jabref.logic.openoffice.style.StyleLoader;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;

diff --git a/...bref/logic/openoffice/OOBibStyleTest.java → ...ogic/openoffice/style/OOBibStyleTest.java b/...bref/logic/openoffice/OOBibStyleTest.java → ...ogic/openoffice/style/OOBibStyleTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.openoffice;
+package org.jabref.logic.openoffice.style;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/.../logic/openoffice/OOPreFormatterTest.java → .../openoffice/style/OOPreFormatterTest.java b/.../logic/openoffice/OOPreFormatterTest.java → .../openoffice/style/OOPreFormatterTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.openoffice;
+package org.jabref.logic.openoffice.style;
 
 import org.junit.jupiter.api.Test;
 

diff --git a/...ref/logic/openoffice/StyleLoaderTest.java → ...gic/openoffice/style/StyleLoaderTest.java b/...ref/logic/openoffice/StyleLoaderTest.java → ...gic/openoffice/style/StyleLoaderTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.openoffice;
+package org.jabref.logic.openoffice.style;
 
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
@@ -9,6 +9,7 @@
 import java.util.List;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.openoffice.OpenOfficePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...f/logic/openoffice/CitationEntryTest.java → ...f/model/openoffice/CitationEntryTest.java b/...f/logic/openoffice/CitationEntryTest.java → ...f/model/openoffice/CitationEntryTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.openoffice;
+package org.jabref.model.openoffice;
 
 import java.util.Optional;
 

diff --git a/...s/org/jabref/logic/openoffice/test.jstyle → ...jabref/logic/openoffice/style/test.jstyle b/...s/org/jabref/logic/openoffice/test.jstyle → ...jabref/logic/openoffice/style/test.jstyle
diff --git a/...noffice/testWithDefaultAtFirstLIne.jstyle → ...e/style/testWithDefaultAtFirstLIne.jstyle b/...noffice/testWithDefaultAtFirstLIne.jstyle → ...e/style/testWithDefaultAtFirstLIne.jstyle