Issue #493: Refactored nested annotation logic

Signed-off-by: Ernesto Posse <eposse.gmail.com>
ZeligsoftDev · Feb 21, 2024 · 744c622 · 744c622
1 parent e72ea24
commit 744c622
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...gc.ccm.generator/src/com/zeligsoft/domain/ngc/ccm/generator/writers/AtcdWriterSwitch.java b/...gc.ccm.generator/src/com/zeligsoft/domain/ngc/ccm/generator/writers/AtcdWriterSwitch.java
@@ -284,13 +284,13 @@ private Map<String, String> getEntityInfo(Object model) {
 		@Override
 		public Object caseStructType(StructType object) {
 
-			String commentString = "//@top-level false";
+			boolean nested = true;
 
 			EAnnotation annotation = object.getEAnnotation(AnnotationUtil.ZCX_ANNOTATION);
 			if( annotation != null ) {
 				String topLevel = annotation.getDetails().get("toplevel");
 				if( topLevel != null && topLevel.matches("true")) {
-					commentString = "//@top-level true";
+					nested = false;
 				}
 			}
 
@@ -307,6 +307,12 @@ public Object caseStructType(StructType object) {
 				}
 			}
 
+			String nestedAnnotation = "@nested(FALSE)";
+			if (nested) {
+				nestedAnnotation = "@nested(TRUE)";
+			}
+			buf.append(String.format("%s%s%n", indentString, nestedAnnotation));
+
 			buf.append(String.format("%sstruct %s {%n", 
 					indentString,
 					object.getName()));
@@ -315,8 +321,8 @@ public Object caseStructType(StructType object) {
 				doSwitch(m);					
 			}
 			popScope();
-			buf.append(String.format("%s}; %s%n",
-					indentString, commentString));
+			buf.append(String.format("%s};%n",
+					indentString));
 			conditionalNewLine();
 			return buf.toString();
 		}

diff --git a/...ccm.generator/src/com/zeligsoft/domain/ngc/ccm/generator/writers/AxciomaWriterSwitch.java b/...ccm.generator/src/com/zeligsoft/domain/ngc/ccm/generator/writers/AxciomaWriterSwitch.java
@@ -338,13 +338,13 @@ public Object caseUnionType(UnionType object) {
 		@Override
 		public Object caseStructType(StructType object) {
 
-			boolean nested = false;
+			boolean nested = true;
 
 			EAnnotation annotation = object.getEAnnotation(AnnotationUtil.ZCX_ANNOTATION);
 			if (annotation != null) {
 				String topLevel = annotation.getDetails().get("toplevel");
 				if (topLevel != null && topLevel.matches("true")) {
-					nested = true;
+					nested = false;
 				}
 			}
 
@@ -368,7 +368,7 @@ public Object caseStructType(StructType object) {
 			}
 			buf.append(String.format("%s%s%n", indentString, extensibility));
 			String nestedAnnotation = "@nested(FALSE)";
-			if (!nested) {
+			if (nested) {
 				nestedAnnotation = "@nested(TRUE)";
 			}
 			buf.append(String.format("%s%s%n", indentString, nestedAnnotation));