Merge pull request #3762 from JabRef/meaningful-button-review-field-m…

…igration * Fix logic * Rename confirmation into "Merge fields"
JabRef · Feb 23, 2018 · 9daaf75 · 9daaf75
2 parents 06b6905 + c0677b3
commit 9daaf75
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
@@ -20,7 +20,7 @@ public void performAction(BasePanel basePanel, ParserResult parserResult) {
 
         migration.performMigration(parserResult);
         List<BibEntry> conflicts = MergeReviewIntoCommentMigration.collectConflicts(parserResult);
-        if (new MergeReviewIntoCommentConfirmationDialog(basePanel).askUserForMerge(conflicts)) {
+        if (!conflicts.isEmpty() && new MergeReviewIntoCommentConfirmationDialog(basePanel).askUserForMerge(conflicts)) {
             migration.performConflictingMigration(parserResult);
         }
     }

diff --git a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java
@@ -25,13 +25,14 @@ public boolean askUserForMerge(List<BibEntry> conflicts) {
                 .map(Optional::get)
                 .collect(Collectors.joining(",\n"));
 
-        int answer = JOptionPane.showConfirmDialog(
+        String[] options = {Localization.lang("Merge fields")};
+        int answer = JOptionPane.showOptionDialog(
                 panel,
                 bibKeys + " " +
                         Localization.lang("has/have both a 'Comment' and a 'Review' field.") + "\n" +
                         Localization.lang("Since the 'Review' field was deprecated in JabRef 4.2, these two fields are about to be merged into the 'Comment' field.") + "\n" +
                         Localization.lang("The conflicting fields of these entries will be merged into the 'Comment' field."),
-                Localization.lang("Review Field Migration"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
+                Localization.lang("Review Field Migration"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
 
         return 0 == answer;
     }

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -719,6 +719,7 @@ Memory\ stick\ mode=Memory stick mode
 Menu\ and\ label\ font\ size=Menu and label font size
 
 Merged\ external\ changes=Merged external changes
+Merge\ fields=Merge fields
 
 Messages=Messages