Merge pull request #5042 from JabRef/mergeSharedentrytofx

Convert merge shared entries to javafx
JabRef · Jun 8, 2019 · 3f89897 · 3f89897
2 parents 08388b6 + ff50e79
commit 3f89897
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 123 deletions.
diff --git a/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java b/src/main/java/org/jabref/gui/shared/MergeSharedEntryDialog.java
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -5,6 +5,7 @@
 import java.util.Optional;
 
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 
@@ -14,6 +15,7 @@
 import org.jabref.gui.JabRefFrame;
 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.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -31,6 +33,7 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
 import org.jabref.model.database.shared.DatabaseSynchronizer;
+import org.jabref.model.entry.BibEntry;
 
 import com.google.common.eventbus.Subscribe;
 
@@ -81,9 +84,40 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
 
         jabRefFrame.getDialogService().notify(Localization.lang("Update refused."));
 
-        new MergeSharedEntryDialog(jabRefFrame, dbmsSynchronizer, updateRefusedEvent.getLocalBibEntry(),
-                                   updateRefusedEvent.getSharedBibEntry(),
-                                   updateRefusedEvent.getBibDatabaseContext().getMode()).showMergeDialog();
+        BibEntry localBibEntry = updateRefusedEvent.getLocalBibEntry();
+        BibEntry sharedBibEntry = updateRefusedEvent.getSharedBibEntry();
+
+        StringBuilder message = new StringBuilder();
+        message.append(Localization.lang("Update could not be performed due to existing change conflicts."));
+        message.append("\r\n");
+        message.append(Localization.lang("You are not working on the newest version of BibEntry."));
+        message.append("\r\n");
+        message.append(Localization.lang("Shared version: %0", String.valueOf(sharedBibEntry.getSharedBibEntryData().getVersion())));
+        message.append("\r\n");
+        message.append(Localization.lang("Local version: %0", String.valueOf(localBibEntry.getSharedBibEntryData().getVersion())));
+        message.append("\r\n");
+        message.append(Localization.lang("Press \"Merge entries\" to merge the changes and resolve this problem."));
+        message.append("\r\n");
+        message.append(Localization.lang("Canceling this operation will leave your changes unsynchronized."));
+
+        ButtonType merge = new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.YES);
+
+        Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(AlertType.CONFIRMATION, Localization.lang("Update refused"), message.toString(), ButtonType.CANCEL, merge);
+
+        if (response.isPresent() && response.get().equals(merge)) {
+            MergeEntriesDialog dialog = new MergeEntriesDialog(localBibEntry, sharedBibEntry, updateRefusedEvent.getBibDatabaseContext().getMode());
+            Optional<BibEntry> mergedEntry = dialog.showAndWait();
+
+            mergedEntry.ifPresent(mergedBibEntry -> {
+                mergedBibEntry.getSharedBibEntryData().setSharedID(sharedBibEntry.getSharedBibEntryData().getSharedID());
+                mergedBibEntry.getSharedBibEntryData().setVersion(sharedBibEntry.getSharedBibEntryData().getVersion());
+
+                dbmsSynchronizer.synchronizeSharedEntry(mergedBibEntry);
+                dbmsSynchronizer.synchronizeLocalDatabase();
+            });
+
+        }
+
     }
 
     @Subscribe

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -1753,14 +1753,12 @@ Work\ offline=Work offline
 Working\ offline.=Working offline.
 Update\ refused.=Update refused.
 Update\ refused=Update refused
-Local\ entry=Local entry
-Shared\ entry=Shared entry
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Update could not be performed due to existing change conflicts.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=You are not working on the newest version of BibEntry.
 Local\ version\:\ %0=Local version: %0
 Shared\ version\:\ %0=Shared version: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Please merge the shared entry with yours and press "Merge entries" to resolve this problem.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Canceling this operation will leave your changes unsynchronized. Cancel anyway?
+Press\ "Merge\ entries"\ to\ merge\ the\ changes\ and\ resolve\ this\ problem.=Press "Merge entries" to merge the changes and resolve this problem.
+Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.=Canceling this operation will leave your changes unsynchronized.
 Shared\ entry\ is\ no\ longer\ present=Shared entry is no longer present
 The\ entry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=The entry you currently work on has been deleted on the shared side.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=You can restore the entry using the "Undo" operation.