am a3c35d19: Merge change 24565 into eclair

Merge commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp

* commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
  Add missing @Override to DroidDoc and ApiCheck

tools/apicheck/src/com/android/apicheck/ApiCheck.java

@@ -140,6 +140,7 @@ public class ApiCheck {
                 mApi = new ApiInfo();
             }
 
+            @Override
             public void startElement(String uri, String localName, String qName,
                                      Attributes attributes) {
                 if (qName.equals("package")) {
@@ -218,6 +219,8 @@ public class ApiCheck {
                     mCurrentClass.addInterface(attributes.getValue("name"));
                 }
             }
+
+            @Override
             public void endElement(String uri, String localName, String qName) {
                 if (qName.equals("method")) {
                     mCurrentClass.addMethod((MethodInfo) mCurrentMethod);

tools/apicheck/src/com/android/apicheck/Errors.java

@@ -41,6 +41,7 @@ public class Errors
             return this.msg.compareTo(that.msg);
         }
 
+        @Override
         public String toString() {
             return this.pos.toString() + this.msg;
         }

tools/apicheck/src/com/android/apicheck/SourcePositionInfo.java

@@ -80,6 +80,7 @@ public class SourcePositionInfo implements Comparable
         return new SourcePositionInfo(that.file, line, 0);
     }
 
+    @Override
     public String toString()
     {
         if (this.file == null) {

tools/droiddoc/src/AnnotationInstanceInfo.java

@@ -35,6 +35,7 @@ class AnnotationInstanceInfo
         return mElementValues;
     }
 
+    @Override
     public String toString()
     {
         StringBuilder str = new StringBuilder();

tools/droiddoc/src/AttrTagInfo.java

@@ -99,6 +99,7 @@ public class AttrTagInfo extends TagInfo
         return REF_COMMAND.equals(mCommand) ? mRefField : null;
     }
 
+    @Override
     public String name() {
         return NAME_COMMAND.equals(mCommand) ? mAttrName : null;
     }
@@ -107,6 +108,7 @@ public class AttrTagInfo extends TagInfo
         return DESCRIPTION_COMMAND.equals(mCommand) ? mDescrComment : null;
     }
 
+    @Override
     public void makeHDF(HDF data, String base)
     {
         super.makeHDF(data, base);

tools/droiddoc/src/ClassInfo.java

@@ -146,6 +146,7 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
         }
     }
 
+    @Override
     public ContainerInfo parent()
     {
         return this;
@@ -1170,6 +1171,7 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
         }
     }
 
+    @Override
     public boolean isHidden()
     {
         int val = mHidden;
@@ -1384,6 +1386,7 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
     public MethodInfo[] getHiddenMethods(){
         return mHiddenMethods;
     }
+    @Override
     public String toString(){
         return this.qualifiedName();
     }

tools/droiddoc/src/Converter.java

@@ -238,6 +238,7 @@ public class Converter
     }
     private static Cache mClasses = new Cache()
     {
+        @Override
         protected Object make(Object o)
         {
             ClassDoc c = (ClassDoc)o;
@@ -268,6 +269,7 @@ public class Converter
             }
             return cl;
         }
+        @Override
         protected void made(Object o, Object r)
         {
             if (mClassesNeedingInit == null) {
@@ -275,6 +277,7 @@ public class Converter
                 ((ClassInfo)r).init2();
             }
         }
