Skip to content

Commit a4643e8

Browse files
committed
Merge branch 'main' of https://github.com/LIM0000/jabref into fix-for-issue-8189
2 parents 556e954 + 0c96007 commit a4643e8

37 files changed

+1146
-413
lines changed

.gitpod.Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# See https://www.gitpod.io/docs/java-in-gitpod/ for a full documentation of Java in GitPod
2+
3+
FROM gitpod/workspace-full
4+
5+
# All available versions can be listed using sdk ls java
6+
# More information about SDKMAN available at https://github.com/sdkman/sdkman-cli#sdkman-cli
7+
RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
8+
&& sdk install java 18.0.1.1-open"

.gitpod.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
image:
2+
file: .gitpod.Dockerfile
3+
tasks:
4+
- init: ./gradlew assemble
5+
jetbrains:
6+
intellij:
7+
plugins:
8+
- CheckStyle-IDEA
9+
- zielu.gittoolbox
10+
vscode:
11+
extensions:
12+
- redhat.java
13+
- richardwillis.vscode-gradle
14+
- vscjava.vscode-java-debug
15+
- kiteco.kite
16+
- DavidAnson.vscode-markdownlint

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
3030
- The Medline/Pubmed search now also supports the [default fields and operators for searching](https://docs.jabref.org/collect/import-using-online-bibliographic-database#search-syntax). [forum#3554](https://discourse.jabref.org/t/native-pubmed-search/3354)
3131
- We improved group expansion arrow that prevent it from activating group when expanding or collapsing. [#7982](https://github.com/JabRef/jabref/issues/7982), [#3176](https://github.com/JabRef/jabref/issues/3176)
3232
- When configured SSL certificates changed, JabRef warns the user to restart to apply the configuration.
33+
- We improved the appearances and logic of the "Manage field names & content" dialog, and renamed it to "Automatic field editor". [#6536](https://github.com/JabRef/jabref/issues/6536)
3334
- We fixed an issue that caused JabRef to sometimes open multiple instances when "Remote Operation" is enabled. [#8653](https://github.com/JabRef/jabref/issues/8653)
3435

3536
### Fixed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ An explanation of donation possibilities and usage of donations is available at
7171
[![OpenHub](https://www.openhub.net/p/jabref/widgets/project_thin_badge.gif)](https://www.openhub.net/p/jabref)
7272
[![Deployment Status](https://github.com/JabRef/jabref/workflows/Deployment/badge.svg)](https://github.com/JabRef/jabref/actions?query=workflow%3ADeployment)
7373
[![Test Status](https://github.com/JabRef/jabref/workflows/Tests/badge.svg)](https://github.com/JabRef/jabref/actions?query=workflow%3ATests)
74-
[![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=master)
74+
[![codecov.io](https://codecov.io/github/JabRef/jabref/coverage.svg?branch=master)](https://codecov.io/github/JabRef/jabref?branch=main)
7575

7676
Want to be part of a free and open-source project that tens of thousands of scientists use every day?
7777
Check out the ways you can contribute, below:

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,18 @@ dependencies {
120120

121121
implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.9.0'
122122
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
123-
implementation 'com.h2database:h2-mvstore:2.1.212'
123+
implementation 'com.h2database:h2-mvstore:2.1.214'
124124

125-
implementation group: 'org.apache.tika', name: 'tika-core', version: '2.4.0'
125+
implementation group: 'org.apache.tika', name: 'tika-core', version: '2.4.1'
126126
implementation 'com.ibm.icu:icu4j-charset:71.1'
127127

128128
// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
129129
implementation 'org.bouncycastle:bcprov-jdk18on:1.71'
130130

131131
implementation 'commons-cli:commons-cli:1.5.0'
132132

133-
implementation 'org.libreoffice:libreoffice:7.3.3'
134-
implementation 'org.libreoffice:unoloader:7.3.3'
133+
implementation 'org.libreoffice:libreoffice:7.3.4'
134+
implementation 'org.libreoffice:unoloader:7.3.4'
135135

136136
implementation 'io.github.java-diff-utils:java-diff-utils:4.11'
137137
implementation 'info.debatty:java-string-similarity:2.0.0'
@@ -142,7 +142,7 @@ dependencies {
142142
antlr4 'org.antlr:antlr4:4.9.3'
143143
implementation 'org.antlr:antlr4-runtime:4.9.3'
144144

145-
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.1.0.202203080745-r'
145+
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.2.0.202206071550-r'
146146

147147
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.3'
148148
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.3'

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repositories {
66
}
77

88
dependencies {
9-
implementation 'com.h2database:h2-mvstore:2.1.212'
9+
implementation 'com.h2database:h2-mvstore:2.1.214'
1010
implementation 'org.apache.commons:commons-csv:1.9.0'
1111
implementation 'org.slf4j:slf4j-api:2.0.0-alpha7'
1212
}

buildres/linux/jabrefHost.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def send_message(message):
7474

7575
def add_jabref_entry(data):
7676
"""Send string via cli as literal to preserve special characters"""
77-
cmd = str(JABREF_PATH).split() + ["--importBibtex", r"{}".format(data)]
77+
cmd = str(JABREF_PATH).split() + ["--importBibtex", r"'{}'".format(data)]
7878
logging.info("Try to execute command {}".format(cmd))
7979
response = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
8080
logging.info("Called JabRef and got: {}".format(response))

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
import org.jabref.gui.edit.CopyMoreAction;
6868
import org.jabref.gui.edit.EditAction;
6969
import org.jabref.gui.edit.ManageKeywordsAction;
70-
import org.jabref.gui.edit.MassSetFieldsAction;
7170
import org.jabref.gui.edit.OpenBrowserAction;
7271
import org.jabref.gui.edit.ReplaceStringAction;
72+
import org.jabref.gui.edit.automaticfiededitor.AutomaticFieldEditorAction;
7373
import org.jabref.gui.entryeditor.OpenEntryEditorAction;
7474
import org.jabref.gui.entryeditor.PreviewSwitchAction;
7575
import org.jabref.gui.exporter.ExportCommand;
@@ -750,8 +750,7 @@ private MenuBar createMenu() {
750750
new SeparatorMenuItem(),
751751

752752
factory.createMenuItem(StandardActions.MANAGE_KEYWORDS, new ManageKeywordsAction(stateManager)),
753-
factory.createMenuItem(StandardActions.MASS_SET_FIELDS, new MassSetFieldsAction(stateManager, dialogService, undoManager)));
754-
753+
factory.createMenuItem(StandardActions.AUTOMATIC_FIELD_EDITOR, new AutomaticFieldEditorAction(stateManager, dialogService)));
755754
SeparatorMenuItem specialFieldsSeparator = new SeparatorMenuItem();
756755
specialFieldsSeparator.visibleProperty().bind(prefs.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
757756

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ public enum StandardActions implements Action {
7878
REPLACE_ALL(Localization.lang("Find and replace"), KeyBinding.REPLACE_STRING),
7979
MANAGE_KEYWORDS(Localization.lang("Manage keywords")),
8080
MASS_SET_FIELDS(Localization.lang("Manage field names & content")),
81+
82+
AUTOMATIC_FIELD_EDITOR(Localization.lang("Automatic field editor")),
8183
TOGGLE_GROUPS(Localization.lang("Groups"), IconTheme.JabRefIcons.TOGGLE_GROUPS, KeyBinding.TOGGLE_GROUPS_INTERFACE),
8284
TOOGLE_OO(Localization.lang("OpenOffice/LibreOffice"), IconTheme.JabRefIcons.FILE_OPENOFFICE, KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
8385
TOGGLE_WEB_SEARCH(Localization.lang("Web search"), Localization.lang("Toggle web search interface"), IconTheme.JabRefIcons.WWW, KeyBinding.WEB_SEARCH),

src/main/java/org/jabref/gui/edit/MassSetFieldsAction.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)