From 086a61665cf5814a2561db8ac62ad92f1056bdef Mon Sep 17 00:00:00 2001 From: SlavaRa <ra...@ya.ru> Date: Wed, 21 Oct 2015 16:08:47 +0300 Subject: [PATCH] Replace with chained append() calls
--- .../asc/src/java/adobe/abc/GlobalOptimizer.java | 6 +-- .../macromedia/asc/embedding/LintEvaluator.java | 2 +- .../asc/src/java/macromedia/asc/parser/Parser.java | 2 +- .../asc/src/java/macromedia/asc/util/Context.java | 6 +-- .../src/java/flex2/compiler/SourcePath.java | 2 +- .../compiler/common/MetadataConfiguration.java | 18 +++---- .../flex2/compiler/config/FileConfigurator.java | 26 +++++----- .../flex2/compiler/fxg/FlexFXG2SWFTranscoder.java | 2 +- .../java/flex2/compiler/media/MovieTranscoder.java | 2 +- .../java/flex2/compiler/media/PBJTranscoder.java | 2 +- .../compiler/mxml/rep/init/ValueInitializer.java | 4 +- .../mxml/rep/init/VisualChildInitializer.java | 6 +-- .../flex2/compiler/util/SwcDependencyUtil.java | 4 +- .../src/java/flex2/linker/DependencyWalker.java | 10 ++-- .../compiler/src/java/flex2/linker/FlexMovie.java | 2 +- modules/compiler/src/java/flex2/tools/PreLink.java | 56 +++++++++------------- .../src/java/flex/tools/debugger/cli/DebugCLI.java | 44 ++++++++--------- .../flex/tools/debugger/cli/ExpressionCache.java | 14 +++--- .../flex/tools/debugger/cli/ExpressionContext.java | 21 +++----- .../src/java/flash/swf/debug/RegisterRecord.java | 2 +- .../src/java/flash/swf/tags/DefineSprite.java | 5 +- .../src/java/flash/swf/tools/SizeReport.java | 8 ++-- .../src/java/flash/swf/tools/SyntaxTreeDumper.java | 2 +- .../src/java/flash/swf/types/ActionList.java | 2 +- .../src/java/flash/swf/types/ButtonCondAction.java | 2 +- .../swfutils/src/java/flash/swf/types/TagList.java | 2 +- .../swfutils/src/java/flash/util/StringUtils.java | 2 +- 27 files changed, 117 insertions(+), 137 deletions(-) diff --git a/modules/asc/src/java/adobe/abc/GlobalOptimizer.java b/modules/asc/src/java/adobe/abc/GlobalOptimizer.java index 42fb596..6c9c3a1 100644 --- a/modules/asc/src/java/adobe/abc/GlobalOptimizer.java +++ b/modules/asc/src/java/adobe/abc/GlobalOptimizer.java @@ -8726,7 +8726,7 @@ public class GlobalOptimizer String formatExprAsAbc(Expr e) { StringBuilder s = new StringBuilder(); - s.append(" " + opNames[e.op]); + s.append(" ").append(opNames[e.op]); if (e.imm != null) { s.append('<'); @@ -8771,7 +8771,7 @@ public class GlobalOptimizer outBuffer.append(" "); if (e.value == null) - outBuffer.append(" "+opNames[e.op]); + outBuffer.append(" ").append(opNames[e.op]); if (e.imm != null) { outBuffer.append('<'); @@ -8792,7 +8792,7 @@ public class GlobalOptimizer if (e.value != null) outBuffer.append(formatObject(e.value)); if (e.ref != null) - outBuffer.append(" "+e.ref);//.format()); // full name + outBuffer.append(" ").append(e.ref);//.format()); // full name return outBuffer.toString(); } diff --git a/modules/asc/src/java/macromedia/asc/embedding/LintEvaluator.java b/modules/asc/src/java/macromedia/asc/embedding/LintEvaluator.java index de2ea96..5f00371 100644 --- a/modules/asc/src/java/macromedia/asc/embedding/LintEvaluator.java +++ b/modules/asc/src/java/macromedia/asc/embedding/LintEvaluator.java @@ -3007,7 +3007,7 @@ public final class LintEvaluator extends Emitter implements Evaluator, ErrorCons { // Just the arguments for sanities, no message (since they chang often) if(ContextStatics.useSanityStyleErrors) { - out.append("code=" + code + "; arg1=" + pRec.errStringArg1 + "; arg2=" + pRec.errStringArg2 + "; arg3=" + pRec.errStringArg3); + out.append("code=").append(code).append("; arg1=").append(pRec.errStringArg1).append("; arg2=").append(pRec.errStringArg2).append("; arg3=").append(pRec.errStringArg3); } // else: standard message else diff --git a/modules/asc/src/java/macromedia/asc/parser/Parser.java b/modules/asc/src/java/macromedia/asc/parser/Parser.java index ba6f6fc..9d5c33a 100644 --- a/modules/asc/src/java/macromedia/asc/parser/Parser.java +++ b/modules/asc/src/java/macromedia/asc/parser/Parser.java @@ -273,7 +273,7 @@ public final class Parser // Just the arguments for sanities, no message (since they change often) if(ContextStatics.useSanityStyleErrors) { - out.append("code=" + errCode + "; arg1=" + arg1 + "; arg2=" + arg2); + out.append("code=").append(errCode).append("; arg1=").append(arg1).append("; arg2=").append(arg2); } else { diff --git a/modules/asc/src/java/macromedia/asc/util/Context.java b/modules/asc/src/java/macromedia/asc/util/Context.java index 5db6117..92d1145 100644 --- a/modules/asc/src/java/macromedia/asc/util/Context.java +++ b/modules/asc/src/java/macromedia/asc/util/Context.java @@ -258,7 +258,7 @@ public final class Context implements ErrorConstants // Just the arguments for sanities, no message (since they change often) if(ContextStatics.useSanityStyleErrors) { - out.append("code=" + error + "; arg1=" + arg1 + "; arg2=" + arg2 + "; arg3=" + arg3); + out.append("code=").append(error).append("; arg1=").append(arg1).append("; arg2=").append(arg2).append("; arg3=").append(arg3); } else { @@ -1691,11 +1691,11 @@ public final class Context implements ErrorConstants // config namespace directive to make the namespace // a configuration namespace. namespaces.add(cv.ns); - code_buffer.append("config namespace " + cv.ns + ";\n"); + code_buffer.append("config namespace ").append(cv.ns).append(";\n"); } code_buffer.append( cv.ns ); code_buffer.append( " const "); - code_buffer.append( cv.name + "=" + cv.value + ";\n"); + code_buffer.append(cv.name).append("=").append(cv.value).append(";\n"); } code = code_buffer.toString(); } diff --git a/modules/compiler/src/java/flex2/compiler/SourcePath.java b/modules/compiler/src/java/flex2/compiler/SourcePath.java index ed507ec..4360df1 100644 --- a/modules/compiler/src/java/flex2/compiler/SourcePath.java +++ b/modules/compiler/src/java/flex2/compiler/SourcePath.java @@ -592,7 +592,7 @@ abstract class SourcePathBase while (iterator.hasNext()) { Source source = iterator.next(); - buffer.append("\tsource = " + source + ", cu = " + source.getCompilationUnit() + "\n"); + buffer.append("\tsource = ").append(source).append(", cu = ").append(source.getCompilationUnit()).append("\n"); } return buffer.toString(); diff --git a/modules/compiler/src/java/flex2/compiler/common/MetadataConfiguration.java b/modules/compiler/src/java/flex2/compiler/common/MetadataConfiguration.java index 87b1c9f..0eeb0ca 100644 --- a/modules/compiler/src/java/flex2/compiler/common/MetadataConfiguration.java +++ b/modules/compiler/src/java/flex2/compiler/common/MetadataConfiguration.java @@ -64,7 +64,7 @@ public class MetadataConfiguration { if ((localizedTitles.size() == 1) && (localizedTitles.get("x-default") != null)) { - sb.append("<dc:title>" + f(localizedTitles.get("x-default")) + "</dc:title>"); + sb.append("<dc:title>").append(f(localizedTitles.get("x-default"))).append("</dc:title>"); } else { @@ -72,7 +72,7 @@ public class MetadataConfiguration for (Iterator it = localizedTitles.entrySet().iterator(); it.hasNext();) { Map.Entry e = (Map.Entry) it.next(); - sb.append("<rdf:li xml:lang='" + e.getKey() + "'>" + f((String) e.getValue()) + "</rdf:li>"); + sb.append("<rdf:li xml:lang='").append(e.getKey()).append("'>").append(f((String) e.getValue())).append("</rdf:li>"); } sb.append("</rdf:Alt></dc:title>"); } @@ -81,7 +81,7 @@ public class MetadataConfiguration { if ((localizedDescriptions.size() == 1) && (localizedDescriptions.get("x-default") != null)) { - sb.append("<dc:description>" + f(localizedDescriptions.get("x-default")) + "</dc:description>"); + sb.append("<dc:description>").append(f(localizedDescriptions.get("x-default"))).append("</dc:description>"); } else { @@ -89,7 +89,7 @@ public class MetadataConfiguration for (Iterator it = localizedDescriptions.entrySet().iterator(); it.hasNext();) { Map.Entry e = (Map.Entry) it.next(); - sb.append("<rdf:li xml:lang='" + (String) e.getKey() + "'>" + f((String) e.getValue()) + "</rdf:li>"); + sb.append("<rdf:li xml:lang='").append((String) e.getKey()).append("'>").append(f((String) e.getValue())).append("</rdf:li>"); } sb.append("</rdf:Alt></dc:description>"); } @@ -98,22 +98,22 @@ public class MetadataConfiguration for (Iterator<String> it = publishers.iterator(); it.hasNext();) { - sb.append("<dc:publisher>" + f(it.next()) + "</dc:publisher>"); + sb.append("<dc:publisher>").append(f(it.next())).append("</dc:publisher>"); } for (Iterator<String> it = creators.iterator(); it.hasNext();) { - sb.append("<dc:creator>" + f(it.next()) + "</dc:creator>"); + sb.append("<dc:creator>").append(f(it.next())).append("</dc:creator>"); } for (Iterator<String> it = contributors.iterator(); it.hasNext();) { - sb.append("<dc:contributor>" + f(it.next()) + "</dc:contributor>"); + sb.append("<dc:contributor>").append(f(it.next())).append("</dc:contributor>"); } for (Iterator<String> it = langs.iterator(); it.hasNext();) { - sb.append("<dc:language>" + f(it.next()) + "</dc:language>"); + sb.append("<dc:language>").append(f(it.next())).append("</dc:language>"); } if (date == null) @@ -121,7 +121,7 @@ public class MetadataConfiguration date = DateFormat.getDateInstance().format(new Date()); } - sb.append("<dc:date>" + f(date) + "</dc:date>"); + sb.append("<dc:date>").append(f(date)).append("</dc:date>"); sb.append("</rdf:Description></rdf:RDF>"); return sb.toString(); } diff --git a/modules/compiler/src/java/flex2/compiler/config/FileConfigurator.java b/modules/compiler/src/java/flex2/compiler/config/FileConfigurator.java index a1cb479..47036df 100644 --- a/modules/compiler/src/java/flex2/compiler/config/FileConfigurator.java +++ b/modules/compiler/src/java/flex2/compiler/config/FileConfigurator.java @@ -554,7 +554,7 @@ public class FileConfigurator { StringBuilder buf = new StringBuilder( 1024 ); - buf.append( indent + "<" + node.shortname + ">\n" ); + buf.append(indent).append("<").append(node.shortname).append(">\n"); if (node.children != null) { for (Iterator it = node.children.entrySet().iterator(); it.hasNext(); ) { @@ -570,13 +570,13 @@ public class FileConfigurator String description = lmgr.getLocalizedTextString( prefix + "." + child.fullname ); if (description != null) - buf.append( indent + pad + "<!-- " + child.fullname + ": " + description + "-->\n" ); + buf.append(indent).append(pad).append("<!-- ").append(child.fullname).append(": ").append(description).append("-->\n"); if ((child.values == null) || !child.info.isDisplayed()) { boolean newline = false; - buf.append( indent + pad + "<!-- " + child.fullname + " usage:\n" ); - buf.append( indent + pad + "<" + child.shortname + ">"); + buf.append(indent).append(pad).append("<!-- ").append(child.fullname).append(" usage:\n"); + buf.append(indent).append(pad).append("<").append(child.shortname).append(">"); int i = 0; while (true) @@ -588,7 +588,7 @@ public class FileConfigurator } else { - buf.append( "\n" + indent + pad + pad + "<" + child.info.getArgName( i ) + ">" + classToArgName( child.info.getArgType( i ) ) + "</" + child.info.getArgName( i ) + ">"); + buf.append("\n").append(indent).append(pad).append(pad).append("<").append(child.info.getArgName(i)).append(">").append(classToArgName(child.info.getArgType(i))).append("</").append(child.info.getArgName(i)).append(">"); newline = true; } if (child.info.getArgCount() == -1) @@ -620,10 +620,10 @@ public class FileConfigurator ++i; } if (newline) - buf.append( "\n" + indent + pad); + buf.append("\n").append(indent).append(pad); - buf.append( "</" + child.shortname + ">\n"); - buf.append( indent + pad + "-->\n" ); + buf.append("</").append(child.shortname).append(">\n"); + buf.append(indent).append(pad).append("-->\n"); } else { @@ -633,7 +633,7 @@ public class FileConfigurator { ConfigurationValue cv = (ConfigurationValue) valit.next(); - buf.append( indent + pad + "<" + child.shortname + ">" ); + buf.append(indent).append(pad).append("<").append(child.shortname).append(">"); int argCount = child.info.getArgCount(); // var may have multiple values... @@ -651,18 +651,18 @@ public class FileConfigurator { String argname = child.info.getArgName( argc++ ); newline = true; - buf.append( "\n" + indent + pad + pad + "<" + argname + ">" + arg + "</" + argname + ">" ); + buf.append("\n").append(indent).append(pad).append(pad).append("<").append(argname).append(">").append(arg).append("</").append(argname).append(">"); } } if (newline) - buf.append( "\n" + indent + pad); - buf.append( "</" + child.shortname + ">\n" ); + buf.append("\n").append(indent).append(pad); + buf.append("</").append(child.shortname).append(">\n"); } } } } } - buf.append( indent + "</" + node.shortname + ">\n" ); + buf.append(indent).append("</").append(node.shortname).append(">\n"); return buf.toString(); } diff --git a/modules/compiler/src/java/flex2/compiler/fxg/FlexFXG2SWFTranscoder.java b/modules/compiler/src/java/flex2/compiler/fxg/FlexFXG2SWFTranscoder.java index 4ba3f48..b0d23b8 100644 --- a/modules/compiler/src/java/flex2/compiler/fxg/FlexFXG2SWFTranscoder.java +++ b/modules/compiler/src/java/flex2/compiler/fxg/FlexFXG2SWFTranscoder.java @@ -1044,7 +1044,7 @@ public class FlexFXG2SWFTranscoder extends FXG2SWFTranscoder } if (thisAttrib != null) - buf.append(" " + variableName + '.' + thisAttrib + ";\r\n"); + buf.append(" ").append(variableName).append('.').append(thisAttrib).append(";\r\n"); } } } diff --git a/modules/compiler/src/java/flex2/compiler/media/MovieTranscoder.java b/modules/compiler/src/java/flex2/compiler/media/MovieTranscoder.java index 40be0bb..b0d89bc 100644 --- a/modules/compiler/src/java/flex2/compiler/media/MovieTranscoder.java +++ b/modules/compiler/src/java/flex2/compiler/media/MovieTranscoder.java @@ -309,7 +309,7 @@ public class MovieTranscoder extends AbstractTranscoder StringBuilder source = new StringBuilder( 1024 ); source.append( "package " ); source.append( packageName ); - source.append( "\n{\nimport " + standardDefs.getCorePackage() + ".MovieClipLoaderAsset;\n" ); + source.append("\n{\nimport ").append(standardDefs.getCorePackage()).append(".MovieClipLoaderAsset;\n"); source.append( "import flash.utils.ByteArray;\n\n" ); source.append( "public class " ); source.append( className ); diff --git a/modules/compiler/src/java/flex2/compiler/media/PBJTranscoder.java b/modules/compiler/src/java/flex2/compiler/media/PBJTranscoder.java index 468c27f..7ef964a 100644 --- a/modules/compiler/src/java/flex2/compiler/media/PBJTranscoder.java +++ b/modules/compiler/src/java/flex2/compiler/media/PBJTranscoder.java @@ -119,7 +119,7 @@ public class PBJTranscoder extends AbstractTranscoder sb.append("\tpublic function ").append(className).append("()\n"); sb.append(" {\n"); sb.append(" super();\n"); - sb.append(" byteCode = new " + byteArrayClassName + "();\n"); + sb.append(" byteCode = new ").append(byteArrayClassName).append("();\n"); sb.append(" }\n"); sb.append("}\n"); sb.append("}\n"); diff --git a/modules/compiler/src/java/flex2/compiler/mxml/rep/init/ValueInitializer.java b/modules/compiler/src/java/flex2/compiler/mxml/rep/init/ValueInitializer.java index 881bb87..5cf5988 100644 --- a/modules/compiler/src/java/flex2/compiler/mxml/rep/init/ValueInitializer.java +++ b/modules/compiler/src/java/flex2/compiler/mxml/rep/init/ValueInitializer.java @@ -459,7 +459,7 @@ public abstract class ValueInitializer implements Initializer, Cloneable { Vector vector = (Vector) value; - stringBuilder.append("new " + selfTypeName + "(" + vector.size()); + stringBuilder.append("new ").append(selfTypeName).append("(").append(vector.size()); if (vector.isFixed()) { @@ -473,7 +473,7 @@ public abstract class ValueInitializer implements Initializer, Cloneable else { // TODO confirm the availability of a 0-arg ctor!! but do it upstream from here, like when Model is built - stringBuilder.append("new " + selfTypeName + "()"); + stringBuilder.append("new ").append(selfTypeName).append("()"); } stringBuilder.append(";"); diff --git a/modules/compiler/src/java/flex2/compiler/mxml/rep/init/VisualChildInitializer.java b/modules/compiler/src/java/flex2/compiler/mxml/rep/init/VisualChildInitializer.java index acc0223..8f212f2 100644 --- a/modules/compiler/src/java/flex2/compiler/mxml/rep/init/VisualChildInitializer.java +++ b/modules/compiler/src/java/flex2/compiler/mxml/rep/init/VisualChildInitializer.java @@ -82,9 +82,9 @@ public class VisualChildInitializer extends ValueInitializer "Repeater parent lacks childRepeaters[] property"; String cr = lvalueBase + "." + StandardDefs.NAMESPACE_MX_INTERNAL_LOCALNAME + "::" + StandardDefs.PROP_CONTAINER_CHILDREPEATERS; StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("var repeater:" + standardDefs.CLASS_REPEATER_DOT + " = " + getValueExpr() + ";\n"); - stringBuilder.append("\trepeater.initializeRepeater(" + lvalueBase + ", true);\n"); - stringBuilder.append("\t(" + cr + " ? " + cr + " : (" + cr + "=[])).push(repeater)"); + stringBuilder.append("var repeater:").append(standardDefs.CLASS_REPEATER_DOT).append(" = ").append(getValueExpr()).append(";\n"); + stringBuilder.append("\trepeater.initializeRepeater(").append(lvalueBase).append(", true);\n"); + stringBuilder.append("\t(").append(cr).append(" ? ").append(cr).append(" : (").append(cr).append("=[])).push(repeater)"); return stringBuilder.toString(); } else diff --git a/modules/compiler/src/java/flex2/compiler/util/SwcDependencyUtil.java b/modules/compiler/src/java/flex2/compiler/util/SwcDependencyUtil.java index 0bcec62..774e902 100644 --- a/modules/compiler/src/java/flex2/compiler/util/SwcDependencyUtil.java +++ b/modules/compiler/src/java/flex2/compiler/util/SwcDependencyUtil.java @@ -410,12 +410,12 @@ public class SwcDependencyUtil for (Vertex<String, SwcExternalScriptInfo> vertexEntry : vertexSet) { String message = i10n.getLocalizedTextString(new DependsOn(vertexEntry.getWeight())); - dependencyMessage.append(message + lineSeparator); + dependencyMessage.append(message).append(lineSeparator); Set<Vertex<String, SwcExternalScriptInfo>> predSet = vertexEntry.getPredecessors(); for (Vertex<String, SwcExternalScriptInfo> predEntry : predSet) { - dependencyMessage.append("\t" + predEntry.getWeight() + lineSeparator); + dependencyMessage.append("\t").append(predEntry.getWeight()).append(lineSeparator); } } diff --git a/modules/compiler/src/java/flex2/linker/DependencyWalker.java b/modules/compiler/src/java/flex2/linker/DependencyWalker.java index 34d276f..8e9484a 100644 --- a/modules/compiler/src/java/flex2/linker/DependencyWalker.java +++ b/modules/compiler/src/java/flex2/linker/DependencyWalker.java @@ -306,15 +306,15 @@ public class DependencyWalker for (Iterator defs = l.getDefinitions(); defs.hasNext();) { - buf.append( " <def id=\"" + (String) defs.next() + "\" />\n" ); + buf.append(" <def id=\"").append((String) defs.next()).append("\" />\n"); } for (Iterator pre = l.getPrerequisites(); pre.hasNext();) { - buf.append( " <pre id=\"" + (String) pre.next() + "\" />\n" ); + buf.append(" <pre id=\"").append((String) pre.next()).append("\" />\n"); } for (Iterator dep = l.getDependencies(); dep.hasNext();) { - buf.append( " <dep id=\"" + (String) dep.next() + "\" />\n" ); + buf.append(" <dep id=\"").append((String) dep.next()).append("\" />\n"); } buf.append( " </script>\n" ); } @@ -329,14 +329,14 @@ public class DependencyWalker if (!state.getUnresolved().contains( ext )) // only print exts we actually depended on continue; - buf.append( " <ext id=\"" + ext + "\" />\n" ); + buf.append(" <ext id=\"").append(ext).append("\" />\n"); } for (Iterator<String> unresolved = state.getUnresolved().iterator(); unresolved.hasNext();) { String unr = unresolved.next(); if (state.getExternal().contains( unr )) continue; - buf.append( " <missing id=\"" + unr + "\" />\n" ); + buf.append(" <missing id=\"").append(unr).append("\" />\n"); } buf.append( " </external-defs>\n"); } diff --git a/modules/compiler/src/java/flex2/linker/FlexMovie.java b/modules/compiler/src/java/flex2/linker/FlexMovie.java index d6e08a8..eed4ace 100644 --- a/modules/compiler/src/java/flex2/linker/FlexMovie.java +++ b/modules/compiler/src/java/flex2/linker/FlexMovie.java @@ -291,7 +291,7 @@ public class FlexMovie extends SimpleMovie for (Iterator<String> iterator = bundles.iterator(); iterator.hasNext();) { String str = iterator.next(); - b.append(str + " "); + b.append(str).append(" "); } return b.toString(); } diff --git a/modules/compiler/src/java/flex2/tools/PreLink.java b/modules/compiler/src/java/flex2/tools/PreLink.java index 20860e5..8273a0c 100644 --- a/modules/compiler/src/java/flex2/tools/PreLink.java +++ b/modules/compiler/src/java/flex2/tools/PreLink.java @@ -891,9 +891,9 @@ public class PreLink implements flex2.compiler.PreLink sb.append(codegenResourceBundleMetadata(externalResourceBundleNames)); sb.append("\n[Mixin]\n"); - sb.append("public class " + flexInitClassName + "\n"); + sb.append("public class ").append(flexInitClassName).append("\n"); sb.append("{\n"); - sb.append(" public function " + flexInitClassName + "()\n"); + sb.append(" public function ").append(flexInitClassName).append("()\n"); sb.append(" {\n"); sb.append(" super();\n"); sb.append(" }\n"); @@ -1261,7 +1261,7 @@ public class PreLink implements flex2.compiler.PreLink { for (Iterator<String> it = accessibilityImplementations.iterator(); it.hasNext();) { - sb.append("import " + it.next() + ";\n"); + sb.append("import ").append(it.next()).append(";\n"); } } @@ -1463,12 +1463,10 @@ public class PreLink implements flex2.compiler.PreLink // start new object buf.append("new RSLData("); String url = rslUrls.get(i); - buf.append("\"" + url + "\",\n"); + buf.append("\"").append(url).append("\",\n"); // write policy url - buf.append("\"" + - info.getPolicyFileUrls().get(i) + - "\",\n"); + buf.append("\"").append(info.getPolicyFileUrls().get(i)).append("\",\n"); // get the swc for current rsl String swcPath = info.getSwcVirtualFile().getName(); @@ -1496,11 +1494,11 @@ public class PreLink implements flex2.compiler.PreLink return; } - buf.append("\"" + digest.getValue() + "\",\n"); - buf.append("\"" + digest.getType() + "\","); - buf.append(info.getSignedFlags().get(i) + ","); - buf.append(secureRsls + ","); - buf.append("\"" + rslSettingsConfig.getApplicationDomain(swcPath) + "\""); + buf.append("\"").append(digest.getValue()).append("\",\n"); + buf.append("\"").append(digest.getType()).append("\","); + buf.append(info.getSignedFlags().get(i)).append(","); + buf.append(secureRsls).append(","); + buf.append("\"").append(rslSettingsConfig.getApplicationDomain(swcPath)).append("\""); // end of one object in the array buf.append(")"); @@ -1524,7 +1522,7 @@ public class PreLink implements flex2.compiler.PreLink ThreadLocalToolkit.log(new RequiredRslUrl(rslUrl)); - rb.append("{url: \"" + rslUrl + "\", size: -1}"); + rb.append("{url: \"").append(rslUrl).append("\", size: -1}"); if (it.hasNext()) { rb.append(", "); @@ -1611,11 +1609,7 @@ public class PreLink implements flex2.compiler.PreLink String fontName = (String) e.getKey(); FontInfo fontInfo = (FontInfo) e.getValue(); - sb.append("\"" + fontName + "\" : {" + - "regular:" + (fontInfo.plain? "true":"false") + - ", bold:" + (fontInfo.bold? "true":"false") + - ", italic:" + (fontInfo.italic? "true":"false") + - ", boldItalic:" + (fontInfo.bolditalic? "true":"false") + "}\n"); + sb.append("\"").append(fontName).append("\" : {").append("regular:").append(fontInfo.plain ? "true" : "false").append(", bold:").append(fontInfo.bold ? "true" : "false").append(", italic:").append(fontInfo.italic ? "true" : "false").append(", boldItalic:").append(fontInfo.bolditalic ? "true" : "false").append("}\n"); if (it.hasNext()) { sb.append(",\n"); @@ -1641,7 +1635,7 @@ public class PreLink implements flex2.compiler.PreLink sb.append(" if (Capabilities.hasAccessibility) {\n"); for (Iterator<String> it = accessibilityImplementations.iterator(); it.hasNext();) { - sb.append(" " + it.next() + ".enableAccessibility();\n"); + sb.append(" ").append(it.next()).append(".enableAccessibility();\n"); } sb.append(" }\n"); } @@ -1676,7 +1670,7 @@ public class PreLink implements flex2.compiler.PreLink for (Iterator<String> it = remoteClassAliases.keySet().iterator(); it.hasNext(); ) { String className = it.next(); - sb.append( "import " + className + ";\n" ); + sb.append("import ").append(className).append(";\n"); } return sb.toString(); @@ -1691,12 +1685,12 @@ public class PreLink implements flex2.compiler.PreLink { String className = (String) e.getKey(); String alias = (String) e.getValue(); - sb.append( " // " + className + "\n"); + sb.append(" // ").append(className).append("\n"); sb.append( " try \n"); sb.append( " { \n"); - sb.append( " if (flash.net.getClassByAlias(\"" + alias + "\") != " + className + ") \n"); + sb.append(" if (flash.net.getClassByAlias(\"").append(alias).append("\") != ").append(className).append(") \n"); sb.append( " { \n"); - sb.append( " flash.net.registerClassAlias(\"" + alias + "\", " + className + "); \n"); + sb.append(" flash.net.registerClassAlias(\"").append(alias).append("\", ").append(className).append("); \n"); // Only generate the diagnostic code if compiling for debug. if (configuration.debug()) { @@ -1704,16 +1698,14 @@ public class PreLink implements flex2.compiler.PreLink sb.append( " { \n"); sb.append( " trace(ResourceManager.getInstance().getString( \"core\", \n"); sb.append( " \"remoteClassMemoryLeak\",\n"); - sb.append( " [\"" + className + "\",\"" + - configuration.getMainDefinition() + "\",\"" + - initClassName + "\"]));\n"); + sb.append(" [\"").append(className).append("\",\"").append(configuration.getMainDefinition()).append("\",\"").append(initClassName).append("\"]));\n"); sb.append( " } \n"); } sb.append( " } \n"); sb.append( " } \n"); sb.append( " catch (e:Error) \n"); sb.append( " { \n"); - sb.append( " flash.net.registerClassAlias(\"" + alias + "\", " + className + "); \n"); + sb.append(" flash.net.registerClassAlias(\"").append(alias).append("\", ").append(className).append("); \n"); // Only generate the diagnostic code if compiling for debug. if (configuration.debug()) { @@ -1721,9 +1713,7 @@ public class PreLink implements flex2.compiler.PreLink sb.append( " { \n"); sb.append( " trace(ResourceManager.getInstance().getString( \"core\", \n"); sb.append( " \"remoteClassMemoryLeak\",\n"); - sb.append( " [\"" + className + "\",\"" + - configuration.getMainDefinition() + "\",\"" + - initClassName + "\"]));\n"); + sb.append(" [\"").append(className).append("\",\"").append(configuration.getMainDefinition()).append("\",\"").append(initClassName).append("\"]));\n"); sb.append( " } \n"); } sb.append( " } \n\n"); @@ -1753,7 +1743,7 @@ public class PreLink implements flex2.compiler.PreLink String name = (String) e.getKey(); String event = (String) e.getValue(); - sb.append( " EffectManager.mx_internal::registerEffectTrigger(\"" + name + "\", \"" + event + "\");\n"); + sb.append(" EffectManager.mx_internal::registerEffectTrigger(\"").append(name).append("\", \"").append(event).append("\");\n"); } return sb.toString(); @@ -1769,7 +1759,7 @@ public class PreLink implements flex2.compiler.PreLink while ( iterator.hasNext() ) { String styleName = iterator.next(); - sb.append("\"" + styleName + "\""); + sb.append("\"").append(styleName).append("\""); if ( iterator.hasNext() ) { sb.append(", "); @@ -2025,7 +2015,7 @@ public class PreLink implements flex2.compiler.PreLink StringBuilder codePieces = new StringBuilder(); for (Iterator<String> i = resourceBundleNames.iterator(); i.hasNext(); ) { - codePieces.append("[ResourceBundle(\"" + i.next() + "\")]" + lineSep); + codePieces.append("[ResourceBundle(\"").append(i.next()).append("\")]").append(lineSep); } return codePieces.toString(); diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java index 5e9edf0..aa19dc8 100644 --- a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java +++ b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java @@ -951,7 +951,7 @@ public class DebugCLI implements Runnable, SourceLocator { void doShowLocations() { StringBuilder sb = new StringBuilder(); - sb.append("Num Type Disp Enb Address What" + m_newline); //$NON-NLS-1$ + sb.append("Num Type Disp Enb Address What").append(m_newline); //$NON-NLS-1$ // our list of breakpoints int count = breakpointCount(); @@ -1198,7 +1198,7 @@ public class DebugCLI implements Runnable, SourceLocator { workArgs.put("worker", (t.getId() - 1)); //$NON-NLS-1$ sb.append(getLocalizationManager().getLocalizedTextString("inWorker", workArgs)); //$NON-NLS-1$ } - sb.append(" - " + status + m_newline); //$NON-NLS-1$ + sb.append(" - ").append(status).append(m_newline); //$NON-NLS-1$ } out(sb.toString()); } @@ -1335,7 +1335,7 @@ public class DebugCLI implements Runnable, SourceLocator { void doInfoDisplay() { StringBuilder sb = new StringBuilder(); - sb.append("Num Enb Expression" + m_newline); //$NON-NLS-1$ + sb.append("Num Enb Expression").append(m_newline); //$NON-NLS-1$ // our list of displays int count = displayCount(); @@ -1586,16 +1586,16 @@ public class DebugCLI implements Runnable, SourceLocator { } if (frameworkFiles.size() > 0) { - sb.append("---" + m_newline); //$NON-NLS-1$ + sb.append("---").append(m_newline); //$NON-NLS-1$ appendStrings(sb, frameworkFiles, (frameworkFiles.size() > wrapAt)); } if (syntheticFiles.size() > 0) { - sb.append("---" + m_newline); //$NON-NLS-1$ + sb.append("---").append(m_newline); //$NON-NLS-1$ appendStrings(sb, syntheticFiles, (syntheticFiles.size() > wrapAt)); } - sb.append("---" + m_newline); //$NON-NLS-1$ + sb.append("---").append(m_newline); //$NON-NLS-1$ } appendStrings(sb, authoredFiles, (authoredFiles.size() > wrapAt)); @@ -1758,7 +1758,7 @@ public class DebugCLI implements Runnable, SourceLocator { // waitTilHalted(); StringBuilder sb = new StringBuilder(); - sb.append("Num Type Disp Enb Address What" + m_newline); //$NON-NLS-1$ + sb.append("Num Type Disp Enb Address What").append(m_newline); //$NON-NLS-1$ // our list of breakpoints int count = breakpointCount(); @@ -1885,7 +1885,7 @@ public class DebugCLI implements Runnable, SourceLocator { // silent? if (silent) { sb.append(INDENT); - sb.append(getLocalizationManager().getLocalizedTextString("silentBreakpoint") + m_newline); //$NON-NLS-1$ + sb.append(getLocalizationManager().getLocalizedTextString("silentBreakpoint")).append(m_newline); //$NON-NLS-1$ } // now if any commands are trailing then we pump them out @@ -2054,20 +2054,20 @@ public class DebugCLI implements Runnable, SourceLocator { propertyPut(LIST_MODULE, 1); sb.append(getLocalizationManager().getLocalizedTextString("additionalCodeLoaded")); //$NON-NLS-1$ if (activeIsolateChanged) { - sb.append(m_newline + getLocalizationManager().getLocalizedTextString("workerChanged") + " " + (targetIsolate - 1) + m_newline); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(m_newline).append(getLocalizationManager().getLocalizedTextString("workerChanged")).append(" ").append(targetIsolate - 1).append(m_newline); //$NON-NLS-1$ //$NON-NLS-2$ } sb.append(m_newline); if (resolveBreakpoints(sb)) - sb.append(getLocalizationManager().getLocalizedTextString("setAdditionalBreakpoints") + m_newline); //$NON-NLS-1$ + sb.append(getLocalizationManager().getLocalizedTextString("setAdditionalBreakpoints")).append(m_newline); //$NON-NLS-1$ else - sb.append(getLocalizationManager().getLocalizedTextString("fixBreakpoints") + m_newline); //$NON-NLS-1$ + sb.append(getLocalizationManager().getLocalizedTextString("fixBreakpoints")).append(m_newline); //$NON-NLS-1$ setPromptState(InitialPromptState.SHOWN_ONCE, targetIsolate); } else if (l == null || l.getFile() == null) { if (activeIsolateChanged) { - sb.append(m_newline + getLocalizationManager().getLocalizedTextString("workerChanged") + " " + (targetIsolate - 1) + m_newline); + sb.append(m_newline).append(getLocalizationManager().getLocalizedTextString("workerChanged")).append(" ").append(targetIsolate - 1).append(m_newline); } // no idea where we are ?!? @@ -2088,7 +2088,7 @@ public class DebugCLI implements Runnable, SourceLocator { // in between, I comment my changes. }*/ else { if (activeIsolateChanged) { - sb.append(m_newline + getLocalizationManager().getLocalizedTextString("workerChanged") + " " + (targetIsolate - 1) + m_newline); + sb.append(m_newline).append(getLocalizationManager().getLocalizedTextString("workerChanged")).append(" ").append(targetIsolate - 1).append(m_newline); } SourceFile file = l.getFile(); @@ -2569,15 +2569,15 @@ public class DebugCLI implements Runnable, SourceLocator { StringBuilder sb = new StringBuilder(); if (getPromptState(targetIsolate) == InitialPromptState.NEVER_SHOWN) { sb.append(getLocalizationManager().getLocalizedTextString("additionalCodeLoaded")); //$NON-NLS-1$ - sb.append(m_newline + getLocalizationManager().getLocalizedTextString("workerChanged") + " " + (targetIsolate - 1) + m_newline); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(m_newline).append(getLocalizationManager().getLocalizedTextString("workerChanged")).append(" ").append(targetIsolate - 1).append(m_newline); //$NON-NLS-1$ //$NON-NLS-2$ sb.append(m_newline); setPromptState(InitialPromptState.SHOWN_ONCE, targetIsolate); } if (resolveBreakpoints(sb)) - sb.append(getLocalizationManager().getLocalizedTextString("setAdditionalBreakpoints") + m_newline); //$NON-NLS-1$ + sb.append(getLocalizationManager().getLocalizedTextString("setAdditionalBreakpoints")).append(m_newline); //$NON-NLS-1$ else - sb.append(getLocalizationManager().getLocalizedTextString("fixBreakpoints") + m_newline); //$NON-NLS-1$ + sb.append(getLocalizationManager().getLocalizedTextString("fixBreakpoints")).append(m_newline); //$NON-NLS-1$ // output whatever has to be if (sb.length() > 0) @@ -4759,8 +4759,8 @@ public class DebugCLI implements Runnable, SourceLocator { } void appendFaultTitles(StringBuilder sb) { - sb.append("Fault Stop Print Description" + m_newline); //$NON-NLS-1$ - sb.append("----- ---- ----- -----------" + m_newline); //$NON-NLS-1$ + sb.append("Fault Stop Print Description").append(m_newline); //$NON-NLS-1$ + sb.append("----- ---- ----- -----------").append(m_newline); //$NON-NLS-1$ } /** @@ -5961,9 +5961,9 @@ public class DebugCLI implements Runnable, SourceLocator { sb.append(getLocalizationManager().getLocalizedTextString("couldNotConvertToNumber", args)); //$NON-NLS-1$ sb.append(m_newline); } catch (PlayerFaultException pfe) { - sb.append(pfe.getMessage() + m_newline); + sb.append(pfe.getMessage()).append(m_newline); } catch (PlayerDebugException e) { - sb.append(e.getMessage() + m_newline); + sb.append(e.getMessage()).append(m_newline); } catch (NullPointerException npe) { sb.append(getLocalizationManager().getLocalizedTextString("couldNotEvaluate")); //$NON-NLS-1$ } @@ -6490,7 +6490,7 @@ public class DebugCLI implements Runnable, SourceLocator { propertyPut(DISPLAY_FRAME_NUMBER, 0); if (doOutput) { - sb.append(getLocalizationManager().getLocalizedTextString("workerChanged") + " "); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(getLocalizationManager().getLocalizedTextString("workerChanged")).append(" "); //$NON-NLS-1$ //$NON-NLS-2$ if (id == Isolate.DEFAULT_ID) { sb.append(getLocalizationManager().getLocalizedTextString("mainThread")); //$NON-NLS-1$ } else @@ -6499,7 +6499,7 @@ public class DebugCLI implements Runnable, SourceLocator { } } else { if (doOutput) { - sb.append(getLocalizationManager().getLocalizedTextString("workerNotFound") + " " + (id - 1)); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(getLocalizationManager().getLocalizedTextString("workerNotFound")).append(" ").append(id - 1); //$NON-NLS-1$ //$NON-NLS-2$ sb.append(m_newline); } } diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/ExpressionCache.java b/modules/debugger/src/java/flex/tools/debugger/cli/ExpressionCache.java index b07e16b..4e6490e 100644 --- a/modules/debugger/src/java/flex/tools/debugger/cli/ExpressionCache.java +++ b/modules/debugger/src/java/flex/tools/debugger/cli/ExpressionCache.java @@ -503,22 +503,22 @@ public class ExpressionCache sb.append(" "); //$NON-NLS-1$ if (v.isAttributeSet(VariableAttribute.DONT_ENUMERATE)) - sb.append(", " + getLocalizationManager().getLocalizedTextString("variableAttribute_dontEnumerate")); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(", ").append(getLocalizationManager().getLocalizedTextString("variableAttribute_dontEnumerate")); //$NON-NLS-1$ //$NON-NLS-2$ if (v.isAttributeSet(VariableAttribute.READ_ONLY)) - sb.append(", " + getLocalizationManager().getLocalizedTextString("variableAttribute_readOnly")); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(", ").append(getLocalizationManager().getLocalizedTextString("variableAttribute_readOnly")); //$NON-NLS-1$ //$NON-NLS-2$ if (v.isAttributeSet(VariableAttribute.IS_LOCAL)) - sb.append(", " + getLocalizationManager().getLocalizedTextString("variableAttribute_localVariable")); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(", ").append(getLocalizationManager().getLocalizedTextString("variableAttribute_localVariable")); //$NON-NLS-1$ //$NON-NLS-2$ if (v.isAttributeSet(VariableAttribute.IS_ARGUMENT)) - sb.append(", " + getLocalizationManager().getLocalizedTextString("variableAttribute_functionArgument")); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(", ").append(getLocalizationManager().getLocalizedTextString("variableAttribute_functionArgument")); //$NON-NLS-1$ //$NON-NLS-2$ if (v.isAttributeSet(VariableAttribute.HAS_GETTER)) - sb.append(", " + getLocalizationManager().getLocalizedTextString("variableAttribute_getterFunction")); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(", ").append(getLocalizationManager().getLocalizedTextString("variableAttribute_getterFunction")); //$NON-NLS-1$ //$NON-NLS-2$ if (v.isAttributeSet(VariableAttribute.HAS_SETTER)) - sb.append(", " + getLocalizationManager().getLocalizedTextString("variableAttribute_setterFunction")); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(", ").append(getLocalizationManager().getLocalizedTextString("variableAttribute_setterFunction")); //$NON-NLS-1$ //$NON-NLS-2$ if (v.isAttributeSet(VariableAttribute.IS_DYNAMIC)) sb.append(", dynamic"); //$NON-NLS-1$ @@ -542,7 +542,7 @@ public class ExpressionCache sb.append(", internal"); //$NON-NLS-1$ if (v.isAttributeSet(VariableAttribute.NAMESPACE_SCOPE)) - sb.append(", " + getLocalizationManager().getLocalizedTextString("variableAttribute_hasNamespace")); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(", ").append(getLocalizationManager().getLocalizedTextString("variableAttribute_hasNamespace")); //$NON-NLS-1$ //$NON-NLS-2$ } private String escapeIfIde(String s) diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/ExpressionContext.java b/modules/debugger/src/java/flex/tools/debugger/cli/ExpressionContext.java index b088f05..1642d12 100644 --- a/modules/debugger/src/java/flex/tools/debugger/cli/ExpressionContext.java +++ b/modules/debugger/src/java/flex/tools/debugger/cli/ExpressionContext.java @@ -17,17 +17,7 @@ package flex.tools.debugger.cli; -import java.util.StringTokenizer; -import java.util.Vector; - -import flash.tools.debugger.Isolate; -import flash.tools.debugger.PlayerDebugException; -import flash.tools.debugger.Session; -import flash.tools.debugger.SessionManager; -import flash.tools.debugger.Value; -import flash.tools.debugger.ValueAttribute; -import flash.tools.debugger.Variable; -import flash.tools.debugger.VariableType; +import flash.tools.debugger.*; import flash.tools.debugger.concrete.DValue; import flash.tools.debugger.events.ExceptionFault; import flash.tools.debugger.events.FaultEvent; @@ -36,6 +26,9 @@ import flash.tools.debugger.expression.ExpressionEvaluatorException; import flash.tools.debugger.expression.NoSuchVariableException; import flash.tools.debugger.expression.PlayerFaultException; +import java.util.StringTokenizer; +import java.util.Vector; + public class ExpressionContext implements Context { ExpressionCache m_cache; @@ -263,12 +256,12 @@ public class ExpressionContext implements Context for (int c=0; c<classHierarchy.length; ++c) { String classname = classHierarchy[c]; - sb.append(m_newline + "(Members of " + classname + ")"); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append(m_newline).append("(Members of ").append(classname).append(")"); //$NON-NLS-1$ //$NON-NLS-2$ for (int i=0; i<mems.length; ++i) { if (classname.equals(mems[i].getDefiningClass())) { - sb.append(m_newline + " "); //$NON-NLS-1$ + sb.append(m_newline).append(" "); //$NON-NLS-1$ m_cache.appendVariable(sb, mems[i], m_isolateId); if (attrs) ExpressionCache.appendVariableAttributes(sb, mems[i]); @@ -280,7 +273,7 @@ public class ExpressionContext implements Context { for(int i=0; i<mems.length; i++) { - sb.append(m_newline + " "); //$NON-NLS-1$ + sb.append(m_newline).append(" "); //$NON-NLS-1$ m_cache.appendVariable(sb, mems[i], m_isolateId); if (attrs) ExpressionCache.appendVariableAttributes(sb, mems[i]); diff --git a/modules/swfutils/src/java/flash/swf/debug/RegisterRecord.java b/modules/swfutils/src/java/flash/swf/debug/RegisterRecord.java index 7ba4fb7..1491d39 100644 --- a/modules/swfutils/src/java/flash/swf/debug/RegisterRecord.java +++ b/modules/swfutils/src/java/flash/swf/debug/RegisterRecord.java @@ -77,7 +77,7 @@ public class RegisterRecord extends Action sb.append(offset); sb.append(" "); for(int i=0; i<registerNumbers.length; i++) - sb.append("$"+registerNumbers[i]+"='"+variableNames[i]+"' "); + sb.append("$").append(registerNumbers[i]).append("='").append(variableNames[i]).append("' "); return ( sb.toString() ); } diff --git a/modules/swfutils/src/java/flash/swf/tags/DefineSprite.java b/modules/swfutils/src/java/flash/swf/tags/DefineSprite.java index a4376bd..3dcbf9f 100644 --- a/modules/swfutils/src/java/flash/swf/tags/DefineSprite.java +++ b/modules/swfutils/src/java/flash/swf/tags/DefineSprite.java @@ -139,10 +139,7 @@ public class DefineSprite extends DefineTag { StringBuilder stringBuffer = new StringBuilder(); - stringBuffer.append("DefineSprite: name = " + name + - ", framecount = " + framecount + - ", tagList = " + tagList + - ", initAction = " + initAction); + stringBuffer.append("DefineSprite: name = ").append(name).append(", framecount = ").append(framecount).append(", tagList = ").append(tagList).append(", initAction = ").append(initAction); return stringBuffer.toString(); } diff --git a/modules/swfutils/src/java/flash/swf/tools/SizeReport.java b/modules/swfutils/src/java/flash/swf/tools/SizeReport.java index dad044b..6419c32 100644 --- a/modules/swfutils/src/java/flash/swf/tools/SizeReport.java +++ b/modules/swfutils/src/java/flash/swf/tools/SizeReport.java @@ -131,14 +131,14 @@ public class SizeReport if (definitions.size() > 0) { - buffer.append( "\n" + indent + "<!-- " + data.description + " -->\n" ); - buffer.append( indent + "<" + data.pluralMoniker + " " ); + buffer.append("\n").append(indent).append("<!-- ").append(data.description).append(" -->\n"); + buffer.append(indent).append("<").append(data.pluralMoniker).append(" "); buffer.append( "totalSize=\"" ); buffer.append(data.totalSize); buffer.append( "\">\n" ); for (DefinitionEntry n : definitions) { - buffer.append( indent + " <" + data.singularMoniker + " "); + buffer.append(indent).append(" <").append(data.singularMoniker).append(" "); String name = (type == FRAME || type == SCRIPT) ? n.stringData : symbols.get(n.id); if (name != null) { @@ -170,7 +170,7 @@ public class SizeReport buffer.append("\"/>\n"); } - buffer.append( indent + "</" + data.pluralMoniker + ">\n" ); + buffer.append(indent).append("</").append(data.pluralMoniker).append(">\n"); } } diff --git a/modules/swfutils/src/java/flash/swf/tools/SyntaxTreeDumper.java b/modules/swfutils/src/java/flash/swf/tools/SyntaxTreeDumper.java index 03bec41..89d3b8d 100644 --- a/modules/swfutils/src/java/flash/swf/tools/SyntaxTreeDumper.java +++ b/modules/swfutils/src/java/flash/swf/tools/SyntaxTreeDumper.java @@ -1067,7 +1067,7 @@ public class SyntaxTreeDumper implements Evaluator { buffer.append(" prototype='true'"); } - buffer.append("" + (showPositions ? " position=\"" + node.pos() + "\"" : "") + ">"); + buffer.append("").append(showPositions ? " position=\"" + node.pos() + "\"" : "").append(">"); output( buffer.toString() ); indent++; // for (Node n : node.items) diff --git a/modules/swfutils/src/java/flash/swf/types/ActionList.java b/modules/swfutils/src/java/flash/swf/types/ActionList.java index 8d1f8e4..9c191e1 100644 --- a/modules/swfutils/src/java/flash/swf/types/ActionList.java +++ b/modules/swfutils/src/java/flash/swf/types/ActionList.java @@ -228,7 +228,7 @@ public class ActionList extends ActionHandler { StringBuilder stringBuffer = new StringBuilder(); - stringBuffer.append("ActionList: count = " + actions.length); + stringBuffer.append("ActionList: count = ").append(actions.length); stringBuffer.append(", actions = "); for (int i = 0; i < size; i++) diff --git a/modules/swfutils/src/java/flash/swf/types/ButtonCondAction.java b/modules/swfutils/src/java/flash/swf/types/ButtonCondAction.java index 3993e53..f835769 100644 --- a/modules/swfutils/src/java/flash/swf/types/ButtonCondAction.java +++ b/modules/swfutils/src/java/flash/swf/types/ButtonCondAction.java @@ -95,7 +95,7 @@ public class ButtonCondAction // return the flags as a string StringBuilder b = new StringBuilder(); - if (keyPress != 0) b.append("keyPress<"+keyPress+">,"); + if (keyPress != 0) b.append("keyPress<").append(keyPress).append(">,"); if (overDownToIdle) b.append("overDownToIdle,"); if (idleToOverDown) b.append("idleToOverDown,"); if (outDownToIdle) b.append("outDownToIdle,"); diff --git a/modules/swfutils/src/java/flash/swf/types/TagList.java b/modules/swfutils/src/java/flash/swf/types/TagList.java index e993954..c5c2a2c 100644 --- a/modules/swfutils/src/java/flash/swf/types/TagList.java +++ b/modules/swfutils/src/java/flash/swf/types/TagList.java @@ -68,7 +68,7 @@ public class TagList extends TagHandler for (int i = 0; i < tags.size(); i++) { - stringBuffer.append( "\t" + i + " = " +tags.get(i) + "\n"); + stringBuffer.append("\t").append(i).append(" = ").append(tags.get(i)).append("\n"); } return stringBuffer.toString(); diff --git a/modules/swfutils/src/java/flash/util/StringUtils.java b/modules/swfutils/src/java/flash/util/StringUtils.java index c02d3e2..51f79c1 100644 --- a/modules/swfutils/src/java/flash/util/StringUtils.java +++ b/modules/swfutils/src/java/flash/util/StringUtils.java @@ -236,7 +236,7 @@ public class StringUtils { buf.append(chars[i]); } else { - buf.append("&#x" + Integer.toString((chars[i+1]), 16) + ";"); + buf.append("&#x").append(Integer.toString((chars[i + 1]), 16)).append(";"); i++; } } -- 1.9.5.msysgit.0