Refactor EntryEvents - removal part

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

@@ -56,11 +56,7 @@
 import org.jabref.gui.specialfields.SpecialFieldDatabaseChangeListener;
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 import org.jabref.gui.specialfields.SpecialFieldViewModel;
-import org.jabref.gui.undo.CountingUndoManager;
-import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableFieldChange;
-import org.jabref.gui.undo.UndoableInsertEntry;
-import org.jabref.gui.undo.UndoableRemoveEntry;
+import org.jabref.gui.undo.*;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.worker.SendAsEMailAction;
 import org.jabref.logic.citationstyle.CitationStyleCache;
@@ -80,8 +76,8 @@
 import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
 import org.jabref.model.database.event.CoarseChangeFilter;
+import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.database.event.EntryAddedEvent;
-import org.jabref.model.database.event.EntryRemovedEvent;
 import org.jabref.model.database.shared.DatabaseLocation;
 import org.jabref.model.database.shared.DatabaseSynchronizer;
 import org.jabref.model.entry.BibEntry;
@@ -409,11 +405,9 @@ private void delete(boolean cut, List<BibEntry> entries) {
         } else {
             compound = new NamedCompound((entries.size() > 1 ? Localization.lang("delete entries") : Localization.lang("delete entry")));
         }
-        for (BibEntry entry : entries) {
-            compound.addEdit(new UndoableRemoveEntry(bibDatabaseContext.getDatabase(), entry));
-            bibDatabaseContext.getDatabase().removeEntry(entry);
-            ensureNotShowingBottomPanel(entry);
-        }
+        compound.addEdit(new UndoableRemoveEntries(bibDatabaseContext.getDatabase(), entries));
+        bibDatabaseContext.getDatabase().removeEntries(entries);
+        ensureNotShowingBottomPanel(entries);
         compound.end();
         getUndoManager().addEdit(compound);
 
