[WIP] Multi module build

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

@@ -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.preferences.SavePreferencesFactory;
 import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.base.Throwables;
@@ -358,7 +359,7 @@ private boolean generateAux(List<ParserResult> loaded, String[] data) {
 
                 try {
                     System.out.println(Localization.lang("Saving") + ": " + subName);
-                    SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs);
+                    SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs);
                     BibDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(FileSaveSession::new);
                     Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
                     SaveSession session = databaseWriter.saveDatabase(new BibDatabaseContext(newBase, defaults), prefs);
@@ -397,7 +398,7 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
                 if (!pr.isInvalid()) {
                     try {
                         System.out.println(Localization.lang("Saving") + ": " + data[0]);
-                        SavePreferences prefs = SavePreferences.loadForSaveFromPreferences(Globals.prefs);
+                        SavePreferences prefs = SavePreferencesFactory.loadForSaveFromPreferences(Globals.prefs);
                         Defaults defaults = new Defaults(Globals.prefs.getDefaultBibDatabaseMode());
                         BibDatabaseWriter<SaveSession> databaseWriter = new BibtexDatabaseWriter<>(
                                 FileSaveSession::new);
@@ -465,7 +466,7 @@ private void importPreferences() {
                     Globals.journalAbbreviationLoader);
             LayoutFormatterPreferences layoutPreferences = Globals.prefs
                     .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
-            SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(Globals.prefs);
+            SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(Globals.prefs);
             Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences);
         } catch (JabRefException ex) {
             LOGGER.error("Cannot import preferences", ex);

org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportAction.java

@@ -27,6 +27,7 @@
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.ExporterFactoryFactory;
 import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
@@ -67,7 +68,7 @@ public InternalExportAction(JabRefFrame frame, boolean selectedOnly) {
 
             @Override
             public void actionPerformed(ActionEvent e) {
-                Globals.exportFactory = ExporterFactory.create(Globals.prefs, Globals.journalAbbreviationLoader);
+                Globals.exportFactory = ExporterFactoryFactory.create(Globals.prefs, Globals.journalAbbreviationLoader);
                 FileDialogConfiguration fileDialogConfiguration = ExportAction.createExportFileChooser(Globals.exportFactory, Globals.prefs.get(JabRefPreferences.EXPORT_WORKING_DIRECTORY));
                 DialogService dialogService = new FXDialogService();
                 DefaultTaskExecutor.runInJavaFXThread(() ->

org.jabref.gui/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.java

@@ -34,6 +34,8 @@
 import ca.odell.glazedlists.swing.DefaultEventTableModel;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 
+import static org.jabref.preferences.SavePreferencesFactory.loadForExportFromPreferences;
+
 /**
  * <p>Title: </p>
  * <p>Description: </p>
@@ -75,7 +77,7 @@ public ExportCustomizationDialog(final JabRefFrame frame) {
             if (ecd.okPressed()) {
                 Globals.prefs.customExports.addFormat(ecd.name(), ecd.layoutFile(), ecd.extension(),
                         Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader),
-                        SavePreferences.loadForExportFromPreferences(Globals.prefs));
+                        loadForExportFromPreferences(Globals.prefs));
                 Globals.prefs.customExports.store(Globals.prefs);
             }
         });
@@ -111,7 +113,7 @@ public ExportCustomizationDialog(final JabRefFrame frame) {
             }
             LayoutFormatterPreferences layoutPreferences = Globals.prefs
                     .getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
-            SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(Globals.prefs);
+            SavePreferences savePreferences = loadForExportFromPreferences(Globals.prefs);
             for (List<String> list : entries) {
                 Globals.prefs.customExports.remove(list, layoutPreferences, savePreferences);
             }

org.jabref.gui/src/main/java/org/jabref/preferences/CustomExportList.java

@@ -70,7 +70,7 @@ private void readPrefs(JabRefPreferences prefs, JournalAbbreviationLoader loader
         int i = 0;
         List<String> s;
         LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(loader);
-        SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(prefs);
+        SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(prefs);
         while (!((s = prefs.getStringList(JabRefPreferences.CUSTOM_EXPORT_FORMAT + i)).isEmpty())) {
             Optional<TemplateExporter> format = createFormat(s.get(EXPORTER_NAME_INDEX), s.get(EXPORTER_FILENAME_INDEX), s.get(EXPORTER_EXTENSION_INDEX), layoutPreferences, savePreferences);
             if (format.isPresent()) {

org.jabref.gui/src/main/java/org/jabref/preferences/ExporterFactoryFactory.java

@@ -0,0 +1,20 @@
+package org.jabref.preferences;
+
+import org.jabref.logic.exporter.ExporterFactory;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.layout.LayoutFormatterPreferences;
+
+import java.util.Map;
+
+public class ExporterFactoryFactory {
+
+    public static ExporterFactory create(JabRefPreferences preferences, JournalAbbreviationLoader abbreviationLoader) {
+        Map<String, TemplateExporter> customFormats = preferences.customExports.getCustomExportFormats(preferences, abbreviationLoader);
+        LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(abbreviationLoader);
+        SavePreferences savePreferences = SavePreferencesFactory.loadForExportFromPreferences(preferences);
+        return ExporterFactory.create(customFormats, layoutPreferences, savePreferences);
+    }
+
+}

org.jabref.gui/src/main/java/org/jabref/preferences/SavePreferencesFactory.java

@@ -0,0 +1,47 @@
+package org.jabref.preferences;
+
+import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
+import org.jabref.model.metadata.SaveOrderConfig;
+
+import java.nio.charset.Charset;
+
+public class SavePreferencesFactory {
+
+    public static SavePreferences loadForExportFromPreferences(JabRefPreferences preferences) {
+        Boolean saveInOriginalOrder = preferences.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER);
+        SaveOrderConfig saveOrder = null;
+        if (!saveInOriginalOrder) {
+            if (preferences.getBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER)) {
+                saveOrder = preferences.loadExportSaveOrder();
+            } else {
+                saveOrder = preferences.loadTableSaveOrder();
+            }
+        }
+        Charset encoding = preferences.getDefaultEncoding();
+        Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP);
+        SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL;
+        Boolean takeMetadataSaveOrderInAccount = false;
+        Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT);
+        LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences();
+        GlobalBibtexKeyPattern globalCiteKeyPattern =  preferences.getKeyPattern();
+        return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType,
+                takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern);
+    }
+
+    public static SavePreferences loadForSaveFromPreferences(JabRefPreferences preferences) {
+        Boolean saveInOriginalOrder = false;
+        SaveOrderConfig saveOrder = null;
+        Charset encoding = preferences.getDefaultEncoding();
+        Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP);
+        SavePreferences.DatabaseSaveType saveType = SavePreferences.DatabaseSaveType.ALL;
+        Boolean takeMetadataSaveOrderInAccount = true;
+        Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT);
+        LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences();
+        GlobalBibtexKeyPattern globalCiteKeyPattern =  preferences.getKeyPattern();
+        return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType,
+                takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern);
+    }
+
+}

org.jabref.logic/src/main/java/org/jabref/logic/exporter/ExporterFactory.java

@@ -8,10 +8,8 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.FileType;
-import org.jabref.preferences.JabRefPreferences;
 
 public class ExporterFactory {
 
@@ -61,13 +59,6 @@ public static ExporterFactory create(Map<String, TemplateExporter> customFormats
         return new ExporterFactory(exporters);
     }
 
-    public static ExporterFactory create(JabRefPreferences preferences, JournalAbbreviationLoader abbreviationLoader) {
-        Map<String, TemplateExporter> customFormats = preferences.customExports.getCustomExportFormats(preferences, abbreviationLoader);
-        LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(abbreviationLoader);
-        SavePreferences savePreferences = SavePreferences.loadForExportFromPreferences(preferences);
-        return create(customFormats, layoutPreferences, savePreferences);
-    }
-
     /**
      * Build a string listing of all available exporters.
      *

org.jabref.logic/src/main/java/org/jabref/logic/exporter/SavePreferences.java

@@ -6,7 +6,6 @@
 import org.jabref.logic.bibtex.LatexFieldFormatterPreferences;
 import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
 import org.jabref.model.metadata.SaveOrderConfig;
-import org.jabref.preferences.JabRefPreferences;
 
 public class SavePreferences {
 
@@ -42,41 +41,6 @@ public SavePreferences(Boolean saveInOriginalOrder, SaveOrderConfig saveOrder, C
         this.globalCiteKeyPattern = globalCiteKeyPattern;
     }
 
-    public static SavePreferences loadForExportFromPreferences(JabRefPreferences preferences) {
-        Boolean saveInOriginalOrder = preferences.getBoolean(JabRefPreferences.EXPORT_IN_ORIGINAL_ORDER);
-        SaveOrderConfig saveOrder = null;
-        if (!saveInOriginalOrder) {
-            if (preferences.getBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER)) {
-                saveOrder = preferences.loadExportSaveOrder();
-            } else {
-                saveOrder = preferences.loadTableSaveOrder();
-            }
-        }
-        Charset encoding = preferences.getDefaultEncoding();
-        Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP);
-        DatabaseSaveType saveType = DatabaseSaveType.ALL;
-        Boolean takeMetadataSaveOrderInAccount = false;
-        Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT);
-        LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences();
-        GlobalBibtexKeyPattern globalCiteKeyPattern =  preferences.getKeyPattern();
-        return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType,
-                takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern);
-    }
-
-    public static SavePreferences loadForSaveFromPreferences(JabRefPreferences preferences) {
-        Boolean saveInOriginalOrder = false;
-        SaveOrderConfig saveOrder = null;
-        Charset encoding = preferences.getDefaultEncoding();
-        Boolean makeBackup = preferences.getBoolean(JabRefPreferences.BACKUP);
-        DatabaseSaveType saveType = DatabaseSaveType.ALL;
-        Boolean takeMetadataSaveOrderInAccount = true;
-        Boolean reformatFile = preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT);
-        LatexFieldFormatterPreferences latexFieldFormatterPreferences = preferences.getLatexFieldFormatterPreferences();
-        GlobalBibtexKeyPattern globalCiteKeyPattern =  preferences.getKeyPattern();
-        return new SavePreferences(saveInOriginalOrder, saveOrder, encoding, makeBackup, saveType,
-                takeMetadataSaveOrderInAccount, reformatFile, latexFieldFormatterPreferences, globalCiteKeyPattern);
-    }
-
     public Boolean getTakeMetadataSaveOrderInAccount() {
         return takeMetadataSaveOrderInAccount;
     }

org.jabref.logic/src/main/java/org/jabref/logic/exporter/TemplateExporter.java

@@ -16,7 +16,6 @@
 import java.util.Objects;
 import java.util.regex.Pattern;
 
-import org.jabref.JabRefMain;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.layout.LayoutHelper;
@@ -43,7 +42,7 @@ public class TemplateExporter extends Exporter {
     private static final Pattern BLANK_LINE_MATCHER = Pattern.compile("(?m)^\\s");
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TemplateExporter.class);
-    
+
     private final String lfFileName;
     private final String directory;
     private final LayoutFormatterPreferences layoutPreferences;
@@ -172,7 +171,7 @@ private Reader getReader(String filename) throws IOException {
         String name = dir + filename;
         Reader reader;
         // Try loading as a resource first. This works for files inside the JAR:
-        URL reso = JabRefMain.class.getResource(name);
+        URL reso = TemplateExporter.class.getResource(name);
 
         // If that did not work, try loading as a normal file URL:
         try {

org.jabref.logic/src/main/java/org/jabref/logic/importer/fileformat/FreeCiteImporter.java

@@ -19,8 +19,6 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.jabref.JabRefGUI;
-import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -202,13 +200,6 @@ public ParserResult importEntries(String text) {
                     // has to be done before label generation as label generation is dependent on entry type
                     e.setType(type);
 
-                    // autogenerate label (BibTeX key)
-                    if (JabRefGUI.getMainFrame() != null) {
-                        // only possible in GUI mode
-                        new BibtexKeyGenerator(JabRefGUI.getMainFrame().getCurrentBasePanel().getBibDatabaseContext(), importFormatPreferences.getBibtexKeyPatternPreferences())
-                                .generateAndSetKey(e);
-                    }
-
                     res.add(e);
                 }
                 parser.next();