StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 85762123: Merge change 24584 into eclair

Browse Source 
Merge commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp

* commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83':
  Add support for @pending annotation.
This commit is contained in:
Xavier Ducrohet
2009-09-10 15:10:39 -07:00
committed by Android Git Automerger
parent aca5e20e4a 857621233a
commit 030df42844
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/droiddoc/src/Comment.java
View File

@@ -157,7 +157,7 @@ public class Comment
else if (name.equals("@literal")) { else if (name.equals("@literal")) {
mInlineTagsList.add(new LiteralTagInfo(name, name, text, pos)); mInlineTagsList.add(new LiteralTagInfo(name, name, text, pos));
} }
else if (name.equals("@hide") || name.equals("@doconly")) { else if (name.equals("@hide") || name.equals("@pending") || name.equals("@doconly")) {
// nothing // nothing
} }
else if (name.equals("@attr")) { else if (name.equals("@attr")) {
@@ -307,7 +307,7 @@ public class Comment
mHidden = 0; mHidden = 0;
return false; return false;
} }
boolean b = mText.indexOf("@hide") >= 0; boolean b = mText.indexOf("@hide") >= 0 || mText.indexOf("@pending") >= 0;
mHidden = b ? 1 : 0; mHidden = b ? 1 : 0;
return b; return b;
} }

5
tools/droiddoc/src/DroidDoc.java
View File

@@ -979,10 +979,11 @@ public class DroidDoc
} }
/** /**
* Returns true if the given element has an @hide annotation. * Returns true if the given element has an @hide or @pending annotation.
*/ */
private static boolean hasHideAnnotation(Doc doc) { private static boolean hasHideAnnotation(Doc doc) {
return doc.getRawCommentText().indexOf("@hide") != -1; String comment = doc.getRawCommentText();
return comment.indexOf("@hide") != -1 || comment.indexOf("@pending") != -1;
} }
/** /**