commit a2fb28f614611e164e014a5c25fd6ffbcb5e5950
author Ying Wang <wangying@google.com> Tue Apr 08 17:54:30 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 08 17:54:31 2014 +0000
tree 858b26ab2384bf2feb49fc1f160cf414a337cbcb
parent bce59d203e50e0d05297d5a9015de30fd43a748b
parent ae8cb832ba8239534b7529292065936bdb85b1e3

Merge "Add inherited fields from hidden base to the stub classes"

src/com/google/doclava/Stubs.java

diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java
index 12a7df5..560acef 100644
--- a/src/com/google/doclava/Stubs.java
+++ b/src/com/google/doclava/Stubs.java
@@ -209,8 +209,8 @@
      * }
      */
     // cant strip any public fields or their generics
-    if (cl.allSelfFields() != null) {
-      for (FieldInfo fInfo : cl.allSelfFields()) {
+    if (cl.selfFields() != null) {
+      for (FieldInfo fInfo : cl.selfFields()) {
         if (fInfo.type() != null) {
           if (fInfo.type().asClassInfo() != null) {
             cantStripThis(fInfo.type().asClassInfo(), notStrippable, "2:" + cl.qualifiedName());
@@ -457,7 +457,7 @@
 
     boolean fieldNeedsInitialization = false;
     boolean staticFieldNeedsInitialization = false;
-    for (FieldInfo field : cl.allSelfFields()) {
+    for (FieldInfo field : cl.selfFields()) {
       if (!field.isDocOnly()) {
         if (!field.isStatic() && field.isFinal() && !fieldIsInitialized(field)) {
           fieldNeedsInitialization = true;
@@ -525,7 +525,7 @@
       }
     }
 
-    for (FieldInfo field : cl.allSelfFields()) {
+    for (FieldInfo field : cl.selfFields()) {
       if (!field.isDocOnly()) {
         writeField(stream, field);
       }
@@ -533,7 +533,7 @@
 
     if (staticFieldNeedsInitialization) {
       stream.print("static { ");
-      for (FieldInfo field : cl.allSelfFields()) {
+      for (FieldInfo field : cl.selfFields()) {
         if (!field.isDocOnly() && field.isStatic() && field.isFinal() && !fieldIsInitialized(field)
             && field.constantValue() == null) {
           stream.print(field.name() + " = " + field.type().defaultValue() + "; ");
@@ -906,7 +906,7 @@
       }
     }
 
-    ArrayList<FieldInfo> fields = cl.allSelfFields();
+    ArrayList<FieldInfo> fields = cl.selfFields();
     Collections.sort(fields, FieldInfo.comparator);
     for (FieldInfo fi : fields) {
       writeFieldXML(xmlWriter, fi);
@@ -1240,7 +1240,7 @@
       writeFieldApi(apiWriter, fi, "enum_constant");
     }
 
-    ArrayList<FieldInfo> fields = cl.allSelfFields();
+    ArrayList<FieldInfo> fields = cl.selfFields();
     Collections.sort(fields, FieldInfo.comparator);
     for (FieldInfo fi : fields) {
       writeFieldApi(apiWriter, fi, "field");
@@ -1445,7 +1445,7 @@
 
     keepListWriter.print("\n");
 
-    ArrayList<FieldInfo> fields = cl.allSelfFields();
+    ArrayList<FieldInfo> fields = cl.selfFields();
     Collections.sort(fields, FieldInfo.comparator);
     for (FieldInfo fi : fields) {
       writeFieldKeepList(keepListWriter, fi);