improved getCommentText for null value

cip4 · Jun 25, 2024 · 9942501 · 9942501
1 parent 098111d
commit 9942501
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/cip4/jdflib/core/JDFElement.java b/src/main/java/org/cip4/jdflib/core/JDFElement.java
@@ -4070,7 +4070,7 @@ public VString getInvalidElements_JDFElement(final EnumValidationLevel level, fi
 			vBad.appendUnique(new VString(getDeprecatedElements(nMax)));
 			if (nMax <= 0 || vBad.size() < nMax)
 			{
-				VString prereleaseElements = getPrereleaseElements(nMax);
+				final VString prereleaseElements = getPrereleaseElements(nMax);
 				vBad.appendUnique(new VString(prereleaseElements));
 			}
 		}
@@ -6338,7 +6338,9 @@ public JDFComment getComment(final String _name, final int index)
 	 */
 	public String getCommentText(final String _name, final int index)
 	{
-		final JDFComment c = getComment(_name, index);
+		JDFComment c = getComment(_name, index);
+		if (c == null && StringUtil.isEmpty(_name))
+			c = getComment(index);
 		return c == null ? null : c.getText();
 	}
 

diff --git a/src/test/java/org/cip4/jdflib/node/JDFNodeTest.java b/src/test/java/org/cip4/jdflib/node/JDFNodeTest.java
@@ -202,10 +202,12 @@ void testComment()
 		final JDFNode n = JDFNode.createRoot();
 		n.setCommentText("foo");
 		assertEquals("foo", n.getComment(0).getText());
+		assertEquals("foo", n.getCommentText(null, 0));
 		n.setCommentText("next", "bar");
 		assertEquals("next", n.getCommentText("bar", 0));
 		assertEquals(null, n.getCommentText("foo", 0));
 		assertEquals(null, n.getCommentText("bar", 1));
+		assertEquals("next", n.getCommentText(null, 1));
 	}
 
 	/**