Merge branch 'fix-arch2' of github.com:JabRef/jabref into fix-arch2

JabRef · Sep 8, 2024 · bbcf36a · bbcf36a
2 parents e77e227 + 9f27c30
commit bbcf36a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -16,7 +16,7 @@
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
 import org.jabref.gui.search.MatchCategory;
-import org.jabref.gui.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchDisplayMode;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.gui.util.FilteredListProxy;
 import org.jabref.gui.util.OptionalObjectProperty;

diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -58,6 +58,7 @@
 import org.jabref.gui.util.TooltipTextUtil;
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.search.SearchDisplayMode;
 import org.jabref.model.entry.Author;
 import org.jabref.model.search.SearchFlags;
 import org.jabref.model.search.SearchQuery;

diff --git a/.../jabref/gui/search/SearchDisplayMode.java → ...abref/logic/search/SearchDisplayMode.java b/.../jabref/gui/search/SearchDisplayMode.java → ...abref/logic/search/SearchDisplayMode.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.search;
+package org.jabref.logic.search;
 
 public enum SearchDisplayMode {
     FLOAT,

diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -52,7 +52,7 @@
 import org.jabref.gui.maintable.NameDisplayPreferences.DisplayStyle;
 import org.jabref.gui.mergeentries.DiffMode;
 import org.jabref.gui.push.PushToApplications;
-import org.jabref.gui.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchDisplayMode;
 import org.jabref.gui.sidepane.SidePaneType;
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.gui.theme.Theme;

diff --git a/src/main/java/org/jabref/preferences/SearchPreferences.java b/src/main/java/org/jabref/preferences/SearchPreferences.java
@@ -11,7 +11,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 
-import org.jabref.gui.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchDisplayMode;
 import org.jabref.model.search.SearchFlags;
 
 import com.google.common.annotations.VisibleForTesting;

diff --git a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
@@ -9,7 +9,7 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.cli.ArgumentProcessor.Mode;
-import org.jabref.gui.search.SearchDisplayMode;
+import org.jabref.logic.search.SearchDisplayMode;
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.exporter.BibDatabaseWriter;
 import org.jabref.logic.exporter.SelfContainedSaveConfiguration;