Moved actual element construction from NGDynamicHTMLTag to the parser

ngobjects · Oct 17, 2024 · afa6448 · afa6448
1 parent 16fcb8c
commit afa6448
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/NGDynamicHTMLTag.java b/ng-appserver/src/main/java/ng/appserver/templating/NGDynamicHTMLTag.java
@@ -1,12 +1,9 @@
 package ng.appserver.templating;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
-import ng.appserver.NGApplication;
 import ng.appserver.NGComponentReference;
 import ng.appserver.NGElement;
 import ng.appserver.elements.NGDynamicGroup;
@@ -125,14 +122,4 @@ public void addChildElement( final Object stringOrElement ) {
 
 		_children.add( stringOrElement );
 	}
-
-	public NGElement dynamicElement( final Map<String, NGDeclaration> declarations ) throws NGDeclarationFormatException {
-		final NGDeclaration declaration = declarations.get( declarationName() );
-
-		if( declaration == null ) {
-			throw new NGDeclarationFormatException( "No declaration for dynamic element (or component) named '%s'".formatted( declarationName() ) );
-		}
-
-		return NGApplication.dynamicElementWithName( declaration.type(), declaration.associations(), template(), Collections.emptyList() );
-	}
 }
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParser.java b/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParser.java
@@ -1,10 +1,12 @@
 package ng.appserver.templating;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringTokenizer;
 
+import ng.appserver.NGApplication;
 import ng.appserver.NGAssociation;
 import ng.appserver.NGAssociationFactory;
 import ng.appserver.NGElement;
@@ -109,7 +111,7 @@ public void didParseClosingWebObjectTag( final String parsedString ) throws NGDe
 			throw new NGHTMLFormatException( message );
 		}
 
-		final NGElement element = _currentDynamicTag.dynamicElement( _declarations );
+		final NGElement element = dynamicElement( _currentDynamicTag, _declarations );
 		_currentDynamicTag = parentDynamicTag;
 		_currentDynamicTag.addChildElement( element );
 	}
@@ -158,6 +160,16 @@ static String extractDeclarationName( final String tagPart ) throws NGHTMLFormat
 		throw new NGHTMLFormatException( "Can't initialize dynamic tag '%s', no 'name' attribute found".formatted( tagPart ) );
 	}
 
+	private static NGElement dynamicElement( NGDynamicHTMLTag tag, final Map<String, NGDeclaration> declarations ) throws NGDeclarationFormatException {
+		final NGDeclaration declaration = declarations.get( tag.declarationName() );
+
+		if( declaration == null ) {
+			throw new NGDeclarationFormatException( "No declaration for dynamic element (or component) named '%s'".formatted( tag.declarationName() ) );
+		}
+
+		return NGApplication.dynamicElementWithName( declaration.type(), declaration.associations(), tag.template(), Collections.emptyList() );
+	}
+
 	private static NGDeclaration parseInlineTag( final String tag, final int colonIndex, final int nextInlineBindingNumber ) throws NGHTMLFormatException {
 
 		final StringBuilder keyBuffer = new StringBuilder();