@@ -22,7 +22,7 @@ public NGComponent pageWithName( final String componentName, final NGContext con
2222 Objects .requireNonNull ( componentName , "'componentName' must not be null. I can't create components from nothing." );
2323 Objects .requireNonNull ( context , "'context' must not be null. What's life without context?" );
2424
25- final NGComponentDefinition definition = _componentDefinition ( componentName );
25+ final NGComponentDefinition definition = componentDefinition ( componentName );
2626 return pageWithName ( definition , context );
2727 }
2828
@@ -34,7 +34,7 @@ public <E extends NGComponent> E pageWithName( final Class<E> componentClass, fi
3434 Objects .requireNonNull ( componentClass , "'componentClass' must not be null. I can't create components from nothing." );
3535 Objects .requireNonNull ( context , "'context' must not be null. What's life without context?" );
3636
37- final NGComponentDefinition definition = _componentDefinition ( componentClass );
37+ final NGComponentDefinition definition = componentDefinition ( componentClass );
3838 return (E )pageWithName ( definition , context );
3939 }
4040
@@ -50,27 +50,21 @@ private NGComponent pageWithName( final NGComponentDefinition componentDefinitio
5050
5151 /**
5252 * @return The componentDefinition corresponding to the given NGComponent class.
53- *
54- * FIXME: This should not be static // Hugi 2023-04-14
5553 */
56- private static NGComponentDefinition _componentDefinition ( final Class <? extends NGComponent > componentClass ) {
54+ private static NGComponentDefinition componentDefinition ( final Class <? extends NGComponent > componentClass ) {
5755 Objects .requireNonNull ( componentClass );
5856 return NGComponentDefinition .get ( componentClass );
5957 }
6058
6159 /**
6260 * @return The componentDefinition corresponding to the named NGComponent
63- *
64- * FIXME: This should not be static // Hugi 2023-04-14
6561 */
66- public static NGComponentDefinition _componentDefinition ( final String componentName ) {
62+ public static NGComponentDefinition componentDefinition ( final String componentName ) {
6763 Objects .requireNonNull ( componentName );
6864 return NGComponentDefinition .get ( componentName );
6965 }
7066
7167 /**
72- * FIXME: This should not be static // Hugi 2023-04-14
73- *
7468 * @param name The name identifying what element we're getting
7569 * @param associations Associations used to bind the generated element to it's parent
7670 * @param contentTemplate The content wrapped by the element (if a container element)
@@ -89,7 +83,7 @@ public static NGElement dynamicElementWithName( final String elementIdentifier,
8983
9084 // If we don't find a class for the element, we're going to try going down the route of a classless component.
9185 if ( elementClass == null ) {
92- final NGComponentDefinition componentDefinition = _componentDefinition ( elementName );
86+ final NGComponentDefinition componentDefinition = componentDefinition ( elementName );
9387 return componentDefinition .componentReferenceWithAssociations ( associations , contentTemplate );
9488 }
9589
@@ -100,7 +94,7 @@ public static NGElement dynamicElementWithName( final String elementIdentifier,
10094
10195 // If it's not an element, let's move on to creating a component reference instead
10296 if ( NGComponent .class .isAssignableFrom ( elementClass ) ) {
103- final NGComponentDefinition componentDefinition = _componentDefinition ( (Class <? extends NGComponent >)elementClass );
97+ final NGComponentDefinition componentDefinition = componentDefinition ( (Class <? extends NGComponent >)elementClass );
10498 return componentDefinition .componentReferenceWithAssociations ( associations , contentTemplate );
10599 }
106100
0 commit comments