Skip to content

Commit 3b62795

Browse files
authored
Fix string util package and methods (#14158)
* Move StringUtil to package org.jabref.logic.util.strings. * solve check style problem * let model layer uses methods in logic layer * accidently optimized by the IDEA function ”optimized import“ * Move org.jabref.logic.database.DuplicateCheck#correlateByWords to org.jabref.logic.util.strings.StringSimilarity. Adapt tests and code accordingly.
1 parent 70e53cd commit 3b62795

File tree

180 files changed

+243
-208
lines changed

Some content is hidden

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

180 files changed

+243
-208
lines changed

jabgui/src/main/java/org/jabref/cli/ArgumentProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.jabref.logic.l10n.Localization;
1010
import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
1111
import org.jabref.logic.util.BuildInfo;
12-
import org.jabref.model.strings.StringUtil;
12+
import org.jabref.logic.util.strings.StringUtil;
1313

1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;

jabgui/src/main/java/org/jabref/gui/JabRefGUI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
import org.jabref.logic.util.FallbackExceptionHandler;
5353
import org.jabref.logic.util.HeadlessExecutorService;
5454
import org.jabref.logic.util.TaskExecutor;
55+
import org.jabref.logic.util.strings.StringUtil;
5556
import org.jabref.model.entry.BibEntryTypesManager;
56-
import org.jabref.model.strings.StringUtil;
5757
import org.jabref.model.util.FileUpdateMonitor;
5858

5959
import com.airhacks.afterburner.injection.Injector;

jabgui/src/main/java/org/jabref/gui/actions/ActionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import javafx.scene.control.Tooltip;
1515

1616
import org.jabref.gui.keyboard.KeyBindingRepository;
17-
import org.jabref.model.strings.StringUtil;
17+
import org.jabref.logic.util.strings.StringUtil;
1818

1919
import com.airhacks.afterburner.injection.Injector;
2020
import com.sun.javafx.scene.control.ContextMenuContent;

jabgui/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import java.util.stream.Stream;
55

66
import org.jabref.logic.bibtex.comparator.EntryComparator;
7+
import org.jabref.logic.util.strings.StringUtil;
78
import org.jabref.model.database.BibDatabase;
89
import org.jabref.model.entry.BibEntry;
910
import org.jabref.model.entry.field.InternalField;
10-
import org.jabref.model.strings.StringUtil;
1111

1212
import com.google.common.base.Equivalence;
1313
import org.controlsfx.control.textfield.AutoCompletionBinding;

jabgui/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import java.util.Map;
77
import java.util.stream.Stream;
88

9+
import org.jabref.logic.util.strings.StringUtil;
910
import org.jabref.model.database.BibDatabase;
1011
import org.jabref.model.entry.Author;
1112
import org.jabref.model.entry.AuthorList;
1213
import org.jabref.model.entry.BibEntry;
1314
import org.jabref.model.entry.field.Field;
14-
import org.jabref.model.strings.StringUtil;
1515

1616
import com.google.common.base.Equivalence;
1717
import org.controlsfx.control.textfield.AutoCompletionBinding;

jabgui/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.Comparator;
44
import java.util.stream.Stream;
55

6-
import org.jabref.model.strings.StringUtil;
6+
import org.jabref.logic.util.strings.StringUtil;
77

88
import com.google.common.base.Equivalence;
99
import org.controlsfx.control.textfield.AutoCompletionBinding;

jabgui/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import org.jabref.logic.exporter.BibWriter;
1515
import org.jabref.logic.l10n.Localization;
1616
import org.jabref.logic.os.OS;
17+
import org.jabref.logic.util.strings.StringUtil;
1718
import org.jabref.model.database.BibDatabaseContext;
1819
import org.jabref.model.database.BibDatabaseMode;
1920
import org.jabref.model.entry.BibEntry;
2021
import org.jabref.model.entry.BibEntryTypesManager;
21-
import org.jabref.model.strings.StringUtil;
2222

2323
import org.fxmisc.richtext.CodeArea;
2424
import org.slf4j.Logger;

jabgui/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.jabref.gui.collab.DatabaseChangeDetailsView;
77
import org.jabref.logic.bibtex.comparator.PreambleDiff;
88
import org.jabref.logic.l10n.Localization;
9-
import org.jabref.model.strings.StringUtil;
9+
import org.jabref.logic.util.strings.StringUtil;
1010

1111
public final class PreambleChangeDetailsView extends DatabaseChangeDetailsView {
1212

jabgui/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import org.jabref.gui.actions.SimpleCommand;
66
import org.jabref.gui.undo.NamedCompoundEdit;
77
import org.jabref.gui.undo.UndoableFieldChange;
8+
import org.jabref.logic.util.strings.StringUtil;
89
import org.jabref.model.entry.BibEntry;
910
import org.jabref.model.entry.field.Field;
10-
import org.jabref.model.strings.StringUtil;
1111

1212
public class MoveFieldValueAction extends SimpleCommand {
1313
private final Field fromField;

jabgui/src/main/java/org/jabref/gui/edit/automaticfiededitor/copyormovecontent/CopyOrMoveFieldContentTabViewModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
import org.jabref.gui.edit.automaticfiededitor.MoveFieldValueAction;
1616
import org.jabref.gui.undo.NamedCompoundEdit;
1717
import org.jabref.gui.undo.UndoableFieldChange;
18+
import org.jabref.logic.util.strings.StringUtil;
1819
import org.jabref.model.database.BibDatabase;
1920
import org.jabref.model.entry.BibEntry;
2021
import org.jabref.model.entry.field.Field;
2122
import org.jabref.model.entry.field.StandardField;
22-
import org.jabref.model.strings.StringUtil;
2323

2424
import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
2525
import de.saxsys.mvvmfx.utils.validation.ValidationMessage;

0 commit comments

Comments
 (0)