commit 815f9342d2b82cf61e56e64cbea46079215041be
author Dirk Dougherty <ddougherty@google.com> Thu Sep 12 00:30:28 2013 -0700
committer Dirk Dougherty <ddougherty@google.com> Thu Sep 12 10:14:36 2013 -0700
tree 927cf2ef7792d08dc81180b9e130e99f46c9789d
parent e52f6d819e7d95e19e9b315f358bb7ac293413d8

Modify format of samples_navtree_data.js to sort projects group tag.

Change-Id: I3155cdff749640100436feec6eb9f1cff36a5229

src/com/google/doclava/SampleCode.java

diff --git a/src/com/google/doclava/SampleCode.java b/src/com/google/doclava/SampleCode.java
index 980dbf6..466d247 100644
--- a/src/com/google/doclava/SampleCode.java
+++ b/src/com/google/doclava/SampleCode.java
@@ -34,13 +34,14 @@
     mTitle = title;
     mTags = null;
 
-    int len = dest.length();
-    if (len > 1 && dest.charAt(len - 1) != '/') {
-      mDest = dest + '/';
-    } else {
-      mDest = dest;
+    if (dest != null) {
+      int len = dest.length();
+      if (len > 1 && dest.charAt(len - 1) != '/') {
+        mDest = dest + '/';
+      } else {
+        mDest = dest;
+      }
     }
-
     //System.out.println("SampleCode init: source: " + mSource);
     //System.out.println("SampleCode init: dest: " + mDest);
     //System.out.println("SampleCode init: title: " + mTitle);
@@ -341,9 +342,17 @@
   /**
   * Render a SC node to a navtree js file.
   */
-  public static void writeSamplesNavTree(List<Node> tnode) {
+  public static void writeSamplesNavTree(List<Node> tnode, List<Node> groupnodes) {
+
     Node node = new Node("Reference", "packages.html", null, null, tnode, null);
 
+    if (groupnodes != null) {
+      for (int i = 0; i < tnode.size(); i++) {
+        groupnodes = appendNodeGroups(tnode.get(i), groupnodes);
+      }
+      node.setChildren(groupnodes);
+    }
+
     StringBuilder buf = new StringBuilder();
     if (false) {
     // if you want a root node
@@ -361,6 +370,27 @@
   }
 
   /**
+  * Iterate the list of projects and sort them by their groups. Samples the reference
+  * a valid sample group tag are added to a list for that group. Samples declare a
+  * sample.group tag in their _index.jd files.
+  */
+  private static List<Node> appendNodeGroups(Node gNode, List<Node> groupnodes) {
+    List<Node> mgrouplist = new ArrayList<Node>();
+    final int N = groupnodes.size();
+    for (int i = 0; i < N; i++) {
+      if (groupnodes.get(i).getLabel().equals(gNode.getGroup())) {
+        if (groupnodes.get(i).getChildren() == null) {
+          groupnodes.get(i).setChildren(mgrouplist);
+        }
+        mgrouplist.add(gNode);
+        //System.out.println("Added " + gNode.getLabel() + " to group " + group);
+        break;
+      } //?? no match
+    }
+    return groupnodes;
+  }
+
+  /**
   * Sort by type and name (alpha), with manifest and src always at top.
   */
   Comparator<File> byTypeAndName = new Comparator<File>() {
@@ -382,7 +412,7 @@
   /**
   * Concatenate dirs that only hold dirs to simplify nav tree
   */
-  public static List<Node> squashNodes(List<Node> tnode){
+  public static List<Node> squashNodes(List<Node> tnode) {
     List<Node> list = tnode;
 
     for(int i = 0; i < list.size(); ++i) {
@@ -558,11 +588,12 @@
       mLink = link;
     }
 
-    public void setGroup(String group) {
-      mGroup = group;
+    public String getGroup() {
+      return mGroup;
     }
 
-    public void setTagss(String tags) {
+    public void setGroup(String group) {
+      mGroup = group;
     }
 
     public void setTags(String tags) {