Moved the elements package to the templating package

hugithordarson · hugithordarson · commit 84d5d291bf77 · 2025-08-03T18:59:16.000Z
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/NGDynamicElementDescription.java b/ng-appserver/src/main/java/ng/appserver/templating/NGDynamicElementDescription.java
@@ -8,22 +8,22 @@
 
 import ng.appserver.NGActionResults;
 import ng.appserver.NGApplication;
-import ng.appserver.elements.NGComponentContent;
-import ng.appserver.elements.NGConditional;
-import ng.appserver.elements.NGDynamicGroup;
-import ng.appserver.elements.NGForm;
-import ng.appserver.elements.NGGenericContainer;
-import ng.appserver.elements.NGGenericElement;
-import ng.appserver.elements.NGHyperlink;
-import ng.appserver.elements.NGImage;
-import ng.appserver.elements.NGJavaScript;
-import ng.appserver.elements.NGPopUpButton;
-import ng.appserver.elements.NGRepetition;
-import ng.appserver.elements.NGString;
-import ng.appserver.elements.NGStylesheet;
-import ng.appserver.elements.NGSubmitButton;
-import ng.appserver.elements.NGSwitchComponent;
-import ng.appserver.elements.NGTextField;
+import ng.appserver.templating.elements.NGComponentContent;
+import ng.appserver.templating.elements.NGConditional;
+import ng.appserver.templating.elements.NGDynamicGroup;
+import ng.appserver.templating.elements.NGForm;
+import ng.appserver.templating.elements.NGGenericContainer;
+import ng.appserver.templating.elements.NGGenericElement;
+import ng.appserver.templating.elements.NGHyperlink;
+import ng.appserver.templating.elements.NGImage;
+import ng.appserver.templating.elements.NGJavaScript;
+import ng.appserver.templating.elements.NGPopUpButton;
+import ng.appserver.templating.elements.NGRepetition;
+import ng.appserver.templating.elements.NGString;
+import ng.appserver.templating.elements.NGStylesheet;
+import ng.appserver.templating.elements.NGSubmitButton;
+import ng.appserver.templating.elements.NGSwitchComponent;
+import ng.appserver.templating.elements.NGTextField;
 
 /**
  * A description of a dynamic element and it's bindings. The eventual goal of this class is to combine:
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/NGElementManager.java b/ng-appserver/src/main/java/ng/appserver/templating/NGElementManager.java
@@ -9,8 +9,8 @@
 import java.util.Objects;
 
 import ng.appserver.NGContext;
-import ng.appserver.elements.NGComponentReference;
 import ng.appserver.templating.assications.NGAssociation;
+import ng.appserver.templating.elements.NGComponentReference;
 
 /**
  * Manages access to and location of dynamic elements and components registered with a project
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParserProxy.java b/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParserProxy.java
@@ -9,12 +9,12 @@
 import java.util.Objects;
 
 import ng.appserver.NGApplication;
-import ng.appserver.elements.NGDynamicGroup;
-import ng.appserver.elements.NGHTMLBareString;
-import ng.appserver.elements.NGHTMLCommentString;
 import ng.appserver.templating.parser.NGDeclaration.NGBindingValue;
 import ng.appserver.templating.assications.NGAssociation;
 import ng.appserver.templating.assications.NGAssociationFactory;
+import ng.appserver.templating.elements.NGDynamicGroup;
+import ng.appserver.templating.elements.NGHTMLBareString;
+import ng.appserver.templating.elements.NGHTMLCommentString;
 import ng.appserver.templating.parser.NGDeclarationFormatException;
 import ng.appserver.templating.parser.NGHTMLFormatException;
 import ng.appserver.templating.parser.NGTemplateParser;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGActionURL.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGActionURL.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Map;
 
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGBrowser.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGBrowser.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Map;
 
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGComponentContent.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGComponentContent.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Map;
 
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGComponentReference.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGComponentReference.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Map;
 
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGConditional.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGConditional.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Map;
 
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGDynamicGroup.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGDynamicGroup.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.List;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGFileUpload.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGFileUpload.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGForm.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGForm.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGGenericContainer.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGGenericContainer.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGGenericElement.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGGenericElement.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGHTMLBareString.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGHTMLBareString.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import ng.appserver.NGContext;
 import ng.appserver.NGResponse;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGHTMLCommentString.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGHTMLCommentString.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import ng.appserver.NGContext;
 import ng.appserver.NGResponse;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGHyperlink.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGHyperlink.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGImage.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGImage.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGJavaScript.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGJavaScript.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGPopUpButton.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGPopUpButton.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGRepetition.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGRepetition.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGResourceURL.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGResourceURL.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGString.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGString.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.text.Format;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGStylesheet.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGStylesheet.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGSubmitButton.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGSubmitButton.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGSwitchComponent.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGSwitchComponent.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGText.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGText.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/NGTextField.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/NGTextField.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements;
+package ng.appserver.templating.elements;
 
 import java.text.Format;
 import java.text.ParseException;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/ajax/AjaxObserveField.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/ajax/AjaxObserveField.java
@@ -1,12 +1,12 @@
-package ng.appserver.elements.ajax;
+package ng.appserver.templating.elements.ajax;
 
 import java.util.Map;
 
 import ng.appserver.NGContext;
 import ng.appserver.NGResponse;
-import ng.appserver.elements.NGDynamicGroup;
 import ng.appserver.templating.NGElement;
 import ng.appserver.templating.assications.NGAssociation;
+import ng.appserver.templating.elements.NGDynamicGroup;
 
 public class AjaxObserveField extends NGDynamicGroup {
 
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/ajax/AjaxSubmitButton.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/ajax/AjaxSubmitButton.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements.ajax;
+package ng.appserver.templating.elements.ajax;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/ajax/AjaxUpdateContainer.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/ajax/AjaxUpdateContainer.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements.ajax;
+package ng.appserver.templating.elements.ajax;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,10 +7,10 @@
 import ng.appserver.NGContext;
 import ng.appserver.NGRequest;
 import ng.appserver.NGResponse;
-import ng.appserver.elements.NGDynamicGroup;
 import ng.appserver.privates.NGHTMLUtilities;
 import ng.appserver.templating.NGElement;
 import ng.appserver.templating.assications.NGAssociation;
+import ng.appserver.templating.elements.NGDynamicGroup;
 
 public class AjaxUpdateContainer extends NGDynamicGroup {
 
diff --git a/ng-appserver/src/main/java/ng/appserver/templating/elements/ajax/AjaxUpdateLink.java b/ng-appserver/src/main/java/ng/appserver/templating/elements/ajax/AjaxUpdateLink.java
@@ -1,4 +1,4 @@
-package ng.appserver.elements.ajax;
+package ng.appserver.templating.elements.ajax;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,11 +7,11 @@
 import ng.appserver.NGContext;
 import ng.appserver.NGRequest;
 import ng.appserver.NGResponse;
-import ng.appserver.elements.NGDynamicGroup;
 import ng.appserver.privates.NGHTMLUtilities;
 import ng.appserver.templating.NGBindingConfigurationException;
 import ng.appserver.templating.NGElement;
 import ng.appserver.templating.assications.NGAssociation;
+import ng.appserver.templating.elements.NGDynamicGroup;
 
 public class AjaxUpdateLink extends NGDynamicGroup {
 
diff --git a/ng-appserver/src/main/java/ng/plugins/NGCorePlugin.java b/ng-appserver/src/main/java/ng/plugins/NGCorePlugin.java
@@ -5,30 +5,30 @@
 import ng.appserver.NGResourceRequestHandler;
 import ng.appserver.NGResourceRequestHandlerDynamic;
 import ng.appserver.directactions.NGDirectActionRequestHandler;
-import ng.appserver.elements.NGActionURL;
-import ng.appserver.elements.NGBrowser;
-import ng.appserver.elements.NGComponentContent;
-import ng.appserver.elements.NGConditional;
-import ng.appserver.elements.NGFileUpload;
-import ng.appserver.elements.NGForm;
-import ng.appserver.elements.NGGenericContainer;
-import ng.appserver.elements.NGGenericElement;
-import ng.appserver.elements.NGHyperlink;
-import ng.appserver.elements.NGImage;
-import ng.appserver.elements.NGJavaScript;
-import ng.appserver.elements.NGPopUpButton;
-import ng.appserver.elements.NGRepetition;
-import ng.appserver.elements.NGResourceURL;
-import ng.appserver.elements.NGString;
-import ng.appserver.elements.NGStylesheet;
-import ng.appserver.elements.NGSubmitButton;
-import ng.appserver.elements.NGSwitchComponent;
-import ng.appserver.elements.NGText;
-import ng.appserver.elements.NGTextField;
-import ng.appserver.elements.ajax.AjaxObserveField;
-import ng.appserver.elements.ajax.AjaxSubmitButton;
-import ng.appserver.elements.ajax.AjaxUpdateContainer;
-import ng.appserver.elements.ajax.AjaxUpdateLink;
+import ng.appserver.templating.elements.NGActionURL;
+import ng.appserver.templating.elements.NGBrowser;
+import ng.appserver.templating.elements.NGComponentContent;
+import ng.appserver.templating.elements.NGConditional;
+import ng.appserver.templating.elements.NGFileUpload;
+import ng.appserver.templating.elements.NGForm;
+import ng.appserver.templating.elements.NGGenericContainer;
+import ng.appserver.templating.elements.NGGenericElement;
+import ng.appserver.templating.elements.NGHyperlink;
+import ng.appserver.templating.elements.NGImage;
+import ng.appserver.templating.elements.NGJavaScript;
+import ng.appserver.templating.elements.NGPopUpButton;
+import ng.appserver.templating.elements.NGRepetition;
+import ng.appserver.templating.elements.NGResourceURL;
+import ng.appserver.templating.elements.NGString;
+import ng.appserver.templating.elements.NGStylesheet;
+import ng.appserver.templating.elements.NGSubmitButton;
+import ng.appserver.templating.elements.NGSwitchComponent;
+import ng.appserver.templating.elements.NGText;
+import ng.appserver.templating.elements.NGTextField;
+import ng.appserver.templating.elements.ajax.AjaxObserveField;
+import ng.appserver.templating.elements.ajax.AjaxSubmitButton;
+import ng.appserver.templating.elements.ajax.AjaxUpdateContainer;
+import ng.appserver.templating.elements.ajax.AjaxUpdateLink;
 
 public class NGCorePlugin implements NGPlugin {
 
diff --git a/ng-testapp/src/main/java/ng/testapp/components/ProgrammaticDynamicComponent.java b/ng-testapp/src/main/java/ng/testapp/components/ProgrammaticDynamicComponent.java
@@ -6,17 +6,17 @@
 import java.util.Map;
 
 import ng.appserver.NGContext;
-import ng.appserver.elements.NGDynamicGroup;
-import ng.appserver.elements.NGHTMLBareString;
-import ng.appserver.elements.NGHyperlink;
-import ng.appserver.elements.NGImage;
-import ng.appserver.elements.NGString;
-import ng.appserver.elements.NGStylesheet;
 import ng.appserver.templating.NGComponent;
 import ng.appserver.templating.NGElement;
 import ng.appserver.templating.assications.NGAssociation;
 import ng.appserver.templating.assications.NGConstantValueAssociation;
 import ng.appserver.templating.assications.NGKeyValueAssociation;
+import ng.appserver.templating.elements.NGDynamicGroup;
+import ng.appserver.templating.elements.NGHTMLBareString;
+import ng.appserver.templating.elements.NGHyperlink;
+import ng.appserver.templating.elements.NGImage;
+import ng.appserver.templating.elements.NGString;
+import ng.appserver.templating.elements.NGStylesheet;
 
 public class ProgrammaticDynamicComponent extends NGComponent {
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package ng.appserver.elements;`
	`1`	`+package ng.appserver.templating.elements;`
`2`	`2`
`3`	`3`	`import java.util.Map;`
`4`	`4`