Skip to content

Commit c50d20a

Browse files
committed
Merge remote-tracking branch 'upstream/master' into customizeEntrydlg
* upstream/master: ide-setup updated (#5915) Added update method to typePropertyListeners (#5917) Bump mariadb-java-client from 2.5.3 to 2.5.4 (#5914) Bump org.beryx.jlink from 2.17.0 to 2.17.1 (#5913)
2 parents 7802588 + 5c101d1 commit c50d20a

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323
id 'com.github.ben-manes.versions' version '0.27.0'
2424
id 'org.javamodularity.moduleplugin' version '1.5.0'
2525
id 'org.openjfx.javafxplugin' version '0.0.8'
26-
id 'org.beryx.jlink' version '2.17.0'
26+
id 'org.beryx.jlink' version '2.17.1'
2727

2828
// nicer test outputs during running and completion
2929
id 'com.adarshr.test-logger' version '2.0.0'
@@ -140,7 +140,7 @@ dependencies {
140140
antlr4 'org.antlr:antlr4:4.8-1'
141141
compile 'org.antlr:antlr4-runtime:4.8-1'
142142

143-
compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.5.3'
143+
compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.5.4'
144144

145145
compile 'org.postgresql:postgresql:42.2.9'
146146

docs/guidelines-for-setting-up-a-local-workspace.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
6969
--add-exports=org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref
7070
```
7171

72-
5. Use IntellJ to build and run (instead of gradle):
72+
5. Use IntelliJ to build and run (instead of gradle):
7373
* File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle:
7474
* Set "Build and run using" and "Run tests using" both to "IntelliJ IDEA"
75-
6. Ensure that the JDK13 is enabled for Gradle: Use IntellJ to build and run (instead of gradle):
75+
6. Ensure that the JDK13 is enabled for Gradle: Use IntelliJ to build and run (instead of gradle):
7676
* File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle -> Gradle:
7777
* Set "Gradle JVM" to "JDK13"
7878
7. Use the provided code style:
@@ -146,17 +146,17 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
146146
5. Now you can also select "jabref [run]" and either run or debug the application from within IntelliJ.
147147
* Equivalently, this can also be executed from the terminal by running `./gradlew run`.
148148
149-
150149
### Setup for Eclipse
151150
152-
1. Run `./gradlew run` to generate all resources and to check if jabref runs.
151+
1. Run `./gradlew run` to generate all resources and to check if JabRef runs.
153152
* The JabRef GUI should finally appear.
154153
* This step is only required once.
155154
2. Run `./gradlew eclipse`
156155
* **This must always be executed, when there are new upstream changes.**
157-
3. Copy the file `Log4jPlugins.java` from `build\generated\sources\annotationProcessor\java\main\org\jabref\gui\logging\plugins` to `src/main/java/org/jabref/gui/logging/plugins/`
156+
3. Copy the file `Log4jPlugins.java` from `build/generated/sources/annotationProcessor/java/main/org/jabref/gui/logging/plugins` to `src/main/java/org/jabref/gui/logging/plugins/`
158157
* Usually, the folder `plugins` must be created for that.
159-
4. Open or import the existing project in Eclipse as Java project. Import as gradle project will not work correctly.
158+
4. Open or import the existing project in Eclipse as Java project.
159+
* Remark: Importing it as gradle project will not work correctly.
160160
5. Create a run/debug configuration for the main class `org.jabref.JabRefLauncher` and/or for `org.jabref.JabRefMain` (both can be used equivalently)
161161
* In the tab "Arguments" of the run/debug configuration, enter the same runtime VM arguments as above for intelliJ:
162162
* Set "VM Arguments" to:
@@ -189,7 +189,7 @@ Under Ubuntu Linux, you can follow the [documentation from the Ubuntu Community]
189189
--add-opens javafx.base/com.sun.javafx.event=com.jfoenix
190190
```
191191
192-
6. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the eclipse marketplace:
192+
6. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the Eclipse marketplace:
193193
1. Help -> Eclipse Marketplace... -> Search tab
194194
2. Enter "e(fx)clipse" in the search dialogue
195195
3. Click "Go"

src/main/java/org/jabref/gui/entryeditor/SourceTab.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ protected void bindToEntry(BibEntry entry) {
240240

241241
updateCodeArea();
242242

243+
entry.typeProperty().addListener(listener -> updateCodeArea());
243244
entry.getFieldsObservable().addListener((InvalidationListener) listener -> updateCodeArea());
244245
}
245246

0 commit comments

Comments
 (0)