+        @Override
         ClassInfo[] all()
         {
             return (ClassInfo[])mCache.values().toArray(new ClassInfo[mCache.size()]);
@@ -367,6 +370,7 @@ public class Converter
     }
     private static Cache mMethods = new Cache()
     {
+        @Override
         protected Object make(Object o)
         {
             if (o instanceof AnnotationTypeElementDoc) {
@@ -472,6 +476,7 @@ public class Converter
     }
     private static Cache mFields = new Cache()
     {
+        @Override
         protected Object make(Object o)
         {
             FieldDoc f = (FieldDoc)o;
@@ -496,6 +501,7 @@ public class Converter
     }
     private static Cache mPackagees = new Cache()
     {
+        @Override
         protected Object make(Object o)
         {
             PackageDoc p = (PackageDoc)o;
@@ -510,7 +516,8 @@ public class Converter
     }
     private static Cache mTypes = new Cache()
     {
-       protected Object make(Object o)
+       @Override
+    protected Object make(Object o)
        {
            Type t = (Type)o;
            String simpleTypeName;
@@ -524,6 +531,7 @@ public class Converter
                    Converter.obtainClass(t.asClassDoc()));
            return ti;
        }
+        @Override
         protected void made(Object o, Object r)
         {
             Type t = (Type)o;
@@ -545,6 +553,7 @@ public class Converter
                              Converter.convertTypes(t.asWildcardType().extendsBounds()));
             }
         }
+        @Override
         protected Object keyFor(Object o)
         {
             Type t = (Type)o;
@@ -599,6 +608,7 @@ public class Converter
     }
     private static Cache mMembers = new Cache()
     {
+        @Override
         protected Object make(Object o)
         {
             if (o instanceof MethodDoc) {
@@ -633,6 +643,7 @@ public class Converter
     }
     private static Cache mAnnotationInstances = new Cache()
     {
+        @Override
         protected Object make(Object o)
         {
             AnnotationDesc a = (AnnotationDesc)o;

tools/droiddoc/src/Errors.java

@@ -41,6 +41,7 @@ public class Errors
             return this.msg.compareTo(that.msg);
         }
 
+        @Override
         public String toString() {
             String whereText = this.pos == null ? "unknown: " : this.pos.toString() + ':';
             return whereText + this.msg;

tools/droiddoc/src/FieldInfo.java

@@ -291,6 +291,7 @@ public class FieldInfo extends MemberInfo
         }
     }
 
+    @Override
     public boolean isExecutable()
     {
         return false;

tools/droiddoc/src/MemberInfo.java

@@ -115,6 +115,7 @@ public abstract class MemberInfo extends DocInfo implements Comparable, Scoped
         return mIsSynthetic;
     }
 
+    @Override
     public ContainerInfo parent()
     {
         return mContainingClass;

tools/droiddoc/src/MethodInfo.java

@@ -589,6 +589,7 @@ public class MethodInfo extends MemberInfo
         return result;
     }
 
+    @Override
     public boolean isExecutable()
     {
         return true;
@@ -624,6 +625,8 @@ public class MethodInfo extends MemberInfo
     public boolean isVarArgs(){
       return mIsVarargs;
     }
+
+    @Override
     public String toString(){
       return this.name();
     }

tools/droiddoc/src/PackageInfo.java

@@ -57,11 +57,13 @@ public class PackageInfo extends DocInfo implements ContainerInfo
         return s;
     }
 
+    @Override
     public ContainerInfo parent()
     {
         return null;
     }
 
+    @Override
     public boolean isHidden()
     {
         return comment().isHidden();

tools/droiddoc/src/ParamTagInfo.java

@@ -76,6 +76,7 @@ public class ParamTagInfo extends ParsedTagInfo
         return mParameterName;
     }
 
+    @Override
     public void makeHDF(HDF data, String base)
     {
         data.setValue(base + ".name", parameterName());

tools/droiddoc/src/SampleTagInfo.java

@@ -274,6 +274,7 @@ public class SampleTagInfo extends TagInfo
         return result.substring(0);
     }
 
+    @Override
     public void makeHDF(HDF data, String base)
     {
         data.setValue(base + ".name", name());

tools/droiddoc/src/SeeTagInfo.java

@@ -45,6 +45,7 @@ public class SeeTagInfo extends TagInfo
         return linkReference().label;
     }
 
+    @Override
     public void makeHDF(HDF data, String base)
     {
         LinkReference linkRef = linkReference();

tools/droiddoc/src/SourcePositionInfo.java

@@ -76,6 +76,7 @@ public class SourcePositionInfo implements Comparable
         return new SourcePositionInfo(that.file, line, 0);
     }
 
+    @Override
     public String toString()
     {
         return file + ':' + line;

tools/droiddoc/src/TypeInfo.java

@@ -249,6 +249,7 @@ public class TypeInfo
         }
     }
 
+    @Override
     public String toString(){
       String returnString = "";
       returnString += "Primitive?: " + mIsPrimitive + " TypeVariable?: " +