Skip to content

Commit 13d90c0

Browse files
committed
Merge remote-tracking branch 'upstream/master' into feature/use-unkown-fields-as-default-fields
2 parents 9a8abf8 + 4aa8378 commit 13d90c0

File tree

175 files changed

+318
-328
lines changed

Some content is hidden

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

175 files changed

+318
-328
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ jobs:
257257
uses: unsplash/comment-on-pr@master
258258
if: steps.authors_check.outputs.newauthor == 'true'
259259
env:
260-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
260+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN_COMMENT_ON_PR }}
261261
with:
262262
msg: "${{ steps.authors_check.outputs.message }}"
263263
check_for_duplicate_msg: true

.idea/runConfigurations/JabRef_Main.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ java {
4646
}
4747

4848
application {
49-
mainClassName = "$moduleName/org.jabref.JabRefLauncher"
49+
mainClassName = "$moduleName/org.jabref.gui.JabRefLauncher"
5050
}
5151

5252
// TODO: Ugly workaround to temporarily ignore build errors to dependencies of latex2unicode

buildres/linux/JabRef.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Type=Application
99
DESKTOP_MIMES
1010
Categories=DEPLOY_BUNDLE_CATEGORY
1111
Keywords=bibtex;biblatex;latex;bibliography
12-
StartupWMClass=org.jabref.JabRefMain
12+
StartupWMClass=org.jabref.gui.JabRefMain

docs/SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* [Code Quality](advanced-reading/code-quality.md)
1414
* [Recommendations for UI design](advanced-reading/ui-recommendations.md)
1515
* [Custom SVG icons](advanced-reading/custom-svg-icons.md)
16+
* [Working on fetchers](advanced-reading/fetchers.md)
1617
* [Creating a binary and debug it](advanced-reading/jpackage.md)
1718
* [JabRef and Software Engineering](teaching.md)
1819
* [Readings on Coding](readings-on-coding/README.md)

docs/advanced-reading/jpackage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Sometimes issues with modularity only arise in the installed version and do not
2828
3. Modify the `build\image\JabRef\runtime\bin\Jabref.bat` file, replace the last line with
2929

3030
```text
31-
pushd %DIR% & %JAVA_EXEC% -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -p "%~dp0/../app" -m org.jabref/org.jabref.JabRefLauncher %* & popd
31+
pushd %DIR% & %JAVA_EXEC% -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -p "%~dp0/../app" -m org.jabref/org.jabref.gui.JabRefLauncher %* & popd
3232
```
3333

3434
4. Open your IDE and add a "Remote Debugging Configuration" for `localhost:8000`

docs/getting-into-the-code/code-howtos.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Principles:
3030
Localization.lang("Something went wrong...", ioe);
3131
}
3232
```
33+
3334
* Never, ever throw and catch `Exception` or `Throwable`
3435
* Errors should only be logged when they are finally caught \(i.e., logged only once\). See **Logging** for details.
3536
* If the Exception message is intended to be shown to the User in the UI \(see below\) provide also a localizedMessage \(see `JabRefException`\).
@@ -51,7 +52,7 @@ TODO: Usage of status bar and Swing Dialogs
5152

5253
## Using the EventSystem
5354

54-
### What the EventSystem is used for?
55+
### What the EventSystem is used for
5556

5657
Many times there is a need to provide an object on many locations simultaneously. This design pattern is quite similar to Java's Observer, but it is much simplier and readable while having the same functional sense.
5758
@@ -368,7 +369,7 @@ The following expressions can be used in FXML attributes, according to the [offi
368369

369370
All radio buttons that should be grouped together need to have a ToggleGroup defined in the FXML code Example:
370371

371-
```markup
372+
```xml
372373
<VBox>
373374
<fx:define>
374375
<ToggleGroup fx:id="citeToggleGroup"/>
@@ -383,4 +384,3 @@ All radio buttons that should be grouped together need to have a ToggleGroup def
383384
</children>
384385
</VBox>
385386
```
386-

docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Make sure your Eclipse installation us up to date, Eclipse JEE 2020-03 or newer
197197
3. Open or import the existing project in Eclipse as Java project.
198198
* Remark: Importing it as gradle project will not work correctly.
199199
* Refresh the project in Eclipse
200-
4. Create a run/debug configuration for the main class `org.jabref.JabRefLauncher` and/or for `org.jabref.JabRefMain` \(both can be used equivalently\)
200+
4. Create a run/debug configuration for the main class `org.jabref.gui.JabRefLauncher` and/or for `org.jabref.gui.JabRefMain` \(both can be used equivalently\)
201201
* Remark: The run/debug configuration needs to be added by right clicking the class \(e.g. JabRefLauncher or JabRefMain\) otherwise it will not work.
202202

203203
![Creating the run/debug configuration by right clicking on the class](../.gitbook/assets/eclipse-create-run-config%20%281%29.png)
@@ -222,6 +222,7 @@ Make sure your Eclipse installation us up to date, Eclipse JEE 2020-03 or newer
222222
--add-exports javafx.web/com.sun.webkit=org.controlsfx.controls
223223
--add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls
224224
--add-exports javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix
225+
--add-exports javafx.graphics/com.sun.javafx.stage=com.jfoenix
225226
--add-exports com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle
226227
--patch-module org.jabref=build/resources/main
227228
```

scripts/generate-authors.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."
5858

5959
# co-authors
6060
coauthors=$(git log -i --grep=co-authored-by | grep -i "co-authored-by" | sed "s/.*co-authored-by: \(.*\)/\1/I" | sed "s/ <.*//")
61-
echo -e "$authors\n$(git log --format='%aN')\n$coauthors" | grep -v "\[bot\]" | grep -v "JabRef" | grep -v "Siedlerchr" | grep -v "^Christoph$" | grep -v "^Mootez$" | grep -v "oscargus" | grep -v "dependabot" | grep -v "github actions" | grep -v "igorsteinmacher" | grep -v "halirutan" | grep -v "matthiasgeiger" | grep -v "Gitter Badger" | grep -v "gdstewart" | LC_ALL=C.UTF-8 sort --unique --ignore-case
61+
echo -e "$authors\n$(git log --format='%aN')\n$coauthors" | grep -v "\[bot\]" | grep -v "JabRef" | grep -v "Siedlerchr" | grep -v "^Christoph$" | grep -v "^Mootez$" | grep -v "oscargus" | grep -v "dependabot" | grep -v "github actions" | grep -v "igorsteinmacher" | grep -v "halirutan" | grep -v "matthiasgeiger" | grep -v "Gitter Badger" | grep -v "gdstewart" | grep -v "chenyuheng" | LC_ALL=C.UTF-8 sort --unique --ignore-case
6262
} > AUTHORS

snap/local/JabRef-launcher

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#! /bin/sh
22
DIR="$SNAP/lib/runtime/bin"
3-
"$DIR/java" -p "$DIR/../app" -m org.jabref/org.jabref.JabRefLauncher "$@"
3+
"$DIR/java" -p "$DIR/../app" -m org.jabref/org.jabref.gui.JabRefLauncher "$@"

0 commit comments

Comments
 (0)