Merge remote-tracking branch 'upstream/master' into swing-test

* upstream/master: (29 commits)
  Improve author parsing (#4931)
  Ui preferences global modifications (#4926)
  Bump checkstyle from 8.19 to 8.20 (#4928)
  Bump mysql-connector-java from 8.0.15 to 8.0.16 (#4924)
  UI Preferences->advanced tab optimization : separators and text modification (#4922)
  Fix for the issue #4912 (#4916)
  Refactorings, move functionality of CustomEntryTypesManager to Preferences Use ObservableList instead of LIstProperty
  Toggle enable status of menu items (#4872)
  Fixes throwing an exception when 'id' field is present in bib file (#4918)
  Quick fix for error when opening preferences (#4917)
  Revert "Create new layout for preferences regarding columns"
  Create new layout for preferences regarding columns
  Rearrange the padding of the "Append library" dialog (#4914)
  Make Group dialog resizable (#4910)
  Adjust save exception to inlcude orgininal stack traces
  remove dialogService parameter
  remove dialog service argument
  rework dialog, create fxml etc fix l10n Remove obsolete code
  rework threading stuff simplify code
  Fix Some Codacy Code Convention Issues (#4904)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/gui/customentrytypes/FieldSetComponent.java

CHANGELOG.md

@@ -82,6 +82,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where a non-existing aux file in a group made it impossible to open the library. [#4735](https://github.com/JabRef/jabref/issues/4735)
 - We fixed an issue where some journal names were wrongly marked as abbreviated. [#4115](https://github.com/JabRef/jabref/issues/4115)
 - We fixed an issue where the custom file column were sorted incorrectly. https://github.com/JabRef/jabref/issues/3119
+- We improved the parsing of author names whose infix is abbreviated without a dot. [#4864](https://github.com/JabRef/jabref/issues/4864)
 - We fixed an issues where the entry losses focus when a field is edited and at the same time used for sorting. https://github.com/JabRef/jabref/issues/3373
 - We fixed an issue where the menu on Mac OS was not displayed in the usual Mac-specific way. https://github.com/JabRef/jabref/issues/3146
 - We improved the integrity check for page numbers. [#4113](https://github.com/JabRef/jabref/issues/4113) and [feature request in the forum](http://discourse.jabref.org/t/pages-field-allow-use-of-en-dash/1199)

build.gradle

@@ -101,10 +101,10 @@ dependencies {
 
  compile 'commons-cli:commons-cli:1.4'
 
- compile "org.libreoffice:juh:6.2.2"
- compile "org.libreoffice:jurt:6.2.2"
- compile "org.libreoffice:ridl:6.2.2"
- compile "org.libreoffice:unoil:6.2.2"
+ compile "org.libreoffice:juh:6.2.3"
+ compile "org.libreoffice:jurt:6.2.3"
+ compile "org.libreoffice:ridl:6.2.3"
+ compile "org.libreoffice:unoil:6.2.3"
 
  compile 'io.github.java-diff-utils:java-diff-utils:4.0'
  compile 'info.debatty:java-string-similarity:1.2.1'
@@ -115,7 +115,7 @@ dependencies {
  antlr4 'org.antlr:antlr4:4.7.2'
  compile 'org.antlr:antlr4-runtime:4.7.2'
 
- compile 'mysql:mysql-connector-java:8.0.15'
+ compile 'mysql:mysql-connector-java:8.0.16'
 
  compile 'org.postgresql:postgresql:42.2.5'
 
@@ -128,7 +128,7 @@ dependencies {
  compile 'de.saxsys:mvvmfx:1.8.0'
  compile 'org.fxmisc.easybind:easybind:1.0.3'
  compile 'org.fxmisc.flowless:flowless:0.6.1'
- compile 'org.fxmisc.richtext:richtextfx:0.9.3'
+ compile 'org.fxmisc.richtext:richtextfx:0.10.0'
  compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
  compile 'javax.inject:javax.inject:1'
  compile 'com.jfoenix:jfoenix:8.0.8'
@@ -171,7 +171,7 @@ dependencies {
  testCompile "org.testfx:testfx-core:4.0.+"
  testCompile "org.testfx:testfx-junit5:4.0.+"
 
- checkstyle 'com.puppycrawl.tools:checkstyle:8.19'
+ checkstyle 'com.puppycrawl.tools:checkstyle:8.20'
 }
 
 jacoco {

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

@@ -30,20 +30,20 @@
 import org.jabref.JabRefExecutorService;
 import org.jabref.gui.actions.Actions;
 import org.jabref.gui.actions.BaseAction;
-import org.jabref.gui.actions.CleanupAction;
-import org.jabref.gui.actions.CopyBibTeXKeyAndLinkAction;
-import org.jabref.gui.actions.GenerateBibtexKeyAction;
-import org.jabref.gui.actions.WriteXMPAction;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.autocompleter.AutoCompleteUpdater;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.bibtexkeypattern.GenerateBibtexKeyAction;
+import org.jabref.gui.cleanup.CleanupAction;
 import org.jabref.gui.collab.DatabaseChangeMonitor;
 import org.jabref.gui.collab.DatabaseChangePane;
 import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.edit.CopyBibTeXKeyAndLinkAction;
 import org.jabref.gui.edit.ReplaceStringAction;
 import org.jabref.gui.entryeditor.EntryEditor;
 import org.jabref.gui.exporter.SaveDatabaseAction;
+import org.jabref.gui.exporter.WriteXMPAction;
 import org.jabref.gui.externalfiles.FindFullTextAction;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -292,7 +292,7 @@ private void setupActions() {
  // The action for cleaning up entry.
  actions.put(Actions.CLEANUP, cleanUpAction);
 
- actions.put(Actions.MERGE_ENTRIES, () -> new MergeEntriesAction(frame).execute());
+ actions.put(Actions.MERGE_ENTRIES, () -> new MergeEntriesAction(frame, Globals.stateManager).execute());
 
  // The action for copying the selected entry's key.
  actions.put(Actions.COPY_KEY, this::copyKey);
@@ -430,7 +430,7 @@ private void delete(boolean cut, List<BibEntry> entries) {
  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, BasePanel.this));
+ compound.addEdit(new UndoableRemoveEntry(bibDatabaseContext.getDatabase(), entry));
  bibDatabaseContext.getDatabase().removeEntry(entry);
  ensureNotShowingBottomPanel(entry);
  }

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

@@ -14,6 +14,7 @@
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
 
+import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.logic.bibtex.DuplicateCheck;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.importer.FetcherException;