p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 030df428: am 85762123: Merge change 24584 into eclair 

Merge commit '030df428443735eed084286564407198792daa82'

* commit '030df428443735eed084286564407198792daa82':
  Add support for @pending annotation.
This commit is contained in:
Xavier Ducrohet 2009-09-10 15:19:55 -07:00 committed by Android Git Automerger
parent c35eaf7e98 030df42844
commit a4faa18b6f
2 changed files with 5 additions and 4 deletions
Show Stats 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")) {
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
}
else if (name.equals("@attr")) {
@ -307,7 +307,7 @@ public class Comment
mHidden = 0;
return false;
}
boolean b = mText.indexOf("@hide") >= 0;
boolean b = mText.indexOf("@hide") >= 0 || mText.indexOf("@pending") >= 0;
mHidden = b ? 1 : 0;
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) {
return doc.getRawCommentText().indexOf("@hide") != -1;
String comment = doc.getRawCommentText();
return comment.indexOf("@hide") != -1 || comment.indexOf("@pending") != -1;
}
/**