Merge remote-tracking branch 'upstream/master' into libraryproperties…

…tofx

* upstream/master:
  Catch NumberFormatException in BibTeXML exporter (#4698)
  Remove resolve duplicate keys dialog (#4696)
  fixes #4610. Changed the way the GroupDialog description is displayed.  (#4660)
  Bump slf4j-api from 1.8.0-beta2 to 1.8.0-beta4 (#4675)

CHANGELOG.md

@@ -103,6 +103,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - The feature to "mark entries" was removed and merged with the groups functionality.  For migration, a group is created for every value of the `__markedentry` field and the entry is added to this group.
 - The number column was removed.
 - We removed the coloring of cells in the maintable according to whether the field is optional/required.
+- We removed the feature to find and resolve duplicate BibTeX keys (as this use case is already covered by the integrity check).
 - We removed a few commands from the right-click menu that are not needed often and thus don't need to be placed that prominently:
   - Print entry preview: available through entry preview
   - All commands related to marking: marking is not yet reimplemented

build.gradle

@@ -146,7 +146,7 @@ dependencies {
     compile 'com.mashape.unirest:unirest-java:1.4.9'
 
     // >1.8.0-beta is required for java 9 compatibility
-    compile 'org.slf4j:slf4j-api:1.8.0-beta2'
+    compile 'org.slf4j:slf4j-api:1.8.0-beta4'
     compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.11.2'
     compile 'org.apache.logging.log4j:log4j-jcl:2.11.2'
     compile 'org.apache.logging.log4j:log4j-api:2.11.2'

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

@@ -40,7 +40,6 @@
 import org.jabref.gui.autocompleter.AutoCompleteUpdater;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
-import org.jabref.gui.bibtexkeypattern.SearchFixDuplicateLabels;
 import org.jabref.gui.collab.DatabaseChangeMonitor;
 import org.jabref.gui.collab.FileUpdatePanel;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -406,8 +405,6 @@ private void setupActions() {
         actions.put(Actions.ABBREVIATE_MEDLINE, new AbbreviateAction(this, false));
         actions.put(Actions.UNABBREVIATE, new UnabbreviateAction(this));
 
-        actions.put(Actions.RESOLVE_DUPLICATE_KEYS, new SearchFixDuplicateLabels(this));
-
         actions.put(Actions.ADD_TO_GROUP, new GroupAddRemoveDialog(this, true, false));
         actions.put(Actions.REMOVE_FROM_GROUP, new GroupAddRemoveDialog(this, false, false));
         actions.put(Actions.MOVE_TO_GROUP, new GroupAddRemoveDialog(this, true, true));

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

@@ -868,7 +868,6 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.RESOLVE_DUPLICATE_KEYS, new OldDatabaseCommandWrapper(Actions.RESOLVE_DUPLICATE_KEYS, this, Globals.stateManager)),
                 factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(this)),
                 factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new OldDatabaseCommandWrapper(Actions.CLEANUP, this, Globals.stateManager)),
                 factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new OldDatabaseCommandWrapper(Actions.MAKE_KEY, this, Globals.stateManager)),

src/main/java/org/jabref/gui/actions/Actions.java

@@ -45,7 +45,6 @@ public enum Actions {
     REDO,
     REMOVE_FROM_GROUP,
     REPLACE_ALL,
-    RESOLVE_DUPLICATE_KEYS,
     SAVE,
     SAVE_AS,
     SAVE_SELECTED_AS_PLAIN,

src/main/java/org/jabref/gui/groups/GroupDescriptions.java

@@ -14,9 +14,9 @@ private GroupDescriptions() {
     public static String getDescriptionForPreview(String field, String expr, boolean caseSensitive, boolean regExp) {
         String header = regExp ? Localization.lang(
                 "This group contains entries whose <b>%0</b> field contains the regular expression <b>%1</b>",
-                field, StringUtil.quoteForHTML(expr)) : Localization.lang(
+                field, expr) : Localization.lang(
                         "This group contains entries whose <b>%0</b> field contains the keyword <b>%1</b>",
-                        field, StringUtil.quoteForHTML(expr));
+                        field, expr);
         String caseSensitiveText = caseSensitive ? Localization.lang("case sensitive") : Localization
                 .lang("case insensitive");
         String footer = regExp ? Localization
@@ -30,7 +30,7 @@ public static String getDescriptionForPreview(String field, String expr, boolean
                                 + "then using the context menu. "
                                 + "This process removes the term <b>%1</b> from "
                                 + "each entry's <b>%0</b> field.",
-                        field, StringUtil.quoteForHTML(expr));
+                        field, expr);
         return String.format("%s (%s). %s", header, caseSensitiveText, footer);
     }