From 075473d8dfe1071251b064e9056d627e567dcb66 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sat, 22 Nov 2025 00:18:08 +0100 Subject: [PATCH] Fix package of Formatter --- .../gui/commonfxcontrols/FieldFormatterCleanupsPanel.java | 2 +- .../commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java | 2 +- .../org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java | 2 +- .../gui/fieldeditors/contextmenu/ProtectedTermsMenu.java | 2 +- .../org/jabref/logic/citationkeypattern/BracketedPattern.java | 2 +- .../java/org/jabref/logic/cleanup/FieldFormatterCleanup.java | 1 + .../java/org/jabref/logic/cleanup/FieldFormatterCleanups.java | 1 + .../org/jabref/logic/{cleanup => formatter}/Formatter.java | 2 +- .../src/main/java/org/jabref/logic/formatter/Formatters.java | 1 - .../java/org/jabref/logic/formatter/IdentityFormatter.java | 1 - .../logic/formatter/bibtexfields/AddBracesFormatter.java | 2 +- .../logic/formatter/bibtexfields/CleanupUrlFormatter.java | 2 +- .../jabref/logic/formatter/bibtexfields/ClearFormatter.java | 2 +- .../logic/formatter/bibtexfields/ConvertMSCCodesFormatter.java | 2 +- .../formatter/bibtexfields/EscapeAmpersandsFormatter.java | 2 +- .../formatter/bibtexfields/EscapeDollarSignFormatter.java | 2 +- .../formatter/bibtexfields/EscapeUnderscoresFormatter.java | 2 +- .../logic/formatter/bibtexfields/HtmlToLatexFormatter.java | 2 +- .../logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java | 2 +- .../logic/formatter/bibtexfields/LatexCleanupFormatter.java | 2 +- .../logic/formatter/bibtexfields/NormalizeDateFormatter.java | 2 +- .../formatter/bibtexfields/NormalizeEnDashesFormatter.java | 2 +- .../org/jabref/logic/formatter/bibtexfields/NormalizeIssn.java | 2 +- .../logic/formatter/bibtexfields/NormalizeMonthFormatter.java | 2 +- .../logic/formatter/bibtexfields/NormalizeNamesFormatter.java | 2 +- .../logic/formatter/bibtexfields/NormalizePagesFormatter.java | 2 +- .../formatter/bibtexfields/NormalizeUnicodeFormatter.java | 2 +- .../formatter/bibtexfields/NormalizeWhitespaceFormatter.java | 3 ++- .../formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java | 2 +- .../jabref/logic/formatter/bibtexfields/RegexFormatter.java | 2 +- .../logic/formatter/bibtexfields/RemoveDigitsFormatter.java | 2 +- .../formatter/bibtexfields/RemoveEnclosingBracesFormatter.java | 2 +- .../bibtexfields/RemoveHyphenatedNewlinesFormatter.java | 2 +- .../logic/formatter/bibtexfields/RemoveNewlinesFormatter.java | 2 +- .../formatter/bibtexfields/RemoveRedundantSpacesFormatter.java | 2 +- .../RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java | 2 +- .../formatter/bibtexfields/ReplaceTabsBySpaceFormater.java | 2 +- .../logic/formatter/bibtexfields/ShortenDOIFormatter.java | 2 +- .../logic/formatter/bibtexfields/TransliterateFormatter.java | 2 +- .../logic/formatter/bibtexfields/TrimWhitespaceFormatter.java | 2 +- .../logic/formatter/bibtexfields/UnicodeToLatexFormatter.java | 2 +- .../logic/formatter/bibtexfields/UnitsToLatexFormatter.java | 2 +- .../org/jabref/logic/formatter/casechanger/CamelFormatter.java | 2 +- .../jabref/logic/formatter/casechanger/CamelNFormatter.java | 2 +- .../logic/formatter/casechanger/CapitalizeFormatter.java | 2 +- .../jabref/logic/formatter/casechanger/LowerCaseFormatter.java | 2 +- .../logic/formatter/casechanger/ProtectTermsFormatter.java | 2 +- .../logic/formatter/casechanger/SentenceCaseFormatter.java | 2 +- .../logic/formatter/casechanger/ShortTitleFormatter.java | 2 +- .../jabref/logic/formatter/casechanger/TitleCaseFormatter.java | 2 +- .../logic/formatter/casechanger/UnprotectTermsFormatter.java | 2 +- .../jabref/logic/formatter/casechanger/UpperCaseFormatter.java | 2 +- .../logic/formatter/casechanger/VeryShortTitleFormatter.java | 2 +- .../logic/formatter/minifier/MinifyNameListFormatter.java | 2 +- .../org/jabref/logic/formatter/minifier/TruncateFormatter.java | 2 +- .../src/main/java/org/jabref/logic/importer/ParserFetcher.java | 2 +- .../org/jabref/logic/layout/LayoutFormatterBasedFormatter.java | 2 +- .../jabref/logic/layout/format/LatexToUnicodeFormatter.java | 2 +- .../logic/layout/format/ReplaceUnicodeLigaturesFormatter.java | 2 +- .../org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java | 1 + .../test/java/org/jabref/logic/formatter/FormatterTest.java | 1 - 61 files changed, 59 insertions(+), 58 deletions(-) rename jablib/src/main/java/org/jabref/logic/{cleanup => formatter}/Formatter.java (98%) diff --git a/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java b/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java index fa0ba437aa1..085bc05e45a 100644 --- a/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java +++ b/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java @@ -19,7 +19,7 @@ import org.jabref.gui.util.ValueTableCellFactory; import org.jabref.gui.util.ViewModelListCellFactory; import org.jabref.logic.cleanup.FieldFormatterCleanup; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldTextMapper; diff --git a/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java b/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java index 765561a50e7..b3d72276c9d 100644 --- a/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java +++ b/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java @@ -16,7 +16,7 @@ import org.jabref.gui.util.NoSelectionModel; import org.jabref.logic.cleanup.FieldFormatterCleanup; import org.jabref.logic.cleanup.FieldFormatterCleanups; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.formatter.Formatters; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java index ba5784034dc..c03164c955a 100644 --- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java +++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java @@ -8,7 +8,7 @@ import javafx.scene.control.SeparatorMenuItem; import javafx.scene.control.TextInputControl; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.formatter.Formatters; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.strings.StringUtil; diff --git a/jabgui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java b/jabgui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java index 8f9cbf611f8..0c8fa3731d2 100644 --- a/jabgui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java +++ b/jabgui/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java @@ -12,7 +12,7 @@ import org.jabref.gui.actions.SimpleCommand; import org.jabref.gui.icon.IconTheme; import org.jabref.gui.icon.JabRefIcon; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter; import org.jabref.logic.l10n.Localization; diff --git a/jablib/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java b/jablib/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java index cb46802d7f2..46c8569c640 100644 --- a/jablib/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java +++ b/jablib/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.formatter.Formatters; import org.jabref.logic.formatter.bibtexfields.RemoveEnclosingBracesFormatter; import org.jabref.logic.formatter.casechanger.Word; diff --git a/jablib/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java b/jablib/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java index 3528cdc5df9..855b318d473 100644 --- a/jablib/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java +++ b/jablib/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java @@ -6,6 +6,7 @@ import java.util.Objects; import java.util.Set; +import org.jabref.logic.formatter.Formatter; import org.jabref.model.FieldChange; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.event.EntriesEventSource; diff --git a/jablib/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java b/jablib/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java index b5eb9811f41..bfe9d57a2d9 100644 --- a/jablib/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java +++ b/jablib/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java @@ -11,6 +11,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.formatter.Formatters; import org.jabref.logic.formatter.IdentityFormatter; import org.jabref.logic.formatter.bibtexfields.ConvertMSCCodesFormatter; diff --git a/jablib/src/main/java/org/jabref/logic/cleanup/Formatter.java b/jablib/src/main/java/org/jabref/logic/formatter/Formatter.java similarity index 98% rename from jablib/src/main/java/org/jabref/logic/cleanup/Formatter.java rename to jablib/src/main/java/org/jabref/logic/formatter/Formatter.java index 116708296c8..21b2a8d9173 100644 --- a/jablib/src/main/java/org/jabref/logic/cleanup/Formatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/Formatter.java @@ -1,4 +1,4 @@ -package org.jabref.logic.cleanup; +package org.jabref.logic.formatter; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/Formatters.java b/jablib/src/main/java/org/jabref/logic/formatter/Formatters.java index fd3417edcc6..d10a602de37 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/Formatters.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/Formatters.java @@ -8,7 +8,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.jabref.logic.cleanup.Formatter; import org.jabref.logic.formatter.bibtexfields.CleanupUrlFormatter; import org.jabref.logic.formatter.bibtexfields.ClearFormatter; import org.jabref.logic.formatter.bibtexfields.ConvertMSCCodesFormatter; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java index 50e81406e19..3d970e79d50 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java @@ -1,6 +1,5 @@ package org.jabref.logic.formatter; -import org.jabref.logic.cleanup.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java index 23c14cc2094..2c2e48c7c93 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java index 46f3a250710..e8b4699dcc5 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java @@ -7,7 +7,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java index e0a1c36de0b..96f0c4ddb24 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ConvertMSCCodesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ConvertMSCCodesFormatter.java index 1d765e5d371..bb47cc3b506 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ConvertMSCCodesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ConvertMSCCodesFormatter.java @@ -5,7 +5,7 @@ import java.util.Iterator; import java.util.List; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.layout.LayoutFormatter; import org.jabref.logic.preferences.JabRefCliPreferences; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java index 2b2a6562914..11f41d2bb56 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java index 1d1ff7a961a..2775ab4d153 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java @@ -2,7 +2,7 @@ import java.util.regex.Matcher; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java index 9b9abec6cba..c91386ec840 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java @@ -2,7 +2,7 @@ import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java index bc4dcfac4dd..175b0b116e1 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java @@ -4,7 +4,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.layout.LayoutFormatter; import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java index b77487b149c..12135931384 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java @@ -3,7 +3,7 @@ import java.util.regex.Pattern; import org.jabref.architecture.AllowedToUseApacheCommonsLang3; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.layout.LayoutFormatter; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java index 71dcbcdfa04..679bf06b129 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java @@ -2,7 +2,7 @@ import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java index 5efb2e74bd5..920a16bf744 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java @@ -2,7 +2,7 @@ import java.util.Optional; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.Date; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatter.java index 54eafae254b..d6189d9a9f9 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeIssn.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeIssn.java index 6c8e82f757d..f8269b90c5d 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeIssn.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeIssn.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.identifier.ISSN; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java index 1f5c1abea8b..47a95bedfda 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java @@ -2,7 +2,7 @@ import java.util.Optional; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.Month; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java index dc1c1f041f5..66435fb4629 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.model.entry.AuthorList; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java index 163363a2fbc..3180c543464 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java @@ -3,7 +3,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter; import org.jabref.logic.l10n.Localization; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatter.java index 9dca5d7995f..7141867f332 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeUnicodeFormatter.java @@ -2,7 +2,7 @@ import java.text.Normalizer; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatter.java index c9215e2b36b..d20733343de 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeWhitespaceFormatter.java @@ -3,6 +3,7 @@ import java.util.regex.Pattern; import org.jabref.logic.bibtex.FieldPreferences; +import org.jabref.logic.formatter.Formatter; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.FieldFactory; @@ -12,7 +13,7 @@ * Replaces two subsequent whitespaces (and tabs) to one space in case of single-line fields. In case of multine fields, * the field content is kept as is. *

