diff --git a/build.gradle.kts b/build.gradle.kts index cf08ddc..b888f12 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { qupathExtension { name = "qupath-extension-training" - version = "0.1.0-SNAPSHOT" + version = "0.1.0-rc2" group = "io.github.qupath" description = "A QuPath extension to help learn how to use the software" automaticModule = "qupath.extension.training" diff --git a/src/main/java/qupath/fx/controls/tour/CssHighlight.java b/src/main/java/qupath/fx/controls/tour/CssHighlight.java index 2a67026..04bf4ed 100644 --- a/src/main/java/qupath/fx/controls/tour/CssHighlight.java +++ b/src/main/java/qupath/fx/controls/tour/CssHighlight.java @@ -2,7 +2,6 @@ import javafx.scene.Node; import javafx.stage.Window; -import qupath.ext.training.ui.tour.GuiTourCommand; import qupath.fx.utils.FXUtils; import java.util.ArrayList; @@ -14,7 +13,7 @@ class CssHighlight implements TourHighlight { private static final String HIGHLIGHT_CLASS = "tour-highlight-node"; - private static final String stylesheet = GuiTourCommand.class.getClassLoader().getResource("css/tour.css").toExternalForm(); + private static final String stylesheet = CssHighlight.class.getClassLoader().getResource("css/tour.css").toExternalForm(); private final List currentNodes = new ArrayList<>(); diff --git a/src/main/java/qupath/fx/controls/tour/GuiTourSkin.java b/src/main/java/qupath/fx/controls/tour/GuiTourSkin.java index e137bb8..ce0b73e 100644 --- a/src/main/java/qupath/fx/controls/tour/GuiTourSkin.java +++ b/src/main/java/qupath/fx/controls/tour/GuiTourSkin.java @@ -20,9 +20,9 @@ */ public class GuiTourSkin extends SkinBase { - private Pagination pagination; + private final Pagination pagination; - private TourHighlight highlight; + private final TourHighlight highlight; /** * Constructor for all SkinBase instances. diff --git a/src/main/java/qupath/fx/controls/tour/OverlayHighlight.java b/src/main/java/qupath/fx/controls/tour/OverlayHighlight.java index 5099d44..a89677f 100644 --- a/src/main/java/qupath/fx/controls/tour/OverlayHighlight.java +++ b/src/main/java/qupath/fx/controls/tour/OverlayHighlight.java @@ -15,7 +15,6 @@ import javafx.stage.StageStyle; import javafx.stage.Window; import javafx.util.Duration; -import qupath.ext.training.ui.tour.GuiTourCommand; import qupath.fx.utils.FXUtils; import java.util.List; @@ -116,7 +115,7 @@ private boolean initialize(Window owner) { stage.getProperties().put("_INSTRUCTION_HIGHLIGHT", true); stage.setScene(scene); - scene.getStylesheets().add(GuiTourCommand.class.getClassLoader().getResource("css/tour.css").toExternalForm()); + scene.getStylesheets().add(OverlayHighlight.class.getClassLoader().getResource("css/tour.css").toExternalForm()); this.rectangle = rect; this.stage = stage;