tga/fxml-compiler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uses jpms where possible

Browse Source
This commit is contained in:
Guillaume Tâche
2024-11-18 23:10:39 +01:00
parent 16c6da51fe
commit fd145271a0
68 changed files with 568 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/module-info.java
+10
View File
@@ -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;
}
loader/pom.xml
+9 -14
View File
@@ -44,19 +44,14 @@
</dependencies> </dependencies>
<build> <build>
<testResources> <plugins>
<testResource> <plugin>
<directory>src/test/resources</directory> <groupId>org.apache.maven.plugins</groupId>
<!-- Enable filtering as workaround for symlink issue: https://issues.apache.org/jira/browse/MRESOURCES-237 --> <artifactId>maven-surefire-plugin</artifactId>
<filtering>true</filtering> <configuration>
<includes> <useModulePath>false</useModulePath>
<include>com/github/gtache/fxml/compiler/impl/*.properties</include> </configuration>
<include>com/github/gtache/fxml/compiler/impl/*.fxml</include> </plugin>
<include>com/github/gtache/fxml/compiler/impl/*.css</include> </plugins>
<include>com/github/gtache/fxml/compiler/impl/*.txt</include>
<include>com/github/gtache/fxml/compiler/parsing/listener/*</include>
</includes>
</testResource>
</testResources>
</build> </build>
</project> </project>
loader/src/main/java/module-info.java
+9
View File
@@ -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;
}
loader/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java
-1
View File
@@ -1 +0,0 @@
../../../../../../../../../../core/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java
loader/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java
-1
View File
@@ -1 +0,0 @@
../../../../../../../../../../core/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java
core/src/test/java/com/github/gtache/fxml/compiler/impl/ControlsController.java → loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/ControlsController.java
+4 -4
View File
@@ -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.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;
@@ -258,17 +258,17 @@ public class ControlsController {
} }
@FXML @FXML
void onEditCancel(final javafx.scene.control.TreeTableColumn.CellEditEvent<TreeItem<String>, String> cellEditEvent) { void onEditCancel(final TreeTableColumn.CellEditEvent<TreeItem<String>, String> cellEditEvent) {
} }
@FXML @FXML
void onEditCommit(final javafx.scene.control.TreeTableColumn.CellEditEvent<TreeItem<String>, String> cellEditEvent) { void onEditCommit(final TreeTableColumn.CellEditEvent<TreeItem<String>, String> cellEditEvent) {
} }
@FXML @FXML
void onEditStart(final javafx.scene.control.TreeTableColumn.CellEditEvent<TreeItem<String>, String> cellEditEvent) { void onEditStart(final TreeTableColumn.CellEditEvent<TreeItem<String>, String> cellEditEvent) {
} }
core/src/test/java/com/github/gtache/fxml/compiler/impl/IncludesController.java → loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/IncludesController.java
+1 -1
View File
@@ -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.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
loader/src/test/java/com/github/gtache/fxml/compiler/impl/TestGeneratorImpl.java → loader/src/test/java/com/github/gtache/fxml/compiler/parsing/listener/TestGeneratorImpl.java
+20 -12
View File
@@ -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.GenerationRequest;
import com.github.gtache.fxml.compiler.Generator; 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.application.Platform;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import org.junit.jupiter.api.BeforeAll; 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) { 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 request = getRequest(file, field, method, bundle);
final var path = Paths.get(getPath(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 expected = new String(in.readAllBytes(), StandardCharsets.UTF_8);
final var actual = generator.generate(request); final var actual = generator.generate(request);
assertEquals(expected, actual); assertEquals(expected, actual);
@@ -111,8 +119,8 @@ class TestGeneratorImpl {
GENERIC_TYPES); GENERIC_TYPES);
final var includesControllerInfo = new ControllerInfoImpl(Map.of(), Map.of()); final var includesControllerInfo = new ControllerInfoImpl(Map.of(), Map.of());
final var controllerInfo = file.equals("Controls") ? controlsControllerInfo : includesControllerInfo; final var controllerInfo = file.equals("Controls") ? controlsControllerInfo : includesControllerInfo;
final var resourceBundlePath = "com.github.gtache.fxml.compiler.impl." + file + "Bundle"; final var resourceBundlePath = "com.github.gtache.fxml.compiler.parsing.listener." + file + "Bundle";
final var viewPath = "/com/github/gtache/fxml/compiler/impl/" + file + "View.fxml"; final var viewPath = "/com/github/gtache/fxml/compiler/parsing/listener/" + file + "View.fxml";
final var listener = new ParsingLoadListener(); final var listener = new ParsingLoadListener();
final var loader = new FXMLLoader(TestGeneratorImpl.class.getResource(viewPath)); final var loader = new FXMLLoader(TestGeneratorImpl.class.getResource(viewPath));
loader.setLoadListener(listener); loader.setLoadListener(listener);
@@ -125,17 +133,17 @@ class TestGeneratorImpl {
final var root = listener.root(); final var root = listener.root();
return new GenerationRequestImpl( return new GenerationRequestImpl(
new GenerationParametersImpl(Map.of( new GenerationParametersImpl(Map.of(
"com.github.gtache.fxml.compiler.impl.ControlsController", new ControllerInjectionImpl(field, method, "com.github.gtache.fxml.compiler.parsing.listener.ControlsController", new ControllerInjectionImpl(field, method,
"com.github.gtache.fxml.compiler.impl.ControlsController"), "com.github.gtache.fxml.compiler.parsing.listener.ControlsController"),
"com.github.gtache.fxml.compiler.impl.IncludesController", new ControllerInjectionImpl(field, method, "com.github.gtache.fxml.compiler.parsing.listener.IncludesController", new ControllerInjectionImpl(field, method,
"com.github.gtache.fxml.compiler.impl.IncludesController")), "com.github.gtache.fxml.compiler.parsing.listener.IncludesController")),
Map.of("controlsView.fxml", "com.github.gtache.fxml.compiler.impl.ControlsView"), Map.of("controlsView.fxml", "com.github.gtache.fxml.compiler.parsing.listener.ControlsView"),
Map.of("controlsView.fxml", "com.github.gtache.fxml.compiler.impl.ControlsController"), Map.of("controlsView.fxml", "com.github.gtache.fxml.compiler.parsing.listener.ControlsController"),
new ResourceBundleInjectionImpl(bundle, resourceBundlePath) new ResourceBundleInjectionImpl(bundle, resourceBundlePath)
), ),
controllerInfo, controllerInfo,
root, root,
"com.github.gtache.fxml.compiler.impl." + file + "Controller" "com.github.gtache.fxml.compiler.parsing.listener." + file + "Controller"
); );
}, Platform::runLater).join(); }, Platform::runLater).join();
} }
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties
-1
View File
@@ -1 +0,0 @@
../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties
-1
View File
@@ -1 +0,0 @@
../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml
-1
View File
@@ -1 +0,0 @@
../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml
-1
View File
@@ -1 +0,0 @@
../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css
-1
View File
@@ -1 +0,0 @@
../../../../../../../../../../core/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css
core/src/test/resources/com/github/gtache/fxml/compiler/impl/ControlsBundle.properties → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/ControlsBundle.properties
View File
core/src/test/resources/com/github/gtache/fxml/compiler/impl/IncludesBundle.properties → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/IncludesBundle.properties
View File
core/src/test/resources/com/github/gtache/fxml/compiler/impl/controlsView.fxml → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/controlsView.fxml
+1 -1
View File
@@ -15,7 +15,7 @@
<GridPane fx:id="gridPane" onInputMethodTextChanged="#inputMethodTextChanged" onKeyPressed="#keyPressed" <GridPane fx:id="gridPane" onInputMethodTextChanged="#inputMethodTextChanged" onKeyPressed="#keyPressed"
onKeyReleased="#keyReleased" onKeyReleased="#keyReleased"
onKeyTyped="#keyTyped" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" onKeyTyped="#keyTyped" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.fxml.compiler.impl.ControlsController"> fx:controller="com.github.gtache.fxml.compiler.parsing.listener.ControlsController">
<rowConstraints> <rowConstraints>
<RowConstraints/> <RowConstraints/>
<RowConstraints/> <RowConstraints/>
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-constructor.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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(); final var object0 = new javafx.scene.layout.GridPane();
controller.gridPane = object0; controller.gridPane = object0;
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -415,7 +415,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-getbundle.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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(); final var object0 = new javafx.scene.layout.GridPane();
controller.gridPane = object0; controller.gridPane = object0;
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -415,7 +415,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reference-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reference-getter.txt
+8 -8
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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(); final var object0 = new javafx.scene.layout.GridPane();
controller.gridPane = object0; controller.gridPane = object0;
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -414,7 +414,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-constructor.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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(); final var object0 = new javafx.scene.layout.GridPane();
controller.gridPane = object0; controller.gridPane = object0;
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -459,7 +459,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-getbundle.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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(); final var object0 = new javafx.scene.layout.GridPane();
controller.gridPane = object0; controller.gridPane = object0;
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -459,7 +459,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-assign-reflection-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-assign-reflection-getter.txt
+8 -8
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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(); final var object0 = new javafx.scene.layout.GridPane();
controller.gridPane = object0; controller.gridPane = object0;
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -458,7 +458,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-constructor.txt
+10 -10
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -14,14 +14,14 @@ public final class ControlsController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory, final ResourceBundle resourceBundle) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> 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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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<String, Object>(); final var fieldMap = new HashMap<String, Object>();
final var object0 = new javafx.scene.layout.GridPane(); final var object0 = new javafx.scene.layout.GridPane();
fieldMap.put("gridPane", object0); fieldMap.put("gridPane", object0);
@@ -363,8 +363,8 @@ public final class ControlsController {
javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setColumnIndex(object76, 1);
javafx.scene.layout.GridPane.setRowIndex(object76, 17); 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); 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); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class);
controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
object0.setOnKeyPressed(e -> controller.keyPressed()); object0.setOnKeyPressed(e -> controller.keyPressed());
object0.setOnKeyReleased(controller::keyReleased); object0.setOnKeyReleased(controller::keyReleased);
@@ -418,7 +418,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-getbundle.txt
+10 -10
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -14,14 +14,14 @@ public final class ControlsController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory, final ResourceBundle resourceBundle) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> 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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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<String, Object>(); final var fieldMap = new HashMap<String, Object>();
final var object0 = new javafx.scene.layout.GridPane(); final var object0 = new javafx.scene.layout.GridPane();
fieldMap.put("gridPane", object0); fieldMap.put("gridPane", object0);
@@ -363,8 +363,8 @@ public final class ControlsController {
javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setColumnIndex(object76, 1);
javafx.scene.layout.GridPane.setRowIndex(object76, 17); 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); 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); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class);
controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
object0.setOnKeyPressed(e -> controller.keyPressed()); object0.setOnKeyPressed(e -> controller.keyPressed());
object0.setOnKeyReleased(controller::keyReleased); object0.setOnKeyReleased(controller::keyReleased);
@@ -418,7 +418,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reference-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reference-getter.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -14,14 +14,14 @@ public final class ControlsController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory, final ResourceBundle resourceBundle) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> 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)); 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.setColumnIndex(object76, 1);
javafx.scene.layout.GridPane.setRowIndex(object76, 17); 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); 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); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class);
controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
object0.setOnKeyPressed(e -> controller.keyPressed()); object0.setOnKeyPressed(e -> controller.keyPressed());
object0.setOnKeyReleased(controller::keyReleased); object0.setOnKeyReleased(controller::keyReleased);
@@ -417,7 +417,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-constructor.txt
+10 -10
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -18,14 +18,14 @@ public final class ControlsController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory, final ResourceBundle resourceBundle) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> 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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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<String, Object>(); final var fieldMap = new HashMap<String, Object>();
final var object0 = new javafx.scene.layout.GridPane(); final var object0 = new javafx.scene.layout.GridPane();
fieldMap.put("gridPane", object0); fieldMap.put("gridPane", object0);
@@ -367,8 +367,8 @@ public final class ControlsController {
javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setColumnIndex(object76, 1);
javafx.scene.layout.GridPane.setRowIndex(object76, 17); 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); 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); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class);
controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
object0.setOnKeyPressed(e -> callMethod("keyPressed", e)); object0.setOnKeyPressed(e -> callMethod("keyPressed", e));
object0.setOnKeyReleased(e -> callMethod("keyReleased", e)); object0.setOnKeyReleased(e -> callMethod("keyReleased", e));
@@ -462,7 +462,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-getbundle.txt
+10 -10
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -18,14 +18,14 @@ public final class ControlsController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory, final ResourceBundle resourceBundle) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> 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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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<String, Object>(); final var fieldMap = new HashMap<String, Object>();
final var object0 = new javafx.scene.layout.GridPane(); final var object0 = new javafx.scene.layout.GridPane();
fieldMap.put("gridPane", object0); fieldMap.put("gridPane", object0);
@@ -367,8 +367,8 @@ public final class ControlsController {
javafx.scene.layout.GridPane.setColumnIndex(object76, 1); javafx.scene.layout.GridPane.setColumnIndex(object76, 1);
javafx.scene.layout.GridPane.setRowIndex(object76, 17); 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); 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); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class);
controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
object0.setOnKeyPressed(e -> callMethod("keyPressed", e)); object0.setOnKeyPressed(e -> callMethod("keyPressed", e));
object0.setOnKeyReleased(e -> callMethod("keyReleased", e)); object0.setOnKeyReleased(e -> callMethod("keyReleased", e));
@@ -462,7 +462,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-factory-reflection-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-factory-reflection-getter.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -18,14 +18,14 @@ public final class ControlsController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.ControlsController> controllerFactory, final ResourceBundle resourceBundle) { public ControlsController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.ControlsController> 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)); 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.setColumnIndex(object76, 1);
javafx.scene.layout.GridPane.setRowIndex(object76, 17); 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); 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); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.ControlsController.class);
controller = (com.github.gtache.fxml.compiler.impl.ControlsController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.ControlsController) controllerFactory.create(fieldMap);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
object0.setOnKeyPressed(e -> callMethod("keyPressed", e)); object0.setOnKeyPressed(e -> callMethod("keyPressed", e));
object0.setOnKeyReleased(e -> callMethod("keyReleased", e)); object0.setOnKeyReleased(e -> callMethod("keyReleased", e));
@@ -461,7 +461,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-constructor.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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(); final var object0 = new javafx.scene.layout.GridPane();
injectField("gridPane", object0); injectField("gridPane", object0);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -424,7 +424,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-getbundle.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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(); final var object0 = new javafx.scene.layout.GridPane();
injectField("gridPane", object0); injectField("gridPane", object0);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -424,7 +424,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reference-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reference-getter.txt
+8 -8
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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(); final var object0 = new javafx.scene.layout.GridPane();
injectField("gridPane", object0); injectField("gridPane", object0);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -423,7 +423,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-constructor.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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(); final var object0 = new javafx.scene.layout.GridPane();
injectField("gridPane", object0); injectField("gridPane", object0);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -468,7 +468,7 @@ private <T> void injectField(final String fieldName, final T object) {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-getbundle.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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(); final var object0 = new javafx.scene.layout.GridPane();
injectField("gridPane", object0); injectField("gridPane", object0);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -468,7 +468,7 @@ private <T> void injectField(final String fieldName, final T object) {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-reflection-reflection-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-reflection-reflection-getter.txt
+8 -8
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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(); final var object0 = new javafx.scene.layout.GridPane();
injectField("gridPane", object0); injectField("gridPane", object0);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -467,7 +467,7 @@ private <T> void injectField(final String fieldName, final T object) {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-constructor.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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(); final var object0 = new javafx.scene.layout.GridPane();
controller.setGridPane(object0); controller.setGridPane(object0);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -415,7 +415,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-getbundle.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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(); final var object0 = new javafx.scene.layout.GridPane();
controller.setGridPane(object0); controller.setGridPane(object0);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -415,7 +415,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reference-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reference-getter.txt
+8 -8
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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(); final var object0 = new javafx.scene.layout.GridPane();
controller.setGridPane(object0); controller.setGridPane(object0);
object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); object0.setOnInputMethodTextChanged(controller::inputMethodTextChanged);
@@ -414,7 +414,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-constructor.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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(); final var object0 = new javafx.scene.layout.GridPane();
controller.setGridPane(object0); controller.setGridPane(object0);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -459,7 +459,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-getbundle.txt
+9 -9
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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(); final var object0 = new javafx.scene.layout.GridPane();
controller.setGridPane(object0); controller.setGridPane(object0);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -459,7 +459,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-controls-setters-reflection-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-controls-setters-reflection-getter.txt
+8 -8
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class ControlsController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new ControlsController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.ControlsController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public ControlsController(final com.github.gtache.fxml.compiler.impl.ControlsController controller, final ResourceBundle resourceBundle) { public ControlsController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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(); final var object0 = new javafx.scene.layout.GridPane();
controller.setGridPane(object0); controller.setGridPane(object0);
object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e)); object0.setOnInputMethodTextChanged(e -> callMethod("inputMethodTextChanged", e));
@@ -458,7 +458,7 @@ public final class ControlsController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.ControlsController controller() { public com.github.gtache.fxml.compiler.parsing.listener.ControlsController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-constructor.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -85,9 +85,9 @@ public final class IncludesController {
controller.volumeValueLabel = object13; controller.volumeValueLabel = object13;
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.controlsController = controller0; controller.controlsController = controller0;
@@ -172,7 +172,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-getbundle.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -85,9 +85,9 @@ public final class IncludesController {
controller.volumeValueLabel = object13; controller.volumeValueLabel = object13;
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.controlsController = controller0; controller.controlsController = controller0;
@@ -172,7 +172,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reference-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reference-getter.txt
+11 -11
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -84,9 +84,9 @@ public final class IncludesController {
controller.volumeValueLabel = object13; controller.volumeValueLabel = object13;
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.controlsController = controller0; controller.controlsController = controller0;
@@ -171,7 +171,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-constructor.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -89,9 +89,9 @@ public final class IncludesController {
controller.volumeValueLabel = object13; controller.volumeValueLabel = object13;
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.controlsController = controller0; controller.controlsController = controller0;
@@ -216,7 +216,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-getbundle.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -89,9 +89,9 @@ public final class IncludesController {
controller.volumeValueLabel = object13; controller.volumeValueLabel = object13;
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.controlsController = controller0; controller.controlsController = controller0;
@@ -216,7 +216,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-assign-reflection-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-assign-reflection-getter.txt
+11 -11
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -88,9 +88,9 @@ public final class IncludesController {
controller.volumeValueLabel = object13; controller.volumeValueLabel = object13;
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.controlsController = controller0; controller.controlsController = controller0;
@@ -215,7 +215,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-constructor.txt
+13 -13
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -14,14 +14,14 @@ public final class IncludesController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory, final ResourceBundle resourceBundle) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> 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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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<String, Object>(); final var fieldMap = new HashMap<String, Object>();
final var object0 = new javafx.scene.layout.BorderPane(); final var object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
@@ -85,9 +85,9 @@ public final class IncludesController {
fieldMap.put("volumeValueLabel", object13); fieldMap.put("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
fieldMap.put("controlsController", controller0); fieldMap.put("controlsController", controller0);
@@ -162,8 +162,8 @@ public final class IncludesController {
object17.getItems().addAll(object18); object17.getItems().addAll(object18);
object16.getChildren().addAll(object17); object16.getChildren().addAll(object17);
object0.setCenter(object16); object0.setCenter(object16);
final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class);
controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap);
object9.setOnAction(controller::playPressed); object9.setOnAction(controller::playPressed);
controller.initialize(); controller.initialize();
loaded = true; loaded = true;
@@ -175,7 +175,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-getbundle.txt
+13 -13
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -14,14 +14,14 @@ public final class IncludesController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory, final ResourceBundle resourceBundle) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> 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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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<String, Object>(); final var fieldMap = new HashMap<String, Object>();
final var object0 = new javafx.scene.layout.BorderPane(); final var object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
@@ -85,9 +85,9 @@ public final class IncludesController {
fieldMap.put("volumeValueLabel", object13); fieldMap.put("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
fieldMap.put("controlsController", controller0); fieldMap.put("controlsController", controller0);
@@ -162,8 +162,8 @@ public final class IncludesController {
object17.getItems().addAll(object18); object17.getItems().addAll(object18);
object16.getChildren().addAll(object17); object16.getChildren().addAll(object17);
object0.setCenter(object16); object0.setCenter(object16);
final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class);
controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap);
object9.setOnAction(controller::playPressed); object9.setOnAction(controller::playPressed);
controller.initialize(); controller.initialize();
loaded = true; loaded = true;
@@ -175,7 +175,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reference-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reference-getter.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -14,14 +14,14 @@ public final class IncludesController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory, final ResourceBundle resourceBundle) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> 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)); 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); fieldMap.put("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
fieldMap.put("controlsController", controller0); fieldMap.put("controlsController", controller0);
@@ -160,8 +160,8 @@ public final class IncludesController {
object17.getItems().addAll(object18); object17.getItems().addAll(object18);
object16.getChildren().addAll(object17); object16.getChildren().addAll(object17);
object0.setCenter(object16); object0.setCenter(object16);
final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class);
controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap);
object9.setOnAction(controller::playPressed); object9.setOnAction(controller::playPressed);
object11.setText(controller.resources().getString("media.volume.label")); object11.setText(controller.resources().getString("media.volume.label"));
controller.initialize(); controller.initialize();
@@ -174,7 +174,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-constructor.txt
+13 -13
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -18,14 +18,14 @@ public final class IncludesController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory, final ResourceBundle resourceBundle) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> 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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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<String, Object>(); final var fieldMap = new HashMap<String, Object>();
final var object0 = new javafx.scene.layout.BorderPane(); final var object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
@@ -89,9 +89,9 @@ public final class IncludesController {
fieldMap.put("volumeValueLabel", object13); fieldMap.put("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
fieldMap.put("controlsController", controller0); fieldMap.put("controlsController", controller0);
@@ -166,8 +166,8 @@ public final class IncludesController {
object17.getItems().addAll(object18); object17.getItems().addAll(object18);
object16.getChildren().addAll(object17); object16.getChildren().addAll(object17);
object0.setCenter(object16); object0.setCenter(object16);
final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class);
controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap);
object9.setOnAction(e -> callMethod("playPressed", e)); object9.setOnAction(e -> callMethod("playPressed", e));
try { try {
final var initialize = controller.getClass().getDeclaredMethod("initialize"); final var initialize = controller.getClass().getDeclaredMethod("initialize");
@@ -219,7 +219,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-getbundle.txt
+13 -13
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -18,14 +18,14 @@ public final class IncludesController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory, final ResourceBundle resourceBundle) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> 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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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<String, Object>(); final var fieldMap = new HashMap<String, Object>();
final var object0 = new javafx.scene.layout.BorderPane(); final var object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
@@ -89,9 +89,9 @@ public final class IncludesController {
fieldMap.put("volumeValueLabel", object13); fieldMap.put("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
fieldMap.put("controlsController", controller0); fieldMap.put("controlsController", controller0);
@@ -166,8 +166,8 @@ public final class IncludesController {
object17.getItems().addAll(object18); object17.getItems().addAll(object18);
object16.getChildren().addAll(object17); object16.getChildren().addAll(object17);
object0.setCenter(object16); object0.setCenter(object16);
final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class);
controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap);
object9.setOnAction(e -> callMethod("playPressed", e)); object9.setOnAction(e -> callMethod("playPressed", e));
try { try {
final var initialize = controller.getClass().getDeclaredMethod("initialize"); final var initialize = controller.getClass().getDeclaredMethod("initialize");
@@ -219,7 +219,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-factory-reflection-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-factory-reflection-getter.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -18,14 +18,14 @@ public final class IncludesController {
private final Map<Class<?>, ControllerFactory<?>> controllersMap; private final Map<Class<?>, ControllerFactory<?>> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controllerFactory The controller factory * @param controllerFactory The controller factory
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> controllerFactory) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controllerFactory), Map.of()); 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 controllerFactory The controller factory
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.impl.IncludesController> controllerFactory, final ResourceBundle resourceBundle) { public IncludesController(final ControllerFactory<com.github.gtache.fxml.compiler.parsing.listener.IncludesController> 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)); 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); fieldMap.put("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
fieldMap.put("controlsController", controller0); fieldMap.put("controlsController", controller0);
@@ -164,8 +164,8 @@ public final class IncludesController {
object17.getItems().addAll(object18); object17.getItems().addAll(object18);
object16.getChildren().addAll(object17); object16.getChildren().addAll(object17);
object0.setCenter(object16); object0.setCenter(object16);
final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.impl.IncludesController.class); final var controllerFactory = controllersMap.get(com.github.gtache.fxml.compiler.parsing.listener.IncludesController.class);
controller = (com.github.gtache.fxml.compiler.impl.IncludesController) controllerFactory.create(fieldMap); controller = (com.github.gtache.fxml.compiler.parsing.listener.IncludesController) controllerFactory.create(fieldMap);
object9.setOnAction(e -> callMethod("playPressed", e)); object9.setOnAction(e -> callMethod("playPressed", e));
object11.setText(controller.resources().getString("media.volume.label")); object11.setText(controller.resources().getString("media.volume.label"));
try { try {
@@ -218,7 +218,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-constructor.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -85,9 +85,9 @@ public final class IncludesController {
injectField("volumeValueLabel", object13); injectField("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
injectField("controlsController", controller0); injectField("controlsController", controller0);
@@ -181,7 +181,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-getbundle.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -85,9 +85,9 @@ public final class IncludesController {
injectField("volumeValueLabel", object13); injectField("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
injectField("controlsController", controller0); injectField("controlsController", controller0);
@@ -181,7 +181,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reference-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reference-getter.txt
+11 -11
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -84,9 +84,9 @@ public final class IncludesController {
injectField("volumeValueLabel", object13); injectField("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
injectField("controlsController", controller0); injectField("controlsController", controller0);
@@ -180,7 +180,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-constructor.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -89,9 +89,9 @@ public final class IncludesController {
injectField("volumeValueLabel", object13); injectField("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
injectField("controlsController", controller0); injectField("controlsController", controller0);
@@ -225,7 +225,7 @@ private <T> void injectField(final String fieldName, final T object) {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-getbundle.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -89,9 +89,9 @@ public final class IncludesController {
injectField("volumeValueLabel", object13); injectField("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
injectField("controlsController", controller0); injectField("controlsController", controller0);
@@ -225,7 +225,7 @@ private <T> void injectField(final String fieldName, final T object) {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-reflection-reflection-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-reflection-reflection-getter.txt
+11 -11
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -88,9 +88,9 @@ public final class IncludesController {
injectField("volumeValueLabel", object13); injectField("volumeValueLabel", object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
injectField("controlsController", controller0); injectField("controlsController", controller0);
@@ -224,7 +224,7 @@ private <T> void injectField(final String fieldName, final T object) {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-constructor.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -85,9 +85,9 @@ public final class IncludesController {
controller.setVolumeValueLabel(object13); controller.setVolumeValueLabel(object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.setControlsController(controller0); controller.setControlsController(controller0);
@@ -172,7 +172,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-getbundle.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -85,9 +85,9 @@ public final class IncludesController {
controller.setVolumeValueLabel(object13); controller.setVolumeValueLabel(object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.setControlsController(controller0); controller.setControlsController(controller0);
@@ -172,7 +172,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reference-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reference-getter.txt
+11 -11
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -13,14 +13,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -84,9 +84,9 @@ public final class IncludesController {
controller.setVolumeValueLabel(object13); controller.setVolumeValueLabel(object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.setControlsController(controller0); controller.setControlsController(controller0);
@@ -171,7 +171,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-constructor.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-constructor.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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);
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -89,9 +89,9 @@ public final class IncludesController {
controller.setVolumeValueLabel(object13); controller.setVolumeValueLabel(object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.setControlsController(controller0); controller.setControlsController(controller0);
@@ -216,7 +216,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-getbundle.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-getbundle.txt
+12 -12
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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");
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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -89,9 +89,9 @@ public final class IncludesController {
controller.setVolumeValueLabel(object13); controller.setVolumeValueLabel(object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.setControlsController(controller0); controller.setControlsController(controller0);
@@ -216,7 +216,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
loader/src/test/resources/com/github/gtache/fxml/compiler/impl/expected-includes-setters-reflection-getter.txt → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/expected-includes-setters-reflection-getter.txt
+11 -11
View File
@@ -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.Map;
import java.util.ResourceBundle; import java.util.ResourceBundle;
@@ -17,14 +17,14 @@ public final class IncludesController {
private final Map<Class<?>, Object> controllersMap; private final Map<Class<?>, Object> controllersMap;
private final Map<Class<?>, ResourceBundle> resourceBundlesMap; private final Map<Class<?>, ResourceBundle> resourceBundlesMap;
private boolean loaded; 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 * Instantiates a new IncludesController with no nested controllers and no resource bundle
* @param controller The controller * @param controller The controller
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller) {
this(Map.of(com.github.gtache.fxml.compiler.impl.IncludesController.class, controller), Map.of()); 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 controller The controller
* @param resourceBundle The resource bundle * @param resourceBundle The resource bundle
*/ */
public IncludesController(final com.github.gtache.fxml.compiler.impl.IncludesController controller, final ResourceBundle resourceBundle) { public IncludesController(final com.github.gtache.fxml.compiler.parsing.listener.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)); 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) { if (loaded) {
throw new IllegalStateException("Already 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 object0 = new javafx.scene.layout.BorderPane();
final var object1 = new javafx.scene.layout.VBox(); final var object1 = new javafx.scene.layout.VBox();
javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER); javafx.scene.layout.BorderPane.setAlignment(object1, javafx.geometry.Pos.CENTER);
@@ -88,9 +88,9 @@ public final class IncludesController {
controller.setVolumeValueLabel(object13); controller.setVolumeValueLabel(object13);
object13.setText("Label"); object13.setText("Label");
final var map0 = new HashMap<>(resourceBundlesMap); final var map0 = new HashMap<>(resourceBundlesMap);
final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.impl.ControlsBundle"); final var bundle0 = ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.listener.ControlsBundle");
map0.put(com.github.gtache.fxml.compiler.impl.ControlsController, bundle0); map0.put(com.github.gtache.fxml.compiler.parsing.listener.ControlsController, bundle0);
final var view0 = new com.github.gtache.fxml.compiler.impl.ControlsView(controllersMap, map0); final var view0 = new com.github.gtache.fxml.compiler.parsing.listener.ControlsView(controllersMap, map0);
final var object14 = view0.load(); final var object14 = view0.load();
final var controller0 = view0.controller(); final var controller0 = view0.controller();
controller.setControlsController(controller0); controller.setControlsController(controller0);
@@ -215,7 +215,7 @@ public final class IncludesController {
/** /**
* @return The controller * @return The controller
*/ */
public com.github.gtache.fxml.compiler.impl.IncludesController controller() { public com.github.gtache.fxml.compiler.parsing.listener.IncludesController controller() {
if (loaded) { if (loaded) {
return controller; return controller;
} else { } else {
core/src/test/resources/com/github/gtache/fxml/compiler/impl/includesView.fxml → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/includesView.fxml
+2 -2
View File
@@ -6,7 +6,7 @@
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.scene.text.TextFlow?> <?import javafx.scene.text.TextFlow?>
<BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" <BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.fxml.compiler.impl.IncludesController"> fx:controller="com.github.gtache.fxml.compiler.parsing.listener.IncludesController">
<bottom> <bottom>
<VBox BorderPane.alignment="CENTER"> <VBox BorderPane.alignment="CENTER">
<children> <children>
@@ -38,7 +38,7 @@
<Slider fx:id="volumeSlider" value="100"/> <Slider fx:id="volumeSlider" value="100"/>
<Label fx:id="volumeValueLabel" text="Label"/> <Label fx:id="volumeValueLabel" text="Label"/>
<fx:include fx:id="controls" source="controlsView.fxml" <fx:include fx:id="controls" source="controlsView.fxml"
resources="com/github/gtache/fxml/compiler/impl/ControlsBundle"/> resources="com/github/gtache/fxml/compiler/parsing/listener/ControlsBundle"/>
</children> </children>
<padding> <padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
core/src/test/resources/com/github/gtache/fxml/compiler/impl/style.css → loader/src/test/resources/com/github/gtache/fxml/compiler/parsing/listener/style.css
View File
xml/pom.xml
+6
View File
@@ -16,5 +16,11 @@
<groupId>com.github.gtache</groupId> <groupId>com.github.gtache</groupId>
<artifactId>fxml-compiler-core</artifactId> <artifactId>fxml-compiler-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>${javafx.version}</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
xml/src/main/java/module-info.java
+6
View File
@@ -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;
}