Sort-in root classes into packages

build.gradle

@@ -46,7 +46,7 @@ java {
 }
 
 application {
-    mainClassName = "$moduleName/org.jabref.JabRefLauncher"
+    mainClassName = "$moduleName/org.jabref.gui.JabRefLauncher"
 }
 
 // TODO: Ugly workaround to temporarily ignore build errors to dependencies of latex2unicode

buildres/linux/JabRef.desktop

@@ -9,4 +9,4 @@ Type=Application
 DESKTOP_MIMES
 Categories=DEPLOY_BUNDLE_CATEGORY
 Keywords=bibtex;biblatex;latex;bibliography
-StartupWMClass=org.jabref.JabRefMain
+StartupWMClass=org.jabref.gui.JabRefMain

docs/advanced-reading/jpackage.md

@@ -28,7 +28,7 @@ Sometimes issues with modularity only arise in the installed version and do not
 3. Modify the `build\image\JabRef\runtime\bin\Jabref.bat` file, replace the last line with
 
    ```text
-   pushd %DIR% & %JAVA_EXEC% -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -p "%~dp0/../app" -m org.jabref/org.jabref.JabRefLauncher  %* & popd
+   pushd %DIR% & %JAVA_EXEC% -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -p "%~dp0/../app" -m org.jabref/org.jabref.gui.JabRefLauncher  %* & popd
    ```
 
 4. Open your IDE and add a "Remote Debugging Configuration" for `localhost:8000`

docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md

@@ -197,7 +197,7 @@ Make sure your Eclipse installation us up to date, Eclipse JEE 2020-03 or newer
 3. Open or import the existing project in Eclipse as Java project.
    * Remark: Importing it as gradle project will not work correctly.
    * Refresh the project in Eclipse
-4. Create a run/debug configuration for the main class `org.jabref.JabRefLauncher` and/or for `org.jabref.JabRefMain` \(both can be used equivalently\)
+4. Create a run/debug configuration for the main class `org.jabref.gui.JabRefLauncher` and/or for `org.jabref.gui.JabRefMain` \(both can be used equivalently\)
    * Remark: The run/debug configuration needs to be added by right clicking the class \(e.g. JabRefLauncher or JabRefMain\) otherwise it will not work.
 
      ![Creating the run/debug configuration by right clicking on the class](../.gitbook/assets/eclipse-create-run-config%20%281%29.png)

snap/local/JabRef-launcher

@@ -1,3 +1,3 @@
 #! /bin/sh
 DIR="$SNAP/lib/runtime/bin"
-"$DIR/java"  -p "$DIR/../app" -m org.jabref/org.jabref.JabRefLauncher  "$@"
+"$DIR/java"  -p "$DIR/../app" -m org.jabref/org.jabref.gui.JabRefLauncher  "$@"

src/jmh/java/org/jabref/benchmarks/Benchmarks.java

@@ -7,7 +7,7 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;

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

@@ -11,8 +11,8 @@
 import java.util.Set;
 import java.util.prefs.BackingStoreException;
 
