Skip to content

Commit e64b406

Browse files
committed
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
* upstream/master: (71 commits) New translations JabRef_en.properties (French) Add Gitter badge and hint (#3630) New translations JabRef_en.properties (Vietnamese) New translations JabRef_en.properties (Chinese Simplified) New translations JabRef_en.properties (Dutch) New translations JabRef_en.properties (French) New translations JabRef_en.properties (German) New translations JabRef_en.properties (Greek) New translations JabRef_en.properties (Indonesian) New translations JabRef_en.properties (Italian) New translations JabRef_en.properties (Japanese) New translations JabRef_en.properties (Norwegian) New translations JabRef_en.properties (Persian) New translations JabRef_en.properties (Portuguese, Brazilian) New translations JabRef_en.properties (Russian) New translations JabRef_en.properties (Spanish) New translations JabRef_en.properties (Swedish) New translations JabRef_en.properties (Turkish) New translations JabRef_en.properties (Danish) Update CHANGELOG.md ...
2 parents e326bcf + 0f59b67 commit e64b406

File tree

69 files changed

+554
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+554
-336
lines changed

CHANGELOG.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
1212
## [Unreleased]
1313

1414
### Changed
15+
- We now show a small notification icon in the entry editor when we detect data inconsistency or other problems. [#3145](https://github.com/JabRef/jabref/issues/3145)
1516
- We added [oaDOI](https://oadoi.org/) as a fulltext provider, so that JabRef is now able to provide fulltexts for more than 90 million open-access articles.
16-
17+
- We changed one default of [Cleanup entries dialog](http://help.jabref.org/en/CleanupEntries): Per default, the PDF are not moved to the default file directory anymore. [#3619](https://github.com/JabRef/jabref/issues/3619)
1718

1819
### Fixed
1920
- We fixed the missing dot in the name of an exported file. [#3576](https://github.com/JabRef/jabref/issues/3576)
21+
- Autocompletion in the search bar can now be disabled via the preferences. [#3598](https://github.com/JabRef/jabref/issues/3598)
2022

2123
### Removed
22-
- We removed the Look and Feels from jgoodies, because these are not compatible with Java 9
24+
- We removed the [Look and Feels from JGoodies](http://www.jgoodies.com/freeware/libraries/looks/), because the open source version is not compatible with Java 9.
2325

2426

2527

@@ -115,7 +117,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
115117
- We fixed an issue where the same Java Look and Feel would be listed more than once in the Preferences. [#3391](https://github.com/JabRef/jabref/issues/3391)
116118
- We fixed an issue where errors in citation styles triggered an exception when opening the preferences dialog. [#3389](https://github.com/JabRef/jabref/issues/3389)
117119
- We fixed an issue where entries were displayed twice after insertion into a shared database. [#3164](https://github.com/JabRef/jabref/issues/3164)
118-
- We improved the auto link algorithm so that files starting with a similar key are no longer found (e.g, `Einstein1902` vs `Einstein1902a`). [#3472](https://github.com/JabRef/jabref/issues/3472)
120+
- We improved the auto link algorithm so that files starting with a similar key are no longer found (e.g, `Einstein1902` vs `Einstein1902a`). [#3472](https://github.com/JabRef/jabref/issues/3472)
119121
- We fixed an issue where special fields (such as `printed`) could not be cleared when syncing special fields via the keywords. [#3432](https://github.com/JabRef/jabref/issues/3432)
120122
- We fixed an issue where the tooltip of the global search bar showed html tags instead of formatting the text. [#3381](https://github.com/JabRef/jabref/issues/3381)
121123
- We fixed an issue where timestamps were not updated for changed entries. [#2810](https://github.com/JabRef/jabref/issues/2810)

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Take a look at GitHub's excellent [help documentation] for a detailed explanatio
66
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).
77

88
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.
9+
We should also be online at [gitter](https://gitter.im/JabRef/jabref).
910

1011

1112
## Formal requirements for a pull request

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
[![Build Status](https://travis-ci.org/JabRef/jabref.svg?branch=master)](https://travis-ci.org/JabRef/jabref)
44
[![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master)
55
[![Donation](https://img.shields.io/badge/donate%20to-jabref-orange.svg)](https://donations.jabref.org)
6+
[![Help Contribute to Open Source](https://www.codetriage.com/jabref/jabref/badges/users.svg)](https://www.codetriage.com/jabref/jabref)
7+
[![Join the chat at https://gitter.im/JabRef/jabref](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/JabRef/jabref?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
68

79
This version is a development version. Features may not work as expected.
810

build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import groovy.json.JsonSlurper
22
import org.gradle.internal.os.OperatingSystem
33

4-
// to update the gradle wrapper, execute ./gradlew wrapper --gradle-version 4.0
4+
// to update the gradle wrapper, execute
5+
// ./gradlew wrapper --gradle-version=4.4.1 --distribution-type=bin
56

67
buildscript {
78
repositories {
@@ -95,7 +96,7 @@ dependencies {
9596
compile 'org.apache.pdfbox:jempbox:1.8.13'
9697

9798
// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
98-
compile 'org.bouncycastle:bcprov-jdk15on:1.58'
99+
compile 'org.bouncycastle:bcprov-jdk15on:1.59'
99100

100101
compile 'commons-cli:commons-cli:1.4'
101102

@@ -132,7 +133,7 @@ dependencies {
132133
compile 'org.fxmisc.richtext:richtextfx:0.8.1'
133134

134135
// Cannot be updated to 9.*.* until Jabref works with Java 9
135-
compile 'org.controlsfx:controlsfx:8.40.14'
136+
compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT'
136137

137138
compile 'org.jsoup:jsoup:1.11.2'
138139
compile 'com.mashape.unirest:unirest-java:1.4.9'
@@ -160,7 +161,7 @@ dependencies {
160161
testRuntime 'org.apache.logging.log4j:log4j-core:2.10.0'
161162
testRuntime 'org.apache.logging.log4j:log4j-jul:2.10.0'
162163
testCompile 'org.mockito:mockito-core:2.13.0'
163-
testCompile 'com.github.tomakehurst:wiremock:2.12.0'
164+
testCompile 'com.github.tomakehurst:wiremock:2.13.0'
164165
testCompile 'org.assertj:assertj-swing-junit:3.8.0'
165166
testCompile 'org.reflections:reflections:0.9.11'
166167
testCompile 'org.xmlunit:xmlunit-core:2.5.1'
@@ -170,7 +171,7 @@ dependencies {
170171
testCompile "org.testfx:testfx-core:4.0.+"
171172
testCompile "org.testfx:testfx-junit:4.0.+"
172173

173-
checkstyle 'com.puppycrawl.tools:checkstyle:8.5'
174+
checkstyle 'com.puppycrawl.tools:checkstyle:8.7'
174175
}
175176

176177
dependencyUpdates {
@@ -389,6 +390,7 @@ afterEvaluate {
389390
def junitPlatformTest = tasks.junitPlatformTest
390391

391392
jacoco {
393+
toolVersion = '0.8.0'
392394
applyTo(junitPlatformTest)
393395
}
394396

@@ -502,7 +504,7 @@ task releaseJar(dependsOn: "shadowJar") {
502504
}
503505
}
504506
// set executable with read permissions (first true) and for all (false)
505-
file("$buildDir/releases/JabRef-${project.version}.jar").setExecutable(true, false);
507+
file("$buildDir/releases/JabRef-${project.version}.jar").setExecutable(true, false)
506508
}
507509
}
508510

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Use Crowdin for tranlsations
2+
3+
The JabRef UI is offered in multiple languages. It should be easy for translators to translate the strings.
4+
5+
## Considered Alternatives
6+
7+
* Use [Crowdin](http://crowdin.com/)
8+
* Use [popeye](https://github.com/JabRef/popeye)
9+
* Use [Lingohub](https://lingohub.com/)
10+
11+
## Decision Outcome
12+
13+
* Chosen Alternative: Crowdin
14+
* Crowdin is easy to use, integrates in our GitHub workflow, and is free for OSS projects.

gradle/wrapper/gradle-wrapper.jar

-402 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

src/main/java/org/jabref/JabRefMain.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ private static void ensureCorrectJavaVersion() {
8080
buildInfo.getMinRequiredJavaVersion()
8181
)
8282
);
83+
84+
versionError.append("\n");
85+
versionError.append(Localization.lang("Your Java Runtime Environment is located at %0.", checker.getJavaInstallationDirectory()));
86+
8387
if (!buildInfo.isAllowJava9()) {
8488
versionError.append("\n");
8589
versionError.append(Localization.lang("Note that currently, JabRef does not run with Java 9."));

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,7 +1619,6 @@ public void ensureNotShowingBottomPanel(BibEntry entry) {
16191619
public void updateEntryEditorIfShowing() {
16201620
if (mode == BasePanelMode.SHOWING_EDITOR) {
16211621
BibEntry currentEntry = entryEditor.getEntry();
1622-
showAndEdit(null);
16231622
showAndEdit(currentEntry);
16241623
}
16251624
}
@@ -2013,18 +2012,19 @@ public void searchAndOpen() {
20132012

20142013
// Run the search operation:
20152014
FileFinder fileFinder = FileFinders.constructFromConfiguration(Globals.prefs.getAutoLinkPreferences());
2015+
try {
20162016
List<Path> files = fileFinder.findAssociatedFiles(entry, dirs, extensions);
2017-
if (!files.isEmpty()) {
2018-
Path file = files.get(0);
2019-
Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByFile(file);
2020-
if (type.isPresent()) {
2021-
try {
2017+
if (!files.isEmpty()) {
2018+
Path file = files.get(0);
2019+
Optional<ExternalFileType> type = ExternalFileTypes.getInstance().getExternalFileTypeByFile(file);
2020+
if (type.isPresent()) {
20222021
JabRefDesktop.openExternalFileAnyFormat(file, basePanel.getBibDatabaseContext(), type);
20232022
basePanel.output(Localization.lang("External viewer called") + '.');
2024-
} catch (IOException ex) {
2025-
basePanel.output(Localization.lang("Error") + ": " + ex.getMessage());
20262023
}
20272024
}
2025+
} catch (IOException ex) {
2026+
LOGGER.error("Problems with finding/or opening files ", ex);
2027+
basePanel.output(Localization.lang("Error") + ": " + ex.getMessage());
20282028
}
20292029
}
20302030
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public static List<java.awt.Image> getLogoSet() {
166166

167167
return jabrefLogos;
168168
}
169-
169+
170170
public enum JabRefIcon {
171171

172172
ADD(MaterialDesignIcon.PLUS_BOX),
@@ -260,6 +260,9 @@ public enum JabRefIcon {
260260
KEY_BINDINGS(MaterialDesignIcon.KEYBOARD), /*css: keyboard */
261261
FIND_DUPLICATES(MaterialDesignIcon.CODE_EQUAL), /*css: code-equal */
262262
PULL(MaterialDesignIcon.SOURCE_PULL), /*source-pull*/
263+
SUCCESS(MaterialDesignIcon.CHECK_CIRCLE),
264+
WARNING(MaterialDesignIcon.ALERT),
265+
ERROR(MaterialDesignIcon.ALERT_CIRCLE),
263266
OPEN_IN_NEW_WINDOW(MaterialDesignIcon.OPEN_IN_NEW), /*css: open-in-new */
264267
CASE_SENSITIVE(MaterialDesignIcon.ALPHABETICAL), /* css: mdi-alphabetical */
265268
REG_EX(MaterialDesignIcon.REGEX), /*css: mdi-regex */

0 commit comments

Comments
 (0)