I am getting tired of the java doc warnings, so fix them.

[android/aapt.git] / Resource.cpp

diff --git a/Resource.cpp b/Resource.cpp
index 76b9d0ab7c9fb71820a325787d8a6b6a85a667b3..e8410cdf0ca4746ca9bb8eb6d1ccc02bdc96317c 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -174,7 +174,7 @@ static sp<AaptFile> getResourceFile(const sp<AaptAssets>& assets, bool makeIfNec
 static status_t parsePackage(const sp<AaptAssets>& assets, const sp<AaptGroup>& grp)
 {
     if (grp->getFiles().size() != 1) {
 static status_t parsePackage(const sp<AaptAssets>& assets, const sp<AaptGroup>& grp)
 {
     if (grp->getFiles().size() != 1) {

-        fprintf(stderr, "WARNING: Multiple AndroidManifest.xml files found, using %s\n",
+        fprintf(stderr, "warning: Multiple AndroidManifest.xml files found, using %s\n",

                 grp->getFiles().valueAt(0)->getPrintableSource().string());
     }
 
                 grp->getFiles().valueAt(0)->getPrintableSource().string());
     }
 


@@ -272,15 +272,16 @@ static status_t preProcessImages(Bundle* bundle, const sp<AaptAssets>& assets,
     ResourceDirIterator it(set, String8("drawable"));
     Vector<sp<AaptFile> > newNameFiles;
     Vector<String8> newNamePaths;
     ResourceDirIterator it(set, String8("drawable"));
     Vector<sp<AaptFile> > newNameFiles;
     Vector<String8> newNamePaths;

+    bool hasErrors = false;

     ssize_t res;
     while ((res=it.next()) == NO_ERROR) {
         res = preProcessImage(bundle, assets, it.getFile(), NULL);
     ssize_t res;
     while ((res=it.next()) == NO_ERROR) {
         res = preProcessImage(bundle, assets, it.getFile(), NULL);

-        if (res != NO_ERROR) {
-            return res;
+        if (res < NO_ERROR) {
+            hasErrors = true;

         }
     }
 
         }
     }
 

-    return NO_ERROR;
+    return (hasErrors || (res < NO_ERROR)) ? UNKNOWN_ERROR : NO_ERROR;

 }
 
 status_t postProcessImages(const sp<AaptAssets>& assets,
 }
 
 status_t postProcessImages(const sp<AaptAssets>& assets,


@@ -288,15 +289,16 @@ status_t postProcessImages(const sp<AaptAssets>& assets,
                            const sp<ResourceTypeSet>& set)
 {
     ResourceDirIterator it(set, String8("drawable"));
                            const sp<ResourceTypeSet>& set)
 {
     ResourceDirIterator it(set, String8("drawable"));

+    bool hasErrors = false;

     ssize_t res;
     while ((res=it.next()) == NO_ERROR) {
         res = postProcessImage(assets, table, it.getFile());
     ssize_t res;
     while ((res=it.next()) == NO_ERROR) {
         res = postProcessImage(assets, table, it.getFile());

-        if (res != NO_ERROR) {
-            return res;
+        if (res < NO_ERROR) {
+            hasErrors = true;

         }
     }
 
         }
     }
 

-    return res < NO_ERROR ? res : (status_t)NO_ERROR;
+    return (hasErrors || (res < NO_ERROR)) ? UNKNOWN_ERROR : NO_ERROR;

 }
 
 static void collect_files(const sp<AaptDir>& dir,
 }
 
 static void collect_files(const sp<AaptDir>& dir,


@@ -419,14 +421,14 @@ static void checkForIds(const String8& path, ResXMLParser& parser)
         if (code == ResXMLTree::START_TAG) {
             ssize_t index = parser.indexOfAttribute(NULL, "id");
             if (index >= 0) {
         if (code == ResXMLTree::START_TAG) {
             ssize_t index = parser.indexOfAttribute(NULL, "id");
             if (index >= 0) {

-                fprintf(stderr, "%s:%d: WARNING: found plain 'id' attribute; did you mean the new 'android:id' name?\n",
+                fprintf(stderr, "%s:%d: warning: found plain 'id' attribute; did you mean the new 'android:id' name?\n",

                         path.string(), parser.getLineNumber());
             }
         }
     }
 }
 
                         path.string(), parser.getLineNumber());
             }
         }
     }
 }
 

-static void applyFileOverlay(const sp<AaptAssets>& assets, 
+static bool applyFileOverlay(const sp<AaptAssets>& assets,

                              const sp<ResourceTypeSet>& baseSet,
                              const char *resType)
 {
                              const sp<ResourceTypeSet>& baseSet,
                              const char *resType)
 {


@@ -434,7 +436,7 @@ static void applyFileOverlay(const sp<AaptAssets>& assets,
     // Also add any found only in the overlay.
     sp<AaptAssets> overlay = assets->getOverlay();
     String8 resTypeString(resType);
     // Also add any found only in the overlay.
     sp<AaptAssets> overlay = assets->getOverlay();
     String8 resTypeString(resType);

-    
+

     // work through the linked list of overlays
     while (overlay.get()) {
         KeyedVector<String8, sp<ResourceTypeSet> >* overlayRes = overlay->getResources();
     // work through the linked list of overlays
     while (overlay.get()) {
         KeyedVector<String8, sp<ResourceTypeSet> >* overlayRes = overlay->getResources();


@@ -449,7 +451,7 @@ static void applyFileOverlay(const sp<AaptAssets>& assets,
             size_t overlayCount = overlaySet->size();
             for (size_t overlayIndex=0; overlayIndex<overlayCount; overlayIndex++) {
                 size_t baseIndex = baseSet->indexOfKey(overlaySet->keyAt(overlayIndex));
             size_t overlayCount = overlaySet->size();
             for (size_t overlayIndex=0; overlayIndex<overlayCount; overlayIndex++) {
                 size_t baseIndex = baseSet->indexOfKey(overlaySet->keyAt(overlayIndex));

-                if (baseIndex != UNKNOWN_ERROR) {
+                if (baseIndex < UNKNOWN_ERROR) {

                     // look for same flavor.  For a given file (strings.xml, for example)
                     // there may be a locale specific or other flavors - we want to match
                     // the same flavor.
                     // look for same flavor.  For a given file (strings.xml, for example)
                     // there may be a locale specific or other flavors - we want to match
                     // the same flavor.


@@ -472,12 +474,22 @@ static void applyFileOverlay(const sp<AaptAssets>& assets,
                             // didn't find a match fall through and add it..
                         }
                         baseGroup->addFile(overlayFiles.valueAt(overlayGroupIndex));
                             // didn't find a match fall through and add it..
                         }
                         baseGroup->addFile(overlayFiles.valueAt(overlayGroupIndex));

+                        assets->addGroupEntry(overlayFiles.keyAt(overlayGroupIndex));

                     }
                 } else {
                     // this group doesn't exist (a file that's only in the overlay)
                     }
                 } else {
                     // this group doesn't exist (a file that's only in the overlay)

-                    // add it

                     baseSet->add(overlaySet->keyAt(overlayIndex),
                     baseSet->add(overlaySet->keyAt(overlayIndex),

-                                 overlaySet->valueAt(overlayIndex));
+                            overlaySet->valueAt(overlayIndex));
+                    // make sure all flavors are defined in the resources.
+                    sp<AaptGroup> overlayGroup = overlaySet->valueAt(overlayIndex);
+                    DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > overlayFiles = 
+                            overlayGroup->getFiles();
+                    size_t overlayGroupSize = overlayFiles.size();
+                    for (size_t overlayGroupIndex = 0; 
+                            overlayGroupIndex<overlayGroupSize; 
+                            overlayGroupIndex++) {
+                        assets->addGroupEntry(overlayFiles.keyAt(overlayGroupIndex));
+                    }

                 }
             }
             // this overlay didn't have resources for this type
                 }
             }
             // this overlay didn't have resources for this type


@@ -485,7 +497,7 @@ static void applyFileOverlay(const sp<AaptAssets>& assets,
         // try next overlay
         overlay = overlay->getOverlay();
     }
         // try next overlay
         overlay = overlay->getOverlay();
     }

-    return;
+    return true;

 }
 
 void addTagAttribute(const sp<XMLNode>& node, const char* ns8,
 }
 
 void addTagAttribute(const sp<XMLNode>& node, const char* ns8,


@@ -611,13 +623,15 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
         current = current->getOverlay();
     }
     // apply the overlay files to the base set
         current = current->getOverlay();
     }
     // apply the overlay files to the base set

-    applyFileOverlay(assets, drawables, "drawable");
-    applyFileOverlay(assets, layouts, "layout");
-    applyFileOverlay(assets, anims, "anim");
-    applyFileOverlay(assets, xmls, "xml");
-    applyFileOverlay(assets, raws, "raw");
-    applyFileOverlay(assets, colors, "color");
-    applyFileOverlay(assets, menus, "menu");
+    if (!applyFileOverlay(assets, drawables, "drawable") ||
+            !applyFileOverlay(assets, layouts, "layout") ||
+            !applyFileOverlay(assets, anims, "anim") ||
+            !applyFileOverlay(assets, xmls, "xml") ||
+            !applyFileOverlay(assets, raws, "raw") ||
+            !applyFileOverlay(assets, colors, "color") ||
+            !applyFileOverlay(assets, menus, "menu")) {
+        return UNKNOWN_ERROR;
+    }

 
     bool hasErrors = false;
 
 
     bool hasErrors = false;
 


@@ -1224,10 +1238,16 @@ static status_t writeLayoutClasses(
 
         NA = idents.size();
 
 
         NA = idents.size();
 

+        bool deprecated = false;
+        

         String16 comment = symbols->getComment(realClassName);
         fprintf(fp, "%s/** ", indentStr);
         if (comment.size() > 0) {
         String16 comment = symbols->getComment(realClassName);
         fprintf(fp, "%s/** ", indentStr);
         if (comment.size() > 0) {

-            fprintf(fp, "%s\n", String8(comment).string());
+            String8 cmt(comment);
+            fprintf(fp, "%s\n", cmt.string());
+            if (strstr(cmt.string(), "@deprecated") != NULL) {
+                deprecated = true;
+            }

         } else {
             fprintf(fp, "Attributes that can be used with a %s.\n", nclassName.string());
         }
         } else {
             fprintf(fp, "Attributes that can be used with a %s.\n", nclassName.string());
         }


@@ -1303,6 +1323,10 @@ static status_t writeLayoutClasses(
         }
         fprintf(fp, "%s */\n", getIndentSpace(indent));
 
         }
         fprintf(fp, "%s */\n", getIndentSpace(indent));
 

+        if (deprecated) {
+            fprintf(fp, "%s@Deprecated\n", indentStr);
+        }
+        

         fprintf(fp,
                 "%spublic static final int[] %s = {\n"
                 "%s",
         fprintf(fp,
                 "%spublic static final int[] %s = {\n"
                 "%s",


@@ -1351,11 +1375,17 @@ static status_t writeLayoutClasses(
                 //printf("%s:%s/%s: 0x%08x\n", String8(package16).string(),
                 //    String8(attr16).string(), String8(name16).string(), typeSpecFlags);
                 const bool pub = (typeSpecFlags&ResTable_typeSpec::SPEC_PUBLIC) != 0;
                 //printf("%s:%s/%s: 0x%08x\n", String8(package16).string(),
                 //    String8(attr16).string(), String8(name16).string(), typeSpecFlags);
                 const bool pub = (typeSpecFlags&ResTable_typeSpec::SPEC_PUBLIC) != 0;

-                    
+                
+                bool deprecated = false;
+                

                 fprintf(fp, "%s/**\n", indentStr);
                 if (comment.size() > 0) {
                 fprintf(fp, "%s/**\n", indentStr);
                 if (comment.size() > 0) {

+                    String8 cmt(comment);

                     fprintf(fp, "%s  <p>\n%s  @attr description\n", indentStr, indentStr);
                     fprintf(fp, "%s  <p>\n%s  @attr description\n", indentStr, indentStr);

-                    fprintf(fp, "%s  %s\n", indentStr, String8(comment).string());
+                    fprintf(fp, "%s  %s\n", indentStr, cmt.string());
+                    if (strstr(cmt.string(), "@deprecated") != NULL) {
+                        deprecated = true;
+                    }

                 } else {
                     fprintf(fp,
                             "%s  <p>This symbol is the offset where the {@link %s.R.attr#%s}\n"
                 } else {
                     fprintf(fp,
                             "%s  <p>This symbol is the offset where the {@link %s.R.attr#%s}\n"


@@ -1367,7 +1397,11 @@ static status_t writeLayoutClasses(
                             indentStr, nclassName.string());
                 }
                 if (typeComment.size() > 0) {
                             indentStr, nclassName.string());
                 }
                 if (typeComment.size() > 0) {

-                    fprintf(fp, "\n\n%s  %s\n", indentStr, String8(typeComment).string());
+                    String8 cmt(typeComment);
+                    fprintf(fp, "\n\n%s  %s\n", indentStr, cmt.string());
+                    if (strstr(cmt.string(), "@deprecated") != NULL) {
+                        deprecated = true;
+                    }

                 }
                 if (comment.size() > 0) {
                     if (pub) {
                 }
                 if (comment.size() > 0) {
                     if (pub) {


@@ -1385,6 +1419,9 @@ static status_t writeLayoutClasses(
                 fprintf(fp, "%s  @attr name %s:%s\n", indentStr,
                         "android", String8(name).string());
                 fprintf(fp, "%s*/\n", indentStr);
                 fprintf(fp, "%s  @attr name %s:%s\n", indentStr,
                         "android", String8(name).string());
                 fprintf(fp, "%s*/\n", indentStr);

+                if (deprecated) {
+                    fprintf(fp, "%s@Deprecated\n", indentStr);
+                }

                 fprintf(fp,
                         "%spublic static final int %s_%s = %d;\n",
                         indentStr, nclassName.string(),
                 fprintf(fp,
                         "%spublic static final int %s_%s = %d;\n",
                         indentStr, nclassName.string(),


@@ -1426,11 +1463,16 @@ static status_t writeSymbolClass(
         }
         String16 comment(sym.comment);
         bool haveComment = false;
         }
         String16 comment(sym.comment);
         bool haveComment = false;

+        bool deprecated = false;

         if (comment.size() > 0) {
             haveComment = true;
         if (comment.size() > 0) {
             haveComment = true;

+            String8 cmt(comment);

             fprintf(fp,
                     "%s/** %s\n",
             fprintf(fp,
                     "%s/** %s\n",

-                    getIndentSpace(indent), String8(comment).string());
+                    getIndentSpace(indent), cmt.string());
+            if (strstr(cmt.string(), "@deprecated") != NULL) {
+                deprecated = true;
+            }

         } else if (sym.isPublic && !includePrivate) {
             sym.sourcePos.warning("No comment for public symbol %s:%s/%s",
                 assets->getPackage().string(), className.string(),
         } else if (sym.isPublic && !includePrivate) {
             sym.sourcePos.warning("No comment for public symbol %s:%s/%s",
                 assets->getPackage().string(), className.string(),


@@ -1438,20 +1480,25 @@ static status_t writeSymbolClass(
         }
         String16 typeComment(sym.typeComment);
         if (typeComment.size() > 0) {
         }
         String16 typeComment(sym.typeComment);
         if (typeComment.size() > 0) {

+            String8 cmt(typeComment);

             if (!haveComment) {
                 haveComment = true;
                 fprintf(fp,
             if (!haveComment) {
                 haveComment = true;
                 fprintf(fp,

-                        "%s/** %s\n",
-                        getIndentSpace(indent), String8(typeComment).string());
+                        "%s/** %s\n", getIndentSpace(indent), cmt.string());

             } else {
                 fprintf(fp,
             } else {
                 fprintf(fp,

-                        "%s %s\n",
-                        getIndentSpace(indent), String8(typeComment).string());
+                        "%s %s\n", getIndentSpace(indent), cmt.string());
+            }
+            if (strstr(cmt.string(), "@deprecated") != NULL) {
+                deprecated = true;

             }
         }
         if (haveComment) {
             fprintf(fp,"%s */\n", getIndentSpace(indent));
         }
             }
         }
         if (haveComment) {
             fprintf(fp,"%s */\n", getIndentSpace(indent));
         }

+        if (deprecated) {
+            fprintf(fp, "%s@Deprecated\n", getIndentSpace(indent));
+        }

         fprintf(fp, "%spublic static final int %s=0x%08x;\n",
                 getIndentSpace(indent),
                 String8(name).string(), (int)sym.int32Val);
         fprintf(fp, "%spublic static final int %s=0x%08x;\n",
                 getIndentSpace(indent),
                 String8(name).string(), (int)sym.int32Val);


@@ -1470,17 +1517,25 @@ static status_t writeSymbolClass(
             return UNKNOWN_ERROR;
         }
         String16 comment(sym.comment);
             return UNKNOWN_ERROR;
         }
         String16 comment(sym.comment);

+        bool deprecated = false;

         if (comment.size() > 0) {
         if (comment.size() > 0) {

+            String8 cmt(comment);

             fprintf(fp,
                     "%s/** %s\n"
                      "%s */\n",
             fprintf(fp,
                     "%s/** %s\n"
                      "%s */\n",

-                    getIndentSpace(indent), String8(comment).string(),
+                    getIndentSpace(indent), cmt.string(),

                     getIndentSpace(indent));
                     getIndentSpace(indent));

+            if (strstr(cmt.string(), "@deprecated") != NULL) {
+                deprecated = true;
+            }

         } else if (sym.isPublic && !includePrivate) {
             sym.sourcePos.warning("No comment for public symbol %s:%s/%s",
                 assets->getPackage().string(), className.string(),
                 String8(sym.name).string());
         }
         } else if (sym.isPublic && !includePrivate) {
             sym.sourcePos.warning("No comment for public symbol %s:%s/%s",
                 assets->getPackage().string(), className.string(),
                 String8(sym.name).string());
         }

+        if (deprecated) {
+            fprintf(fp, "%s@Deprecated\n", getIndentSpace(indent));
+        }

         fprintf(fp, "%spublic static final String %s=\"%s\";\n",
                 getIndentSpace(indent),
                 String8(name).string(), sym.stringVal.string());
         fprintf(fp, "%spublic static final String %s=\"%s\";\n",
                 getIndentSpace(indent),
                 String8(name).string(), sym.stringVal.string());