Fixed bug that a comment block is missing in generated sources

zhourenjian@gmail.com · zhourenjian@gmail.com · commit b9aff1fc1ba8 · 2014-05-30T05:47:40.000Z
diff --git a/sources/net.sf.j2s.ajax/generator/net/sf/j2s/ajax/SimpleSource4Java.java b/sources/net.sf.j2s.ajax/generator/net/sf/j2s/ajax/SimpleSource4Java.java
@@ -509,12 +509,8 @@ public int compare(Class<?> c1, Class<?> c2) {
 			}
 		}
 		
-		if (gotStaticFinalFields) {
-			source.append("\r\n");
-			SourceUtils.insertLineComment(source, "\t", index++, true);
-		} else {
-			index++;
-		}
+		source.append("\r\n");
+		SourceUtils.insertLineComment(source, "\t", index++, true);
 
 		boolean firstField = true;
 		for (Iterator<Field> itr = fields.iterator(); itr.hasNext();) {
@@ -542,7 +538,9 @@ public int compare(Class<?> c1, Class<?> c2) {
 			}
 		}
 		
-		source.append("\r\n");
+		if (!firstField) { // contains fields
+			source.append("\r\n");
+		} // else no blank line as previous comment block contains a blank line
 		SourceUtils.insertLineComment(source, "\t", index++, true);
 		boolean moreCodesAdded = false;
 		if (fieldMappings != null && fieldMappings.size() > 0) {

Original file line number	Diff line number	Diff line change
`@@ -509,12 +509,8 @@ public int compare(Class<?> c1, Class<?> c2) {`
`509`	`509`	`}`
`510`	`510`	`}`
`511`	`511`
`512`		`- if (gotStaticFinalFields) {`
`513`		`- source.append("\r\n");`
`514`		`- SourceUtils.insertLineComment(source, "\t", index++, true);`
`515`		`- } else {`
`516`		`- index++;`
`517`		`- }`
	`512`	`+ source.append("\r\n");`
	`513`	`+ SourceUtils.insertLineComment(source, "\t", index++, true);`
`518`	`514`
`519`	`515`	`boolean firstField = true;`
`520`	`516`	`for (Iterator<Field> itr = fields.iterator(); itr.hasNext();) {`
`@@ -542,7 +538,9 @@ public int compare(Class<?> c1, Class<?> c2) {`
`542`	`538`	`}`
`543`	`539`	`}`
`544`	`540`
`545`		`- source.append("\r\n");`
	`541`	`+ if (!firstField) { // contains fields`
	`542`	`+ source.append("\r\n");`
	`543`	`+ } // else no blank line as previous comment block contains a blank line`
`546`	`544`	`SourceUtils.insertLineComment(source, "\t", index++, true);`
`547`	`545`	`boolean moreCodesAdded = false;`
`548`	`546`	`if (fieldMappings != null && fieldMappings.size() > 0) {`