diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index adbebcba3c1..580c0020a8c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,10 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source - uses: actions/checkout@v1 - with: - depth: 1 - submodules: false + uses: actions/checkout@v2 - name: Set up JDK uses: actions/setup-java@v1 with: @@ -42,10 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source - uses: actions/checkout@v1 - with: - depth: 1 - submodules: false + uses: actions/checkout@v2 - name: Set up JDK uses: actions/setup-java@v1 with: @@ -89,10 +83,7 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - name: Checkout source - uses: actions/checkout@v1 - with: - depth: 1 - submodules: false + uses: actions/checkout@v2 - name: Set up JDK uses: actions/setup-java@v1 with: @@ -138,10 +129,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source - uses: actions/checkout@v1 - with: - depth: 1 - submodules: false + uses: actions/checkout@v2 - name: Set up JDK uses: actions/setup-java@v1 with: @@ -164,6 +152,11 @@ jobs: run: xvfb-run --auto-servernum ./gradlew guiTest env: CI: "true" + - name: Upload screenshots to GitHub workflow artifacts store + uses: actions/upload-artifact@master + with: + name: screenshots + path: build/screenshots codecoverage: name: Code coverage runs-on: ubuntu-latest @@ -180,10 +173,7 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - name: Checkout source - uses: actions/checkout@v1 - with: - depth: 1 - submodules: false + uses: actions/checkout@v2 - name: Set up JDK uses: actions/setup-java@v1 with: @@ -203,7 +193,7 @@ jobs: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - name: Update test coverage metrics - run: xvfb-run --auto-servernum ./gradlew jacocoTestReport && bash <(curl -s https://codecov.io/bash); + run: xvfb-run --server-args=":1 -screen 0 1024x768x24" --auto-servernum ./gradlew jacocoTestReport && bash <(curl -s https://codecov.io/bash); env: CI: "false" # we pretend to run locally - even if tests fail on the CI, they count towards test coverage CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/src/main/java/org/jabref/JabRefMain.java b/src/main/java/org/jabref/JabRefMain.java index ec1cf738ac8..ab0f0f79e05 100644 --- a/src/main/java/org/jabref/JabRefMain.java +++ b/src/main/java/org/jabref/JabRefMain.java @@ -159,7 +159,7 @@ private static boolean handleMultipleAppInstances(String[] args) { return true; } - private static void applyPreferences(JabRefPreferences preferences) { + public static void applyPreferences(JabRefPreferences preferences) { // Read list(s) of journal names and abbreviations Globals.journalAbbreviationLoader = new JournalAbbreviationLoader(); diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index b097b875c92..0d09379cf08 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -3,7 +3,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -143,11 +142,10 @@ import org.slf4j.LoggerFactory; /** - * The main window of the application. + * The main window of JabRef's UI */ public class JabRefFrame extends BorderPane { - // Frame titles. public static final String FRAME_TITLE = "JabRef"; private static final Logger LOGGER = LoggerFactory.getLogger(JabRefFrame.class); @@ -276,7 +274,7 @@ public void run() { } } - private Void showTrackingNotification() { + private void showTrackingNotification() { if (!Globals.prefs.shouldCollectTelemetry()) { boolean shouldCollect = dialogService.showConfirmationDialogAndWait( Localization.lang("Telemetry: Help make JabRef better"), @@ -287,13 +285,10 @@ private Void showTrackingNotification() { } Globals.prefs.askedToCollectTelemetry(); - - return null; } public void refreshTitleAndTabs() { DefaultTaskExecutor.runInJavaFXThread(() -> { - setWindowTitle(); updateAllTabTitles(); }); @@ -328,22 +323,6 @@ public void setWindowTitle() { } } - /** - * The MacAdapter calls this method when a "BIB" file has been double-clicked from the Finder. - */ - public void openAction(String filePath) { - Path file = Paths.get(filePath); - // all the logic is done in openIt. Even raising an existing panel - getOpenDatabaseAction().openFile(file, true); - } - - /** - * The MacAdapter calls this method when "About" is selected from the application menu. - */ - public void about() { - HelpAction.getMainHelpPageCommand().execute(); - } - public JabRefPreferences prefs() { return prefs; } diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java index a1a27ef1061..689e153d4a4 100644 --- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java +++ b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java @@ -52,7 +52,9 @@ public class ManageJournalAbbreviationsView extends BaseDialog { public ManageJournalAbbreviationsView() { this.setTitle(Localization.lang("Journal abbreviations")); - ViewLoader.view(this).load().setAsDialogPane(this); + ViewLoader.view(this) + .load() + .setAsDialogPane(this); ControlHelper.setAction(saveButton, getDialogPane(), event -> saveAbbreviationsAndCloseDialog()); } diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java index 921be10e748..7898cd7bc64 100644 --- a/src/main/java/org/jabref/gui/util/BaseDialog.java +++ b/src/main/java/org/jabref/gui/util/BaseDialog.java @@ -36,7 +36,7 @@ protected BaseDialog() { setDialogIcon(IconTheme.getJabRefImageFX()); setResizable(true); - Globals.getThemeLoader().installCss(getDialogPane().getScene(), Globals.prefs); + //Globals.getThemeLoader().installCss(getDialogPane().getScene(), Globals.prefs); } private Optional