You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/09 14:46:34 UTC
svn commit: rev 20939 - in avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info: ant builder/tags
Author: mcconnell
Date: Wed Jun 9 05:46:33 2004
New Revision: 20939
Modified:
avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/ant/MetaTask.java
avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/DependencyTag.java
avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java
Log:
housekeeping
Modified: avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/ant/MetaTask.java
==============================================================================
--- avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/ant/MetaTask.java (original)
+++ avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/ant/MetaTask.java Wed Jun 9 05:46:33 2004
@@ -99,7 +99,7 @@
* will be generated only when the source file is
* newer than the destination file.
*/
- private boolean m_force = true;
+ private boolean m_force = false;
/**
* Set the desitation directory to generate output files to.
@@ -167,16 +167,13 @@
throws BuildException
{
validate();
-
final String message =
"Writing descriptors using '"
+ getOutputDescription()
+ "' format.";
log( message );
-
super.execute();
- addInnerClasses();
-
+ addInnerClasses();
try
{
Counter counter = writeMetaData();
@@ -273,7 +270,7 @@
int types = 0;
final int size = allClasses.size();
for( int i = 0; i < size; i++ )
- {
+ {
final JavaClass javaClass = (JavaClass)allClasses.get( i );
if( javaClass.isInterface() )
{
@@ -315,7 +312,8 @@
writeService( service );
}
else
- {
+ {
+
Type type = new TypeTag( javaClass ).getType();
if( type == null )
{
Modified: avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/DependencyTag.java
==============================================================================
--- avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/DependencyTag.java (original)
+++ avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/DependencyTag.java Wed Jun 9 05:46:33 2004
@@ -85,7 +85,8 @@
{
int n = -1;
final ArrayList deps = new ArrayList();
- final Set marked = new HashSet( 10 );
+ final Set marked = new HashSet( 10 );
+
for ( int j = 0; j < m_methods.length; j++ )
{
JavaMethod method = m_methods[j];
Modified: avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java
==============================================================================
--- avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java (original)
+++ avalon/trunk/runtime/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/TypeTag.java Wed Jun 9 05:46:33 2004
@@ -102,7 +102,7 @@
* @exception IllegalArgumentException if the name tag does not contain a value
*/
public Type getType()
- {
+ {
DocletTag tag = getJavaClass().getTagByName( getNS() + Tags.DELIMITER + KEY );
if( null == tag )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org