Merge branch 'master' of github.com:JabRef/jabref into HEAD

# Conflicts:
#	CHANGELOG.md
#	src/main/java/net/sf/jabref/gui/ClipBoardManager.java

.gitattributes

@@ -2,11 +2,13 @@
 gradlew eol=lf
 *.sh eol=lf
 
+AUTHORS eol=lf
+
 # ensure that line endings of *.java and *.properties are normalized
 *.properties text
 *.java text
 
-# disalbe after a release
+# disable after a release
 # CHANGELOG.md merge=union
 
 src/main/resources/l10n/*.properties merge=union

.gitignore

@@ -33,6 +33,10 @@ ui/
 .classpath
 .project
 
+# markdown-toc
+node_modules/
+npm-debug.log
+
 # UNKNWON
 jabref.xml
 *.sonargraph

.travis.yml

@@ -11,7 +11,24 @@ services:
   - mysql
 
 env:
-  - GRADLE_OPTS=-Dorg.gradle.daemon=false
+  global:
+    - GRADLE_OPTS=-Dorg.gradle.daemon=false
+  matrix:
+    - TEST_SUITE=check OPTIONS=modernizer
+    - TEST_SUITE=fetcherTest
+    - TEST_SUITE=databaseTest
+    - TEST_SUITE=guiTest
+
+matrix:
+    fast_finish: true
+    allow_failures:
+      - env: TEST_SUITE=fetcherTest
+
+# JavaFX localization tests need a running X environment
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
 
 install: true
 
@@ -20,31 +37,12 @@ before_script:
   - mysql -u root -e 'create database jabref'
 
 script:
-  - ./gradlew check modernizer -Dscan
-  - ./gradlew fetcherTest -Dscan
-  - ./gradlew databaseTest -Dscan
-  # Prepare integration tests
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
-  # no need for databases for the integrationTest -> save memory
-  # currently does not work: "stop: Unknown instance:" - sudo service mysql stop
-  - sudo service postgresql stop
-  # following services identified by "sudo service --status-all" do not need to run, too
-  # excluded: rsyslog (feels wrong), udev (feels wrong), friendly-recovery ("Unknown instance" error)
-  - sudo service acpid stop
-  - sudo service atd stop
-  - sudo service cron stop
-  - sudo service memcached stop
-  - sudo service ntp stop
-  - sudo service rabbitmq-server stop
-  - sudo service resolvconf stop
-  - sudo service sshguard stop
-  - sudo service ssh stop
-  # Integration tests run in a timeout. Just start them and kill them after 60s.
-  - timeout 60 ./gradlew guiTest -Dscan --info || true
-
-after_script:
+  # -Dscan enables the Gradle build scan, which can be used to investiage the time each action consumes
+  # For more information see https://gradle.com/scans/get-started
+  - if [ "$TEST_SUITE" != "guiTest" ]; then ./gradlew $TEST_SUITE $OPTIONS -Dscan; fi
+  - if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
+
+after_success:
   # enable codecov report
   - ./gradlew jacocoTestReport
   - bash <(curl -s https://codecov.io/bash)

AUTHORS

@@ -4,6 +4,7 @@ Aaron Chen
 Adam Rehn
 Admir Obralija
 Adrian Daerr
+Alain Vaucher
 Alessio Pollero
 Alex Montgomery
 Alexis Gallagher
@@ -13,6 +14,7 @@ Ambrogio Oliva
 Andreas Amann
 Andreas Rudert
 Anh Nghia Tran
+Anita Armbruster
 Antonio Ribeiro
 Arno Blouin
 Behrouz Javanmardi
@@ -39,6 +41,7 @@ David Weitzman
 Dennis Tschechlov
 Dominik Waßenhoven
 Douglas Nassif Roma Junior
+Eduard Braun
 Eduardo Greco
 Egon Willighagen
 Ellen Reitmayr
@@ -69,6 +72,7 @@ Jan Kubovy
 Janosch Kutscherauer
 Jason Pickering
 Jeff Kerr
+Jeff Miller
 Jeffrey Kuhn
 Jens Döcke
 John David
@@ -91,6 +95,7 @@ Laura Hernández Gómez
 Lee Patton
 Leonardo Haddad
 Ling Wang
+Linus Dietz
 Lorenzo Genta
 Luciana de Melo e Abud
 Mairieli Wessel
@@ -126,12 +131,15 @@ Olaf Lenz
 Oliver Beckmann
 Oliver Kopp
 Oscar Gustafsson
+Owen Huang
+Paul Martin
 payload
 Peter Ansell
 Philip Johnson
 Raik Nagel
 Renato Massao
 Robert Jäschke
+Rolf Starre
 Rudolf Seemann
 Ruy Minoru Ito Takata
 Ryo Igarashi
@@ -140,22 +148,26 @@ Saivert
 Samin Muhammad Ridwanul Karim
 Sascha Hunold
 Sascha Zeller
+Saulius Gražulis
 Saverio Mori
 Scott Townsend
 Seb Wills
 Shitikanth
 Simon Harrer
 Simon Rutishauser
 speed9
+Stefan Feyer
 Stefan Kolb
 Stefan Robert
 Stefano Gariazzo
 Stephan Lau
 Stephan Rave
+Sven Jäger
 The Gitter Badger
 Thiago Toledo
 Thomas Arildsen
 Thorsten Dahlheimer
+Tim van Rossum
 Tobias Boceck
 Tobias Denkinger
 Tobias Diez
@@ -168,6 +180,8 @@ Uwe Kuehn
 Vincent W. Yang
 Waluyo Adi Siswanto
 Ward Poelmans
+Wenbo Yang
 wuw
 Yang Zongze
 Yara Grassi Gouffon
+Yifan Peng

CONTRIBUTING.md

@@ -1,26 +1,15 @@
 ## Understanding the basics
-We welcome contributions to JabRef and encourage to create a fork, clone, **create a new branch** (such as `fix-for-issue-121`), **work on the new branch - not master**, and create a pull request.
+We welcome contributions to JabRef and encourage to create a fork, clone, **create a new branch** (such as `fix-for-issue-121`), **work on the new branch — not master**, and create a pull request.
 Be sure to create a **separate branch** for each improvement you implement.
 Take a look at GitHub's excellent [help documentation] for a detailed explanation.
 
 We also have [code howtos](/~https://github.com/JabRef/jabref/wiki/Code-Howtos) and [guidelines for setting up a local workspace](/~https://github.com/JabRef/jabref/wiki/Guidelines-for-setting-up-a-local-workspace).
 
-For newcomers, [FLOSS Coach](http://www.flosscoach.com/) might be helpful.
-It contains steps to get started with JabRef development.
-
 In case you have any question, do not hesitate to write one of our [JabRef developers](/~https://github.com/orgs/JabRef/teams/developers) an email.
 
 
 ## Formal requirements for a pull request
 The main goal of the formal requirements is to provide credit to you and to be able to understand the patch.
-Nevertheless we aim to keep the code consistently formatted, therefore we additionally have a requirement regarding the source formatter.
-
-
-### Ensure consistent formatting
-Ensure your code is formatted according the JabRef formatting guidelines.
-When you use Eclipse, the required configuration is generated automatically by `gradlew cleanEclipse eclipse`.
-You can also run `gradlew format` to let the [Gradle Format plugin](/~https://github.com/youribonnaffe/gradle-format-plugin) do the formatting.
-
 
 ### Add your change to CHANGELOG.md
 You should edit the [CHANGELOG.md](CHANGELOG.md) located in the root directory of the JabRef source.
@@ -50,7 +39,7 @@ Please make sure there are no duplicates or alternate spellings of your name lis
 If you need to merge different Git usernames or email addresses you can do so by editing `.mailmap`.
 More information on this can be found via `man git-shortlog`.
 
-Please, **do not add yourself at `@authors`**.
+Please, **do not add yourself at JavaDoc's `@authors`**.
 The contribution information is tracked via the version control system.
 
 Your contribution is considered being made under [MIT license](https://tldrlegal.com/license/mit-license).
@@ -92,14 +81,14 @@ because <additional rationale>.
 
 
 ### When adding a new Localization.lang entry
-Add new Localization.lang("KEY") to Java file.
+Add new `Localization.lang("KEY")` to Java file.
 Tests fail. In the test output a snippet is generated which must be added to the English translation file. There is also a snippet generated for the non-English files, but this is irrelevant.
 Add snippet to English translation file located at `src/main/resources/l10n/JabRef_en.properties`
 With `gradlew localizationUpdate` the "KEY" is added to the other translation files as well.
 Tests are green again.
 
 You can also directly run the specific test in your IDE. The test "LocalizationConsistencyTest" is placed under `src/test/java/net.sf.jabref.logic.l10n/LocalizationConsistencyTest.java`
-Find more information in the [JabRef Wiki](/~https://github.com/JabRef/jabref/wiki/Code-Howtos#using-localization-correctly)
+Find more information in the [JabRef Wiki](/~https://github.com/JabRef/jabref/wiki/Code-Howtos#using-localization-correctly).
 
 
 ### Create a pull request

README.md

@@ -3,9 +3,7 @@
 [![Build Status](https://travis-ci.org/JabRef/jabref.svg?branch=master)](https://travis-ci.org/JabRef/jabref)
 [![Dependency Status](https://www.versioneye.com/user/projects/557f2723386664002000009c/badge.svg?style=flat)](https://www.versioneye.com/user/projects/557f2723386664002000009c)
 [![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master)
-[![Donation](https://img.shields.io/badge/donate-something-orange.svg)](https://donations.jabref.org)
-[![Issue Stats](http://www.issuestats.com/github/jabref/jabref/badge/pr)](http://www.issuestats.com/github/jabref/jabref)
-[![Issue Stats](http://www.issuestats.com/github/jabref/jabref/badge/issue)](http://www.issuestats.com/github/jabref/jabref)
+[![Donation](https://img.shields.io/badge/donate-to%20jabref-orange.svg)](https://donations.jabref.org)
 
 This version is a development version. Features may not work as expected.
 
@@ -26,9 +24,9 @@ JabRef also lets you easily link to PDF or web sources for your reference entrie
 JabRef can import from and export to several formats, and you can customize export filters.
 JabRef can be run as a command line application to convert from any import format to any export format.
 
-* Homepage: https://www.jabref.org
-* Development page: /~https://github.com/JabRef/jabref
-* Open HUB page: https://www.openhub.net/p/jabref
+* Homepage: <https://www.jabref.org>
+* Development page: </~https://github.com/JabRef/jabref>
+* Open HUB page: <https://www.openhub.net/p/jabref>
 
 ### Bug Reports, Suggestions, Other Feedback
 
@@ -49,6 +47,11 @@ For details see [CONTRIBUTING](CONTRIBUTING.md).
 ### Requirements
 
 JabRef runs on any system equipped with the Java Virtual Machine (1.8 or newer), which can be downloaded at no cost from [Oracle](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
+From JabRef 4.0 onwards, [JavaFX] support has to be available.
+
+### Installing and Running, Linux:
+
+Please see our [Installation Guide](http://help.jabref.org/en/Installation).
 
 ### Installing and Running, Mac OS X:
 
@@ -105,10 +108,11 @@ Releasing is done using [CircleCI](https://circleci.com/gh/JabRef/jabref). A ful
 Since version 3.6, JabRef is licensed under the [MIT license](https://tldrlegal.com/license/mit-license).
 See the [LICENSE.md](LICENSE.md) for the full MIT license.
 
-JabRef also uses libraries distributed by other parties.
+JabRef also uses libraries, fonts, and icons distributed by other parties.
 See [external libraries](external-libraries.txt) for details.
 
   [BibTeX]: https://www.ctan.org/pkg/bibtex
   [Biblatex]: https://www.ctan.org/pkg/biblatex
   [install4j]: https://www.ej-technologies.com/products/install4j/overview.html
-  [JabRef]: http://www.jabref.org
+  [JabRef]: https://www.jabref.org
+  [JavaFX]: https://en.wikipedia.org/wiki/JavaFX

buildres/JabRef.VisualElementsManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <VisualElements ForegroundText="light" BackgroundColor="#4F5F8F" ShowNameOnSquare150x150Logo="on"></VisualElements>
-</Application>
+<Application>
+    <VisualElements ForegroundText="dark" BackgroundColor="#a2aed1" ShowNameOnSquare150x150Logo="on"></VisualElements>
+</Application>

buildres/gui-tests.sh

@@ -0,0 +1,16 @@
+# no need for databases for the integrationTest -> save memory overflow
+# currently does not work: "stop: Unknown instance:" - sudo service mysql stop
+sudo service postgresql stop
+# following services identified by "sudo service --status-all" do not need to run, too
+# excluded: rsyslog (feels wrong), udev (feels wrong), friendly-recovery ("Unknown instance" error)
+sudo service acpid stop
+sudo service atd stop
+sudo service cron stop
+sudo service memcached stop
+sudo service ntp stop
+sudo service rabbitmq-server stop
+sudo service resolvconf stop
+sudo service sshguard stop
+sudo service ssh stop
+# Integration tests run in a timeout. Just start them and kill them after 60s.
+timeout 60 ./gradlew guiTest -Dscan --info || true

config/IntelliJ Code Style.xml

@@ -10,7 +10,9 @@
       <emptyLine />
       <package name="javax" withSubpackages="true" static="false" />
       <emptyLine />
-      <package name="net.sf.jabref" withSubpackages="true" static="false" />
+        <package name="javafx" withSubpackages="true" static="false"/>
+        <emptyLine/>
+        <package name="org.jabref" withSubpackages="true" static="false"/>
       <emptyLine />
       <package name="" withSubpackages="true" static="false" />
       <emptyLine />
@@ -25,4 +27,4 @@
   <codeStyleSettings language="JAVA">
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>

config/README.md

@@ -0,0 +1,13 @@
+# IntelliJ Configuration
+
+1. Press <kbd>Ctrl</kbd> + <kbd>Alt</kbd> + <kbd>S</kbd>
+2. Go to "Editor > Code Style"
+3. Click "Manage..." (right of "Scheme:")
+4. Click "Import..."
+5. Choose `IntelliJ Code Style.xml`
+6. Press "OK"
+7. Press "OK"
+8. Press "Close"
+9. Press "OK"
+
+* Please let `.editorconfig` override the settings of IntelliJ