removing line endings in @j2sNative blocks to avoid return problems

BobHanson · BobHanson · commit 56d8e57074fb · 2017-09-02T15:53:43.000-05:00
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTJ2SDocVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTJ2SDocVisitor.java
@@ -143,19 +143,31 @@ private void addJavadocJ2SSource(TagElement tagEl) {
 			String text = commentEl.getText().trim();
 			if (text.length() == 0)
 				continue;
-			buf.append(text.replace('\n', ' ').replace('\r', ' '));
+			buf.append(text).append(text.endsWith(";") || text.indexOf("//") >= 0 ? "\r\n" : " ");
 			// BH note that all line terminators are removed,
 			// as this causes problems after source cleaning, which may result
 			// in code such as:
 			//
 			// return
 			// x
 			//
-			buf.append("\r\n");
+			// but this still does not fix the problem that we can have
+			// x = " 
+			//       "
+			// after source cleaning
 		}
 		buffer.append(fixCommentBlock(buf.toString()));
 	}
 	
+	private String fixCommentBlock(String text) {
+		if (text == null || text.length() == 0) {
+			return text;
+		}
+		return Pattern.compile("\\/-\\*(.*)\\*-\\/",
+				Pattern.MULTILINE | Pattern.DOTALL)
+				.matcher(text).replaceAll("/*$1*/");
+	}
+	
 	private void addJavadocXStringSource(TagElement tagEl, String tagName) {
 		List<?> fragments = tagEl.fragments();
 		boolean isFirstLine = true;
@@ -503,15 +515,6 @@ boolean readSources(BodyDeclaration node, String tagName, String prefix, String
 		return haveJ2SJavaDoc;
 	}
 
-	private String fixCommentBlock(String text) {
-		if (text == null || text.length() == 0) {
-			return text;
-		}
-		return Pattern.compile("\\/-\\*(.*)\\*-\\/",
-				Pattern.MULTILINE | Pattern.DOTALL)
-				.matcher(text).replaceAll("/*$1*/");
-	}
-	
 	private Javadoc[] checkJavadocs(ASTNode root) {
 		if (root instanceof CompilationUnit) {
 			List<?> commentList = ((CompilationUnit) root).getCommentList();
