Make format args explicit in DocString.
Previously it was not clear that passing a single argument to
DocString.text, DocString.append, or DocString.uri would be treated as
a format string. With this change, the 'text', 'append', and 'uri'
methods take literal strings, and the new 'format', 'appendFormat',
and 'formattedUri' methods take format strings.
Bug: 23782192
Change-Id: I9a094575f0831de6659033052305f918c71ac8b7
diff --git a/tools/ahat/src/Value.java b/tools/ahat/src/Value.java
index 22c3b8f..9b483fa 100644
--- a/tools/ahat/src/Value.java
+++ b/tools/ahat/src/Value.java
@@ -45,7 +45,7 @@
// Annotate Strings with their values.
String stringValue = InstanceUtils.asString(inst);
if (stringValue != null) {
- link.append("\"%s\"", stringValue);
+ link.appendFormat("\"%s\"", stringValue);
}
// Annotate DexCache with its location.
@@ -54,14 +54,14 @@
link.append(" for " + dexCacheLocation);
}
- URI objTarget = DocString.uri("object?id=%d", inst.getId());
+ URI objTarget = DocString.formattedUri("object?id=%d", inst.getId());
DocString formatted = DocString.link(objTarget, link);
// Annotate bitmaps with a thumbnail.
Instance bitmap = InstanceUtils.getAssociatedBitmapInstance(inst);
String thumbnail = "";
if (bitmap != null) {
- URI uri = DocString.uri("bitmap?id=%d", bitmap.getId());
+ URI uri = DocString.formattedUri("bitmap?id=%d", bitmap.getId());
formatted.appendThumbnail(uri, "bitmap image");
}
return formatted;
@@ -74,7 +74,7 @@
if (val instanceof Instance) {
return renderInstance((Instance)val);
} else {
- return DocString.text("%s", val);
+ return DocString.format("%s", val);
}
}
}