diff --git a/src/main/java/dk/cs/aau/huppaal/HUPPAAL.java b/src/main/java/dk/cs/aau/huppaal/HUPPAAL.java index 80b4545d..5172eb0d 100644 --- a/src/main/java/dk/cs/aau/huppaal/HUPPAAL.java +++ b/src/main/java/dk/cs/aau/huppaal/HUPPAAL.java @@ -11,7 +11,7 @@ import dk.cs.aau.huppaal.presentations.BackgroundThreadPresentation; import dk.cs.aau.huppaal.presentations.HUPPAALPresentation; import dk.cs.aau.huppaal.presentations.UndoRedoHistoryPresentation; -import dk.cs.aau.huppaal.presentations.util.PresentationFxmlLoader; +import dk.cs.aau.huppaal.presentations.PresentationFxmlLoader; import dk.cs.aau.huppaal.utility.keyboard.Keybind; import dk.cs.aau.huppaal.utility.keyboard.KeyboardTracker; import com.google.common.io.Files; diff --git a/src/main/java/dk/cs/aau/huppaal/presentations/LogTabPresentation.java b/src/main/java/dk/cs/aau/huppaal/presentations/LogTabPresentation.java index 778e5f3f..fdd28830 100644 --- a/src/main/java/dk/cs/aau/huppaal/presentations/LogTabPresentation.java +++ b/src/main/java/dk/cs/aau/huppaal/presentations/LogTabPresentation.java @@ -9,11 +9,9 @@ import dk.cs.aau.huppaal.presentations.logging.Hyperlink; import dk.cs.aau.huppaal.presentations.logging.HyperlinkTextArea; import dk.cs.aau.huppaal.presentations.logging.TextStyle; -import dk.cs.aau.huppaal.presentations.util.PresentationFxmlLoader; import dk.cs.aau.huppaal.utility.helpers.SelectHelper; import javafx.application.Platform; import javafx.beans.NamedArg; -import javafx.beans.value.ChangeListener; import javafx.scene.control.Tooltip; import javafx.scene.layout.HBox; import org.fxmisc.flowless.VirtualizedScrollPane; diff --git a/src/main/java/dk/cs/aau/huppaal/presentations/util/PresentationFxmlLoader.java b/src/main/java/dk/cs/aau/huppaal/presentations/PresentationFxmlLoader.java similarity index 86% rename from src/main/java/dk/cs/aau/huppaal/presentations/util/PresentationFxmlLoader.java rename to src/main/java/dk/cs/aau/huppaal/presentations/PresentationFxmlLoader.java index b61cf443..80f587ef 100644 --- a/src/main/java/dk/cs/aau/huppaal/presentations/util/PresentationFxmlLoader.java +++ b/src/main/java/dk/cs/aau/huppaal/presentations/PresentationFxmlLoader.java @@ -1,4 +1,4 @@ -package dk.cs.aau.huppaal.presentations.util; +package dk.cs.aau.huppaal.presentations; import javafx.fxml.FXMLLoader; import javafx.fxml.JavaFXBuilderFactory; @@ -6,7 +6,7 @@ public class PresentationFxmlLoader { public static R load(String resource) { - return load("../" + resource, PresentationFxmlLoader.class); + return load(resource, PresentationFxmlLoader.class); } public static R load(String resource, Class clazz) { try { @@ -21,7 +21,7 @@ public static R load(String resource, Class clazz) { public static R loadSetRoot(String resource, T root) { try { - var url = PresentationFxmlLoader.class.getResource("../" + resource); + var url = root.getClass().getResource(resource); if(url == null) throw new NullPointerException("Could not find resource: '%s'".formatted(resource)); var fxmlLoader = new FXMLLoader(); @@ -37,7 +37,7 @@ public static R loadSetRoot(String resource, T root) { public static R loadSetRootGetElement(String resource, T root) { try { - var url = PresentationFxmlLoader.class.getResource("../" + resource); + var url = PresentationFxmlLoader.class.getResource(resource); if(url == null) throw new NullPointerException("Could not find resource: '%s'".formatted(resource)); var fxmlLoader = new FXMLLoader();