Generate constant string instead of qualified name if constant string is shorter than 20 characters.

zhourenjian · zhourenjian · commit f1e4b916040d · 2007-09-25T17:56:48.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTVariableVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTVariableVisitor.java
@@ -204,6 +204,20 @@ protected String checkConstantValue(Expression node) {
 			}
 			return buffer.toString();
 		}
+		if (constValue != null && (constValue instanceof String)) {
+			StringBuffer buffer = new StringBuffer();
+			String str = (String) constValue;
+			if (str.length() > 20) {
+				return null;
+			}
+			buffer.append("\"");
+			buffer.append(str.replaceAll("\\\\", "\\\\\\\\")
+					.replaceAll("\r", "\\\\r")
+					.replaceAll("\n", "\\\\n")
+					.replaceAll("\"", "\\\\\""));
+			buffer.append("\"");
+			return buffer.toString();
+		}
 		return null;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,20 @@ protected String checkConstantValue(Expression node) {`
`204`	`204`	`}`
`205`	`205`	`return buffer.toString();`
`206`	`206`	`}`
	`207`	`+ if (constValue != null && (constValue instanceof String)) {`
	`208`	`+ StringBuffer buffer = new StringBuffer();`
	`209`	`+ String str = (String) constValue;`
	`210`	`+ if (str.length() > 20) {`
	`211`	`+ return null;`
	`212`	`+ }`
	`213`	`+ buffer.append("\"");`
	`214`	`+ buffer.append(str.replaceAll("\\\\", "\\\\\\\\")`
	`215`	`+ .replaceAll("\r", "\\\\r")`
	`216`	`+ .replaceAll("\n", "\\\\n")`
	`217`	`+ .replaceAll("\"", "\\\\\""));`
	`218`	`+ buffer.append("\"");`
	`219`	`+ return buffer.toString();`
	`220`	`+ }`
`207`	`221`	`return null;`
`208`	`222`	`}`
`209`	`223`	`}`