@@ -886,8 +880,8 @@ public void entryEditorClosing() {
     /**
      * Closes the entry editor if it is showing the given entry.
      */
-    private void ensureNotShowingBottomPanel(BibEntry entry) {
-        if (((mode == BasePanelMode.SHOWING_EDITOR) && (entryEditor.getEntry() == entry))) {
+    private void ensureNotShowingBottomPanel(List<BibEntry> entriesToCheck) {
+        if ((mode == BasePanelMode.SHOWING_EDITOR) && (entriesToCheck.contains(entryEditor.getEntry()))) {
             closeBottomPane();
         }
     }
@@ -1145,8 +1139,8 @@ public void listen(EntryAddedEvent addedEntryEvent) {
     private class EntryRemovedListener {
 
         @Subscribe
-        public void listen(EntryRemovedEvent entryRemovedEvent) {
-            ensureNotShowingBottomPanel(entryRemovedEvent.getBibEntry());
+        public void listen(EntriesRemovedEvent entriesRemovedEvent) {
+            ensureNotShowingBottomPanel(entriesRemovedEvent.getBibEntries());
         }
     }
 
@@ -1184,7 +1178,7 @@ public void listen(EntryChangedEvent entryChangedEvent) {
         }
 
         @Subscribe
-        public void listen(EntryRemovedEvent removedEntryEvent) {
+        public void listen(EntriesRemovedEvent removedEntriesEvent) {
             // IMO only used to update the status (found X entries)
             DefaultTaskExecutor.runInJavaFXThread(() -> frame.getGlobalSearchBar().performSearch());
         }

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

@@ -6,7 +6,7 @@
 import org.jabref.JabRefGUI;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.undo.NamedCompound;
-import org.jabref.gui.undo.UndoableRemoveEntry;
+import org.jabref.gui.undo.UndoableRemoveEntries;
 import org.jabref.logic.bibtex.DuplicateCheck;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
@@ -15,6 +15,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
+
 class EntryDeleteChangeViewModel extends DatabaseChangeViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EntryDeleteChangeViewModel.class);
@@ -40,7 +42,7 @@ public EntryDeleteChangeViewModel(BibEntry memEntry, BibEntry tmpEntry) {
     @Override
     public void makeChange(BibDatabaseContext database, NamedCompound undoEdit) {
         database.getDatabase().removeEntry(memEntry);
-        undoEdit.addEdit(new UndoableRemoveEntry(database.getDatabase(), memEntry));
+        undoEdit.addEdit(new UndoableRemoveEntries(database.getDatabase(), Collections.singletonList(memEntry)));
     }
 
     @Override

src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java

@@ -23,7 +23,7 @@
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog.DuplicateResolverType;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableInsertEntry;
-import org.jabref.gui.undo.UndoableRemoveEntry;
+import org.jabref.gui.undo.UndoableRemoveEntries;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.bibtex.DuplicateCheck;
@@ -162,10 +162,8 @@ private void handleDuplicates(DuplicateSearchResult result) {
         final NamedCompound compoundEdit = new NamedCompound(Localization.lang("duplicate removal"));
         // Now, do the actual removal:
         if (!result.getToRemove().isEmpty()) {
-            for (BibEntry entry : result.getToRemove()) {
-                panel.getDatabase().removeEntry(entry);
-                compoundEdit.addEdit(new UndoableRemoveEntry(panel.getDatabase(), entry));
-            }
+            compoundEdit.addEdit(new UndoableRemoveEntries(panel.getDatabase(), new ArrayList<>(result.getToRemove())));
+            panel.getDatabase().removeEntries(new ArrayList<>(result.getToRemove()));
             panel.markBaseChanged();
         }
         // and adding merged entries:

src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java

@@ -1,5 +1,6 @@
 package org.jabref.gui.mergeentries;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -10,7 +11,7 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableInsertEntry;
-import org.jabref.gui.undo.UndoableRemoveEntry;
+import org.jabref.gui.undo.UndoableRemoveEntries;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 
@@ -57,10 +58,11 @@ public void execute() {
             // Remove the other two entries and add them to the undo stack (which is not working...)
             NamedCompound ce = new NamedCompound(Localization.lang("Merge entries"));
             ce.addEdit(new UndoableInsertEntry(basePanel.getDatabase(), mergedEntry.get()));
-            ce.addEdit(new UndoableRemoveEntry(basePanel.getDatabase(), one));
-            basePanel.getDatabase().removeEntry(one);
-            ce.addEdit(new UndoableRemoveEntry(basePanel.getDatabase(), two));
-            basePanel.getDatabase().removeEntry(two);
+            List<BibEntry> entriesToRemove = new ArrayList<>();
+            entriesToRemove.add(one);
+            entriesToRemove.add(two);
+            ce.addEdit(new UndoableRemoveEntries(basePanel.getDatabase(), entriesToRemove));
+            basePanel.getDatabase().removeEntries(entriesToRemove);
             ce.end();
             basePanel.getUndoManager().addEdit(ce);
 

src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java

@@ -16,14 +16,14 @@
 import org.jabref.gui.entryeditor.EntryEditor;
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.mergeentries.MergeEntriesDialog;
-import org.jabref.gui.undo.UndoableRemoveEntry;
+import org.jabref.gui.undo.UndoableRemoveEntries;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DBMSConnection;
 import org.jabref.logic.shared.DBMSConnectionProperties;
 import org.jabref.logic.shared.DBMSSynchronizer;
 import org.jabref.logic.shared.event.ConnectionLostEvent;
-import org.jabref.logic.shared.event.SharedEntryNotPresentEvent;
+import org.jabref.logic.shared.event.SharedEntriesNotPresentEvent;
 import org.jabref.logic.shared.event.UpdateRefusedEvent;
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
@@ -121,13 +121,13 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
     }
 
     @Subscribe
-    public void listen(SharedEntryNotPresentEvent event) {
+    public void listen(SharedEntriesNotPresentEvent event) {
         BasePanel panel = jabRefFrame.getCurrentBasePanel();
         EntryEditor entryEditor = panel.getEntryEditor();
 
-        panel.getUndoManager().addEdit(new UndoableRemoveEntry(panel.getDatabase(), event.getBibEntry()));
+        panel.getUndoManager().addEdit(new UndoableRemoveEntries(panel.getDatabase(), event.getBibEntries()));
 
-        if (Objects.nonNull(entryEditor) && (entryEditor.getEntry() == event.getBibEntry())) {
+        if (Objects.nonNull(entryEditor) && (event.getBibEntries().contains(entryEditor.getEntry()))) {
 
             dialogService.showInformationDialogAndWait(Localization.lang("Shared entry is no longer present"),
                                                        Localization.lang("The entry you currently work on has been deleted on the shared side.")

src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java → src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java

@@ -9,33 +9,43 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * This class represents the removal of an entry. The constructor needs
  * references to the database, the entry, and the map of open entry editors.
  * The latter to be able to close the entry's editor if it is opened after
  * an undo, and the removal is then undone.
  */
-public class UndoableRemoveEntry extends AbstractUndoableJabRefEdit {
+public class UndoableRemoveEntries extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableRemoveEntry.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableRemoveEntries.class);
     private final BibDatabase base;
-    private final BibEntry entry;
+    private final List<BibEntry> entries;
 
-    public UndoableRemoveEntry(BibDatabase base, BibEntry entry) {
+    public UndoableRemoveEntries(BibDatabase base, List<BibEntry> entries) {
         this.base = base;
-        this.entry = entry;
+        this.entries = entries;
     }
 
     @Override
     public String getPresentationName() {
-        return Localization.lang("remove entry %0",
-                StringUtil.boldHTML(entry.getCiteKeyOptional().orElse(Localization.lang("undefined"))));
+        if (entries.size() > 1) {
+            return Localization.lang("remove entries");
+        }
+        else if (entries.size() == 1) {
+            return Localization.lang("remove entry %0",
+                    StringUtil.boldHTML(entries.get(0).getCiteKeyOptional().orElse(Localization.lang("undefined"))));
+        }
+        else {
+            return null;
+        }
     }
 
     @Override
     public void undo() {
         super.undo();
-        base.insertEntry(entry, EntryEventSource.UNDO);
+        base.insertEntries(entries, EntryEventSource.UNDO);
     }
 
     @Override
@@ -44,7 +54,7 @@ public void redo() {
 
         // Redo the change.
         try {
-            base.removeEntry(entry);
+            base.removeEntries(entries);
         } catch (Throwable ex) {
             LOGGER.warn("Problem to redo `remove entry`", ex);
         }

src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java

@@ -3,7 +3,7 @@
 import java.util.Objects;
 
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.event.EntryRemovedEvent;
+import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.EntryChangedEvent;
 
@@ -65,8 +65,8 @@ public void listen(EntryChangedEvent entryChangedEvent) {
          * removes the citation of the removed entry as it's not needed anymore
          */
         @Subscribe
-        public void listen(EntryRemovedEvent entryRemovedEvent) {
-            citationStyleCache.invalidate(entryRemovedEvent.getBibEntry());
+        public void listen(EntriesRemovedEvent entriesRemovedEvent) {
+            citationStyleCache.invalidateAll(entriesRemovedEvent.getBibEntries());
         }
     }
 }

src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java

@@ -14,20 +14,20 @@
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.util.MetaDataParser;
 import org.jabref.logic.shared.event.ConnectionLostEvent;
-import org.jabref.logic.shared.event.SharedEntryNotPresentEvent;
+import org.jabref.logic.shared.event.SharedEntriesNotPresentEvent;
 import org.jabref.logic.shared.event.UpdateRefusedEvent;
 import org.jabref.logic.shared.exception.OfflineLockException;
 import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.database.event.EntryAddedEvent;
-import org.jabref.model.database.event.EntryRemovedEvent;
 import org.jabref.model.database.shared.DatabaseConnection;
 import org.jabref.model.database.shared.DatabaseConnectionProperties;
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
 import org.jabref.model.database.shared.DatabaseSynchronizer;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.event.EntryEvent;
+import org.jabref.model.entry.event.EntriesEvent;
 import org.jabref.model.entry.event.EntryEventSource;
 import org.jabref.model.entry.event.FieldChangedEvent;
 import org.jabref.model.entry.field.Field;
@@ -108,12 +108,17 @@ public void listen(FieldChangedEvent event) {
      *
      * @param event {@link EntryRemovedEvent} object
      */
+
+    // This has not been made parellel yet - hence the for loop - that will take more effort
     @Subscribe
-    public void listen(EntryRemovedEvent event) {
+    public void listen(EntriesRemovedEvent event) {
         // While synchronizing the local database (see synchronizeLocalDatabase() below), some EntryEvents may be posted.
         // In this case DBSynchronizer should not try to delete the bibEntry entry again (but it would not harm).
         if (isEventSourceAccepted(event) && checkCurrentConnection()) {
-            dbmsProcessor.removeEntry(event.getBibEntry());
+            List<BibEntry> entries = event.getBibEntries();
+            for (BibEntry entry : entries) {
+                dbmsProcessor.removeEntry(entry);
+            }
             synchronizeLocalMetaData();
             synchronizeLocalDatabase(); // Pull changes for the case that there where some
         }
@@ -223,6 +228,7 @@ public void synchronizeLocalDatabase() {
      * @param sharedIDs Set of all IDs which are present on shared database
      */
     private void removeNotSharedEntries(List<BibEntry> localEntries, Set<Integer> sharedIDs) {
+        List<BibEntry> entriesToRemove = new ArrayList<>();
         for (int i = 0; i < localEntries.size(); i++) {
             BibEntry localEntry = localEntries.get(i);
             boolean match = false;
@@ -233,11 +239,13 @@ private void removeNotSharedEntries(List<BibEntry> localEntries, Set<Integer> sh
                 }
             }
             if (!match) {
-                eventBus.post(new SharedEntryNotPresentEvent(localEntry));
-                bibDatabase.removeEntry(localEntry, EntryEventSource.SHARED); // Should not reach the listeners above.
-                i--; // due to index shift on localEntries
+                entriesToRemove.add(localEntry);
             }
         }
+        if (!entriesToRemove.isEmpty()) {
+            eventBus.post(new SharedEntriesNotPresentEvent(entriesToRemove));
+        }
+        bibDatabase.removeEntries(entriesToRemove, EntryEventSource.SHARED); // Should not reach the listeners above.
     }
 
     /**
@@ -350,7 +358,7 @@ public boolean checkCurrentConnection() {
      * @param event An {@link EntryEvent}
      * @return <code>true</code> if the event is able to trigger operations in {@link DBMSSynchronizer}, else <code>false</code>
      */
-    public boolean isEventSourceAccepted(EntryEvent event) {
+    public boolean isEventSourceAccepted(EntriesEvent event) {
         EntryEventSource eventSource = event.getEntryEventSource();
         return ((eventSource == EntryEventSource.LOCAL) || (eventSource == EntryEventSource.UNDO));
     }

src/main/java/org/jabref/logic/shared/event/SharedEntriesNotPresentEvent.java

@@ -0,0 +1,25 @@
+package org.jabref.logic.shared.event;
+
+import org.jabref.model.entry.BibEntry;
+
+import java.util.List;
+
+/**
+ * A new {@link SharedEntriwaNotPresentEvent} is fired, when the user tries to push changes of an obsolete
+ * {@link BibEntry} to the server.
+ */
+public class SharedEntriesNotPresentEvent {
+
+    private final List<BibEntry> bibEntries;
+
+    /**
+     * @param bibEntries Affected {@link BibEntry}
+     */
+    public SharedEntriesNotPresentEvent(List<BibEntry> bibEntries) {
+        this.bibEntries = bibEntries;
+    }
+
+    public List<BibEntry> getBibEntries() {
+        return this.bibEntries;
+    }
+}