Improved attListDecl handling

rmraya · rmraya · commit faac2ee37630 · 2025-05-11T16:04:13.000-03:00
diff --git a/src/com/maxprograms/xml/XMLOutputter.java b/src/com/maxprograms/xml/XMLOutputter.java
@@ -60,13 +60,14 @@ public void output(Document sdoc, OutputStream out) throws IOException {
 				String publicId = sdoc.getPublicId();
 				String systemId = sdoc.getSystemId();
 				String internalSubset = sdoc.getInternalSubset();
-				List<AttributeDecl> customAttributes = sdoc.getAttributes();
-				if (customAttributes != null) {
+
+				List<AttlistDecl> attlistDeclarations = sdoc.getAttlistDeclarations();
+				if (attlistDeclarations != null && !attlistDeclarations.isEmpty()) {
 					if (internalSubset == null) {
 						internalSubset = "";
 					}
-					for (int i = 0; i < customAttributes.size(); i++) {
-						internalSubset = internalSubset + "\n" + customAttributes.get(i);
+					for (AttlistDecl attlist : attlistDeclarations) {
+						internalSubset += "\n" + attlist.toString();
 					}
 				}
 				if (publicId != null || systemId != null || internalSubset != null) {

Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,14 @@ public void output(Document sdoc, OutputStream out) throws IOException {`
`60`	`60`	`String publicId = sdoc.getPublicId();`
`61`	`61`	`String systemId = sdoc.getSystemId();`
`62`	`62`	`String internalSubset = sdoc.getInternalSubset();`
`63`		`- List<AttributeDecl> customAttributes = sdoc.getAttributes();`
`64`		`- if (customAttributes != null) {`
	`63`	`+`
	`64`	`+ List<AttlistDecl> attlistDeclarations = sdoc.getAttlistDeclarations();`
	`65`	`+ if (attlistDeclarations != null && !attlistDeclarations.isEmpty()) {`
`65`	`66`	`if (internalSubset == null) {`
`66`	`67`	`internalSubset = "";`
`67`	`68`	`}`
`68`		`- for (int i = 0; i < customAttributes.size(); i++) {`
`69`		`- internalSubset = internalSubset + "\n" + customAttributes.get(i);`
	`69`	`+ for (AttlistDecl attlist : attlistDeclarations) {`
	`70`	`+ internalSubset += "\n" + attlist.toString();`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`if (publicId != null \|\| systemId != null \|\| internalSubset != null) {`