Merge branch 'master' into MedlinePlainImporterTest

# Conflicts:
#	src/main/java/net/sf/jabref/importer/fileformat/MedlinePlainImporter.java

Author: boceckts

.travis.yml

@@ -0,0 +1,16 @@
+language: java
+jdk:
+  - oraclejdk8
+sudo: false
+
+before_install:
+  - chmod +x gradlew
+
+script:
+  - ./gradlew test --info
+
+# cache gradle dependencies
+cache:
+  directories:
+  - $HOME/.gradle/caches/
+  - $HOME/.gradle/wrapper/

CHANGELOG.md

@@ -13,19 +13,37 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 ## [Unreleased]
 
 ### Changed
+- Add options to close other/all databases in tab right-click menu
+- Implements #470: Show editor (as an alternative to author) and booktitle (as an alternative to journal) in the main table by default
+- Restore focus to last focused tab on start
+- Add ability to format/cleanup the date field
 - Add support for proxy authentication via VM args and GUI settings, this implements Feature Request #388
 - Move Bibtex and Biblatex mode switcher to File menu
 - Display active edit mode (BibTeX or Biblatex) at window title
+- Implements #444: The search is cleared by either clicking the clear-button or by pressing ESC with having focus in the search field. 
+- Icons are shown as Header for icon columns in the entry table (#315)
+- Tooltips are shown for header columns and contents which are too wide to be displayed in the entry table (#384)
+- Default order in entry table:  # | all file based icons (file, URL/DOI, ...) | all bibtex field based icons (bibtexkey, entrytype, author, title, ...) | all activated special field icons (ranking, quality, ...)
 
 ### Fixed
-- Fix #420: Reenable preference changes
-- Fix #414: Rework BibLatex entry types with correct required and optional fields
-- Fix #413: Help links in released jar version are not working
-- Biblatex preserves capital letters, checking whether letters may be converted to lowercase within the Integrity Check action is obsolete. Fixes #412 
+- Fixed #434: Revert to old 'JabRef' installation folder name instead of 'jabref'
+- Fixed #435: Retrieve non open access ScienceDirect PDFs via HTTP DOM
+- Fixed: Cleanup process aborts if linked file does not exists
+- Fixed #420: Reenable preference changes
+- Fixed #414: Rework BibLatex entry types with correct required and optional fields
+- Fixed #413: Help links in released jar version are not working
+- Fixes #412: Biblatex preserves capital letters, checking whether letters may be converted to lowercase within the Integrity Check action is obsolete.
+- Fixed #437: The toolbar after the search field is now correctly wrapped when using a small window size for JabRef
+- Fixed #438: Cut, Copy and Paste are now translated correctly in the menu
+- Fixed #443/#445: Fixed sorting and moving special field columns
+- Fixed #498: non-working legacy PDF/PS column removed
+- Fixed #473: Import/export to external database works again
 
 ### Removed
 - Removed file history size preference (never available from the UI)
-
+- Removed jstorImporter because it's hardly ever used, even Jstor.org doesn't support/export said format anymore
+- Removed option "Show one letter heading for icon columns" which is obsolete with the fix of #315/384
+- Removed table column "PDF/PS" which refers to legacy fields "ps" resp. "pdf" which are no longer supported (see also fix #498)
 
 
 
@@ -155,7 +173,7 @@ Since much functionality has changed during development, a release of this versi
 
 ## 2.11 - 2015-11-11
 
-The changelog of 2.11 and versions before is maintained as text file in the [dev_2.11 branch](https://github.com/JabRef/jabref/tree/dev_2.11).
+The changelog of 2.11 and versions before is maintained as [text file](https://github.com/JabRef/jabref/blob/dev_2.11/CHANGELOG) in the [dev_2.11 branch](https://github.com/JabRef/jabref/tree/dev_2.11).
 
 [Unreleased]: https://github.com/JabRef/jabref/compare/v3.0...HEAD
 [3.0]: https://github.com/JabRef/jabref/compare/v2.11.1...v3.0

README.md

@@ -1,13 +1,11 @@
 # JabRef Development Version
 
-[![CircleCI](https://img.shields.io/circleci/project/JabRef/jabref.svg)](https://circleci.com/gh/JabRef/jabref)
+[![CircleCI](https://img.shields.io/circleci/project/JabRef/jabref/master.svg)](https://circleci.com/gh/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)
 [![Coverity Status](https://badges.ondemand.coverity.com/streams/tslj9m8e2149d8elggiskktgpc)](https://ondemand.coverity.com/streams/tslj9m8e2149d8elggiskktgpc)
-[![License](https://img.shields.io/badge/license-GPLv2-blue.svg)](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt)
 [![Donation](https://img.shields.io/badge/donate-paypal-orange.svg)](https://www.paypal.com/cgi-bin/webscr?item_name=JabRef+Bibliography+Manager&cmd=_donations&lc=US&currency_code=EUR&business=jabrefmail%40gmail.com)
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=koppor&url=https%3A%2F%2Fgithub.com%2FJabRef%2Fjabref&title=JabRef&language=Java&tags=github&category=software)
-[![Download JabRef](https://img.shields.io/sourceforge/dw/jabref.svg)](http://sourceforge.net/projects/jabref/files/jabref/)
+[![Download JabRef](https://img.shields.io/sourceforge/dw/jabref.svg)](http://sourceforge.net/projects/jabref/files/)
 [![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)
 
@@ -16,9 +14,11 @@ This version is a development version. Features may not work as expected.
 The branch of this README file is `master`.
 The intention of this branch is to move JabRef forward to modern technologies such as Java8 and JavaFX.
 
-The last version with Java6 support is `v2.11` being developed at the [dev_2.11 branch](https://github.com/JabRef/jabref/tree/dev_2.11).
+The last version with Java 6 support is `v2.11` being developed at the [dev_2.11 branch](https://github.com/JabRef/jabref/tree/dev_2.11).
 
-The development builds are available at [builds.jabref.org](http://builds.jabref.org/)
+Development builds are available at [builds.jabref.org](http://builds.jabref.org/master/), the [latest release is available via GitHub](https://github.com/JabRef/jabref/releases/latest).
+
+Explanation of donation possibilities and usage of donations is available at our [donations page](https://github.com/JabRef/jabref/wiki/Donations).
 
 We use [install4j], the multi-platform installer builder.
 
@@ -38,11 +38,8 @@ 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: http://jabref.sourceforge.net/
-* Development mailing list: https://lists.sourceforge.net/lists/listinfo/jabref-devel
-* Development page: https://github.com/JabRef
-* Main git repository: https://github.com/JabRef/jabref
-* CI Server: https://circleci.com/gh/JabRef/jabref
+* Homepage: http://www.jabref.org
+* Development page: https://github.com/JabRef/jabref
 * Open HUB page: https://www.openhub.net/p/jabref
 
 ### Bug Reports, Suggestions, Other Feedback
@@ -135,4 +132,4 @@ See the [LICENSE](LICENSE) for full details.
 JabRef also uses libraries distributed by other parties.
 See [external libraries](external-libraries.txt) for details.
 
-  [install4j]: https://www.ej-technologies.com/products/install4j/overview.html
+  [install4j]: https://www.ej-technologies.com/products/install4j/overview.html

build.gradle

@@ -94,11 +94,12 @@ dependencies {
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
     compile fileTree(dir: 'lib', includes: ['*.jar'])
 
-    compile 'com.google.guava:guava:18.0'
+    compile 'com.google.guava:guava:19.0'
 
     compile 'commons-logging:commons-logging:1.2'
 
-    compile 'junit:junit:4.12'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
 
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'com.mashape.unirest:unirest-java:1.4.7'
@@ -347,7 +348,7 @@ task releaseJar(dependsOn: "shadowJar") {
 // see http://stackoverflow.com/a/27455099/873282 for an inspiration of this task
 // better solution: https://discuss.gradle.org/t/how-to-download-maven-dependencies-into-project-local-directory-and-set-eclipse-classpath/9851
 task getdeps(type: Copy) {
-    from (configurations.compile+configurations.testCompile) {
+    from (configurations.compile+configurations.antlr3+configurations.antlr4+configurations.testCompile) {
         include "*.jar"
     }
     into 'build/tmp/alldeps/'

jabref.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="6.0.4" transformSequenceNumber="5">
   <directoryPresets config="./buildres/JabRef.VisualElementsManifest.xml" />
-  <application name="JabRef" distributionSourceDir="" applicationId="0034-7691-1464-4754" mediaDir="build/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="jabref" publisher="JabRef Community" publisherWeb="http://www.jabref.org/" version="3.0dev" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="780dfea2d33a0244" javaMinVersion="1.8" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
+  <application name="JabRef" distributionSourceDir="" applicationId="0034-7691-1464-4754" mediaDir="build/install4j" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="JabRef" publisher="JabRef Community" publisherWeb="http://www.jabref.org/" version="3.0dev" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="780dfea2d33a0244" javaMinVersion="1.8" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="true" languageSelectionInPrincipalLanguage="false">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages>

localization.gradle

@@ -0,0 +1,44 @@
+repositories {
+    jcenter()
+}
+
+configurations {
+    jython
+}
+
+dependencies {
+    jython 'org.python:jython-standalone:2.7.0'
+}
+
+task checkTranslations(type: JavaExec) {
+    description "Print empty and duplicate translations."
+    main 'org.python.util.jython'
+    classpath project.configurations.jython.asPath
+    args file("scripts/syncLang.py")
+    args "-d"
+}
+
+task checkTranslationsSummary(type: JavaExec) {
+    description "Print summary of empty and duplicate translations."
+    main 'org.python.util.jython'
+    classpath project.configurations.jython.asPath
+    args file("scripts/syncLang.py")
+    args "-c"
+}
+
+task compareTranslationsWithEnglishTranslation(type: JavaExec) {
+    description "Prints differences between the english translation and translations in other languages."
+    main 'org.python.util.jython'
+    classpath project.configurations.jython.asPath
+    args file("scripts/syncLang.py")
+    args "-t"
+}
+
+task compareAndUpdateTranslationsWithEnglishTranslation(type: JavaExec) {
+    description "Prints differences between the english translation and translations in other languages, and updates translations if possible."
+    main 'org.python.util.jython'
+    classpath project.configurations.jython.asPath
+    args file("scripts/syncLang.py")
+    args "-t"
+    args "-u"
+}