Trying to fix indentation in AcademicPagesExporterTest

Author: GreLucie

jablib/src/main/java/org/jabref/logic/exporter/AcademicPagesExporter.java

@@ -30,6 +30,15 @@ public class AcademicPagesExporter extends Exporter {
     private final String directory;
     private final LayoutFormatterPreferences layoutPreferences;
     private final SelfContainedSaveOrder saveOrder;
+<<<<<<< HEAD
+=======
+
+    private final Replace replaceFormatter = new Replace();
+    private final RemoveLatexCommandsFormatter commandsFormatter = new RemoveLatexCommandsFormatter();
+    private final HTMLChars htmlFormatter = new HTMLChars();
+    private final SafeFileName safeFormatter = new SafeFileName();
+
+>>>>>>> 100fe95fd2e80d7e86a23d3ade55de7117501700
     private TemplateExporter academicPagesTemplate;
 
     /**
@@ -49,8 +58,9 @@ public AcademicPagesExporter(LayoutFormatterPreferences layoutPreferences, SelfC
     @Override
     public void export(@NonNull final BibDatabaseContext databaseContext,
                        @NonNull final Path exportDirectory,
-                       @NonNull List<BibEntry> entries) throws SaveException {
-        export(databaseContext, exportDirectory, entries, List.of(), JournalAbbreviationLoader.loadBuiltInRepository());
+                       @NonNull List<BibEntry> entries)
+        throws SaveException {
+        export(databaseContext, exportDirectory, entries, List.of(exportDirectory), JournalAbbreviationLoader.loadBuiltInRepository());
     }
 
     /**
@@ -67,7 +77,8 @@ public void export(@NonNull final BibDatabaseContext databaseContext,
                        @NonNull final Path file,
                        @NonNull List<BibEntry> entries,
                        List<Path> fileDirForDataBase,
-                       JournalAbbreviationRepository abbreviationRepository) throws SaveException {
+                       JournalAbbreviationRepository abbreviationRepository)
+        throws SaveException {
         if (entries.isEmpty()) { // Only export if entries exist
             return;
         }
@@ -93,15 +104,23 @@ public void export(@NonNull final BibDatabaseContext databaseContext,
         }
     }
 
+<<<<<<< HEAD
     private static @NonNull Path getPath(BibEntry entry, Path exportDirectory) {
         Replace replaceFormatter = new Replace();
         replaceFormatter.setArgument(" ,-"); // expects an expression that has the character to remove and the replacement character separated by a comma.
         RemoveLatexCommandsFormatter commandsFormatter = new RemoveLatexCommandsFormatter();
         HTMLChars htmlFormatter = new HTMLChars();
         String title = entry.getTitle().get();
+=======
+    private @NonNull Path getPath(BibEntry entry, Path exportDirectory) throws SaveException {
+
+        replaceFormatter.setArgument(" ,-"); // The replaceFormatter expects a "-" instead of " " hence the strange argument.
+
+        String title = entry.getTitle().orElseThrow(() -> new SaveException("Entry does not contain a title"));
+>>>>>>> 100fe95fd2e80d7e86a23d3ade55de7117501700
         String formattedTitle = commandsFormatter.format(htmlFormatter.format(replaceFormatter.format(title)));
-        SafeFileName safeFormatter = new SafeFileName();
         String safeTitle = safeFormatter.format(formattedTitle);
+
         return exportDirectory.resolve(safeTitle + ".md");
     }
 }