From fd145271a02fc308710e6e537f9db6117448e7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20T=C3=A2che?= Date: Mon, 18 Nov 2024 23:10:39 +0100 Subject: [PATCH] Uses jpms where possible --- core/src/main/java/module-info.java | 10 ++++++ loader/pom.xml | 23 ++++++------- loader/src/main/java/module-info.java | 9 ++++++ .../compiler/impl/ControlsController.java | 1 - .../compiler/impl/IncludesController.java | 1 - .../parsing/listener}/ControlsController.java | 8 ++--- .../parsing/listener}/IncludesController.java | 2 +- .../listener}/TestGeneratorImpl.java | 32 ++++++++++++------- .../compiler/impl/ControlsBundle.properties | 1 - .../compiler/impl/IncludesBundle.properties | 1 - .../fxml/compiler/impl/controlsView.fxml | 1 - .../fxml/compiler/impl/includesView.fxml | 1 - .../gtache/fxml/compiler/impl/style.css | 1 - .../listener}/ControlsBundle.properties | 0 .../listener}/IncludesBundle.properties | 0 .../parsing/listener}/controlsView.fxml | 2 +- ...-controls-assign-reference-constructor.txt | 18 +++++------ ...ed-controls-assign-reference-getbundle.txt | 18 +++++------ ...ected-controls-assign-reference-getter.txt | 16 +++++----- ...controls-assign-reflection-constructor.txt | 18 +++++------ ...d-controls-assign-reflection-getbundle.txt | 18 +++++------ ...cted-controls-assign-reflection-getter.txt | 16 +++++----- ...controls-factory-reference-constructor.txt | 20 ++++++------ ...d-controls-factory-reference-getbundle.txt | 20 ++++++------ ...cted-controls-factory-reference-getter.txt | 18 +++++------ ...ontrols-factory-reflection-constructor.txt | 20 ++++++------ ...-controls-factory-reflection-getbundle.txt | 20 ++++++------ ...ted-controls-factory-reflection-getter.txt | 18 +++++------ ...trols-reflection-reference-constructor.txt | 18 +++++------ ...ontrols-reflection-reference-getbundle.txt | 18 +++++------ ...d-controls-reflection-reference-getter.txt | 16 +++++----- ...rols-reflection-reflection-constructor.txt | 18 +++++------ ...ntrols-reflection-reflection-getbundle.txt | 18 +++++------ ...-controls-reflection-reflection-getter.txt | 16 +++++----- ...controls-setters-reference-constructor.txt | 18 +++++------ ...d-controls-setters-reference-getbundle.txt | 18 +++++------ ...cted-controls-setters-reference-getter.txt | 16 +++++----- ...ontrols-setters-reflection-constructor.txt | 18 +++++------ ...-controls-setters-reflection-getbundle.txt | 18 +++++------ ...ted-controls-setters-reflection-getter.txt | 16 +++++----- ...-includes-assign-reference-constructor.txt | 24 +++++++------- ...ed-includes-assign-reference-getbundle.txt | 24 +++++++------- ...ected-includes-assign-reference-getter.txt | 22 ++++++------- ...includes-assign-reflection-constructor.txt | 24 +++++++------- ...d-includes-assign-reflection-getbundle.txt | 24 +++++++------- ...cted-includes-assign-reflection-getter.txt | 22 ++++++------- ...includes-factory-reference-constructor.txt | 26 +++++++-------- ...d-includes-factory-reference-getbundle.txt | 26 +++++++-------- ...cted-includes-factory-reference-getter.txt | 24 +++++++------- ...ncludes-factory-reflection-constructor.txt | 26 +++++++-------- ...-includes-factory-reflection-getbundle.txt | 26 +++++++-------- ...ted-includes-factory-reflection-getter.txt | 24 +++++++------- ...ludes-reflection-reference-constructor.txt | 24 +++++++------- ...ncludes-reflection-reference-getbundle.txt | 24 +++++++------- ...d-includes-reflection-reference-getter.txt | 22 ++++++------- ...udes-reflection-reflection-constructor.txt | 24 +++++++------- ...cludes-reflection-reflection-getbundle.txt | 24 +++++++------- ...-includes-reflection-reflection-getter.txt | 22 ++++++------- ...includes-setters-reference-constructor.txt | 24 +++++++------- ...d-includes-setters-reference-getbundle.txt | 24 +++++++------- ...cted-includes-setters-reference-getter.txt | 22 ++++++------- ...ncludes-setters-reflection-constructor.txt | 24 +++++++------- ...-includes-setters-reflection-getbundle.txt | 24 +++++++------- ...ted-includes-setters-reflection-getter.txt | 22 ++++++------- .../parsing/listener}/includesView.fxml | 4 +-- .../fxml/compiler/parsing/listener}/style.css | 0 xml/pom.xml | 6 ++++ xml/src/main/java/module-info.java | 6 ++++ 68 files changed, 568 insertions(+), 541 deletions(-) create mode 100644 core/src/main/java/module-info.java create mode 100644 loader/src/main/java/module-info.java delete mode 120000 loader/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java delete mode 120000 loader/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java rename {core/src/test/java/com/github/gtache/fxml/compiler/impl => loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener}/ControlsController.java (96%) rename {core/src/test/java/com/github/gtache/fxml/compiler/impl => loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener}/IncludesController.java (98%) rename loader/src/test/java/com/github/gtache/fxml/compiler/{impl => parsing/listener}/TestGeneratorImpl.java (82%) delete mode 120000 loader/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties delete mode 120000 loader/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties delete mode 120000 loader/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml delete mode 120000 loader/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml delete mode 120000 loader/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css rename {core/src/test/resources/com/github/gtache/fxml/compiler/impl => loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener}/ControlsBundle.properties (100%) rename {core/src/test/resources/com/github/gtache/fxml/compiler/impl => loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener}/IncludesBundle.properties (100%) rename {core/src/test/resources/com/github/gtache/fxml/compiler/impl => loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener}/controlsView.fxml (99%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-assign-reference-constructor.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-assign-reference-getbundle.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-assign-reference-getter.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-assign-reflection-constructor.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-assign-reflection-getbundle.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-assign-reflection-getter.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-factory-reference-constructor.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-factory-reference-getbundle.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-factory-reference-getter.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-factory-reflection-constructor.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-factory-reflection-getbundle.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-factory-reflection-getter.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-reflection-reference-constructor.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-reflection-reference-getbundle.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-reflection-reference-getter.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-reflection-reflection-constructor.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-reflection-reflection-getbundle.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-reflection-reflection-getter.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-setters-reference-constructor.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-setters-reference-getbundle.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-setters-reference-getter.txt (95%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-setters-reflection-constructor.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-setters-reflection-getbundle.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-controls-setters-reflection-getter.txt (96%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-assign-reference-constructor.txt (85%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-assign-reference-getbundle.txt (85%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-assign-reference-getter.txt (86%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-assign-reflection-constructor.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-assign-reflection-getbundle.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-assign-reflection-getter.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-factory-reference-constructor.txt (85%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-factory-reference-getbundle.txt (85%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-factory-reference-getter.txt (85%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-factory-reflection-constructor.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-factory-reflection-getbundle.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-factory-reflection-getter.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-reflection-reference-constructor.txt (86%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-reflection-reference-getbundle.txt (86%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-reflection-reference-getter.txt (86%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-reflection-reflection-constructor.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-reflection-reflection-getbundle.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-reflection-reflection-getter.txt (89%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-setters-reference-constructor.txt (85%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-setters-reference-getbundle.txt (85%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-setters-reference-getter.txt (86%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-setters-reflection-constructor.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-setters-reflection-getbundle.txt (88%) rename loader/src/test/resources/com/github/gtache/fxml/compiler/{impl => parsing/listener}/expected-includes-setters-reflection-getter.txt (88%) rename {core/src/test/resources/com/github/gtache/fxml/compiler/impl => loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener}/includesView.fxml (98%) rename {core/src/test/resources/com/github/gtache/fxml/compiler/impl => loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener}/style.css (100%) create mode 100644 xml/src/main/java/module-info.java diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java new file mode 100644 index 0000000..1083ce9 --- /dev/null +++ b/core/src/main/java/module-info.java @@ -0,0 +1,10 @@ +/** + * Core module for FXML compiler + */ +module com.github.gtache.fxml.compiler.core { + requires transitive com.github.gtache.fxml.compiler.api; + requires transitive javafx.graphics; + + exports com.github.gtache.fxml.compiler.impl; + exports com.github.gtache.fxml.compiler.parsing.impl; +} \ No newline at end of file diff --git a/loader/pom.xml b/loader/pom.xml index 5621fed..b8af117 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -44,19 +44,14 @@ - - - src/test/resources - - true - - com/github/gtache/fxml/compiler/impl/*.properties - com/github/gtache/fxml/compiler/impl/*.fxml - com/github/gtache/fxml/compiler/impl/*.css - com/github/gtache/fxml/compiler/impl/*.txt - com/github/gtache/fxml/compiler/parsing/listener/* - - - + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + \ No newline at end of file diff --git a/loader/src/main/java/module-info.java b/loader/src/main/java/module-info.java new file mode 100644 index 0000000..c7d2242 --- /dev/null +++ b/loader/src/main/java/module-info.java @@ -0,0 +1,9 @@ +/** + * FXML LoadListener module for FXML compiler + */ +module com.github.gtache.fxml.compiler.loader { + requires transitive com.github.gtache.fxml.compiler.core; + requires transitive javafx.fxml; + + exports com.github.gtache.fxml.compiler.parsing.listener; +} \ No newline at end of file diff --git a/loader/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java b/loader/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java deleted file mode 120000 index c73ef71..0000000 --- a/loader/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../core/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java \ No newline at end of file diff --git a/loader/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java b/loader/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java deleted file mode 120000 index 1ebca78..0000000 --- a/loader/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../core/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java \ No newline at end of file diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java b/loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/ControlsController.java similarity index 96% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java rename to loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/ControlsController.java index b00f5ad..4230608 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java +++ b/loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/ControlsController.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import javafx.fxml.FXML; import javafx.scene.control.*; @@ -258,17 +258,17 @@ public class ControlsController { } @FXML - void onEditCancel(final javafx.scene.control.TreeTableColumn.CellEditEvent, String> cellEditEvent) { + void onEditCancel(final TreeTableColumn.CellEditEvent, String> cellEditEvent) { } @FXML - void onEditCommit(final javafx.scene.control.TreeTableColumn.CellEditEvent, String> cellEditEvent) { + void onEditCommit(final TreeTableColumn.CellEditEvent, String> cellEditEvent) { } @FXML - void onEditStart(final javafx.scene.control.TreeTableColumn.CellEditEvent, String> cellEditEvent) { + void onEditStart(final TreeTableColumn.CellEditEvent, String> cellEditEvent) { } diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java b/loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/IncludesController.java similarity index 98% rename from core/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java rename to loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/IncludesController.java index 4dc07a4..efa7e42 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java +++ b/loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/IncludesController.java @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import javafx.event.ActionEvent; import javafx.fxml.FXML; diff --git a/loader/src/test/java/com/github/gtache/fxml/compiler/impl/TestGeneratorImpl.java b/loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/TestGeneratorImpl.java similarity index 82% rename from loader/src/test/java/com/github/gtache/fxml/compiler/impl/TestGeneratorImpl.java rename to loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/TestGeneratorImpl.java index f5c5560..26d2c02 100644 --- a/loader/src/test/java/com/github/gtache/fxml/compiler/impl/TestGeneratorImpl.java +++ b/loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/TestGeneratorImpl.java @@ -1,8 +1,16 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import com.github.gtache.fxml.compiler.GenerationRequest; import com.github.gtache.fxml.compiler.Generator; -import com.github.gtache.fxml.compiler.parsing.listener.ParsingLoadListener; +import com.github.gtache.fxml.compiler.impl.ControllerFieldInjectionTypes; +import com.github.gtache.fxml.compiler.impl.ControllerInfoImpl; +import com.github.gtache.fxml.compiler.impl.ControllerInjectionImpl; +import com.github.gtache.fxml.compiler.impl.ControllerMethodsInjectionType; +import com.github.gtache.fxml.compiler.impl.GenerationParametersImpl; +import com.github.gtache.fxml.compiler.impl.GenerationRequestImpl; +import com.github.gtache.fxml.compiler.impl.GeneratorImpl; +import com.github.gtache.fxml.compiler.impl.ResourceBundleInjectionImpl; +import com.github.gtache.fxml.compiler.impl.ResourceBundleInjectionTypes; import javafx.application.Platform; import javafx.fxml.FXMLLoader; import org.junit.jupiter.api.BeforeAll; @@ -64,7 +72,7 @@ class TestGeneratorImpl { public void testGenerate(final String file, final ControllerFieldInjectionTypes field, final ControllerMethodsInjectionType method, final ResourceBundleInjectionTypes bundle) { final var request = getRequest(file, field, method, bundle); final var path = Paths.get(getPath(file, field, method, bundle)); - try (final var in = getClass().getResourceAsStream("/com/github/gtache/fxml/compiler/impl/" + path)) { + try (final var in = getClass().getResourceAsStream("/com/github/gtache/fxml/compiler/parsing/listener/" + path)) { final var expected = new String(in.readAllBytes(), StandardCharsets.UTF_8); final var actual = generator.generate(request); assertEquals(expected, actual); @@ -111,8 +119,8 @@ class TestGeneratorImpl { GENERIC_TYPES); final var includesControllerInfo = new ControllerInfoImpl(Map.of(), Map.of()); final var controllerInfo = file.equals("Controls") ? controlsControllerInfo : includesControllerInfo; - final var resourceBundlePath = "com.github.gtache.fxml.compiler.impl." + file + "Bundle"; - final var viewPath = "/com/github/gtache/fxml/compiler/impl/" + file + "View.fxml"; + final var resourceBundlePath = "com.github.gtache.fxml.compiler.parsing.listener." + file + "Bundle"; + final var viewPath = "/com/github/gtache/fxml/compiler/parsing/listener/" + file + "View.fxml"; final var listener = new ParsingLoadListener(); final var loader = new FXMLLoader(TestGeneratorImpl.class.getResource(viewPath)); loader.setLoadListener(listener); @@ -125,17 +133,17 @@ class TestGeneratorImpl { final var root = listener.root(); return new GenerationRequestImpl( new GenerationParametersImpl(Map.of( - "com.github.gtache.fxml.compiler.impl.ControlsController", new ControllerInjectionImpl(field, method, - "com.github.gtache.fxml.compiler.impl.ControlsController"), - "com.github.gtache.fxml.compiler.impl.IncludesController", new ControllerInjectionImpl(field, method, - "com.github.gtache.fxml.compiler.impl.IncludesController")), - Map.of("controlsView.fxml", "com.github.gtache.fxml.compiler.impl.ControlsView"), - Map.of("controlsView.fxml", "com.github.gtache.fxml.compiler.impl.ControlsController"), + "com.github.gtache.fxml.compiler.parsing.listener.ControlsController", new ControllerInjectionImpl(field, method, + "com.github.gtache.fxml.compiler.parsing.listener.ControlsController"), + "com.github.gtache.fxml.compiler.parsing.listener.IncludesController", new ControllerInjectionImpl(field, method, + "com.github.gtache.fxml.compiler.parsing.listener.IncludesController")), + Map.of("controlsView.fxml", "com.github.gtache.fxml.compiler.parsing.listener.ControlsView"), + Map.of("controlsView.fxml", "com.github.gtache.fxml.compiler.parsing.listener.ControlsController"), new ResourceBundleInjectionImpl(bundle, resourceBundlePath) ), controllerInfo, root, - "com.github.gtache.fxml.compiler.impl." + file + "Controller" + "com.github.gtache.fxml.compiler.parsing.listener." + file + "Controller" ); }, Platform::runLater).join(); } diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties b/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties deleted file mode 120000 index 0224a88..0000000 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties \ No newline at end of file diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties b/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties deleted file mode 120000 index f1df677..0000000 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties \ No newline at end of file diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml b/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml deleted file mode 120000 index a4a6d57..0000000 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml \ No newline at end of file diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml b/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml deleted file mode 120000 index 1430c1d..0000000 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml \ No newline at end of file diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css b/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css deleted file mode 120000 index dfd8001..0000000 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css \ No newline at end of file diff --git a/core/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/ControlsBundle.properties similarity index 100% rename from core/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/ControlsBundle.properties diff --git a/core/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/IncludesBundle.properties similarity index 100% rename from core/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/IncludesBundle.properties diff --git a/core/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/controlsView.fxml similarity index 99% rename from core/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/controlsView.fxml index e6dc611..95c8126 100644 --- a/core/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/controlsView.fxml @@ -15,7 +15,7 @@ + fx:controller="com.github.gtache.fxml.compiler.parsing.listener.ControlsController"> diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-constructor.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-constructor.txt index a58a5ac..fb5d653 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.gridPane = object0; object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -415,7 +415,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-getbundle.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-getbundle.txt index fa1aa39..b90f3fa 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.gridPane = object0; object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -415,7 +415,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-getter.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-getter.txt index 81b8de3..abee861 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,7 +46,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.gridPane = object0; object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -414,7 +414,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-constructor.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-constructor.txt index 1d21add..8a3034d 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.gridPane = object0; object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -459,7 +459,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-getbundle.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-getbundle.txt index 55a5da4..1bf7543 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.gridPane = object0; object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -459,7 +459,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-getter.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-getter.txt index 9732a42..4e2353c 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,7 +50,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.gridPane = object0; object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -458,7 +458,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-constructor.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-constructor.txt index 28000ab..0f12d8c 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -14,14 +14,14 @@ public final class ControlsController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public ControlsController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); + public ControlsController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of()); } /** @@ -29,8 +29,8 @@ public final class ControlsController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -47,7 +47,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var fieldMap = new HashMap(); final var object0 = new javafx.scene.layout.GridPane(); fieldMap.put("gridPane", object0); @@ -363,8 +363,8 @@ public final class ControlsController { javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setRowIndex(object76, 17); object0.getChildren().addAll(object22, object23, object24, object25, object28, object31, object32, object33, object34, object35, object36, object37, object38, object45, object49, object51, object52, object53, object55, object56, object57, object58, object59, object60, object61, object62, object63, object66, object69, object70, object71, object72, object75, object76); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnKeyPressed(e -> controller.keyPressed()); object0.setOnKeyReleased(controller::keyReleased); @@ -418,7 +418,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-getbundle.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-getbundle.txt index cebc5f5..36e6461 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -14,14 +14,14 @@ public final class ControlsController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public ControlsController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); + public ControlsController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of()); } /** @@ -29,8 +29,8 @@ public final class ControlsController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -47,7 +47,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); final var fieldMap = new HashMap(); final var object0 = new javafx.scene.layout.GridPane(); fieldMap.put("gridPane", object0); @@ -363,8 +363,8 @@ public final class ControlsController { javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setRowIndex(object76, 17); object0.getChildren().addAll(object22, object23, object24, object25, object28, object31, object32, object33, object34, object35, object36, object37, object38, object45, object49, object51, object52, object53, object55, object56, object57, object58, object59, object60, object61, object62, object63, object66, object69, object70, object71, object72, object75, object76); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnKeyPressed(e -> controller.keyPressed()); object0.setOnKeyReleased(controller::keyReleased); @@ -418,7 +418,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-getter.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-getter.txt index b9d5928..dc02e41 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -14,14 +14,14 @@ public final class ControlsController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public ControlsController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); + public ControlsController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of()); } /** @@ -29,8 +29,8 @@ public final class ControlsController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -361,8 +361,8 @@ public final class ControlsController { javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setRowIndex(object76, 17); object0.getChildren().addAll(object22, object23, object24, object25, object28, object31, object32, object33, object34, object35, object36, object37, object38, object45, object49, object51, object52, object53, object55, object56, object57, object58, object59, object60, object61, object62, object63, object66, object69, object70, object71, object72, object75, object76); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnKeyPressed(e -> controller.keyPressed()); object0.setOnKeyReleased(controller::keyReleased); @@ -417,7 +417,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-constructor.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-constructor.txt index 34e3bcf..7679fe9 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -18,14 +18,14 @@ public final class ControlsController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public ControlsController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); + public ControlsController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of()); } /** @@ -33,8 +33,8 @@ public final class ControlsController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -51,7 +51,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var fieldMap = new HashMap(); final var object0 = new javafx.scene.layout.GridPane(); fieldMap.put("gridPane", object0); @@ -367,8 +367,8 @@ public final class ControlsController { javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setRowIndex(object76, 17); object0.getChildren().addAll(object22, object23, object24, object25, object28, object31, object32, object33, object34, object35, object36, object37, object38, object45, object49, object51, object52, object53, object55, object56, object57, object58, object59, object60, object61, object62, object63, object66, object69, object70, object71, object72, object75, object76); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnKeyPressed(e -> callMethod("keyPressed", e)); object0.setOnKeyReleased(e -> callMethod("keyReleased", e)); @@ -462,7 +462,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-getbundle.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-getbundle.txt index 03f0bb5..ce93452 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -18,14 +18,14 @@ public final class ControlsController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public ControlsController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); + public ControlsController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of()); } /** @@ -33,8 +33,8 @@ public final class ControlsController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -51,7 +51,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); final var fieldMap = new HashMap(); final var object0 = new javafx.scene.layout.GridPane(); fieldMap.put("gridPane", object0); @@ -367,8 +367,8 @@ public final class ControlsController { javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setRowIndex(object76, 17); object0.getChildren().addAll(object22, object23, object24, object25, object28, object31, object32, object33, object34, object35, object36, object37, object38, object45, object49, object51, object52, object53, object55, object56, object57, object58, object59, object60, object61, object62, object63, object66, object69, object70, object71, object72, object75, object76); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnKeyPressed(e -> callMethod("keyPressed", e)); object0.setOnKeyReleased(e -> callMethod("keyReleased", e)); @@ -462,7 +462,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-getter.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-getter.txt index c6afa0c..54480d1 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -18,14 +18,14 @@ public final class ControlsController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public ControlsController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); + public ControlsController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of()); } /** @@ -33,8 +33,8 @@ public final class ControlsController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -365,8 +365,8 @@ public final class ControlsController { javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setRowIndex(object76, 17); object0.getChildren().addAll(object22, object23, object24, object25, object28, object31, object32, object33, object34, object35, object36, object37, object38, object45, object49, object51, object52, object53, object55, object56, object57, object58, object59, object60, object61, object62, object63, object66, object69, object70, object71, object72, object75, object76); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnKeyPressed(e -> callMethod("keyPressed", e)); object0.setOnKeyReleased(e -> callMethod("keyReleased", e)); @@ -461,7 +461,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-constructor.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-constructor.txt index 57cc538..4b1c3c0 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); injectField("gridPane", object0); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -424,7 +424,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-getbundle.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-getbundle.txt index ecec6c8..38a22f6 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); injectField("gridPane", object0); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -424,7 +424,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-getter.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-getter.txt index 14cacdf..ac9ecda 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,7 +46,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); injectField("gridPane", object0); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -423,7 +423,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-constructor.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-constructor.txt index 47994dc..9fd0a6c 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); injectField("gridPane", object0); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -468,7 +468,7 @@ private void injectField(final String fieldName, final T object) { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-getbundle.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-getbundle.txt index 85dd8c2..fe97eba 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); injectField("gridPane", object0); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -468,7 +468,7 @@ private void injectField(final String fieldName, final T object) { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-getter.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-getter.txt index b7748d1..c753827 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,7 +50,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); injectField("gridPane", object0); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -467,7 +467,7 @@ private void injectField(final String fieldName, final T object) { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-constructor.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-constructor.txt index d16ef5b..7262e4b 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.setGridPane(object0); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -415,7 +415,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-getbundle.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-getbundle.txt index d1f85ce..7f014d4 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.setGridPane(object0); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -415,7 +415,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-getter.txt similarity index 95% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-getter.txt index 1c56295..fa95ea6 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -46,7 +46,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.setGridPane(object0); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); @@ -414,7 +414,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-constructor.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-constructor.txt index 198e309..eb03f37 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.setGridPane(object0); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -459,7 +459,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-getbundle.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-getbundle.txt index ac73886..5803758 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.setGridPane(object0); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -459,7 +459,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-getter.txt similarity index 96% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-getter.txt index 33760c9..0fb9fc8 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class ControlsController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.ControlsController controller; + private com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller; /** * Instantiates a new ControlsController with no nested controllers and no resource bundle * @param controller The controller */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class ControlsController { * @param controller The controller * @param resourceBundle The resource bundle */ - public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, resourceBundle)); + public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class, resourceBundle)); } /** @@ -50,7 +50,7 @@ public final class ControlsController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.impl.ControlsController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class); final var object0 = new javafx.scene.layout.GridPane(); controller.setGridPane(object0); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); @@ -458,7 +458,7 @@ public final class ControlsController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.ControlsController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-constructor.txt similarity index 85% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-constructor.txt index 8b34ae9..90159ec 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -85,9 +85,9 @@ public final class IncludesController { controller.volumeValueLabel = object13; object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.controlsController = controller0; @@ -172,7 +172,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-getbundle.txt similarity index 85% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-getbundle.txt index ed4d62d..a0d5ae0 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.IncludesBundle"); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.IncludesBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -85,9 +85,9 @@ public final class IncludesController { controller.volumeValueLabel = object13; object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.controlsController = controller0; @@ -172,7 +172,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-getter.txt similarity index 86% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-getter.txt index 3eb58a1..685cdc9 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,7 +46,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -84,9 +84,9 @@ public final class IncludesController { controller.volumeValueLabel = object13; object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.controlsController = controller0; @@ -171,7 +171,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-constructor.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-constructor.txt index 75e09b1..c84847f 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -89,9 +89,9 @@ public final class IncludesController { controller.volumeValueLabel = object13; object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.controlsController = controller0; @@ -216,7 +216,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-getbundle.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-getbundle.txt index ae583fa..4b6facf 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.IncludesBundle"); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.IncludesBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -89,9 +89,9 @@ public final class IncludesController { controller.volumeValueLabel = object13; object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.controlsController = controller0; @@ -216,7 +216,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-getter.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-getter.txt index 75fb01d..6858ee0 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,7 +50,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -88,9 +88,9 @@ public final class IncludesController { controller.volumeValueLabel = object13; object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.controlsController = controller0; @@ -215,7 +215,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-constructor.txt similarity index 85% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-constructor.txt index 7332d07..80a9f00 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -14,14 +14,14 @@ public final class IncludesController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public IncludesController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); + public IncludesController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of()); } /** @@ -29,8 +29,8 @@ public final class IncludesController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -47,7 +47,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var fieldMap = new HashMap(); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); @@ -85,9 +85,9 @@ public final class IncludesController { fieldMap.put("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); fieldMap.put("controlsController", controller0); @@ -162,8 +162,8 @@ public final class IncludesController { object17.getItems().addAll(object18); object16.getChildren().addAll(object17); object0.setCenter(object16); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap); object9.setOnAction(controller::playPressed); controller.initialize(); loaded = true; @@ -175,7 +175,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-getbundle.txt similarity index 85% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-getbundle.txt index 93051ce..0a2a73a 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -14,14 +14,14 @@ public final class IncludesController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public IncludesController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); + public IncludesController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of()); } /** @@ -29,8 +29,8 @@ public final class IncludesController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -47,7 +47,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.IncludesBundle"); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.IncludesBundle"); final var fieldMap = new HashMap(); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); @@ -85,9 +85,9 @@ public final class IncludesController { fieldMap.put("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); fieldMap.put("controlsController", controller0); @@ -162,8 +162,8 @@ public final class IncludesController { object17.getItems().addAll(object18); object16.getChildren().addAll(object17); object0.setCenter(object16); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap); object9.setOnAction(controller::playPressed); controller.initialize(); loaded = true; @@ -175,7 +175,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-getter.txt similarity index 85% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-getter.txt index bf3b063..5bd1088 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -14,14 +14,14 @@ public final class IncludesController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public IncludesController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); + public IncludesController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of()); } /** @@ -29,8 +29,8 @@ public final class IncludesController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -83,9 +83,9 @@ public final class IncludesController { fieldMap.put("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); fieldMap.put("controlsController", controller0); @@ -160,8 +160,8 @@ public final class IncludesController { object17.getItems().addAll(object18); object16.getChildren().addAll(object17); object0.setCenter(object16); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap); object9.setOnAction(controller::playPressed); object11.setText(controller.resources().getString("media.volume.label")); controller.initialize(); @@ -174,7 +174,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-constructor.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-constructor.txt index 3defcc6..c3c5df3 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -18,14 +18,14 @@ public final class IncludesController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public IncludesController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); + public IncludesController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of()); } /** @@ -33,8 +33,8 @@ public final class IncludesController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -51,7 +51,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var fieldMap = new HashMap(); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); @@ -89,9 +89,9 @@ public final class IncludesController { fieldMap.put("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); fieldMap.put("controlsController", controller0); @@ -166,8 +166,8 @@ public final class IncludesController { object17.getItems().addAll(object18); object16.getChildren().addAll(object17); object0.setCenter(object16); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap); object9.setOnAction(e -> callMethod("playPressed", e)); try { final var initialize = controller.getClass().getDeclaredMethod("initialize"); @@ -219,7 +219,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-getbundle.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-getbundle.txt index 5249b74..645ed22 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -18,14 +18,14 @@ public final class IncludesController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public IncludesController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); + public IncludesController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of()); } /** @@ -33,8 +33,8 @@ public final class IncludesController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -51,7 +51,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.IncludesBundle"); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.IncludesBundle"); final var fieldMap = new HashMap(); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); @@ -89,9 +89,9 @@ public final class IncludesController { fieldMap.put("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); fieldMap.put("controlsController", controller0); @@ -166,8 +166,8 @@ public final class IncludesController { object17.getItems().addAll(object18); object16.getChildren().addAll(object17); object0.setCenter(object16); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap); object9.setOnAction(e -> callMethod("playPressed", e)); try { final var initialize = controller.getClass().getDeclaredMethod("initialize"); @@ -219,7 +219,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-getter.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-getter.txt index 3064169..d5fbffe 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -18,14 +18,14 @@ public final class IncludesController { private final Map, ControllerFactory> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controllerFactory The controller factory */ - public IncludesController(final ControllerFactory controllerFactory) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); + public IncludesController(final ControllerFactory controllerFactory) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of()); } /** @@ -33,8 +33,8 @@ public final class IncludesController { * @param controllerFactory The controller factory * @param resourceBundle The resource bundle */ - public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final ControllerFactory controllerFactory, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controllerFactory), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -87,9 +87,9 @@ public final class IncludesController { fieldMap.put("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); fieldMap.put("controlsController", controller0); @@ -164,8 +164,8 @@ public final class IncludesController { object17.getItems().addAll(object18); object16.getChildren().addAll(object17); object0.setCenter(object16); - final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); + final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap); object9.setOnAction(e -> callMethod("playPressed", e)); object11.setText(controller.resources().getString("media.volume.label")); try { @@ -218,7 +218,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-constructor.txt similarity index 86% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-constructor.txt index 0e1bd4e..f7aabde 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -85,9 +85,9 @@ public final class IncludesController { injectField("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); injectField("controlsController", controller0); @@ -181,7 +181,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-getbundle.txt similarity index 86% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-getbundle.txt index bf21835..71c936d 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.IncludesBundle"); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.IncludesBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -85,9 +85,9 @@ public final class IncludesController { injectField("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); injectField("controlsController", controller0); @@ -181,7 +181,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-getter.txt similarity index 86% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-getter.txt index ebeb2b6..b15cd34 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,7 +46,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -84,9 +84,9 @@ public final class IncludesController { injectField("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); injectField("controlsController", controller0); @@ -180,7 +180,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-constructor.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-constructor.txt index d37428a..6412e5a 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -89,9 +89,9 @@ public final class IncludesController { injectField("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); injectField("controlsController", controller0); @@ -225,7 +225,7 @@ private void injectField(final String fieldName, final T object) { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-getbundle.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-getbundle.txt index f51d579..f5b2600 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.IncludesBundle"); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.IncludesBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -89,9 +89,9 @@ public final class IncludesController { injectField("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); injectField("controlsController", controller0); @@ -225,7 +225,7 @@ private void injectField(final String fieldName, final T object) { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-getter.txt similarity index 89% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-getter.txt index b0dfb9f..1e4b0cf 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,7 +50,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -88,9 +88,9 @@ public final class IncludesController { injectField("volumeValueLabel", object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); injectField("controlsController", controller0); @@ -224,7 +224,7 @@ private void injectField(final String fieldName, final T object) { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-constructor.txt similarity index 85% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-constructor.txt index 0ca7307..a263f9f 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -85,9 +85,9 @@ public final class IncludesController { controller.setVolumeValueLabel(object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.setControlsController(controller0); @@ -172,7 +172,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-getbundle.txt similarity index 85% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-getbundle.txt index f7a2dfd..e4098e6 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,8 +46,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.IncludesBundle"); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.IncludesBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -85,9 +85,9 @@ public final class IncludesController { controller.setVolumeValueLabel(object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.setControlsController(controller0); @@ -172,7 +172,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-getter.txt similarity index 86% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-getter.txt index eafa584..ffb92de 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -13,14 +13,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -28,8 +28,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -46,7 +46,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -84,9 +84,9 @@ public final class IncludesController { controller.setVolumeValueLabel(object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.setControlsController(controller0); @@ -171,7 +171,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-constructor.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-constructor.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-constructor.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-constructor.txt index 1ef0f15..e78eb68 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-constructor.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-constructor.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -89,9 +89,9 @@ public final class IncludesController { controller.setVolumeValueLabel(object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.setControlsController(controller0); @@ -216,7 +216,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-getbundle.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-getbundle.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-getbundle.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-getbundle.txt index fb16e6a..4f15c49 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-getbundle.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-getbundle.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,8 +50,8 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.IncludesBundle"); - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + final var bundle = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.IncludesBundle"); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -89,9 +89,9 @@ public final class IncludesController { controller.setVolumeValueLabel(object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.setControlsController(controller0); @@ -216,7 +216,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-getter.txt b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-getter.txt similarity index 88% rename from loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-getter.txt rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-getter.txt index 7a118e3..ec4f670 100644 --- a/loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-getter.txt +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-getter.txt @@ -1,4 +1,4 @@ -package com.github.gtache.fxml.compiler.impl; +package com.github.gtache.fxml.compiler.parsing.listener; import java.util.Map; import java.util.ResourceBundle; @@ -17,14 +17,14 @@ public final class IncludesController { private final Map, Object> controllersMap; private final Map, ResourceBundle> resourceBundlesMap; private boolean loaded; - private com.github.gtache.fxml.compiler.impl.IncludesController controller; + private com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller; /** * Instantiates a new IncludesController with no nested controllers and no resource bundle * @param controller The controller */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of()); } /** @@ -32,8 +32,8 @@ public final class IncludesController { * @param controller The controller * @param resourceBundle The resource bundle */ - public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { - this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, resourceBundle)); + public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller, final ResourceBundle resourceBundle) { + this(Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, controller), Map.of(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class, resourceBundle)); } /** @@ -50,7 +50,7 @@ public final class IncludesController { if (loaded) { throw new IllegalStateException("Already loaded"); } - controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); + controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class); final var object0 = new javafx.scene.layout.BorderPane(); final var object1 = new javafx.scene.layout.VBox(); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); @@ -88,9 +88,9 @@ public final class IncludesController { controller.setVolumeValueLabel(object13); object13.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); - final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); - map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); - final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); + final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle"); + map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0); + final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0); final var object14 = view0.load(); final var controller0 = view0.controller(); controller.setControlsController(controller0); @@ -215,7 +215,7 @@ public final class IncludesController { /** * @return The controller */ - public com.github.gtache.fxml.compiler.impl.IncludesController controller() { + public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() { if (loaded) { return controller; } else { diff --git a/core/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/includesView.fxml similarity index 98% rename from core/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/includesView.fxml index 03f7f5f..605d0ba 100644 --- a/core/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml +++ b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/includesView.fxml @@ -6,7 +6,7 @@ + fx:controller="com.github.gtache.fxml.compiler.parsing.listener.IncludesController"> @@ -38,7 +38,7 @@ diff --git a/core/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css b/loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/style.css similarity index 100% rename from core/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css rename to loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/style.css diff --git a/xml/pom.xml b/xml/pom.xml index 0adec52..d75fd5a 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -16,5 +16,11 @@ com.github.gtache fxml-compiler-core + + org.openjfx + javafx-graphics + ${javafx.version} + provided + \ No newline at end of file diff --git a/xml/src/main/java/module-info.java b/xml/src/main/java/module-info.java new file mode 100644 index 0000000..924ba43 --- /dev/null +++ b/xml/src/main/java/module-info.java @@ -0,0 +1,6 @@ +/** + * XML parsing module for FXML compiler (not implemented yet) + */ +module com.github.gtache.fxml.compiler.xml { + requires transitive com.github.gtache.fxml.compiler.core; +} \ No newline at end of file