Allow registration of unnamespaced elements in element manager. For now.

Author: hugithordarson

ng-appserver/src/main/java/ng/appserver/NGApplication.java

@@ -31,7 +31,6 @@
 import ng.appserver.resources.StandardResourceType;
 import ng.appserver.routing.NGRouteTable;
 import ng.appserver.templating.NGElementManager;
-import ng.appserver.templating.NGElementUtils;
 import ng.appserver.wointegration.NGDefaultLifeBeatThread;
 import ng.appserver.wointegration.WOMPRequestHandler;
 import ng.plugins.NGPlugin;
@@ -160,10 +159,10 @@ public static <E extends NGApplication> E runAndReturn( final String[] args, fin
 			application.loadPlugins();
 
 			// The application class' package gets added by default // FIXME: Don't like this Hugi 2022-10-10
-			NGElementUtils.addPackage( applicationClass.getPackageName() );
+			application._elementManager.registerElementPackage( applicationClass.getPackageName() );
 
 			// FIXME: Registering for the instance stopper to work. Horrid stuff. We need to convert NGAdminAction to routes // Hugi 2025-03-16
-			NGElementUtils.addClass( NGAdminAction.class );
+			application._elementManager.registerElementClass( NGAdminAction.class );
 
 			// FIXME: Eventually the adaptor startup should probably be done by the user
 			application.createAdaptor().start( application );

ng-appserver/src/main/java/ng/appserver/templating/NGElementManager.java

@@ -149,10 +149,26 @@ private static <E extends NGDynamicElement> E createDynamicElementInstance( fina
 	 */
 	private final Map<String, String> _elementTagNames = new HashMap<>();
 
+	/**
+	 * FIXME: Allows us to invoke registerElementClass without a namespace. Temporary while we're working on namespaces
+	 */
+	@Deprecated
+	public void registerElementClass( final Class<?> elementClass, String... tagNames ) {
+		registerElementClass( GLOBAL_UNNAMESPACED_NAMESPACE, elementClass, tagNames );
+	}
+
+	/**
+	 * FIXME: Allows us to invoke registerElementPackage without a namespace. Temporary while we're working on namespaces
+	 */
+	@Deprecated
+	public void registerElementPackage( final String packageName ) {
+		registerElementPackage( GLOBAL_UNNAMESPACED_NAMESPACE, packageName );
+	}
+
 	/**
 	 * Registers an element class for use in the application
 	 */
-	public void registerElementClass( final String namespace, final Class<? extends NGElement> elementClass, String... tagNames ) {
+	public void registerElementClass( final String namespace, final Class<?> elementClass, String... tagNames ) {
 		_elementClasses.add( elementClass );
 
 		for( String shortcut : tagNames ) {

ng-appserver/src/main/java/ng/appserver/templating/NGElementUtils.java

@@ -63,11 +63,11 @@ public class NGElementUtils {
 	 */
 	@Deprecated
 	public static void addClass( final Class<?> elementClass, final String... tagNames ) {
-		NGApplication.application().elementManager().registerElementClass( NGElementManager.GLOBAL_UNNAMESPACED_NAMESPACE, (Class<? extends NGElement>)elementClass, tagNames );
+		NGApplication.application().elementManager().registerElementClass( (Class<? extends NGElement>)elementClass, tagNames );
 	}
 
 	@Deprecated
 	public static void addPackage( final String packageName ) {
-		NGApplication.application().elementManager().registerElementPackage( NGElementManager.GLOBAL_UNNAMESPACED_NAMESPACE, packageName );
+		NGApplication.application().elementManager().registerElementPackage( packageName );
 	}
 }