- * Due to the distinction between single line and multiline fields, this formatter does not implement the interface {@link org.jabref.logic.cleanup.Formatter}. + * Due to the distinction between single line and multiline fields, this formatter does not implement the interface {@link Formatter}. */ public class NormalizeWhitespaceFormatter { diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java index 37cb68cc671..2044861bb41 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java @@ -3,7 +3,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java index 1aa7131e004..652ed23f98c 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java @@ -6,7 +6,7 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java index de17362fc27..97a57817655 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java @@ -2,7 +2,7 @@ import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatter.java index 31b071aac12..07e0700be79 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveEnclosingBracesFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NullMarked; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java index 89f89cb2ef0..b4f035b0b35 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java @@ -2,7 +2,7 @@ import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java index fb5e0a259a6..97e79c05a3a 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java @@ -2,7 +2,7 @@ import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java index ade885787b6..9fbd714c47c 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java @@ -2,7 +2,7 @@ import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java index b655fdc96c7..49a5651b52e 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveWordEnclosingAndOuterEnclosingBracesFormatter.java @@ -2,7 +2,7 @@ import java.util.StringJoiner; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.strings.StringUtil; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java index f7aa741f001..3dd37676bde 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java @@ -2,7 +2,7 @@ import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java index cb128143b6b..1c0ea08b912 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java @@ -3,7 +3,7 @@ import java.util.function.Predicate; import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.importer.util.ShortDOIService; import org.jabref.logic.importer.util.ShortDOIServiceException; import org.jabref.logic.l10n.Localization; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TransliterateFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TransliterateFormatter.java index e228aa0206a..083d30abbc1 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TransliterateFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TransliterateFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.strings.Transliteration; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java index 22a2a799aa9..73e9d2d0764 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.bibtexfields; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java index e8c0b3385b8..50a29439097 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java @@ -2,7 +2,7 @@ import java.util.Map; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.layout.LayoutFormatter; import org.jabref.logic.util.strings.HTMLUnicodeConversionMaps; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java index 11d01d31797..2a7cf56a1c7 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.strings.StringLengthComparator; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CamelFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CamelFormatter.java index 28fede0de30..ec6a1f2455d 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CamelFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CamelFormatter.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CamelNFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CamelNFormatter.java index 7778842aeee..e154b114483 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CamelNFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CamelNFormatter.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java index 0e7894ada38..463eb8d462f 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.casechanger; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java index cbe52c077ff..feec1d01ead 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.casechanger; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java index 27c51fd4d95..e369238641b 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java @@ -2,7 +2,7 @@ import java.util.List; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.protectedterms.ProtectedTermsLoader; import org.jabref.logic.util.strings.StringLengthComparator; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java index 439581e3220..fa501572086 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.strings.StringUtil; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/ShortTitleFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/ShortTitleFormatter.java index 62b482a7ad1..8d070ff9579 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/ShortTitleFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/ShortTitleFormatter.java @@ -3,7 +3,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java index ce599cf8281..a7c58a925f8 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java @@ -2,7 +2,7 @@ import java.util.stream.Collectors; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.strings.StringUtil; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java index cd953c43eea..3e7284e293b 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.casechanger; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java index 9699d68c1a8..b704f6f656d 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.casechanger; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/VeryShortTitleFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/VeryShortTitleFormatter.java index 86c0b9f588f..30d3e80e265 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/casechanger/VeryShortTitleFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/casechanger/VeryShortTitleFormatter.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.function.Predicate; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java index 20aeae81f17..c0e1aeac4bd 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.minifier; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java b/jablib/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java index 1d9f90a2707..7280865bad8 100644 --- a/jablib/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.formatter.minifier; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/importer/ParserFetcher.java b/jablib/src/main/java/org/jabref/logic/importer/ParserFetcher.java index 847eea92e20..4bf81bfaaf1 100644 --- a/jablib/src/main/java/org/jabref/logic/importer/ParserFetcher.java +++ b/jablib/src/main/java/org/jabref/logic/importer/ParserFetcher.java @@ -1,6 +1,6 @@ package org.jabref.logic.importer; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.model.entry.BibEntry; public interface ParserFetcher { diff --git a/jablib/src/main/java/org/jabref/logic/layout/LayoutFormatterBasedFormatter.java b/jablib/src/main/java/org/jabref/logic/layout/LayoutFormatterBasedFormatter.java index 4a0b84baa13..b53b352bef3 100644 --- a/jablib/src/main/java/org/jabref/logic/layout/LayoutFormatterBasedFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/layout/LayoutFormatterBasedFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.layout; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jspecify.annotations.NonNull; diff --git a/jablib/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java b/jablib/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java index a8c09453fe8..5b7690bf428 100644 --- a/jablib/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java @@ -1,6 +1,6 @@ package org.jabref.logic.layout.format; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.layout.LayoutFormatter; import org.jabref.model.strings.LatexToUnicodeAdapter; diff --git a/jablib/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java b/jablib/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java index 7a82fc45110..89ea5535887 100644 --- a/jablib/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java +++ b/jablib/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.regex.Pattern; -import org.jabref.logic.cleanup.Formatter; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.l10n.Localization; import org.jabref.logic.layout.LayoutFormatter; import org.jabref.logic.util.strings.UnicodeLigaturesMap; diff --git a/jablib/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java b/jablib/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java index a36c7cb2a2f..8cdb0c803dd 100644 --- a/jablib/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java +++ b/jablib/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.stream.Stream; +import org.jabref.logic.formatter.Formatter; import org.jabref.logic.formatter.IdentityFormatter; import org.jabref.logic.formatter.bibtexfields.EscapeAmpersandsFormatter; import org.jabref.logic.formatter.bibtexfields.EscapeDollarSignFormatter; diff --git a/jablib/src/test/java/org/jabref/logic/formatter/FormatterTest.java b/jablib/src/test/java/org/jabref/logic/formatter/FormatterTest.java index a5717db0f01..776b910c8df 100644 --- a/jablib/src/test/java/org/jabref/logic/formatter/FormatterTest.java +++ b/jablib/src/test/java/org/jabref/logic/formatter/FormatterTest.java @@ -5,7 +5,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jabref.logic.cleanup.Formatter; import org.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import org.jabref.logic.formatter.minifier.TruncateFormatter; import org.jabref.logic.protectedterms.ProtectedTermsLoader;