Bugfix for validate that there are no nested Exposed classes

Validate code falsely assumed that all subclasses had been identified at this point in the processing. Algorithm was changed to follow the "component_of" chain. Resolves #142 Refs CCB-204
NASA-PDS · Mar 12, 2020 · f7d973f · f7d973f
1 parent 8de20d0
commit f7d973f
Showing 1 changed file with 19 additions and 22 deletions.
diff --git a/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/LDDDOMParser.java b/model-dmdocument/src/main/java/gov/nasa/pds/model/plugin/LDDDOMParser.java
@@ -1687,33 +1687,30 @@ private void validateNilRequiredAttributes () {
 	}
 
 	private void validateNoNestedExposedClasses () {
-		// first find an exposed classe
+		// first find an exposed class
 		for (Iterator <DOMClass> i = DOMInfoModel.masterDOMClassArr.iterator(); i.hasNext();) {
 			DOMClass lClass = (DOMClass) i.next();
 			if (lClass.isExposed) {
 				// check all component classes
-				ArrayList <DOMProp> allAssocArr = new ArrayList <DOMProp> ();
-				allAssocArr.addAll(lClass.ownedAssocArr);
-				allAssocArr.addAll(lClass.inheritedAssocArr);
-				for (Iterator <DOMProp> j = allAssocArr.iterator(); j.hasNext();) {
-					DOMProp lDOMProp = j.next();
-					if (lDOMProp.hasDOMObject != null && lDOMProp.hasDOMObject instanceof DOMClass) {
-						DOMClass lCompClass = (DOMClass) lDOMProp.hasDOMObject;
-						if (lCompClass.isExposed) {
-							lddErrorMsg.add("   ERROR    Class: <" + lClass.title + "> - <" + lCompClass.title + "> - Exposed classes cannot be nested (component_of).");
-						}
-					}
-				}
-
-				// check all super classes
-				DOMClass lSubClass = lClass;
-				while (lSubClass.subClassOf != null) {
-					DOMClass lSuperClass = lSubClass.subClassOf;
-					if (lSuperClass.isExposed) {
-						lddErrorMsg.add("   ERROR    Class: <" + lClass.title + "> - <" + lSuperClass.title + "> - Exposed classes cannot be nested (parent_of).");						
-					}
-					lSubClass = lSuperClass; 
+				checkAllSubclasses (lClass);
+			}
+		}
+		return;
+	}
+
+	private void checkAllSubclasses (DOMClass lClass) {
+		// check all component classes
+		ArrayList <DOMProp> allAssocArr = new ArrayList <DOMProp> ();
+		allAssocArr.addAll(lClass.ownedAssocArr);
+		allAssocArr.addAll(lClass.inheritedAssocArr);
+		for (Iterator <DOMProp> j = allAssocArr.iterator(); j.hasNext();) {
+			DOMProp lDOMProp = j.next();
+			if (lDOMProp.hasDOMObject != null && lDOMProp.hasDOMObject instanceof DOMClass) {
+				DOMClass lCompClass = (DOMClass) lDOMProp.hasDOMObject;
+				if (lCompClass.isExposed) {
+					lddErrorMsg.add("   ERROR    Class: <" + lCompClass.title + "> - An exposed class cannot be nested within another exposed class.");
 				}
+				checkAllSubclasses (lCompClass);
 			}
 		}
 		return;