-import org.jabref.Globals;
-import org.jabref.JabRefException;
+import org.jabref.gui.Globals;
+import org.jabref.logic.JabRefException;
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.undo.NamedCompound;
@@ -48,6 +48,7 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.base.Throwables;
@@ -83,7 +84,7 @@ private static Optional<ParserResult> importToOpenBase(String argument) {
     }
 
     private static Optional<ParserResult> importBibtexToOpenBase(String argument) {
-        BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
+        BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences(), new DummyFileUpdateMonitor());
         try {
             List<BibEntry> entries = parser.parseEntries(argument);
             ParserResult result = new ParserResult(entries);
@@ -143,7 +144,7 @@ private static Optional<ParserResult> importFile(Path file, String importFormat)
                 // * means "guess the format":
                 System.out.println(Localization.lang("Importing in unknown format") + ": " + file);
 
-                ImportFormatReader.UnknownFormatImport importResult = Globals.IMPORT_FORMAT_READER.importUnknownFormat(file, Globals.getFileUpdateMonitor());
+                ImportFormatReader.UnknownFormatImport importResult = Globals.IMPORT_FORMAT_READER.importUnknownFormat(file, new DummyFileUpdateMonitor());
 
                 System.out.println(Localization.lang("Format used") + ": " + importResult.format);
                 return Optional.of(importResult.parserResult);

src/main/java/org/jabref/cli/CrossrefFetcherEvaluator.java

@@ -9,7 +9,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fetcher.CrossRef;

src/main/java/org/jabref/cli/JabRefCLI.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.logic.l10n.Localization;
 
 import org.apache.commons.cli.CommandLine;

src/main/java/org/jabref/gui/BasePanel.java

@@ -12,7 +12,6 @@
 import javafx.scene.control.SplitPane;
 import javafx.scene.layout.StackPane;
 
-import org.jabref.Globals;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;

src/main/java/org/jabref/gui/BasePanelPreferences.java

@@ -3,7 +3,6 @@
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 
-import org.jabref.Globals;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.keyboard.KeyBindingRepository;

src/main/java/org/jabref/gui/ClipBoardManager.java

@@ -19,7 +19,6 @@
 import javafx.scene.input.DataFormat;
 import javafx.scene.input.MouseButton;
 
-import org.jabref.Globals;
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.logic.importer.FetcherException;

src/main/java/org/jabref/gui/DefaultInjector.java

@@ -4,8 +4,6 @@
 
 import javax.swing.undo.UndoManager;
 
-import org.jabref.Globals;
-import org.jabref.JabRefGUI;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;

src/main/java/org/jabref/gui/EntryTypeView.java

@@ -18,7 +18,6 @@
 import javafx.scene.layout.FlowPane;
 import javafx.stage.Screen;
 
-import org.jabref.Globals;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.IconValidationDecorator;

src/main/java/org/jabref/gui/EntryTypeViewModel.java

@@ -14,7 +14,6 @@
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
 
-import org.jabref.Globals;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.database.DuplicateCheck;

src/main/java/org/jabref/gui/FXDialog.java

@@ -8,7 +8,6 @@
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
-import org.jabref.Globals;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;

src/main/java/org/jabref/FallbackExceptionHandler.java → src/main/java/org/jabref/gui/FallbackExceptionHandler.java

@@ -1,4 +1,4 @@
-package org.jabref;
+package org.jabref.gui;
 
 import org.jabref.gui.util.DefaultTaskExecutor;
 

src/main/java/org/jabref/Globals.java → src/main/java/org/jabref/gui/Globals.java

@@ -1,13 +1,11 @@
-package org.jabref;
+package org.jabref.gui;
 
 import java.awt.GraphicsEnvironment;
 import java.util.Optional;
 import java.util.UUID;
 
 import javafx.stage.Screen;
 
-import org.jabref.gui.ClipBoardManager;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;

src/main/java/org/jabref/JabRefExecutorService.java → src/main/java/org/jabref/gui/JabRefExecutorService.java

@@ -1,4 +1,4 @@
-package org.jabref;
+package org.jabref.gui;
 
 import java.util.Collection;
 import java.util.Collections;

src/main/java/org/jabref/gui/JabRefFrame.java

@@ -46,8 +46,6 @@
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
-import org.jabref.Globals;
-import org.jabref.JabRefExecutorService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;

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

@@ -1,4 +1,4 @@
-package org.jabref;
+package org.jabref.gui;
 
 import java.io.File;
 import java.sql.SQLException;
@@ -11,8 +11,6 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 
-import org.jabref.gui.BasePanel;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.dialogs.BackupUIManager;
 import org.jabref.gui.help.VersionWorker;
 import org.jabref.gui.icon.IconTheme;

src/main/java/org/jabref/JabRefLauncher.java → src/main/java/org/jabref/gui/JabRefLauncher.java

@@ -1,4 +1,6 @@
-package org.jabref;
+package org.jabref.gui;
+
+import org.jabref.gui.JabRefMain;
 
 /**
  * JabRef launcher: This just starts JabRefMain. It is there because to have the name consistent to other Java applications.

src/main/java/org/jabref/JabRefMain.java → src/main/java/org/jabref/gui/JabRefMain.java

@@ -1,4 +1,4 @@
-package org.jabref;
+package org.jabref.gui;
 
 import java.net.Authenticator;
 
@@ -9,7 +9,6 @@
 
 import org.jabref.cli.ArgumentProcessor;
 import org.jabref.cli.JabRefCLI;
-import org.jabref.gui.FXDialog;
 import org.jabref.gui.remote.JabRefMessageHandler;
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.journals.JournalAbbreviationLoader;

src/main/java/org/jabref/gui/SendAsEMailAction.java

@@ -8,7 +8,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jabref.Globals;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;

src/main/java/org/jabref/gui/SidePaneManager.java

@@ -7,7 +7,6 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import org.jabref.Globals;
 import org.jabref.gui.groups.GroupSidePane;
 import org.jabref.gui.importer.fetcher.WebSearchPane;
 import org.jabref.gui.openoffice.OpenOfficeSidePanel;

src/main/java/org/jabref/gui/actions/JabRefAction.java

@@ -5,7 +5,7 @@
 
 import javafx.beans.binding.Bindings;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
 import de.saxsys.mvvmfx.utils.commands.Command;

src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java

@@ -8,7 +8,7 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiles.ImportHandler;

src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternDialog.java

@@ -2,7 +2,7 @@
 
 import javafx.scene.control.ButtonType;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;

src/main/java/org/jabref/gui/citationkeypattern/CitationKeyPatternPanel.java

@@ -10,7 +10,7 @@
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;

src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;

src/main/java/org/jabref/gui/cleanup/CleanupAction.java

@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;

src/main/java/org/jabref/gui/collab/ChangeScanner.java

@@ -5,7 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.logic.bibtex.comparator.BibDatabaseDiff;
 import org.jabref.logic.bibtex.comparator.BibEntryDiff;
 import org.jabref.logic.bibtex.comparator.BibStringDiff;

src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java

@@ -2,8 +2,8 @@
 
 import javafx.scene.Node;
 
-import org.jabref.Globals;
-import org.jabref.JabRefGUI;
+import org.jabref.gui.Globals;
+import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableInsertEntries;

src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java

@@ -2,8 +2,8 @@
 
 import javafx.scene.Node;
 
-import org.jabref.Globals;
-import org.jabref.JabRefGUI;
+import org.jabref.gui.Globals;
+import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableRemoveEntries;

src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java

@@ -9,7 +9,7 @@
 import javafx.collections.FXCollections;
 import javafx.scene.control.SelectionModel;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.logic.cleanup.Cleanups;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;

src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java

@@ -6,7 +6,7 @@
 
 import javafx.concurrent.Task;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;

src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java

@@ -14,7 +14,7 @@
 
 import javafx.concurrent.Task;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.io.FileUtil;

src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java

@@ -4,7 +4,7 @@
 import java.util.Optional;
 import java.util.function.BiFunction;
 
-import org.jabref.Globals;
+import org.jabref.gui.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Localization;

src/main/java/org/jabref/gui/desktop/JabRefDesktop.java

@@ -10,8 +10,8 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import org.jabref.Globals;
-import org.jabref.JabRefGUI;
+import org.jabref.gui.Globals;
+import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.desktop.os.DefaultDesktop;
 import org.jabref.gui.desktop.os.Linux;
 import org.jabref.gui.desktop.os.NativeDesktop;

src/main/java/org/jabref/gui/desktop/os/Linux.java

@@ -8,7 +8,7 @@
 import java.util.Locale;
 import java.util.Optional;
 
-import org.jabref.JabRefExecutorService;
+import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.StreamGobbler;