am bf9b8e89: am 270de928: Cleanstep required by switching back to JSC in the browser
Merge commit 'bf9b8e8904b930028adaf94c7139b714cef3d641'
* commit 'bf9b8e8904b930028adaf94c7139b714cef3d641':
Cleanstep required by switching back to JSC in the browser
diff --git a/tools/adbs b/tools/adbs
index 8b1fac6..815ae10 100755
--- a/tools/adbs
+++ b/tools/adbs
@@ -217,6 +217,7 @@
SymbolTranslation(groups)
else:
print line
+ sys.stdout.flush()
# adb itself aborts
stream.close()
diff --git a/tools/apicheck/src/com/android/apicheck/ClassInfo.java b/tools/apicheck/src/com/android/apicheck/ClassInfo.java
index 5405ad2..d4416f4 100644
--- a/tools/apicheck/src/com/android/apicheck/ClassInfo.java
+++ b/tools/apicheck/src/com/android/apicheck/ClassInfo.java
@@ -121,7 +121,11 @@
consistent = false;
}
for (String iface : mInterfaces) {
- if (!cl.mInterfaces.contains(iface)) {
+ boolean found = false;
+ for (ClassInfo c = cl; c != null && !found; c = c.mSuperClass) {
+ found = c.mInterfaces.contains(iface);
+ }
+ if (!found) {
Errors.error(Errors.REMOVED_INTERFACE, cl.position(),
"Class " + qualifiedName() + " no longer implements " + iface);
}
diff --git a/tools/droiddoc/src/MethodInfo.java b/tools/droiddoc/src/MethodInfo.java
index bded88b..82cd05b 100644
--- a/tools/droiddoc/src/MethodInfo.java
+++ b/tools/droiddoc/src/MethodInfo.java
@@ -363,8 +363,17 @@
public String getHashableName() {
StringBuilder result = new StringBuilder();
result.append(name());
- for (ParameterInfo pInfo : mParameters) {
- result.append(":").append(pInfo.type().fullName());
+ for (int p = 0; p < mParameters.length; p++) {
+ result.append(":");
+ if (p == mParameters.length - 1 && isVarArgs()) {
+ // TODO: note that this does not attempt to handle hypothetical
+ // vararg methods whose last parameter is a list of arrays, e.g.
+ // "Object[]...".
+ result.append(mParameters[p].type().fullNameNoDimension(typeVariables()))
+ .append("...");
+ } else {
+ result.append(mParameters[p].type().fullName(typeVariables()));
+ }
}
return result.toString();
}
diff --git a/tools/droiddoc/src/SinceTagger.java b/tools/droiddoc/src/SinceTagger.java
index fb69c04..a1bce55 100644
--- a/tools/droiddoc/src/SinceTagger.java
+++ b/tools/droiddoc/src/SinceTagger.java
@@ -1,8 +1,13 @@
// Copyright 2009 Google Inc. All Rights Reserved.
-import com.android.apicheck.*;
+import com.android.apicheck.ApiCheck;
+import com.android.apicheck.ApiInfo;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Collections;
import org.clearsilver.HDF;
@@ -165,31 +170,68 @@
*/
private void warnForMissingVersions(ClassInfo[] classDocs) {
for (ClassInfo claz : classDocs) {
+ if (!checkLevelRecursive(claz)) {
+ continue;
+ }
+
if (claz.getSince() == null) {
Errors.error(Errors.NO_SINCE_DATA, claz.position(),
"XML missing class " + claz.qualifiedName());
}
- for (FieldInfo field : claz.fields()) {
- if (field.getSince() == null) {
- Errors.error(Errors.NO_SINCE_DATA, field.position(),
- "XML missing field "
- + claz.qualifiedName() + "#" + field .name());
- }
+
+ for (FieldInfo field : missingVersions(claz.fields())) {
+ Errors.error(Errors.NO_SINCE_DATA, field.position(),
+ "XML missing field " + claz.qualifiedName()
+ + "#" + field.name());
}
- for (MethodInfo constructor : claz.constructors()) {
- if (constructor.getSince() == null) {
- Errors.error(Errors.NO_SINCE_DATA, constructor.position(),
- "XML missing constructor "
- + claz.qualifiedName() + "#" + constructor.getHashableName());
- }
+
+ for (MethodInfo constructor : missingVersions(claz.constructors())) {
+ Errors.error(Errors.NO_SINCE_DATA, constructor.position(),
+ "XML missing constructor " + claz.qualifiedName()
+ + "#" + constructor.getHashableName());
}
- for (MethodInfo method : claz.methods()) {
- if (method.getSince() == null) {
- Errors.error(Errors.NO_SINCE_DATA, method.position(),
- "XML missing method "
- + claz.qualifiedName() + "#" + method .getHashableName());
- }
+
+ for (MethodInfo method : missingVersions(claz.methods())) {
+ Errors.error(Errors.NO_SINCE_DATA, method.position(),
+ "XML missing method " + claz.qualifiedName()
+ + "#" + method.getHashableName());
}
}
}
+
+ /**
+ * Returns the DocInfos in {@code all} that are documented but do not have
+ * since tags.
+ */
+ private <T extends MemberInfo> Iterable<T> missingVersions(T[] all) {
+ List<T> result = Collections.emptyList();
+ for (T t : all) {
+ // if this member has version info or isn't documented, skip it
+ if (t.getSince() != null
+ || t.isHidden()
+ || !checkLevelRecursive(t.realContainingClass())) {
+ continue;
+ }
+
+ if (result.isEmpty()) {
+ result = new ArrayList<T>(); // lazily construct a mutable list
+ }
+ result.add(t);
+ }
+ return result;
+ }
+
+ /**
+ * Returns true if {@code claz} and all containing classes are documented.
+ * The result may be used to filter out members that exist in the API
+ * data structure but aren't a part of the API.
+ */
+ private boolean checkLevelRecursive(ClassInfo claz) {
+ for (ClassInfo c = claz; c != null; c = c.containingClass()) {
+ if (!c.checkLevel()) {
+ return false;
+ }
+ }
+ return true;
+ }
}