[infinispan-commits] Infinispan SVN: r1158 - in trunk/tools/src/main/java/org/infinispan/tools: schema and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-11-12 14:35:56 -0500 (Thu, 12 Nov 2009)
New Revision: 1158

Modified:
   trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
   trunk/tools/src/main/java/org/infinispan/tools/schema/TreeNode.java
Log:
Better config docs, sort elements alphabetically

Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java	2009-11-12 17:45:43 UTC (rev 1157)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java	2009-11-12 19:35:56 UTC (rev 1158)
@@ -253,7 +253,7 @@
                   sb.append("<td>").append("null").append("</td>\n");
                }
             } catch (Exception e) {
-               debug("Caught exception!", 2);
+               debug("Caught exception, bean is " + bean.getName() + ", looking for field " + a.getName() + ", field " + field, 2);               
                e.printStackTrace();
                sb.append("<td>").append("N/A").append("</td>\n");
             }
@@ -358,9 +358,11 @@
          ClassDoc classDoc = rootDoc.classNamed(c.getName());
          for (FieldDoc fd : classDoc.fields()) {
             for (Tag t : fd.tags(CONFIG_REF)) {
-               if (t.text().startsWith(fieldName)) {
+                Map<String, String> m = parseTag(t.text().trim());
+                String field = m.get("name");               
+                if (field != null && field.startsWith(fieldName)) {
                   return findFieldRecursively(c, fd.name());
-               }
+                }
             }
          }
          if (!c.equals(Object.class))

Modified: trunk/tools/src/main/java/org/infinispan/tools/schema/TreeNode.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/schema/TreeNode.java	2009-11-12 17:45:43 UTC (rev 1157)
+++ trunk/tools/src/main/java/org/infinispan/tools/schema/TreeNode.java	2009-11-12 19:35:56 UTC (rev 1158)
@@ -22,6 +22,7 @@
 package org.infinispan.tools.schema;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -37,7 +38,7 @@
  * @since 4.0
  */
 @SuppressWarnings("restriction")
-public class TreeNode implements Iterable<TreeNode> {
+public class TreeNode implements Iterable<TreeNode>, Comparable<TreeNode> {
    private final String name;
    private TreeNode parent;
    private final Set<TreeNode> children = new HashSet<TreeNode>();
@@ -135,6 +136,11 @@
       return this.parent.name != null && tn.parent != null
                && this.parent.name.equals(tn.parent.name) && this.name.equals(tn.name);
    }
+   
+   @Override
+   public int compareTo(TreeNode o) {       
+       return name.compareTo(o.getName());
+   }
 
    public int hashCode() {
       int result = 17;
@@ -157,6 +163,7 @@
          super();
          nodes = new ArrayList<TreeNode>();
          preOrderTraverse(TreeNode.this);
+         Collections.sort(nodes);
          i = nodes.iterator();
       }