changeset 20:e8e14d5d6be2

improve formatting. exclude @transient and version
author smith@nwoca.org
date Fri, 08 Jan 2016 20:16:44 +0000
parents c3527be50f56
children b14418c2ce40
files gradle.properties src/main/groovy/org/ssdt_ohio/gradle/doc/tools/UserClassDocProxy.groovy src/main/resources/org/ssdt_ohio/gradle/userdoc/templates/classDocName.html
diffstat 3 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gradle.properties	Thu Jan 07 17:22:03 2016 +0000
+++ b/gradle.properties	Fri Jan 08 20:16:44 2016 +0000
@@ -1,2 +1,2 @@
-version=0.4.0.SNAPSHOT
+version=0.4.1.SNAPSHOT
 group=org.ssdt_ohio
--- a/src/main/groovy/org/ssdt_ohio/gradle/doc/tools/UserClassDocProxy.groovy	Thu Jan 07 17:22:03 2016 +0000
+++ b/src/main/groovy/org/ssdt_ohio/gradle/doc/tools/UserClassDocProxy.groovy	Fri Jan 08 20:16:44 2016 +0000
@@ -13,11 +13,13 @@
     GroovyFieldDoc[] properties() {
         println "getting properties for $adaptee"
         getAdaptee().properties().findAll { GroovyFieldDoc p ->
-            !p.isTransient()
+            !p.isTransient() &&
+                    p.name() != 'version' &&
+                    !p.annotations().any { it.name().contains('Transient') }
         }
 
     }
 
     def propertyMissing(String name) { getAdaptee()."$name" }
-    
+
 }
--- a/src/main/resources/org/ssdt_ohio/gradle/userdoc/templates/classDocName.html	Thu Jan 07 17:22:03 2016 +0000
+++ b/src/main/resources/org/ssdt_ohio/gradle/userdoc/templates/classDocName.html	Fri Jan 08 20:16:44 2016 +0000
@@ -171,7 +171,7 @@
 <div class="header">
 <%
 def pkg = classDoc.containingPackage().nameWithDots()
-String classDesc = "${classDoc.isGroovy() ? "[Groovy]" : "[Java]"} ${classDoc.typeDescription} ${org.codehaus.groovy.tools.groovydoc.SimpleGroovyClassDoc.encodeAngleBrackets(classDoc.getNameWithTypeArgs())}"
+String classDesc = "${classDoc.typeDescription} ${org.codehaus.groovy.tools.groovydoc.SimpleGroovyClassDoc.encodeAngleBrackets(classDoc.getNameWithTypeArgs())}"
 if (pkg != "DefaultPackage") {
 %>
     <div class="subTitle">Package: <strong>${pkg}</strong></div>
@@ -565,7 +565,7 @@
                         <a name="${field.name()}"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>${annotations(field, '\n') + modifiersWithIgnore(field, false) + linkable(field.type())} <strong>${field.name()}</strong></h4>
+                                <pre>${annotations(field, '\n')}</pre> ${modifiersWithIgnore(field, false) + linkable(field.type())} <h4>${field.name()}</h4>
                                 <p>${field.commentText()}</p>
                             </li>
                         </ul>
@@ -585,7 +585,8 @@
                         <a name="${prop.name()}"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>${annotations(prop, '\n') + modifiers(prop) + linkable(prop.type())} <strong>${prop.name()}</strong></h4>
+                                <h4>${modifiers(prop) + linkable(prop.type())} <strong>${prop.name()}</strong></h4>
+                                <blockquote><pre>${annotations(prop, '\n')}</pre></blockquote>
                                 <p>${prop.commentText()}</p>
                             </li>
                         </ul>
@@ -646,7 +647,8 @@
                         <a name="${nameFromParams(method)}"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>${annotations(method, '\n') + modifiers(method)}${linkable(method.returnType())} <strong>${method.name()}</strong>(${paramsOf(method, false)})</h4>
+                                <h4>${modifiers(method)}${linkable(method.returnType())} <strong>${method.name()}</strong>(${paramsOf(method, false)})</h4>
+                                <blockquote><pre>${annotations(method, '\n')}</pre></blockquote>
                                 <p>${method.commentText()}</p>
                             </li>
                         </ul>