From 7ec52cd1751e8a43a187172303fbf459e852e9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20T=C3=A2che?= Date: Sat, 30 Nov 2024 19:04:01 +0100 Subject: [PATCH] Tries to avoid injecting fields that are not defined in controller --- README.md | 5 +- .../fxml/compiler/ControllerFieldInfo.java | 32 +++++++++++++ .../gtache/fxml/compiler/ControllerInfo.java | 15 +++--- .../compiler/TestControllerFieldInfo.java | 31 ++++++++++++ .../fxml/compiler/TestControllerInfo.java | 28 ++++++----- .../impl/ControllerFieldInfoImpl.java | 27 +++++++++++ .../compiler/impl/ControllerInfoImpl.java | 10 ++-- .../impl/internal/GenerationHelper.java | 10 +++- .../impl/internal/ObjectFormatter.java | 11 ++++- .../impl/internal/ReflectionHelper.java | 15 ++++-- .../impl/TestControllerFieldInfoImpl.java | 48 +++++++++++++++++++ .../compiler/impl/TestControllerInfoImpl.java | 34 +++++++------ .../maven/ControllerInfoProvider.java | 44 ++++++++--------- .../parsing/xml/TestGeneratorImpl.java | 43 ++++++++--------- ...-controls-assign-reference-constructor.txt | 36 +------------- ...ed-controls-assign-reference-getbundle.txt | 36 +------------- ...ected-controls-assign-reference-getter.txt | 36 +------------- ...controls-assign-reflection-constructor.txt | 36 +------------- ...d-controls-assign-reflection-getbundle.txt | 36 +------------- ...cted-controls-assign-reflection-getter.txt | 36 +------------- ...controls-factory-reference-constructor.txt | 36 +------------- ...d-controls-factory-reference-getbundle.txt | 36 +------------- ...cted-controls-factory-reference-getter.txt | 36 +------------- ...ontrols-factory-reflection-constructor.txt | 36 +------------- ...-controls-factory-reflection-getbundle.txt | 36 +------------- ...ted-controls-factory-reflection-getter.txt | 36 +------------- ...trols-reflection-reference-constructor.txt | 36 +------------- ...ontrols-reflection-reference-getbundle.txt | 36 +------------- ...d-controls-reflection-reference-getter.txt | 36 +------------- ...rols-reflection-reflection-constructor.txt | 36 +------------- ...ntrols-reflection-reflection-getbundle.txt | 36 +------------- ...-controls-reflection-reflection-getter.txt | 36 +------------- ...controls-setters-reference-constructor.txt | 36 +------------- ...d-controls-setters-reference-getbundle.txt | 36 +------------- ...cted-controls-setters-reference-getter.txt | 36 +------------- ...ontrols-setters-reflection-constructor.txt | 36 +------------- ...-controls-setters-reflection-getbundle.txt | 36 +------------- ...ted-controls-setters-reflection-getter.txt | 36 +------------- ...-includes-assign-reference-constructor.txt | 25 ---------- ...ed-includes-assign-reference-getbundle.txt | 25 ---------- ...ected-includes-assign-reference-getter.txt | 25 ---------- ...includes-assign-reflection-constructor.txt | 25 ---------- ...d-includes-assign-reflection-getbundle.txt | 25 ---------- ...cted-includes-assign-reflection-getter.txt | 25 ---------- ...includes-factory-reference-constructor.txt | 25 ---------- ...d-includes-factory-reference-getbundle.txt | 25 ---------- ...cted-includes-factory-reference-getter.txt | 25 ---------- ...ncludes-factory-reflection-constructor.txt | 25 ---------- ...-includes-factory-reflection-getbundle.txt | 25 ---------- ...ted-includes-factory-reflection-getter.txt | 25 ---------- ...ludes-reflection-reference-constructor.txt | 25 ---------- ...ncludes-reflection-reference-getbundle.txt | 25 ---------- ...d-includes-reflection-reference-getter.txt | 25 ---------- ...udes-reflection-reflection-constructor.txt | 25 ---------- ...cludes-reflection-reflection-getbundle.txt | 25 ---------- ...-includes-reflection-reflection-getter.txt | 25 ---------- ...includes-setters-reference-constructor.txt | 25 ---------- ...d-includes-setters-reference-getbundle.txt | 25 ---------- ...cted-includes-setters-reference-getter.txt | 25 ---------- ...ncludes-setters-reflection-constructor.txt | 25 ---------- ...-includes-setters-reflection-getbundle.txt | 25 ---------- ...ted-includes-setters-reflection-getter.txt | 25 ---------- 62 files changed, 280 insertions(+), 1537 deletions(-) create mode 100644 api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInfo.java create mode 100644 api/src/test/java/com/github/gtache/fxml/compiler/TestControllerFieldInfo.java create mode 100644 core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java create mode 100644 core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java diff --git a/README.md b/README.md index 447bee7..120e8a5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1 @@ -## TODO - -- How to support resources in fx:include? -- Get included controllers without needing to specify them? \ No newline at end of file +# FXML Compiler \ No newline at end of file diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInfo.java b/api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInfo.java new file mode 100644 index 0000000..0596bee --- /dev/null +++ b/api/src/main/java/com/github/gtache/fxml/compiler/ControllerFieldInfo.java @@ -0,0 +1,32 @@ +package com.github.gtache.fxml.compiler; + +import java.util.List; + +/** + * Info about a controller field + */ +public interface ControllerFieldInfo { + + /** + * Returns the field name + * + * @return The name + */ + String name(); + + /** + * Returns whether the field is generic + * + * @return True if the field is generic, false if not (or raw) + */ + default boolean isGeneric() { + return !genericTypes().isEmpty(); + } + + /** + * Returns the generic types for the field + * + * @return The generic types as a list, empty if not generic or raw + */ + List genericTypes(); +} diff --git a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerInfo.java b/api/src/main/java/com/github/gtache/fxml/compiler/ControllerInfo.java index 04c6630..442073b 100644 --- a/api/src/main/java/com/github/gtache/fxml/compiler/ControllerInfo.java +++ b/api/src/main/java/com/github/gtache/fxml/compiler/ControllerInfo.java @@ -1,6 +1,5 @@ package com.github.gtache.fxml.compiler; -import java.util.List; import java.util.Map; /** @@ -26,19 +25,19 @@ public interface ControllerInfo { } /** - * Returns a mapping of property name -> generic types + * Returns a mapping of property name -> field info * - * @return A mapping of property name to generic types + * @return the mapping */ - Map> propertyGenericTypes(); + Map fieldInfo(); /** - * Returns the generic types for the given property (null if not generic or raw) + * Returns the field information for the given property * * @param property The property - * @return The generic types + * @return The info, or null if not found */ - default List propertyGenericTypes(final String property) { - return propertyGenericTypes().get(property); + default ControllerFieldInfo fieldInfo(final String property) { + return fieldInfo().get(property); } } diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerFieldInfo.java b/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerFieldInfo.java new file mode 100644 index 0000000..e9e0728 --- /dev/null +++ b/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerFieldInfo.java @@ -0,0 +1,31 @@ +package com.github.gtache.fxml.compiler; + +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +class TestControllerFieldInfo { + + private final ControllerFieldInfo info; + + TestControllerFieldInfo() { + this.info = spy(ControllerFieldInfo.class); + } + + @Test + void testIsGenericFalse() { + when(info.genericTypes()).thenReturn(List.of()); + assertFalse(info.isGeneric()); + } + + @Test + void testIsGenericTrue() { + when(info.genericTypes()).thenReturn(List.of("A", "B", "C")); + assertTrue(info.isGeneric()); + } +} diff --git a/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerInfo.java b/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerInfo.java index 3fd8333..4d76b82 100644 --- a/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerInfo.java +++ b/api/src/test/java/com/github/gtache/fxml/compiler/TestControllerInfo.java @@ -2,35 +2,39 @@ package com.github.gtache.fxml.compiler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.HashMap; -import java.util.List; import java.util.Map; +import java.util.Objects; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +@ExtendWith(MockitoExtension.class) class TestControllerInfo { private final String string; private final Map handlerHasArgument; - private final Map> propertyGenericTypes; - private final List genericTypes; + private final ControllerFieldInfo fieldInfo; + private final Map fieldInfoMap; private final ControllerInfo controllerInfo; - TestControllerInfo() { + TestControllerInfo(@Mock final ControllerFieldInfo fieldInfo) { this.string = "string"; this.handlerHasArgument = new HashMap<>(); - this.propertyGenericTypes = new HashMap<>(); - this.genericTypes = List.of("a", "b"); + this.fieldInfoMap = new HashMap<>(); + this.fieldInfo = Objects.requireNonNull(fieldInfo); this.controllerInfo = spy(ControllerInfo.class); } @BeforeEach void beforeEach() { when(controllerInfo.handlerHasArgument()).thenReturn(handlerHasArgument); - when(controllerInfo.propertyGenericTypes()).thenReturn(propertyGenericTypes); + when(controllerInfo.fieldInfo()).thenReturn(fieldInfoMap); } @Test @@ -51,13 +55,13 @@ class TestControllerInfo { } @Test - void testPropertyGenericTypesNull() { - assertNull(controllerInfo.propertyGenericTypes(string)); + void testFieldInfoNull() { + assertNull(controllerInfo.fieldInfo(string)); } @Test - void testPropertyGenericTypes() { - propertyGenericTypes.put(string, genericTypes); - assertEquals(genericTypes, controllerInfo.propertyGenericTypes(string)); + void testFieldInfo() { + fieldInfoMap.put(string, fieldInfo); + assertEquals(fieldInfo, controllerInfo.fieldInfo(string)); } } diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java b/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java new file mode 100644 index 0000000..c790d8e --- /dev/null +++ b/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerFieldInfoImpl.java @@ -0,0 +1,27 @@ +package com.github.gtache.fxml.compiler.impl; + +import com.github.gtache.fxml.compiler.ControllerFieldInfo; + +import java.util.List; +import java.util.Objects; + +/** + * Implementation of {@link ControllerFieldInfo} + * + * @param name The field name + * @param genericTypes The generic types + */ +public record ControllerFieldInfoImpl(String name, List genericTypes) implements ControllerFieldInfo { + + /** + * Instantiates a new info + * + * @param name The field name + * @param genericTypes The generic types (will be copied) + * @throws NullPointerException if any parameter is null + */ + public ControllerFieldInfoImpl { + Objects.requireNonNull(name); + genericTypes = List.copyOf(genericTypes); + } +} diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerInfoImpl.java b/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerInfoImpl.java index 53c2307..9835ef7 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerInfoImpl.java +++ b/core/src/main/java/com/github/gtache/fxml/compiler/impl/ControllerInfoImpl.java @@ -1,21 +1,21 @@ package com.github.gtache.fxml.compiler.impl; +import com.github.gtache.fxml.compiler.ControllerFieldInfo; import com.github.gtache.fxml.compiler.ControllerInfo; -import java.util.List; import java.util.Map; /** * Implementation of {@link ControllerInfo} * - * @param handlerHasArgument The mapping of method name to true if the method has an argument - * @param propertyGenericTypes The mapping of property name to generic types + * @param handlerHasArgument The mapping of method name to true if the method has an argument + * @param fieldInfo The mapping of property name to controller field info */ public record ControllerInfoImpl(Map handlerHasArgument, - Map> propertyGenericTypes) implements ControllerInfo { + Map fieldInfo) implements ControllerInfo { public ControllerInfoImpl { handlerHasArgument = Map.copyOf(handlerHasArgument); - propertyGenericTypes = Map.copyOf(propertyGenericTypes); + fieldInfo = Map.copyOf(fieldInfo); } } diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationHelper.java b/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationHelper.java index 7648c8b..264ee0e 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationHelper.java +++ b/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/GenerationHelper.java @@ -5,6 +5,8 @@ import com.github.gtache.fxml.compiler.GenerationException; import com.github.gtache.fxml.compiler.impl.GeneratorImpl; import com.github.gtache.fxml.compiler.parsing.ParsedObject; import com.github.gtache.fxml.compiler.parsing.ParsedProperty; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.List; import java.util.Map; @@ -16,6 +18,7 @@ import static com.github.gtache.fxml.compiler.impl.internal.ControllerInjector.i */ public final class GenerationHelper { + private static final Logger logger = LogManager.getLogger(GenerationHelper.class); static final String FX_ID = "fx:id"; static final String FX_VALUE = "fx:value"; static final String VALUE = "value"; @@ -107,8 +110,11 @@ public final class GenerationHelper { if (id != null) { progress.idToVariableName().put(id.value(), variableName); progress.idToObject().put(id.value(), parsedObject); - //TODO Don't inject if variable doesn't exist - injectControllerField(progress, id.value(), variableName); + if (progress.request().controllerInfo().fieldInfo(id.value()) == null) { + logger.debug("Not injecting {} because it is not found in controller", id.value()); + } else { + injectControllerField(progress, id.value(), variableName); + } } } diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ObjectFormatter.java b/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ObjectFormatter.java index 6f5ec7b..8f1b971 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ObjectFormatter.java +++ b/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ObjectFormatter.java @@ -4,6 +4,8 @@ import com.github.gtache.fxml.compiler.GenerationException; import com.github.gtache.fxml.compiler.impl.GeneratorImpl; import com.github.gtache.fxml.compiler.parsing.*; import com.github.gtache.fxml.compiler.parsing.impl.ParsedPropertyImpl; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.Collection; @@ -31,6 +33,8 @@ import static com.github.gtache.fxml.compiler.impl.internal.WebViewBuilder.forma */ public final class ObjectFormatter { + private static final Logger logger = LogManager.getLogger(ObjectFormatter.class); + private static final String NEW_ASSIGN = " = new "; private static final Set BUILDER_CLASSES = Set.of( @@ -304,8 +308,11 @@ public final class ObjectFormatter { progress.stringBuilder().append(START_VAR).append(subControllerVariable).append(" = ").append(subViewVariable).append(".controller();\n"); progress.idToVariableName().put(id, subControllerVariable); progress.idToObject().put(id, include); - //TODO Don't inject if variable doesn't exist - injectControllerField(progress, id, subControllerVariable); + if (progress.request().controllerInfo().fieldInfo(id) == null) { + logger.debug("Not injecting {} because it is not found in controller", id); + } else { + injectControllerField(progress, id, subControllerVariable); + } } } diff --git a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ReflectionHelper.java b/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ReflectionHelper.java index b483d15..0782625 100644 --- a/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ReflectionHelper.java +++ b/core/src/main/java/com/github/gtache/fxml/compiler/impl/internal/ReflectionHelper.java @@ -5,6 +5,8 @@ import com.github.gtache.fxml.compiler.parsing.ParsedObject; import javafx.beans.DefaultProperty; import javafx.beans.NamedArg; import javafx.scene.Node; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -21,6 +23,7 @@ import static com.github.gtache.fxml.compiler.impl.internal.GenerationHelper.FX_ * Helper methods for reflection */ final class ReflectionHelper { + private static final Logger logger = LogManager.getLogger(ReflectionHelper.class); private static final Map, Boolean> HAS_VALUE_OF = new ConcurrentHashMap<>(); private static final Map, Boolean> IS_GENERIC = new ConcurrentHashMap<>(); private static final Map DEFAULT_PROPERTY = new ConcurrentHashMap<>(); @@ -300,14 +303,16 @@ final class ReflectionHelper { if (isGeneric(clazz)) { final var idProperty = parsedObject.attributes().get(FX_ID); if (idProperty == null) { - return "<>"; + logger.warn("No id found for generic class {} ; Using raw", clazz.getName()); + return ""; } else { final var id = idProperty.value(); - final var genericTypes = progress.request().controllerInfo().propertyGenericTypes(id); - if (genericTypes == null) { //Raw + final var fieldInfo = progress.request().controllerInfo().fieldInfo(id); + if (fieldInfo == null) { //Not found + logger.warn("No field found for generic class {} (id={}) ; Using raw", clazz.getName(), id); return ""; - } else { - return "<" + String.join(", ", genericTypes) + ">"; + } else if (fieldInfo.isGeneric()) { + return "<" + String.join(", ", fieldInfo.genericTypes()) + ">"; } } } diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java b/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java new file mode 100644 index 0000000..77c03dd --- /dev/null +++ b/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerFieldInfoImpl.java @@ -0,0 +1,48 @@ +package com.github.gtache.fxml.compiler.impl; + +import com.github.gtache.fxml.compiler.ControllerFieldInfo; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +class TestControllerFieldInfoImpl { + + private final String name; + private final List genericTypes; + private final ControllerFieldInfo info; + + TestControllerFieldInfoImpl() { + this.name = "name"; + this.genericTypes = new ArrayList<>(List.of("A", "B", "C")); + this.info = new ControllerFieldInfoImpl(name, genericTypes); + } + + @Test + void testGetters() { + assertEquals(name, info.name()); + assertEquals(genericTypes, info.genericTypes()); + } + + @Test + void testCopyList() { + final var originalGenericTypes = info.genericTypes(); + genericTypes.clear(); + assertEquals(originalGenericTypes, info.genericTypes()); + } + + @Test + void testUnmodifiable() { + final var infoList = info.genericTypes(); + assertThrows(UnsupportedOperationException.class, infoList::clear); + } + + @Test + void testIllegal() { + assertThrows(NullPointerException.class, () -> new ControllerFieldInfoImpl(null, genericTypes)); + assertThrows(NullPointerException.class, () -> new ControllerFieldInfoImpl(name, null)); + } +} diff --git a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerInfoImpl.java b/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerInfoImpl.java index 0dcdd65..7b66fae 100644 --- a/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerInfoImpl.java +++ b/core/src/test/java/com/github/gtache/fxml/compiler/impl/TestControllerInfoImpl.java @@ -1,24 +1,31 @@ package com.github.gtache.fxml.compiler.impl; +import com.github.gtache.fxml.compiler.ControllerFieldInfo; import com.github.gtache.fxml.compiler.ControllerInfo; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.HashMap; -import java.util.List; import java.util.Map; +import java.util.Objects; import static org.junit.jupiter.api.Assertions.*; +@ExtendWith(MockitoExtension.class) class TestControllerInfoImpl { private final Map handlerHasArgument; - private final Map> propertyGenericTypes; + private final ControllerFieldInfo fieldInfo; + private final Map fieldInfoMap; private final ControllerInfo info; - TestControllerInfoImpl() { + TestControllerInfoImpl(@Mock final ControllerFieldInfo fieldInfo) { this.handlerHasArgument = new HashMap<>(Map.of("one", true, "two", false)); - this.propertyGenericTypes = new HashMap<>(Map.of("one", List.of("a", "b"), "two", List.of())); - this.info = new ControllerInfoImpl(handlerHasArgument, propertyGenericTypes); + this.fieldInfo = Objects.requireNonNull(fieldInfo); + this.fieldInfoMap = new HashMap<>(Map.of("one", fieldInfo)); + this.info = new ControllerInfoImpl(handlerHasArgument, fieldInfoMap); } @Test @@ -31,35 +38,34 @@ class TestControllerInfoImpl { @Test void testPropertyGenericTypes() { - assertEquals(propertyGenericTypes, info.propertyGenericTypes()); - assertEquals(List.of("a", "b"), info.propertyGenericTypes("one")); - assertEquals(List.of(), info.propertyGenericTypes("two")); + assertEquals(fieldInfoMap, info.fieldInfo()); + assertEquals(fieldInfo, info.fieldInfo("one")); } @Test void testMapsCopied() { final var originalHandler = Map.copyOf(handlerHasArgument); - final var originalPropertyTypes = Map.copyOf(propertyGenericTypes); + final var originalFieldInfo = Map.copyOf(fieldInfoMap); assertEquals(originalHandler, info.handlerHasArgument()); - assertEquals(originalPropertyTypes, info.propertyGenericTypes()); + assertEquals(originalFieldInfo, info.fieldInfo()); handlerHasArgument.clear(); - propertyGenericTypes.clear(); + fieldInfoMap.clear(); assertEquals(originalHandler, info.handlerHasArgument()); - assertEquals(originalPropertyTypes, info.propertyGenericTypes()); + assertEquals(originalFieldInfo, info.fieldInfo()); } @Test void testUnmodifiable() { final var infoHandler = info.handlerHasArgument(); - final var infoProperty = info.propertyGenericTypes(); + final var infoProperty = info.fieldInfo(); assertThrows(UnsupportedOperationException.class, infoHandler::clear); assertThrows(UnsupportedOperationException.class, infoProperty::clear); } @Test void testIllegal() { - assertThrows(NullPointerException.class, () -> new ControllerInfoImpl(null, propertyGenericTypes)); + assertThrows(NullPointerException.class, () -> new ControllerInfoImpl(null, fieldInfoMap)); assertThrows(NullPointerException.class, () -> new ControllerInfoImpl(handlerHasArgument, null)); } } diff --git a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/ControllerInfoProvider.java b/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/ControllerInfoProvider.java index 80ff9b5..4b3ebd3 100644 --- a/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/ControllerInfoProvider.java +++ b/maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/ControllerInfoProvider.java @@ -1,7 +1,9 @@ package com.github.gtache.fxml.compiler.maven; +import com.github.gtache.fxml.compiler.ControllerFieldInfo; import com.github.gtache.fxml.compiler.ControllerInfo; import com.github.gtache.fxml.compiler.impl.ClassesFinder; +import com.github.gtache.fxml.compiler.impl.ControllerFieldInfoImpl; import com.github.gtache.fxml.compiler.impl.ControllerInfoImpl; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.logging.Log; @@ -51,21 +53,21 @@ class ControllerInfoProvider { try { final var content = Files.readString(info.controllerFile()); final var imports = getImports(content); - final var propertyGenericTypes = new HashMap>(); + final var propertyGenericTypes = new HashMap(); for (final var fieldInfo : info.injectedFields()) { final var name = fieldInfo.name(); final var type = fieldInfo.type(); - if (fillGenericTypes(type, name, content, imports, propertyGenericTypes)) { + if (fillFieldInfo(type, name, content, imports, propertyGenericTypes)) { logger.debug("Found injected field " + name + " of type " + type + " with generic types " + propertyGenericTypes.get(name) + " in controller " + info.controllerFile()); } else if (type.contains(".")) { final var simpleName = type.substring(type.lastIndexOf('.') + 1); - if (fillGenericTypes(simpleName, name, content, imports, propertyGenericTypes)) { + if (fillFieldInfo(simpleName, name, content, imports, propertyGenericTypes)) { logger.debug("Found injected field " + name + " of type " + simpleName + " with generic types " + propertyGenericTypes.get(name) + " in controller " + info.controllerFile()); } } else { - throw new MojoExecutionException("Cannot find field " + name + "(" + type + ")" + " in controller " + info.controllerFile()); + logger.info("Field " + name + "(" + type + ")" + " not found in controller " + info.controllerFile()); } } final var handlerHasArgument = new HashMap(); @@ -112,33 +114,31 @@ class ControllerInfoProvider { return new Imports(resolved, unresolved); } - private static boolean fillGenericTypes(final String type, final String name, final CharSequence content, final Imports imports, final Map> propertyGenericTypes) throws MojoExecutionException { + private static boolean fillFieldInfo(final String type, final String name, final CharSequence content, final Imports imports, final Map fieldInfos) throws MojoExecutionException { final var pattern = Pattern.compile(Pattern.quote(type) + "(?<[^>]+>)?\\s+" + Pattern.quote(name) + "\\s*;"); final var matcher = pattern.matcher(content); if (matcher.find()) { final var genericTypes = matcher.group("type"); if (genericTypes != null && !genericTypes.isBlank()) { - if (genericTypes.equals("<>")) { - propertyGenericTypes.put(name, List.of()); - } else { - final var split = genericTypes.replace("<", "").replace(">", "").split(","); - final var resolved = new ArrayList(); - for (final var s : split) { - final var trimmed = s.trim(); - if (trimmed.contains(".") || JAVA_LANG_CLASSES.contains(trimmed)) { - resolved.add(trimmed); + final var split = genericTypes.replace("<", "").replace(">", "").split(","); + final var resolved = new ArrayList(); + for (final var s : split) { + final var trimmed = s.trim(); + if (trimmed.contains(".") || JAVA_LANG_CLASSES.contains(trimmed)) { + resolved.add(trimmed); + } else { + final var imported = imports.imports().get(trimmed); + if (imported == null) { + throw new MojoExecutionException("Cannot find class " + trimmed + " probably in one of " + imports.packages() + " ; " + + "Use non-wildcard imports, use fully qualified name or put the classes in a dependency."); } else { - final var imported = imports.imports().get(trimmed); - if (imported == null) { - throw new MojoExecutionException("Cannot find class " + trimmed + " probably in one of " + imports.packages() + " ; " + - "Use non-wildcard imports, use fully qualified name or put the classes in a dependency."); - } else { - resolved.add(imported); - } + resolved.add(imported); } } - propertyGenericTypes.put(name, resolved); } + fieldInfos.put(name, new ControllerFieldInfoImpl(name, resolved)); + } else { + fieldInfos.put(name, new ControllerFieldInfoImpl(name, List.of())); } return true; } else { diff --git a/xml/src/test/java/com/github/gtache/fxml/compiler/parsing/xml/TestGeneratorImpl.java b/xml/src/test/java/com/github/gtache/fxml/compiler/parsing/xml/TestGeneratorImpl.java index f41f3d0..748c4aa 100644 --- a/xml/src/test/java/com/github/gtache/fxml/compiler/parsing/xml/TestGeneratorImpl.java +++ b/xml/src/test/java/com/github/gtache/fxml/compiler/parsing/xml/TestGeneratorImpl.java @@ -1,17 +1,10 @@ package com.github.gtache.fxml.compiler.parsing.xml; +import com.github.gtache.fxml.compiler.ControllerFieldInfo; import com.github.gtache.fxml.compiler.GenerationException; import com.github.gtache.fxml.compiler.GenerationRequest; import com.github.gtache.fxml.compiler.Generator; -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 com.github.gtache.fxml.compiler.impl.*; import com.github.gtache.fxml.compiler.parsing.ParseException; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -32,20 +25,24 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; class TestGeneratorImpl { - private static final Map> GENERIC_TYPES; + private static final Map FIELD_INFO_MAP; static { - GENERIC_TYPES = new HashMap<>(); - GENERIC_TYPES.put("choiceBox", List.of("String")); - GENERIC_TYPES.put("listView", List.of("javafx.scene.control.Label")); - GENERIC_TYPES.put("spinner", List.of("Double")); - GENERIC_TYPES.put("tableView", List.of("javafx.scene.control.TextArea")); - GENERIC_TYPES.put("treeView", List.of("String")); - GENERIC_TYPES.put("treeTableView", List.of("javafx.scene.control.TreeItem")); - GENERIC_TYPES.put("treeTableColumn1", List.of("javafx.scene.control.TreeItem", "String")); - GENERIC_TYPES.put("treeTableColumn2", List.of("javafx.scene.control.TreeItem", "Integer")); - GENERIC_TYPES.put("tableColumn1", List.of("javafx.scene.control.TextArea", "Float")); - GENERIC_TYPES.put("tableColumn2", List.of("javafx.scene.control.TextArea", "String")); + FIELD_INFO_MAP = new HashMap<>(); + FIELD_INFO_MAP.put("button", new ControllerFieldInfoImpl("button", List.of())); + FIELD_INFO_MAP.put("checkBox", new ControllerFieldInfoImpl("checkBox", List.of())); + FIELD_INFO_MAP.put("colorPicker", new ControllerFieldInfoImpl("colorPicker", List.of())); + FIELD_INFO_MAP.put("color", new ControllerFieldInfoImpl("color", List.of())); + FIELD_INFO_MAP.put("comboBox", new ControllerFieldInfoImpl("comboBox", List.of())); + FIELD_INFO_MAP.put("listView", new ControllerFieldInfoImpl("listView", List.of("javafx.scene.control.Label"))); + FIELD_INFO_MAP.put("spinner", new ControllerFieldInfoImpl("spinner", List.of("Double"))); + FIELD_INFO_MAP.put("tableView", new ControllerFieldInfoImpl("tableView", List.of("javafx.scene.control.TextArea"))); + FIELD_INFO_MAP.put("treeView", new ControllerFieldInfoImpl("treeView", List.of("String"))); + FIELD_INFO_MAP.put("treeTableView", new ControllerFieldInfoImpl("treeTableView", List.of("javafx.scene.control.TreeItem"))); + FIELD_INFO_MAP.put("treeTableColumn1", new ControllerFieldInfoImpl("treeTableColumn1", List.of("javafx.scene.control.TreeItem", "String"))); + FIELD_INFO_MAP.put("treeTableColumn2", new ControllerFieldInfoImpl("treeTableColumn2", List.of("javafx.scene.control.TreeItem", "Integer"))); + FIELD_INFO_MAP.put("tableColumn1", new ControllerFieldInfoImpl("tableColumn1", List.of("javafx.scene.control.TextArea", "Float"))); + FIELD_INFO_MAP.put("tableColumn2", new ControllerFieldInfoImpl("tableColumn2", List.of("javafx.scene.control.TextArea", "String"))); } private final Generator generator; @@ -69,7 +66,7 @@ class TestGeneratorImpl { } } - static void main(final String[] args) throws GenerationException, IOException, ParseException { + public static void main(final String[] args) throws GenerationException, IOException, ParseException { final var generator = new GeneratorImpl(); final var files = List.of("Controls", "Includes"); for (final var file : files) { @@ -92,7 +89,7 @@ class TestGeneratorImpl { private static GenerationRequest getRequest(final String file, final ControllerFieldInjectionTypes field, final ControllerMethodsInjectionType method, final ResourceBundleInjectionTypes bundle) throws IOException, ParseException { final var controlsControllerInfo = new ControllerInfoImpl(Map.of("keyPressed", false, "mouseClicked", false), - GENERIC_TYPES); + FIELD_INFO_MAP); final var includesControllerInfo = new ControllerInfoImpl(Map.of(), Map.of()); final var controllerInfo = file.equals("Controls") ? controlsControllerInfo : includesControllerInfo; final var resourceBundlePath = "com.github.gtache.fxml.compiler.parsing.xml." + file + "Bundle"; diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-constructor.txt index 29369ab..b60cf89 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-constructor.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - controller.str = string0; final var button0 = new javafx.scene.control.Button(); controller.button = button0; button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.choiceBox = choicebox0; choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.datePicker = datepicker0; javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.htmlEditor = htmleditor0; htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.hyperlink = hyperlink0; javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.imageView = imageview0; imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.image = image0; imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.definedImage = image2; final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.label = label0; label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.mediaView = mediaview0; javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.menuBar = menubar0; javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.menu1 = menu0; menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.menuItem1 = menuitem0; menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.menuItem2 = menuitem1; menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.menuButton = menubutton0; menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.pagination = pagination0; pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.passwordField = passwordfield0; passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.progressBar = progressbar0; progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.progressIndicator = progressindicator0; progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.radioButton = radiobutton0; radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.scrollBarH = scrollbar0; javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.scrollBarV = scrollbar1; scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.separatorH = separator0; separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.separatorV = separator1; separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.sliderH = slider0; slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.sliderV = slider1; slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -333,16 +306,13 @@ try { controller.spinner = spinner0; javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.splitMenuButton = splitmenubutton0; splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.item1 = menuitem6; menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.item2 = menuitem7; menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.textArea = textarea0; textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.font = font0; textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.textField = textfield0; javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -424,7 +391,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.webView = webview0; gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-getbundle.txt index 70d221c..665fe12 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-getbundle.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - controller.str = string0; final var button0 = new javafx.scene.control.Button(); controller.button = button0; button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.choiceBox = choicebox0; choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.datePicker = datepicker0; javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.htmlEditor = htmleditor0; htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.hyperlink = hyperlink0; javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.imageView = imageview0; imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.image = image0; imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.definedImage = image2; final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.label = label0; label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.mediaView = mediaview0; javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.menuBar = menubar0; javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.menu1 = menu0; menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.menuItem1 = menuitem0; menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.menuItem2 = menuitem1; menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.menuButton = menubutton0; menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.pagination = pagination0; pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.passwordField = passwordfield0; passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.progressBar = progressbar0; progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.progressIndicator = progressindicator0; progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.radioButton = radiobutton0; radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.scrollBarH = scrollbar0; javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.scrollBarV = scrollbar1; scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.separatorH = separator0; separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.separatorV = separator1; separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.sliderH = slider0; slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.sliderV = slider1; slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -333,16 +306,13 @@ try { controller.spinner = spinner0; javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.splitMenuButton = splitmenubutton0; splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.item1 = menuitem6; menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.item2 = menuitem7; menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.textArea = textarea0; textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.font = font0; textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.textField = textfield0; javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -424,7 +391,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.webView = webview0; gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-getter.txt index 9130fd2..ddbef14 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reference-getter.txt @@ -48,13 +48,11 @@ public final class ControlsView { } controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - controller.str = string0; final var button0 = new javafx.scene.control.Button(); controller.button = button0; button0.setMnemonicParsing(false); @@ -67,13 +65,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.choiceBox = choicebox0; choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -102,12 +99,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.datePicker = datepicker0; javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.htmlEditor = htmleditor0; htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -116,13 +111,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.hyperlink = hyperlink0; javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.imageView = imageview0; imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -134,7 +127,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.image = image0; imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -149,7 +141,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.definedImage = image2; final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -160,7 +151,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.label = label0; label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -180,26 +170,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.mediaView = mediaview0; javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.menuBar = menubar0; javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.menu1 = menu0; menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.menuItem1 = menuitem0; menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.menuItem2 = menuitem1; menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -220,7 +205,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.menuButton = menubutton0; menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -234,7 +218,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.pagination = pagination0; pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -242,7 +225,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.passwordField = passwordfield0; passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -252,7 +234,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.progressBar = progressbar0; progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -260,14 +241,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.progressIndicator = progressindicator0; progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.radioButton = radiobutton0; radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -279,15 +258,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.scrollBarH = scrollbar0; javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.scrollBarV = scrollbar1; scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.separatorH = separator0; separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -301,13 +277,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.separatorV = separator1; separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.sliderH = slider0; slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -321,7 +295,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.sliderV = slider1; slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -332,16 +305,13 @@ try { controller.spinner = spinner0; javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.splitMenuButton = splitmenubutton0; splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.item1 = menuitem6; menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.item2 = menuitem7; menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -361,16 +331,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.textArea = textarea0; textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.font = font0; textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.textField = textfield0; javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -423,7 +390,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.webView = webview0; gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-constructor.txt index f4b74be..0d00794 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-constructor.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - controller.str = string0; final var button0 = new javafx.scene.control.Button(); controller.button = button0; button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.choiceBox = choicebox0; choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.datePicker = datepicker0; javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.htmlEditor = htmleditor0; htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.hyperlink = hyperlink0; javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.imageView = imageview0; imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.image = image0; imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.definedImage = image2; final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.label = label0; label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.mediaView = mediaview0; javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.menuBar = menubar0; javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.menu1 = menu0; menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.menuItem1 = menuitem0; menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.menuItem2 = menuitem1; menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.menuButton = menubutton0; menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.pagination = pagination0; pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.passwordField = passwordfield0; passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.progressBar = progressbar0; progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.progressIndicator = progressindicator0; progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.radioButton = radiobutton0; radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.scrollBarH = scrollbar0; javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.scrollBarV = scrollbar1; scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.separatorH = separator0; separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.separatorV = separator1; separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.sliderH = slider0; slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.sliderV = slider1; slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -333,16 +306,13 @@ try { controller.spinner = spinner0; javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.splitMenuButton = splitmenubutton0; splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.item1 = menuitem6; menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.item2 = menuitem7; menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.textArea = textarea0; textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.font = font0; textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.textField = textfield0; javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -424,7 +391,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.webView = webview0; gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-getbundle.txt index 069fce1..14ee22c 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-getbundle.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - controller.str = string0; final var button0 = new javafx.scene.control.Button(); controller.button = button0; button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.choiceBox = choicebox0; choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.datePicker = datepicker0; javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.htmlEditor = htmleditor0; htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.hyperlink = hyperlink0; javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.imageView = imageview0; imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.image = image0; imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.definedImage = image2; final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.label = label0; label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.mediaView = mediaview0; javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.menuBar = menubar0; javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.menu1 = menu0; menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.menuItem1 = menuitem0; menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.menuItem2 = menuitem1; menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.menuButton = menubutton0; menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.pagination = pagination0; pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.passwordField = passwordfield0; passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.progressBar = progressbar0; progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.progressIndicator = progressindicator0; progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.radioButton = radiobutton0; radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.scrollBarH = scrollbar0; javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.scrollBarV = scrollbar1; scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.separatorH = separator0; separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.separatorV = separator1; separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.sliderH = slider0; slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.sliderV = slider1; slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -333,16 +306,13 @@ try { controller.spinner = spinner0; javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.splitMenuButton = splitmenubutton0; splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.item1 = menuitem6; menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.item2 = menuitem7; menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.textArea = textarea0; textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.font = font0; textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.textField = textfield0; javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -424,7 +391,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.webView = webview0; gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-getter.txt index 26beec1..b9905a8 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-assign-reflection-getter.txt @@ -48,13 +48,11 @@ public final class ControlsView { } controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - controller.str = string0; final var button0 = new javafx.scene.control.Button(); controller.button = button0; button0.setMnemonicParsing(false); @@ -67,13 +65,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.choiceBox = choicebox0; choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -102,12 +99,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.datePicker = datepicker0; javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.htmlEditor = htmleditor0; htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -116,13 +111,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.hyperlink = hyperlink0; javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.imageView = imageview0; imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -134,7 +127,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.image = image0; imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -149,7 +141,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.definedImage = image2; final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -160,7 +151,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.label = label0; label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -180,26 +170,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.mediaView = mediaview0; javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.menuBar = menubar0; javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.menu1 = menu0; menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.menuItem1 = menuitem0; menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.menuItem2 = menuitem1; menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -220,7 +205,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.menuButton = menubutton0; menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -234,7 +218,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.pagination = pagination0; pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -242,7 +225,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.passwordField = passwordfield0; passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -252,7 +234,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.progressBar = progressbar0; progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -260,14 +241,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.progressIndicator = progressindicator0; progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.radioButton = radiobutton0; radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -279,15 +258,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.scrollBarH = scrollbar0; javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.scrollBarV = scrollbar1; scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.separatorH = separator0; separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -301,13 +277,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.separatorV = separator1; separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.sliderH = slider0; slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -321,7 +295,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.sliderV = slider1; slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -332,16 +305,13 @@ try { controller.spinner = spinner0; javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.splitMenuButton = splitmenubutton0; splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.item1 = menuitem6; menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.item2 = menuitem7; menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -361,16 +331,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.textArea = textarea0; textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.font = font0; textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.textField = textfield0; javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -423,7 +390,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.webView = webview0; gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-constructor.txt index 8a33c48..17773db 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-constructor.txt @@ -49,9 +49,7 @@ public final class ControlsView { final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var fieldMap = new HashMap(); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var string0 = "text"; - fieldMap.put("str", string0); final var button0 = new javafx.scene.control.Button(); fieldMap.put("button", button0); button0.setMnemonicParsing(false); @@ -64,13 +62,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - fieldMap.put("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -99,12 +96,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - fieldMap.put("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - fieldMap.put("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -113,13 +108,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - fieldMap.put("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - fieldMap.put("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -131,7 +124,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - fieldMap.put("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -146,7 +138,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - fieldMap.put("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -157,7 +148,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - fieldMap.put("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -177,26 +167,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - fieldMap.put("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - fieldMap.put("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - fieldMap.put("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -217,7 +202,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - fieldMap.put("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -231,7 +215,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - fieldMap.put("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -239,7 +222,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - fieldMap.put("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -249,7 +231,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - fieldMap.put("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -257,14 +238,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - fieldMap.put("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - fieldMap.put("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -276,28 +255,22 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - fieldMap.put("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - fieldMap.put("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - fieldMap.put("separatorH", separator0); separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - fieldMap.put("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - fieldMap.put("sliderH", slider0); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("sliderV", slider1); slider1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(slider1, 13); final var spinner0 = new javafx.scene.control.Spinner(); @@ -305,16 +278,13 @@ try { fieldMap.put("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - fieldMap.put("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - fieldMap.put("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - fieldMap.put("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -334,16 +304,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - fieldMap.put("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - fieldMap.put("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - fieldMap.put("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -377,7 +344,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - fieldMap.put("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-getbundle.txt index 1f812c3..bc21d48 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-getbundle.txt @@ -49,9 +49,7 @@ public final class ControlsView { final var bundle = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); final var fieldMap = new HashMap(); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var string0 = "text"; - fieldMap.put("str", string0); final var button0 = new javafx.scene.control.Button(); fieldMap.put("button", button0); button0.setMnemonicParsing(false); @@ -64,13 +62,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - fieldMap.put("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -99,12 +96,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - fieldMap.put("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - fieldMap.put("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -113,13 +108,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - fieldMap.put("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - fieldMap.put("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -131,7 +124,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - fieldMap.put("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -146,7 +138,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - fieldMap.put("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -157,7 +148,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - fieldMap.put("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -177,26 +167,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - fieldMap.put("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - fieldMap.put("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - fieldMap.put("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -217,7 +202,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - fieldMap.put("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -231,7 +215,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - fieldMap.put("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -239,7 +222,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - fieldMap.put("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -249,7 +231,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - fieldMap.put("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -257,14 +238,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - fieldMap.put("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - fieldMap.put("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -276,28 +255,22 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - fieldMap.put("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - fieldMap.put("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - fieldMap.put("separatorH", separator0); separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - fieldMap.put("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - fieldMap.put("sliderH", slider0); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("sliderV", slider1); slider1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(slider1, 13); final var spinner0 = new javafx.scene.control.Spinner(); @@ -305,16 +278,13 @@ try { fieldMap.put("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - fieldMap.put("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - fieldMap.put("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - fieldMap.put("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -334,16 +304,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - fieldMap.put("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - fieldMap.put("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - fieldMap.put("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -377,7 +344,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - fieldMap.put("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-getter.txt index b83209d..0afa049 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reference-getter.txt @@ -48,9 +48,7 @@ public final class ControlsView { } final var fieldMap = new HashMap(); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var string0 = "text"; - fieldMap.put("str", string0); final var button0 = new javafx.scene.control.Button(); fieldMap.put("button", button0); button0.setMnemonicParsing(false); @@ -63,13 +61,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - fieldMap.put("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -98,12 +95,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - fieldMap.put("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - fieldMap.put("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -112,13 +107,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - fieldMap.put("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - fieldMap.put("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -130,7 +123,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - fieldMap.put("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -145,7 +137,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - fieldMap.put("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -156,7 +147,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - fieldMap.put("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -175,26 +165,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - fieldMap.put("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - fieldMap.put("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - fieldMap.put("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -215,7 +200,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - fieldMap.put("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -229,7 +213,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - fieldMap.put("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -237,7 +220,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - fieldMap.put("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -247,7 +229,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - fieldMap.put("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -255,14 +236,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - fieldMap.put("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - fieldMap.put("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -274,28 +253,22 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - fieldMap.put("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - fieldMap.put("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - fieldMap.put("separatorH", separator0); separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - fieldMap.put("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - fieldMap.put("sliderH", slider0); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("sliderV", slider1); slider1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(slider1, 13); final var spinner0 = new javafx.scene.control.Spinner(); @@ -303,16 +276,13 @@ try { fieldMap.put("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - fieldMap.put("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - fieldMap.put("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - fieldMap.put("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -332,16 +302,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - fieldMap.put("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - fieldMap.put("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - fieldMap.put("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -375,7 +342,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - fieldMap.put("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-constructor.txt index 771cc0c..33b3475 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-constructor.txt @@ -49,9 +49,7 @@ public final class ControlsView { final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var fieldMap = new HashMap(); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var string0 = "text"; - fieldMap.put("str", string0); final var button0 = new javafx.scene.control.Button(); fieldMap.put("button", button0); button0.setMnemonicParsing(false); @@ -64,13 +62,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - fieldMap.put("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -99,12 +96,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - fieldMap.put("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - fieldMap.put("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -113,13 +108,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - fieldMap.put("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - fieldMap.put("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -131,7 +124,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - fieldMap.put("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -146,7 +138,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - fieldMap.put("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -157,7 +148,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - fieldMap.put("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -177,26 +167,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - fieldMap.put("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - fieldMap.put("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - fieldMap.put("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -217,7 +202,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - fieldMap.put("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -231,7 +215,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - fieldMap.put("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -239,7 +222,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - fieldMap.put("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -249,7 +231,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - fieldMap.put("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -257,14 +238,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - fieldMap.put("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - fieldMap.put("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -276,28 +255,22 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - fieldMap.put("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - fieldMap.put("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - fieldMap.put("separatorH", separator0); separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - fieldMap.put("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - fieldMap.put("sliderH", slider0); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("sliderV", slider1); slider1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(slider1, 13); final var spinner0 = new javafx.scene.control.Spinner(); @@ -305,16 +278,13 @@ try { fieldMap.put("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - fieldMap.put("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - fieldMap.put("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - fieldMap.put("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -334,16 +304,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - fieldMap.put("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - fieldMap.put("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - fieldMap.put("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -377,7 +344,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - fieldMap.put("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-getbundle.txt index 8c02ef7..27f4ac1 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-getbundle.txt @@ -49,9 +49,7 @@ public final class ControlsView { final var bundle = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); final var fieldMap = new HashMap(); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var string0 = "text"; - fieldMap.put("str", string0); final var button0 = new javafx.scene.control.Button(); fieldMap.put("button", button0); button0.setMnemonicParsing(false); @@ -64,13 +62,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - fieldMap.put("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -99,12 +96,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - fieldMap.put("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - fieldMap.put("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -113,13 +108,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - fieldMap.put("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - fieldMap.put("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -131,7 +124,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - fieldMap.put("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -146,7 +138,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - fieldMap.put("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -157,7 +148,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - fieldMap.put("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -177,26 +167,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - fieldMap.put("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - fieldMap.put("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - fieldMap.put("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -217,7 +202,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - fieldMap.put("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -231,7 +215,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - fieldMap.put("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -239,7 +222,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - fieldMap.put("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -249,7 +231,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - fieldMap.put("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -257,14 +238,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - fieldMap.put("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - fieldMap.put("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -276,28 +255,22 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - fieldMap.put("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - fieldMap.put("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - fieldMap.put("separatorH", separator0); separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - fieldMap.put("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - fieldMap.put("sliderH", slider0); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("sliderV", slider1); slider1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(slider1, 13); final var spinner0 = new javafx.scene.control.Spinner(); @@ -305,16 +278,13 @@ try { fieldMap.put("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - fieldMap.put("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - fieldMap.put("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - fieldMap.put("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -334,16 +304,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - fieldMap.put("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - fieldMap.put("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - fieldMap.put("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -377,7 +344,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - fieldMap.put("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-getter.txt index 868dfac..124c0d8 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-factory-reflection-getter.txt @@ -48,9 +48,7 @@ public final class ControlsView { } final var fieldMap = new HashMap(); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var string0 = "text"; - fieldMap.put("str", string0); final var button0 = new javafx.scene.control.Button(); fieldMap.put("button", button0); button0.setMnemonicParsing(false); @@ -63,13 +61,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - fieldMap.put("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -98,12 +95,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - fieldMap.put("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - fieldMap.put("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -112,13 +107,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - fieldMap.put("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - fieldMap.put("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -130,7 +123,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - fieldMap.put("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -145,7 +137,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - fieldMap.put("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -156,7 +147,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - fieldMap.put("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -175,26 +165,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - fieldMap.put("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - fieldMap.put("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - fieldMap.put("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - fieldMap.put("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -215,7 +200,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - fieldMap.put("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -229,7 +213,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - fieldMap.put("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -237,7 +220,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - fieldMap.put("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -247,7 +229,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - fieldMap.put("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -255,14 +236,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - fieldMap.put("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - fieldMap.put("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -274,28 +253,22 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - fieldMap.put("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - fieldMap.put("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - fieldMap.put("separatorH", separator0); separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - fieldMap.put("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - fieldMap.put("sliderH", slider0); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("sliderV", slider1); slider1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(slider1, 13); final var spinner0 = new javafx.scene.control.Spinner(); @@ -303,16 +276,13 @@ try { fieldMap.put("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - fieldMap.put("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - fieldMap.put("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - fieldMap.put("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -332,16 +302,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - fieldMap.put("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - fieldMap.put("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - fieldMap.put("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -375,7 +342,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - fieldMap.put("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-constructor.txt index e855eda..f4fa09e 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-constructor.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - injectField("str", string0); final var button0 = new javafx.scene.control.Button(); injectField("button", button0); button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - injectField("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - injectField("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - injectField("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - injectField("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - injectField("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - injectField("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - injectField("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - injectField("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - injectField("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - injectField("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - injectField("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - injectField("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - injectField("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - injectField("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - injectField("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - injectField("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - injectField("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - injectField("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - injectField("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - injectField("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - injectField("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - injectField("separatorH", separator0); separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - injectField("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - injectField("sliderH", slider0); slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - injectField("sliderV", slider1); slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -333,16 +306,13 @@ try { injectField("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - injectField("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - injectField("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - injectField("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - injectField("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - injectField("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - injectField("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -438,7 +405,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - injectField("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-getbundle.txt index be42b67..5c0007c 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-getbundle.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - injectField("str", string0); final var button0 = new javafx.scene.control.Button(); injectField("button", button0); button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - injectField("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - injectField("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - injectField("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - injectField("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - injectField("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - injectField("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - injectField("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - injectField("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - injectField("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - injectField("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - injectField("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - injectField("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - injectField("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - injectField("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - injectField("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - injectField("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - injectField("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - injectField("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - injectField("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - injectField("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - injectField("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - injectField("separatorH", separator0); separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - injectField("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - injectField("sliderH", slider0); slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - injectField("sliderV", slider1); slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -333,16 +306,13 @@ try { injectField("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - injectField("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - injectField("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - injectField("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - injectField("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - injectField("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - injectField("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -438,7 +405,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - injectField("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-getter.txt index 831f869..94dfc5f 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reference-getter.txt @@ -48,13 +48,11 @@ public final class ControlsView { } controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - injectField("str", string0); final var button0 = new javafx.scene.control.Button(); injectField("button", button0); button0.setMnemonicParsing(false); @@ -67,13 +65,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - injectField("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -102,12 +99,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - injectField("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - injectField("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -116,13 +111,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - injectField("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - injectField("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -134,7 +127,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - injectField("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -149,7 +141,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - injectField("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -160,7 +151,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - injectField("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -180,26 +170,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - injectField("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - injectField("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - injectField("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - injectField("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - injectField("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -220,7 +205,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - injectField("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -234,7 +218,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - injectField("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -242,7 +225,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - injectField("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -252,7 +234,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - injectField("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -260,14 +241,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - injectField("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - injectField("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -279,15 +258,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - injectField("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - injectField("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - injectField("separatorH", separator0); separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -301,13 +277,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - injectField("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - injectField("sliderH", slider0); slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -321,7 +295,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - injectField("sliderV", slider1); slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -332,16 +305,13 @@ try { injectField("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - injectField("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - injectField("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - injectField("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -361,16 +331,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - injectField("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - injectField("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - injectField("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -437,7 +404,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - injectField("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-constructor.txt index 1521669..2c22413 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-constructor.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - injectField("str", string0); final var button0 = new javafx.scene.control.Button(); injectField("button", button0); button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - injectField("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - injectField("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - injectField("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - injectField("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - injectField("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - injectField("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - injectField("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - injectField("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - injectField("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - injectField("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - injectField("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - injectField("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - injectField("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - injectField("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - injectField("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - injectField("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - injectField("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - injectField("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - injectField("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - injectField("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - injectField("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - injectField("separatorH", separator0); separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - injectField("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - injectField("sliderH", slider0); slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - injectField("sliderV", slider1); slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -333,16 +306,13 @@ try { injectField("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - injectField("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - injectField("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - injectField("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - injectField("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - injectField("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - injectField("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -438,7 +405,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - injectField("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-getbundle.txt index 0a0fa1c..eb31f02 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-getbundle.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - injectField("str", string0); final var button0 = new javafx.scene.control.Button(); injectField("button", button0); button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - injectField("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - injectField("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - injectField("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - injectField("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - injectField("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - injectField("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - injectField("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - injectField("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - injectField("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - injectField("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - injectField("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - injectField("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - injectField("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - injectField("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - injectField("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - injectField("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - injectField("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - injectField("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - injectField("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - injectField("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - injectField("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - injectField("separatorH", separator0); separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - injectField("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - injectField("sliderH", slider0); slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - injectField("sliderV", slider1); slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -333,16 +306,13 @@ try { injectField("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - injectField("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - injectField("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - injectField("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - injectField("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - injectField("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - injectField("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -438,7 +405,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - injectField("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-getter.txt index ef9b760..9ca0471 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-reflection-reflection-getter.txt @@ -48,13 +48,11 @@ public final class ControlsView { } controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - injectField("str", string0); final var button0 = new javafx.scene.control.Button(); injectField("button", button0); button0.setMnemonicParsing(false); @@ -67,13 +65,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - injectField("choiceBox", choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -102,12 +99,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - injectField("datePicker", datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - injectField("htmlEditor", htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -116,13 +111,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - injectField("hyperlink", hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - injectField("imageView", imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -134,7 +127,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - injectField("image", image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -149,7 +141,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - injectField("definedImage", image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -160,7 +151,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - injectField("label", label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -180,26 +170,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - injectField("mediaView", mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - injectField("menuBar", menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - injectField("menu1", menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - injectField("menuItem1", menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - injectField("menuItem2", menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -220,7 +205,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - injectField("menuButton", menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -234,7 +218,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - injectField("pagination", pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -242,7 +225,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - injectField("passwordField", passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -252,7 +234,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - injectField("progressBar", progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -260,14 +241,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - injectField("progressIndicator", progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - injectField("radioButton", radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -279,15 +258,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - injectField("scrollBarH", scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - injectField("scrollBarV", scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - injectField("separatorH", separator0); separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -301,13 +277,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - injectField("separatorV", separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - injectField("sliderH", slider0); slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -321,7 +295,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - injectField("sliderV", slider1); slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -332,16 +305,13 @@ try { injectField("spinner", spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - injectField("splitMenuButton", splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - injectField("item1", menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - injectField("item2", menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -361,16 +331,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - injectField("textArea", textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - injectField("font", font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - injectField("textField", textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -437,7 +404,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - injectField("webView", webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-constructor.txt index 2fb328a..bb136b5 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-constructor.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - controller.setStr(string0); final var button0 = new javafx.scene.control.Button(); controller.setButton(button0); button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.setChoiceBox(choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.setDatePicker(datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.setHtmlEditor(htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.setHyperlink(hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.setImageView(imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.setImage(image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.setDefinedImage(image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.setLabel(label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.setMediaView(mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.setMenuBar(menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.setMenu1(menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.setMenuItem1(menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.setMenuItem2(menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.setMenuButton(menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.setPagination(pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.setPasswordField(passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.setProgressBar(progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.setProgressIndicator(progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.setRadioButton(radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.setScrollBarH(scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.setScrollBarV(scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.setSeparatorH(separator0); separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.setSeparatorV(separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.setSliderH(slider0); slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.setSliderV(slider1); slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -333,16 +306,13 @@ try { controller.setSpinner(spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.setSplitMenuButton(splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.setItem1(menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.setItem2(menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.setTextArea(textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.setFont(font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.setTextField(textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -424,7 +391,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.setWebView(webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-getbundle.txt index d676e38..2b9290e 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-getbundle.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - controller.setStr(string0); final var button0 = new javafx.scene.control.Button(); controller.setButton(button0); button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.setChoiceBox(choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.setDatePicker(datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.setHtmlEditor(htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.setHyperlink(hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.setImageView(imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.setImage(image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.setDefinedImage(image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.setLabel(label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.setMediaView(mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.setMenuBar(menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.setMenu1(menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.setMenuItem1(menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.setMenuItem2(menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.setMenuButton(menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.setPagination(pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.setPasswordField(passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.setProgressBar(progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.setProgressIndicator(progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.setRadioButton(radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.setScrollBarH(scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.setScrollBarV(scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.setSeparatorH(separator0); separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.setSeparatorV(separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.setSliderH(slider0); slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.setSliderV(slider1); slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -333,16 +306,13 @@ try { controller.setSpinner(spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.setSplitMenuButton(splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.setItem1(menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.setItem2(menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.setTextArea(textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.setFont(font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.setTextField(textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -424,7 +391,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.setWebView(webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-getter.txt index 7d9613b..a7473df 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reference-getter.txt @@ -48,13 +48,11 @@ public final class ControlsView { } controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); gridpane0.setOnInputMethodTextChanged(controller::inputMethodTextChanged); gridpane0.setOnKeyPressed(e -> controller.keyPressed()); gridpane0.setOnKeyReleased(controller::keyReleased); gridpane0.setOnKeyTyped(controller::keyTyped); final var string0 = "text"; - controller.setStr(string0); final var button0 = new javafx.scene.control.Button(); controller.setButton(button0); button0.setMnemonicParsing(false); @@ -67,13 +65,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.setChoiceBox(choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -102,12 +99,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.setDatePicker(datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.setHtmlEditor(htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -116,13 +111,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.setHyperlink(hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.setImageView(imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -134,7 +127,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.setImage(image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -149,7 +141,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.setDefinedImage(image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -160,7 +151,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.setLabel(label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -180,26 +170,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.setMediaView(mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.setMenuBar(menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.setMenu1(menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.setMenuItem1(menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.setMenuItem2(menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -220,7 +205,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.setMenuButton(menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -234,7 +218,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.setPagination(pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -242,7 +225,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.setPasswordField(passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -252,7 +234,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.setProgressBar(progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -260,14 +241,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.setProgressIndicator(progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.setRadioButton(radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -279,15 +258,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.setScrollBarH(scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.setScrollBarV(scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.setSeparatorH(separator0); separator0.setOnDragDetected(controller::dragDetected); separator0.setOnDragDone(controller::dragDone); separator0.setOnDragDropped(controller::dragDropped); @@ -301,13 +277,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.setSeparatorV(separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.setSliderH(slider0); slider0.setOnContextMenuRequested(controller::contextMenuRequested); slider0.setOnMouseClicked(e -> controller.mouseClicked()); slider0.setOnMouseDragged(controller::mouseDragged); @@ -321,7 +295,6 @@ try { slider0.setOnScrollStarted(controller::onScrollStarted); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.setSliderV(slider1); slider1.setOnZoom(controller::onZoom); slider1.setOnZoomFinished(controller::onZoomFinished); slider1.setOnZoomStarted(controller::onZoomStarted); @@ -332,16 +305,13 @@ try { controller.setSpinner(spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.setSplitMenuButton(splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.setItem1(menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.setItem2(menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -361,16 +331,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.setTextArea(textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.setFont(font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.setTextField(textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -423,7 +390,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.setWebView(webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-constructor.txt index dce422e..4410a38 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-constructor.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = resourceBundlesMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - controller.setStr(string0); final var button0 = new javafx.scene.control.Button(); controller.setButton(button0); button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.setChoiceBox(choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.setDatePicker(datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.setHtmlEditor(htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.setHyperlink(hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.setImageView(imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.setImage(image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.setDefinedImage(image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.setLabel(label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.setMediaView(mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.setMenuBar(menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.setMenu1(menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.setMenuItem1(menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.setMenuItem2(menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.setMenuButton(menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.setPagination(pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.setPasswordField(passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.setProgressBar(progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.setProgressIndicator(progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.setRadioButton(radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.setScrollBarH(scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.setScrollBarV(scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.setSeparatorH(separator0); separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.setSeparatorV(separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.setSliderH(slider0); slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.setSliderV(slider1); slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -333,16 +306,13 @@ try { controller.setSpinner(spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.setSplitMenuButton(splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.setItem1(menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.setItem2(menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.setTextArea(textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.setFont(font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.setTextField(textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -424,7 +391,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.setWebView(webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-getbundle.txt index 8cf8e8b..a6eb808 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-getbundle.txt @@ -49,13 +49,11 @@ public final class ControlsView { final var bundle = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - controller.setStr(string0); final var button0 = new javafx.scene.control.Button(); controller.setButton(button0); button0.setMnemonicParsing(false); @@ -68,13 +66,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.setChoiceBox(choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -103,12 +100,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.setDatePicker(datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.setHtmlEditor(htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -117,13 +112,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.setHyperlink(hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.setImageView(imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -135,7 +128,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.setImage(image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -150,7 +142,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.setDefinedImage(image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -161,7 +152,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.setLabel(label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -181,26 +171,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.setMediaView(mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.setMenuBar(menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.setMenu1(menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.setMenuItem1(menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.setMenuItem2(menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -221,7 +206,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.setMenuButton(menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -235,7 +219,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.setPagination(pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -243,7 +226,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.setPasswordField(passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -253,7 +235,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.setProgressBar(progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -261,14 +242,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.setProgressIndicator(progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.setRadioButton(radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -280,15 +259,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.setScrollBarH(scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.setScrollBarV(scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.setSeparatorH(separator0); separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -302,13 +278,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.setSeparatorV(separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.setSliderH(slider0); slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -322,7 +296,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.setSliderV(slider1); slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -333,16 +306,13 @@ try { controller.setSpinner(spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.setSplitMenuButton(splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.setItem1(menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.setItem2(menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -362,16 +332,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.setTextArea(textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.setFont(font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.setTextField(textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -424,7 +391,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.setWebView(webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-getter.txt index d10dfb3..1407bbd 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-controls-setters-reflection-getter.txt @@ -48,13 +48,11 @@ public final class ControlsView { } controller = (com.github.gtache.fxml.compiler.parsing.xml.ControlsController) controllersMap.get(com.github.gtache.fxml.compiler.parsing.xml.ControlsController.class); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); gridpane0.setOnInputMethodTextChanged(e -> callEventHandlerMethod("inputMethodTextChanged", e)); gridpane0.setOnKeyPressed(e -> callEventHandlerMethod("keyPressed", e)); gridpane0.setOnKeyReleased(e -> callEventHandlerMethod("keyReleased", e)); gridpane0.setOnKeyTyped(e -> callEventHandlerMethod("keyTyped", e)); final var string0 = "text"; - controller.setStr(string0); final var button0 = new javafx.scene.control.Button(); controller.setButton(button0); button0.setMnemonicParsing(false); @@ -67,13 +65,12 @@ public final class ControlsView { checkbox0.setMnemonicParsing(false); final var string2 = "CheckBox"; checkbox0.setText(string2); - final var choicebox0 = new javafx.scene.control.ChoiceBox(); + final var choicebox0 = new javafx.scene.control.ChoiceBox(); choicebox0.setAccessibleText(string0); choicebox0.setCacheShape(false); choicebox0.setCenterShape(false); choicebox0.setDisable(true); choicebox0.setFocusTraversable(false); - controller.setChoiceBox(choicebox0); choicebox0.setPrefWidth(150.0); javafx.scene.layout.GridPane.setRowIndex(choicebox0, 1); choicebox0.setScaleShape(false); @@ -102,12 +99,10 @@ public final class ControlsView { combobox0.setEffect(bloom0); final var datepicker0 = new javafx.scene.control.DatePicker(); javafx.scene.layout.GridPane.setColumnIndex(datepicker0, 1); - controller.setDatePicker(datepicker0); javafx.scene.layout.GridPane.setRowIndex(datepicker0, 2); datepicker0.setShowWeekNumbers(true); datepicker0.setStyle("-fx-background-color: #ffffff;"); final var htmleditor0 = new javafx.scene.web.HTMLEditor(); - controller.setHtmlEditor(htmleditor0); htmleditor0.setHtmlText(""); htmleditor0.setPrefHeight(200.0); htmleditor0.setPrefWidth(506.0); @@ -116,13 +111,11 @@ public final class ControlsView { htmleditor0.getStylesheets().addAll(java.util.List.of(getClass().getResource("style.css").toString())); final var hyperlink0 = new javafx.scene.control.Hyperlink(); javafx.scene.layout.GridPane.setColumnIndex(hyperlink0, 1); - controller.setHyperlink(hyperlink0); javafx.scene.layout.GridPane.setRowIndex(hyperlink0, 3); hyperlink0.setText("Hyperlink"); final var imageview0 = new javafx.scene.image.ImageView(); imageview0.setFitHeight(150.0); imageview0.setFitWidth(200.0); - controller.setImageView(imageview0); imageview0.setPickOnBounds(true); imageview0.setPreserveRatio(true); javafx.scene.layout.GridPane.setRowIndex(imageview0, 4); @@ -134,7 +127,6 @@ try { } final var urlStr0 = url0.toString(); final var image0 = new javafx.scene.image.Image(urlStr0, 200.0, 100.0, true, true, true); - controller.setImage(image0); imageview0.setImage(image0); final var imageview1 = new javafx.scene.image.ImageView(); final var url1 = getClass().getResource("image.png"); @@ -149,7 +141,6 @@ try { } final var urlStr2 = url2.toString(); final var image2 = new javafx.scene.image.Image(urlStr2, 0.0, 0.0, false, false, false); - controller.setDefinedImage(image2); final var imageview2 = new javafx.scene.image.ImageView(); final var parsedreference0 = image2; imageview2.setImage(parsedreference0); @@ -160,7 +151,6 @@ try { label0.setCacheHint(javafx.scene.CacheHint.QUALITY); javafx.scene.layout.GridPane.setColumnIndex(label0, 1); label0.setDepthTest(javafx.scene.DepthTest.ENABLE); - controller.setLabel(label0); label0.setMnemonicParsing(true); label0.setMouseTransparent(true); javafx.scene.layout.GridPane.setRowIndex(label0, 4); @@ -180,26 +170,21 @@ try { javafx.scene.layout.GridPane.setColumnSpan(mediaview0, 2); mediaview0.setFitHeight(200.0); mediaview0.setFitWidth(200.0); - controller.setMediaView(mediaview0); javafx.scene.layout.GridPane.setRowIndex(mediaview0, 5); javafx.scene.layout.GridPane.setRowSpan(mediaview0, 2); final var menubar0 = new javafx.scene.control.MenuBar(); - controller.setMenuBar(menubar0); javafx.scene.layout.GridPane.setHalignment(menubar0, javafx.geometry.HPos.RIGHT); javafx.scene.layout.GridPane.setHgrow(menubar0, javafx.scene.layout.Priority.ALWAYS); javafx.scene.layout.GridPane.setRowIndex(menubar0, 7); javafx.scene.layout.GridPane.setValignment(menubar0, javafx.geometry.VPos.BASELINE); javafx.scene.layout.GridPane.setVgrow(menubar0, javafx.scene.layout.Priority.SOMETIMES); final var menu0 = new javafx.scene.control.Menu(); - controller.setMenu1(menu0); menu0.setMnemonicParsing(false); menu0.setText("File"); final var menuitem0 = new javafx.scene.control.MenuItem(); - controller.setMenuItem1(menuitem0); menuitem0.setMnemonicParsing(false); menuitem0.setText("Close"); final var menuitem1 = new javafx.scene.control.MenuItem(); - controller.setMenuItem2(menuitem1); menuitem1.setMnemonicParsing(false); menuitem1.setText("Open"); menu0.getItems().addAll(java.util.List.of(menuitem0, menuitem1)); @@ -220,7 +205,6 @@ try { menubar0.getMenus().addAll(java.util.List.of(menu0, menu1, menu2)); final var menubutton0 = new javafx.scene.control.MenuButton(); javafx.scene.layout.GridPane.setColumnIndex(menubutton0, 1); - controller.setMenuButton(menubutton0); menubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(menubutton0, 7); menubutton0.setText("MenuButton"); @@ -234,7 +218,6 @@ try { final var insets1 = new javafx.geometry.Insets(5.0, 4.0, 3.0, 2.0); javafx.scene.layout.GridPane.setMargin(menubutton0, insets1); final var pagination0 = new javafx.scene.control.Pagination(); - controller.setPagination(pagination0); pagination0.setPrefHeight(200.0); pagination0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(pagination0, 8); @@ -242,7 +225,6 @@ try { pagination0.setPadding(insets2); final var passwordfield0 = new javafx.scene.control.PasswordField(); javafx.scene.layout.GridPane.setColumnIndex(passwordfield0, 1); - controller.setPasswordField(passwordfield0); passwordfield0.setMaxHeight(Double.valueOf("Infinity")); passwordfield0.setMaxWidth(5.0); passwordfield0.setMinHeight(Double.valueOf("-Infinity")); @@ -252,7 +234,6 @@ try { passwordfield0.setPrefWidth(3.0); javafx.scene.layout.GridPane.setRowIndex(passwordfield0, 8); final var progressbar0 = new javafx.scene.control.ProgressBar(); - controller.setProgressBar(progressbar0); progressbar0.setLayoutX(10.0); progressbar0.setLayoutY(20.0); progressbar0.setPrefWidth(200.0); @@ -260,14 +241,12 @@ try { javafx.scene.layout.GridPane.setRowIndex(progressbar0, 9); final var progressindicator0 = new javafx.scene.control.ProgressIndicator(); javafx.scene.layout.GridPane.setColumnIndex(progressindicator0, 1); - controller.setProgressIndicator(progressindicator0); progressindicator0.setProgress(0.0); progressindicator0.setRotate(2.0); javafx.scene.layout.GridPane.setRowIndex(progressindicator0, 9); final var point3d0 = new javafx.geometry.Point3D(4.0, 5.0, 6.0); progressindicator0.setRotationAxis(point3d0); final var radiobutton0 = new javafx.scene.control.RadioButton(); - controller.setRadioButton(radiobutton0); radiobutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(radiobutton0, 10); radiobutton0.setScaleX(7.0); @@ -279,15 +258,12 @@ try { radiobutton0.setTranslateZ(6.0); final var scrollbar0 = new javafx.scene.control.ScrollBar(); javafx.scene.layout.GridPane.setColumnIndex(scrollbar0, 1); - controller.setScrollBarH(scrollbar0); javafx.scene.layout.GridPane.setRowIndex(scrollbar0, 10); final var scrollbar1 = new javafx.scene.control.ScrollBar(); - controller.setScrollBarV(scrollbar1); scrollbar1.setOrientation(javafx.geometry.Orientation.VERTICAL); javafx.scene.layout.GridPane.setRowIndex(scrollbar1, 11); final var separator0 = new javafx.scene.control.Separator(); javafx.scene.layout.GridPane.setColumnIndex(separator0, 1); - controller.setSeparatorH(separator0); separator0.setOnDragDetected(e -> callEventHandlerMethod("dragDetected", e)); separator0.setOnDragDone(e -> callEventHandlerMethod("dragDone", e)); separator0.setOnDragDropped(e -> callEventHandlerMethod("dragDropped", e)); @@ -301,13 +277,11 @@ try { separator0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(separator0, 11); final var separator1 = new javafx.scene.control.Separator(); - controller.setSeparatorV(separator1); separator1.setOrientation(javafx.geometry.Orientation.VERTICAL); separator1.setPrefHeight(200.0); javafx.scene.layout.GridPane.setRowIndex(separator1, 12); final var slider0 = new javafx.scene.control.Slider(); javafx.scene.layout.GridPane.setColumnIndex(slider0, 1); - controller.setSliderH(slider0); slider0.setOnContextMenuRequested(e -> callEventHandlerMethod("contextMenuRequested", e)); slider0.setOnMouseClicked(e -> callEventHandlerMethod("mouseClicked", e)); slider0.setOnMouseDragged(e -> callEventHandlerMethod("mouseDragged", e)); @@ -321,7 +295,6 @@ try { slider0.setOnScrollStarted(e -> callEventHandlerMethod("onScrollStarted", e)); javafx.scene.layout.GridPane.setRowIndex(slider0, 12); final var slider1 = new javafx.scene.control.Slider(); - controller.setSliderV(slider1); slider1.setOnZoom(e -> callEventHandlerMethod("onZoom", e)); slider1.setOnZoomFinished(e -> callEventHandlerMethod("onZoomFinished", e)); slider1.setOnZoomStarted(e -> callEventHandlerMethod("onZoomStarted", e)); @@ -332,16 +305,13 @@ try { controller.setSpinner(spinner0); javafx.scene.layout.GridPane.setRowIndex(spinner0, 13); final var splitmenubutton0 = new javafx.scene.control.SplitMenuButton(); - controller.setSplitMenuButton(splitmenubutton0); splitmenubutton0.setMnemonicParsing(false); javafx.scene.layout.GridPane.setRowIndex(splitmenubutton0, 14); splitmenubutton0.setText("SplitMenuButton"); final var menuitem6 = new javafx.scene.control.MenuItem(); - controller.setItem1(menuitem6); menuitem6.setMnemonicParsing(false); menuitem6.setText("Action 1"); final var menuitem7 = new javafx.scene.control.MenuItem(); - controller.setItem2(menuitem7); menuitem7.setMnemonicParsing(false); menuitem7.setText("Action 2"); splitmenubutton0.getItems().addAll(java.util.List.of(menuitem6, menuitem7)); @@ -361,16 +331,13 @@ try { tablecolumn1.setText("C2"); tableview0.getColumns().addAll(java.util.List.of(tablecolumn0, tablecolumn1)); final var textarea0 = new javafx.scene.control.TextArea(); - controller.setTextArea(textarea0); textarea0.setPrefHeight(200.0); textarea0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(textarea0, 15); final var font0 = new javafx.scene.text.Font("Arial", 12.0); - controller.setFont(font0); textarea0.setFont(font0); final var textfield0 = new javafx.scene.control.TextField(); javafx.scene.layout.GridPane.setColumnIndex(textfield0, 1); - controller.setTextField(textfield0); javafx.scene.layout.GridPane.setRowIndex(textfield0, 15); final var togglebutton0 = new javafx.scene.control.ToggleButton(); togglebutton0.setMnemonicParsing(false); @@ -423,7 +390,6 @@ try { webview0.setPrefHeight(200.0); webview0.setPrefWidth(200.0); javafx.scene.layout.GridPane.setRowIndex(webview0, 17); - controller.setWebView(webview0); gridpane0.getChildren().addAll(java.util.List.of(button0, checkbox0, choicebox0, colorpicker0, combobox0, datepicker0, htmleditor0, hyperlink0, imageview0, imageview1, imageview2, label0, listview0, mediaview0, menubar0, menubutton0, pagination0, passwordfield0, progressbar0, progressindicator0, radiobutton0, scrollbar0, scrollbar1, separator0, separator1, slider0, slider1, spinner0, splitmenubutton0, tableview0, textarea0, textfield0, togglebutton0, treetableview0, treeview0, webview0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); final var columnconstraints1 = new javafx.scene.layout.ColumnConstraints(); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-constructor.txt index 797862b..c394005 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-constructor.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.playSlider = slider0; javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.playLabel = label0; label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.playButton = button0; button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.volumeSlider = slider1; slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.volumeValueLabel = label2; label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.controlsController = controller0; hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.vbox = vbox1; final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.toolBar = toolbar0; final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.titledPane = titledpane0; final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.tilePane = tilepane0; final var textflow0 = new javafx.scene.text.TextFlow(); - controller.textFlow = textflow0; final var tabpane0 = new javafx.scene.control.TabPane(); - controller.tabPane = tabpane0; final var tab0 = new javafx.scene.control.Tab(); - controller.tab = tab0; final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.stackPane = stackpane0; final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.splitPane = splitpane0; final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.scrollPane = scrollpane0; final var pane0 = new javafx.scene.layout.Pane(); - controller.pane = pane0; final var hbox2 = new javafx.scene.layout.HBox(); - controller.hbox = hbox2; final var group0 = new javafx.scene.Group(); - controller.group = group0; final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.flowPane = flowpane0; final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.dialogPane = dialogpane0; final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.buttonBar = buttonbar0; final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.anchorPane = anchorpane0; final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.columnConstraints = columnconstraints0; columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-getbundle.txt index 5380b73..1f3023d 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-getbundle.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.playSlider = slider0; javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.playLabel = label0; label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.playButton = button0; button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.volumeSlider = slider1; slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.volumeValueLabel = label2; label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.controlsController = controller0; hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.vbox = vbox1; final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.toolBar = toolbar0; final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.titledPane = titledpane0; final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.tilePane = tilepane0; final var textflow0 = new javafx.scene.text.TextFlow(); - controller.textFlow = textflow0; final var tabpane0 = new javafx.scene.control.TabPane(); - controller.tabPane = tabpane0; final var tab0 = new javafx.scene.control.Tab(); - controller.tab = tab0; final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.stackPane = stackpane0; final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.splitPane = splitpane0; final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.scrollPane = scrollpane0; final var pane0 = new javafx.scene.layout.Pane(); - controller.pane = pane0; final var hbox2 = new javafx.scene.layout.HBox(); - controller.hbox = hbox2; final var group0 = new javafx.scene.Group(); - controller.group = group0; final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.flowPane = flowpane0; final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.dialogPane = dialogpane0; final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.buttonBar = buttonbar0; final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.anchorPane = anchorpane0; final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.columnConstraints = columnconstraints0; columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-getter.txt index 335221c..75a1f60 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reference-getter.txt @@ -54,12 +54,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.playSlider = slider0; javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.playLabel = label0; label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -70,7 +68,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.playButton = button0; button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -78,10 +75,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(controller.resources().getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.volumeSlider = slider1; slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.volumeValueLabel = label2; label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.controlsController = controller0; hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.vbox = vbox1; final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.toolBar = toolbar0; final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.titledPane = titledpane0; final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.tilePane = tilepane0; final var textflow0 = new javafx.scene.text.TextFlow(); - controller.textFlow = textflow0; final var tabpane0 = new javafx.scene.control.TabPane(); - controller.tabPane = tabpane0; final var tab0 = new javafx.scene.control.Tab(); - controller.tab = tab0; final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.stackPane = stackpane0; final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.splitPane = splitpane0; final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.scrollPane = scrollpane0; final var pane0 = new javafx.scene.layout.Pane(); - controller.pane = pane0; final var hbox2 = new javafx.scene.layout.HBox(); - controller.hbox = hbox2; final var group0 = new javafx.scene.Group(); - controller.group = group0; final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.flowPane = flowpane0; final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.dialogPane = dialogpane0; final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.buttonBar = buttonbar0; final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.anchorPane = anchorpane0; final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.columnConstraints = columnconstraints0; columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-constructor.txt index a9409d0..1deb88c 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-constructor.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.playSlider = slider0; javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.playLabel = label0; label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.playButton = button0; button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.volumeSlider = slider1; slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.volumeValueLabel = label2; label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.controlsController = controller0; hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.vbox = vbox1; final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.toolBar = toolbar0; final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.titledPane = titledpane0; final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.tilePane = tilepane0; final var textflow0 = new javafx.scene.text.TextFlow(); - controller.textFlow = textflow0; final var tabpane0 = new javafx.scene.control.TabPane(); - controller.tabPane = tabpane0; final var tab0 = new javafx.scene.control.Tab(); - controller.tab = tab0; final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.stackPane = stackpane0; final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.splitPane = splitpane0; final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.scrollPane = scrollpane0; final var pane0 = new javafx.scene.layout.Pane(); - controller.pane = pane0; final var hbox2 = new javafx.scene.layout.HBox(); - controller.hbox = hbox2; final var group0 = new javafx.scene.Group(); - controller.group = group0; final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.flowPane = flowpane0; final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.dialogPane = dialogpane0; final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.buttonBar = buttonbar0; final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.anchorPane = anchorpane0; final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.columnConstraints = columnconstraints0; columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-getbundle.txt index 0957ade..591693a 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-getbundle.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.playSlider = slider0; javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.playLabel = label0; label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.playButton = button0; button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.volumeSlider = slider1; slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.volumeValueLabel = label2; label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.controlsController = controller0; hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.vbox = vbox1; final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.toolBar = toolbar0; final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.titledPane = titledpane0; final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.tilePane = tilepane0; final var textflow0 = new javafx.scene.text.TextFlow(); - controller.textFlow = textflow0; final var tabpane0 = new javafx.scene.control.TabPane(); - controller.tabPane = tabpane0; final var tab0 = new javafx.scene.control.Tab(); - controller.tab = tab0; final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.stackPane = stackpane0; final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.splitPane = splitpane0; final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.scrollPane = scrollpane0; final var pane0 = new javafx.scene.layout.Pane(); - controller.pane = pane0; final var hbox2 = new javafx.scene.layout.HBox(); - controller.hbox = hbox2; final var group0 = new javafx.scene.Group(); - controller.group = group0; final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.flowPane = flowpane0; final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.dialogPane = dialogpane0; final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.buttonBar = buttonbar0; final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.anchorPane = anchorpane0; final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.columnConstraints = columnconstraints0; columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-getter.txt index fdae7c0..df58748 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-assign-reflection-getter.txt @@ -54,12 +54,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.playSlider = slider0; javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.playLabel = label0; label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -70,7 +68,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.playButton = button0; button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -78,10 +75,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(controller.resources().getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.volumeSlider = slider1; slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.volumeValueLabel = label2; label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.controlsController = controller0; hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.vbox = vbox1; final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.toolBar = toolbar0; final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.titledPane = titledpane0; final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.tilePane = tilepane0; final var textflow0 = new javafx.scene.text.TextFlow(); - controller.textFlow = textflow0; final var tabpane0 = new javafx.scene.control.TabPane(); - controller.tabPane = tabpane0; final var tab0 = new javafx.scene.control.Tab(); - controller.tab = tab0; final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.stackPane = stackpane0; final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.splitPane = splitpane0; final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.scrollPane = scrollpane0; final var pane0 = new javafx.scene.layout.Pane(); - controller.pane = pane0; final var hbox2 = new javafx.scene.layout.HBox(); - controller.hbox = hbox2; final var group0 = new javafx.scene.Group(); - controller.group = group0; final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.gridPane = gridpane0; final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.flowPane = flowpane0; final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.dialogPane = dialogpane0; final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.buttonBar = buttonbar0; final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.anchorPane = anchorpane0; final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.columnConstraints = columnconstraints0; columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-constructor.txt index 53cd130..339bf0f 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-constructor.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - fieldMap.put("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - fieldMap.put("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,17 +69,14 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - fieldMap.put("playButton", button0); button0.setMnemonicParsing(false); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); javafx.scene.layout.HBox.setMargin(button0, insets3); final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - fieldMap.put("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - fieldMap.put("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - fieldMap.put("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - fieldMap.put("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - fieldMap.put("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - fieldMap.put("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - fieldMap.put("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - fieldMap.put("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - fieldMap.put("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - fieldMap.put("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - fieldMap.put("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - fieldMap.put("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - fieldMap.put("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - fieldMap.put("hbox", hbox2); final var group0 = new javafx.scene.Group(); - fieldMap.put("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - fieldMap.put("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - fieldMap.put("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - fieldMap.put("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - fieldMap.put("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - fieldMap.put("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-getbundle.txt index 7ee15ec..19aa7af 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-getbundle.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - fieldMap.put("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - fieldMap.put("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,17 +69,14 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - fieldMap.put("playButton", button0); button0.setMnemonicParsing(false); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); javafx.scene.layout.HBox.setMargin(button0, insets3); final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - fieldMap.put("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - fieldMap.put("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - fieldMap.put("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - fieldMap.put("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - fieldMap.put("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - fieldMap.put("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - fieldMap.put("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - fieldMap.put("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - fieldMap.put("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - fieldMap.put("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - fieldMap.put("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - fieldMap.put("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - fieldMap.put("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - fieldMap.put("hbox", hbox2); final var group0 = new javafx.scene.Group(); - fieldMap.put("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - fieldMap.put("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - fieldMap.put("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - fieldMap.put("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - fieldMap.put("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - fieldMap.put("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-getter.txt index dd2d805..4269c05 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reference-getter.txt @@ -54,12 +54,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - fieldMap.put("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - fieldMap.put("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -70,16 +68,13 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - fieldMap.put("playButton", button0); button0.setMnemonicParsing(false); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); javafx.scene.layout.HBox.setMargin(button0, insets3); final var label1 = new javafx.scene.control.Label(); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - fieldMap.put("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -87,48 +82,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - fieldMap.put("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - fieldMap.put("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - fieldMap.put("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - fieldMap.put("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - fieldMap.put("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - fieldMap.put("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - fieldMap.put("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - fieldMap.put("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - fieldMap.put("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - fieldMap.put("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - fieldMap.put("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - fieldMap.put("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - fieldMap.put("hbox", hbox2); final var group0 = new javafx.scene.Group(); - fieldMap.put("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - fieldMap.put("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - fieldMap.put("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - fieldMap.put("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - fieldMap.put("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -137,7 +113,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - fieldMap.put("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-constructor.txt index 523c348..0b8f46b 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-constructor.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - fieldMap.put("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - fieldMap.put("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,17 +69,14 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - fieldMap.put("playButton", button0); button0.setMnemonicParsing(false); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); javafx.scene.layout.HBox.setMargin(button0, insets3); final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - fieldMap.put("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - fieldMap.put("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - fieldMap.put("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - fieldMap.put("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - fieldMap.put("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - fieldMap.put("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - fieldMap.put("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - fieldMap.put("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - fieldMap.put("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - fieldMap.put("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - fieldMap.put("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - fieldMap.put("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - fieldMap.put("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - fieldMap.put("hbox", hbox2); final var group0 = new javafx.scene.Group(); - fieldMap.put("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - fieldMap.put("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - fieldMap.put("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - fieldMap.put("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - fieldMap.put("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - fieldMap.put("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-getbundle.txt index f99bd54..dec0c26 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-getbundle.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - fieldMap.put("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - fieldMap.put("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,17 +69,14 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - fieldMap.put("playButton", button0); button0.setMnemonicParsing(false); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); javafx.scene.layout.HBox.setMargin(button0, insets3); final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - fieldMap.put("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - fieldMap.put("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - fieldMap.put("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - fieldMap.put("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - fieldMap.put("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - fieldMap.put("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - fieldMap.put("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - fieldMap.put("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - fieldMap.put("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - fieldMap.put("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - fieldMap.put("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - fieldMap.put("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - fieldMap.put("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - fieldMap.put("hbox", hbox2); final var group0 = new javafx.scene.Group(); - fieldMap.put("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - fieldMap.put("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - fieldMap.put("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - fieldMap.put("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - fieldMap.put("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - fieldMap.put("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-getter.txt index a9c17c2..1b3b3fd 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-factory-reflection-getter.txt @@ -54,12 +54,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - fieldMap.put("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - fieldMap.put("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -70,16 +68,13 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - fieldMap.put("playButton", button0); button0.setMnemonicParsing(false); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); javafx.scene.layout.HBox.setMargin(button0, insets3); final var label1 = new javafx.scene.control.Label(); final var slider1 = new javafx.scene.control.Slider(); - fieldMap.put("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - fieldMap.put("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -87,48 +82,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - fieldMap.put("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - fieldMap.put("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - fieldMap.put("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - fieldMap.put("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - fieldMap.put("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - fieldMap.put("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - fieldMap.put("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - fieldMap.put("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - fieldMap.put("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - fieldMap.put("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - fieldMap.put("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - fieldMap.put("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - fieldMap.put("hbox", hbox2); final var group0 = new javafx.scene.Group(); - fieldMap.put("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - fieldMap.put("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - fieldMap.put("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - fieldMap.put("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - fieldMap.put("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - fieldMap.put("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -137,7 +113,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - fieldMap.put("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-constructor.txt index c4a09d0..55cb61d 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-constructor.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - injectField("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - injectField("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - injectField("playButton", button0); button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - injectField("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - injectField("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - injectField("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - injectField("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - injectField("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - injectField("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - injectField("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - injectField("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - injectField("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - injectField("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - injectField("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - injectField("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - injectField("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - injectField("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - injectField("hbox", hbox2); final var group0 = new javafx.scene.Group(); - injectField("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - injectField("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - injectField("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - injectField("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - injectField("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - injectField("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-getbundle.txt index 3b5dadf..e652c4f 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-getbundle.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - injectField("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - injectField("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - injectField("playButton", button0); button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - injectField("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - injectField("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - injectField("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - injectField("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - injectField("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - injectField("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - injectField("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - injectField("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - injectField("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - injectField("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - injectField("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - injectField("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - injectField("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - injectField("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - injectField("hbox", hbox2); final var group0 = new javafx.scene.Group(); - injectField("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - injectField("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - injectField("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - injectField("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - injectField("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - injectField("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-getter.txt index 7b75ae4..46c814c 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reference-getter.txt @@ -54,12 +54,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - injectField("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - injectField("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -70,7 +68,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - injectField("playButton", button0); button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -78,10 +75,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(controller.resources().getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - injectField("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - injectField("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - injectField("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - injectField("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - injectField("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - injectField("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - injectField("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - injectField("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - injectField("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - injectField("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - injectField("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - injectField("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - injectField("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - injectField("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - injectField("hbox", hbox2); final var group0 = new javafx.scene.Group(); - injectField("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - injectField("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - injectField("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - injectField("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - injectField("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - injectField("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-constructor.txt index f73e84e..805600a 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-constructor.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - injectField("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - injectField("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - injectField("playButton", button0); button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - injectField("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - injectField("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - injectField("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - injectField("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - injectField("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - injectField("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - injectField("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - injectField("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - injectField("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - injectField("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - injectField("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - injectField("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - injectField("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - injectField("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - injectField("hbox", hbox2); final var group0 = new javafx.scene.Group(); - injectField("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - injectField("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - injectField("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - injectField("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - injectField("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - injectField("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-getbundle.txt index 421f94c..d4bd1f1 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-getbundle.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - injectField("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - injectField("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - injectField("playButton", button0); button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - injectField("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - injectField("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - injectField("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - injectField("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - injectField("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - injectField("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - injectField("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - injectField("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - injectField("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - injectField("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - injectField("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - injectField("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - injectField("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - injectField("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - injectField("hbox", hbox2); final var group0 = new javafx.scene.Group(); - injectField("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - injectField("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - injectField("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - injectField("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - injectField("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - injectField("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-getter.txt index e5cdf7c..656dfcb 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-reflection-reflection-getter.txt @@ -54,12 +54,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - injectField("playSlider", slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - injectField("playLabel", label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -70,7 +68,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - injectField("playButton", button0); button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -78,10 +75,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(controller.resources().getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - injectField("volumeSlider", slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - injectField("volumeValueLabel", label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - injectField("controlsController", controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - injectField("vbox", vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - injectField("toolBar", toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - injectField("titledPane", titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - injectField("tilePane", tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - injectField("textFlow", textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - injectField("tabPane", tabpane0); final var tab0 = new javafx.scene.control.Tab(); - injectField("tab", tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - injectField("stackPane", stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - injectField("splitPane", splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - injectField("scrollPane", scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - injectField("pane", pane0); final var hbox2 = new javafx.scene.layout.HBox(); - injectField("hbox", hbox2); final var group0 = new javafx.scene.Group(); - injectField("group", group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - injectField("gridPane", gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - injectField("flowPane", flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - injectField("dialogPane", dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - injectField("buttonBar", buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - injectField("anchorPane", anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - injectField("columnConstraints", columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-constructor.txt index f85bad7..c394005 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-constructor.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.setPlaySlider(slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.setPlayLabel(label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.setPlayButton(button0); button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.setVolumeSlider(slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.setVolumeValueLabel(label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.setControlsController(controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.setVbox(vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.setToolBar(toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.setTitledPane(titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.setTilePane(tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - controller.setTextFlow(textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - controller.setTabPane(tabpane0); final var tab0 = new javafx.scene.control.Tab(); - controller.setTab(tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.setStackPane(stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.setSplitPane(splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.setScrollPane(scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - controller.setPane(pane0); final var hbox2 = new javafx.scene.layout.HBox(); - controller.setHbox(hbox2); final var group0 = new javafx.scene.Group(); - controller.setGroup(group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.setFlowPane(flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.setDialogPane(dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.setButtonBar(buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.setAnchorPane(anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.setColumnConstraints(columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-getbundle.txt index cc32310..1f3023d 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-getbundle.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.setPlaySlider(slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.setPlayLabel(label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.setPlayButton(button0); button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.setVolumeSlider(slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.setVolumeValueLabel(label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.setControlsController(controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.setVbox(vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.setToolBar(toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.setTitledPane(titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.setTilePane(tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - controller.setTextFlow(textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - controller.setTabPane(tabpane0); final var tab0 = new javafx.scene.control.Tab(); - controller.setTab(tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.setStackPane(stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.setSplitPane(splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.setScrollPane(scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - controller.setPane(pane0); final var hbox2 = new javafx.scene.layout.HBox(); - controller.setHbox(hbox2); final var group0 = new javafx.scene.Group(); - controller.setGroup(group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.setFlowPane(flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.setDialogPane(dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.setButtonBar(buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.setAnchorPane(anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.setColumnConstraints(columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-getter.txt index b5951b9..75a1f60 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reference-getter.txt @@ -54,12 +54,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.setPlaySlider(slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.setPlayLabel(label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -70,7 +68,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.setPlayButton(button0); button0.setMnemonicParsing(false); button0.setOnAction(controller::playPressed); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -78,10 +75,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(controller.resources().getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.setVolumeSlider(slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.setVolumeValueLabel(label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.setControlsController(controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.setVbox(vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.setToolBar(toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.setTitledPane(titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.setTilePane(tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - controller.setTextFlow(textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - controller.setTabPane(tabpane0); final var tab0 = new javafx.scene.control.Tab(); - controller.setTab(tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.setStackPane(stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.setSplitPane(splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.setScrollPane(scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - controller.setPane(pane0); final var hbox2 = new javafx.scene.layout.HBox(); - controller.setHbox(hbox2); final var group0 = new javafx.scene.Group(); - controller.setGroup(group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.setFlowPane(flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.setDialogPane(dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.setButtonBar(buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.setAnchorPane(anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.setColumnConstraints(columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-constructor.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-constructor.txt index ad203e1..1deb88c 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-constructor.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-constructor.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.setPlaySlider(slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.setPlayLabel(label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.setPlayButton(button0); button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.setVolumeSlider(slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.setVolumeValueLabel(label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.setControlsController(controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.setVbox(vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.setToolBar(toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.setTitledPane(titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.setTilePane(tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - controller.setTextFlow(textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - controller.setTabPane(tabpane0); final var tab0 = new javafx.scene.control.Tab(); - controller.setTab(tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.setStackPane(stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.setSplitPane(splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.setScrollPane(scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - controller.setPane(pane0); final var hbox2 = new javafx.scene.layout.HBox(); - controller.setHbox(hbox2); final var group0 = new javafx.scene.Group(); - controller.setGroup(group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.setFlowPane(flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.setDialogPane(dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.setButtonBar(buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.setAnchorPane(anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.setColumnConstraints(columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-getbundle.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-getbundle.txt index d37994a..591693a 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-getbundle.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-getbundle.txt @@ -55,12 +55,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.setPlaySlider(slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.setPlayLabel(label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -71,7 +69,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.setPlayButton(button0); button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -79,10 +76,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(bundle.getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.setVolumeSlider(slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.setVolumeValueLabel(label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -90,48 +85,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.setControlsController(controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.setVbox(vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.setToolBar(toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.setTitledPane(titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.setTilePane(tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - controller.setTextFlow(textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - controller.setTabPane(tabpane0); final var tab0 = new javafx.scene.control.Tab(); - controller.setTab(tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.setStackPane(stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.setSplitPane(splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.setScrollPane(scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - controller.setPane(pane0); final var hbox2 = new javafx.scene.layout.HBox(); - controller.setHbox(hbox2); final var group0 = new javafx.scene.Group(); - controller.setGroup(group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.setFlowPane(flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.setDialogPane(dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.setButtonBar(buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.setAnchorPane(anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -140,7 +116,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.setColumnConstraints(columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0)); diff --git a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-getter.txt b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-getter.txt index e2cd40a..df58748 100644 --- a/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-getter.txt +++ b/xml/src/test/resources/com/github/gtache/fxml/compiler/parsing/xml/expected-includes-setters-reflection-getter.txt @@ -54,12 +54,10 @@ public final class IncludesView { hbox0.setAlignment(javafx.geometry.Pos.CENTER); hbox0.setSpacing(10.0); final var slider0 = new javafx.scene.control.Slider(); - controller.setPlaySlider(slider0); javafx.scene.layout.HBox.setHgrow(slider0, javafx.scene.layout.Priority.ALWAYS); final var insets0 = new javafx.geometry.Insets(0, 0, 0, 10.0); slider0.setPadding(insets0); final var label0 = new javafx.scene.control.Label(); - controller.setPlayLabel(label0); label0.setText("Label"); final var insets1 = new javafx.geometry.Insets(0, 10.0, 0, 0); label0.setPadding(insets1); @@ -70,7 +68,6 @@ public final class IncludesView { hbox1.setAlignment(javafx.geometry.Pos.CENTER); hbox1.setSpacing(10.0); final var button0 = new javafx.scene.control.Button(); - controller.setPlayButton(button0); button0.setMnemonicParsing(false); button0.setOnAction(e -> callEventHandlerMethod("playPressed", e)); final var insets3 = new javafx.geometry.Insets(0, 20.0, 0, 0); @@ -78,10 +75,8 @@ public final class IncludesView { final var label1 = new javafx.scene.control.Label(); label1.setText(controller.resources().getString("media.volume.label")); final var slider1 = new javafx.scene.control.Slider(); - controller.setVolumeSlider(slider1); slider1.setValue(100); final var label2 = new javafx.scene.control.Label(); - controller.setVolumeValueLabel(label2); label2.setText("Label"); final var map0 = new HashMap<>(resourceBundlesMap); final var bundle0 = java.util.ResourceBundle.getBundle("com.github.gtache.fxml.compiler.parsing.xml.ControlsBundle"); @@ -89,48 +84,29 @@ public final class IncludesView { final var view0 = new com.github.gtache.fxml.compiler.parsing.xml.ControlsView(controllersMap, map0); final javafx.scene.Parent parsedinclude0 = view0.load(); final var controller0 = view0.controller(); - controller.setControlsController(controller0); hbox1.getChildren().addAll(java.util.List.of(button0, label1, slider1, label2, parsedinclude0)); final var insets4 = new javafx.geometry.Insets(10.0, 10.0, 10.0, 10.0); hbox1.setPadding(insets4); vbox0.getChildren().addAll(java.util.List.of(hbox0, hbox1)); borderpane0.setBottom(vbox0); final var vbox1 = new javafx.scene.layout.VBox(); - controller.setVbox(vbox1); final var toolbar0 = new javafx.scene.control.ToolBar(); - controller.setToolBar(toolbar0); final var titledpane0 = new javafx.scene.control.TitledPane(); - controller.setTitledPane(titledpane0); final var tilepane0 = new javafx.scene.layout.TilePane(); - controller.setTilePane(tilepane0); final var textflow0 = new javafx.scene.text.TextFlow(); - controller.setTextFlow(textflow0); final var tabpane0 = new javafx.scene.control.TabPane(); - controller.setTabPane(tabpane0); final var tab0 = new javafx.scene.control.Tab(); - controller.setTab(tab0); final var stackpane0 = new javafx.scene.layout.StackPane(); - controller.setStackPane(stackpane0); final var splitpane0 = new javafx.scene.control.SplitPane(); - controller.setSplitPane(splitpane0); final var scrollpane0 = new javafx.scene.control.ScrollPane(); - controller.setScrollPane(scrollpane0); final var pane0 = new javafx.scene.layout.Pane(); - controller.setPane(pane0); final var hbox2 = new javafx.scene.layout.HBox(); - controller.setHbox(hbox2); final var group0 = new javafx.scene.Group(); - controller.setGroup(group0); final var gridpane0 = new javafx.scene.layout.GridPane(); - controller.setGridPane(gridpane0); final var flowpane0 = new javafx.scene.layout.FlowPane(); - controller.setFlowPane(flowpane0); final var dialogpane0 = new javafx.scene.control.DialogPane(); - controller.setDialogPane(dialogpane0); final var buttonbar0 = new javafx.scene.control.ButtonBar(); - controller.setButtonBar(buttonbar0); final var anchorpane0 = new javafx.scene.layout.AnchorPane(); - controller.setAnchorPane(anchorpane0); final var label3 = new javafx.scene.control.Label(); label3.setManaged(false); anchorpane0.getChildren().addAll(java.util.List.of(label3)); @@ -139,7 +115,6 @@ public final class IncludesView { flowpane0.getChildren().addAll(java.util.List.of(dialogpane0)); gridpane0.getChildren().addAll(java.util.List.of(flowpane0)); final var columnconstraints0 = new javafx.scene.layout.ColumnConstraints(); - controller.setColumnConstraints(columnconstraints0); columnconstraints0.setHgrow(javafx.scene.layout.Priority.SOMETIMES); columnconstraints0.setMinWidth(10.0); gridpane0.getColumnConstraints().addAll(java.util.List.of(columnconstraints0));