ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r491717 - in /ant/core/trunk: WHATSNEW docs/manual/CoreTasks/javadoc.html src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Date Tue, 02 Jan 2007 00:11:49 GMT
Author: peterreilly
Date: Mon Jan  1 16:11:48 2007
New Revision: 491717

URL: http://svn.apache.org/viewvc?view=rev&rev=491717
Log:
Bugzilla 41268: rollback 32927

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/docs/manual/CoreTasks/javadoc.html
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=491717&r1=491716&r2=491717
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Mon Jan  1 16:11:48 2007
@@ -24,6 +24,10 @@
   and expands properties if expandproperties is false.
   Bugzilla report 41204.
 
+* Rolling back Bugzilla 32927 (set a default description for a javadoc tag
+  if not set) as it caused a BC problem.
+  Bugzilla report 41268.
+
 Other changes:
 --------------
 

Modified: ant/core/trunk/docs/manual/CoreTasks/javadoc.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/javadoc.html?view=diff&rev=491717&r1=491716&r2=491717
==============================================================================
--- ant/core/trunk/docs/manual/CoreTasks/javadoc.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/javadoc.html Mon Jan  1 16:11:48 2007
@@ -702,8 +702,9 @@
   <tr>
     <td valign="top">description</td>
     <td valign="top">Description for tag (e.g. <code>To do:</code>)</td>
-    <td align="center" valign="top">No, the name will be used as a description
-      if this is not specified.</td>
+    <td align="center" valign="top">
+      No, the javadoc executable will pick a default if this is not specified.
+    </td>
   </tr>
   <tr>
     <td valign="top">enabled</td>

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java?view=diff&rev=491717&r1=491716&r2=491717
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java Mon Jan  1 16:11:48
2007
@@ -1399,9 +1399,10 @@
             if (getDescription() != null) {
                 return name + ":" + (enabled ? "" : "X")
                     + scope + ":" + getDescription();
+            } else if (!enabled || !"a".equals(scope)) {
+                return name + ":" + (enabled ? "" : "X") + scope;
             } else {
-                return name + ":" + (enabled ? "" : "X")
-                    + scope + ":" + name;
+                return name;
             }
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message