commit a821585fae04096334af2b7a6e6c40bc6f2e3de5
author Dirk Dougherty <ddougherty@google.com> Wed Sep 11 10:17:42 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 11 10:17:42 2013 -0700
tree e2b8eef2a305c1027ebae8697191bdac179d1fd1
parent 87cdac6d3b4e82ad87ecfe344469f5c080553e54
parent 6fa13bb8340485bb868d26dc76a4faf7492c5df7

am 6fa13bb8: am b4d562ba: Normalize values for page.tags. Values can now be declared with quotes or not. Multiple values must still be comma delimited.

* commit '6fa13bb8340485bb868d26dc76a4faf7492c5df7':
  Normalize values for page.tags. Values can now be declared with quotes or not. Multiple values must still be comma delimited.

src/com/google/doclava/Doclava.java

diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java
index b95c8cb..8e00272 100644
--- a/src/com/google/doclava/Doclava.java
+++ b/src/com/google/doclava/Doclava.java
@@ -922,7 +922,22 @@
               title.concat(splitTitle[j]);
             }
           }
-          String tags = hdf.getValue("page.tags", "");
+
+          StringBuilder tags =  new StringBuilder();
+          String tagList = hdf.getValue("page.tags", "");
+          if (!tagList.equals("")) {
+            tagList = tagList.replaceAll("\"", "");
+            String[] tagParts = tagList.split(",");
+            for (int iter = 0; iter < tagParts.length; iter++) {
+              tags.append("\"");
+              tags.append(tagParts[iter].trim());
+              tags.append("\"");
+              if (iter < tagParts.length - 1) {
+                tags.append(",");
+              }
+            }
+          }
+
           String dirName = (webPath.indexOf("/") != -1)
                   ? webPath.substring(0, webPath.indexOf("/")) : "";
 
@@ -931,7 +946,7 @@
               !hdf.getBooleanValue("excludeFromSuggestions")) {
             data.setValue("docs.pages." + counter.i + ".label", title);
             data.setValue("docs.pages." + counter.i + ".link", webPath);
-            data.setValue("docs.pages." + counter.i + ".tags", tags);
+            data.setValue("docs.pages." + counter.i + ".tags", tags.toString());
             data.setValue("docs.pages." + counter.i + ".type", dirName);
             counter.i++;
           }