bloritsch 2003/06/17 13:56:39
Modified: fortress/tools/src/java/org/apache/avalon/fortress/tools
Component.java
Log:
update
Revision Changes Path
1.15 +9 -3
avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/Component.java
Index: Component.java
===================================================================
RCS file:
/home/cvs/avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/Component.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Component.java 17 Jun 2003 20:50:26 -0000 1.14
+++ Component.java 17 Jun 2003 20:56:38 -0000 1.15
@@ -57,7 +57,6 @@
import com.thoughtworks.qdox.model.*;
import org.apache.avalon.fortress.MetaInfoEntry;
import org.apache.avalon.fortress.util.dag.Vertex;
-import org.apache.avalon.fortress.util.Service;
import org.apache.tools.ant.BuildException;
import java.io.File;
@@ -206,7 +205,14 @@
DocletTag avalonConfigName = m_javaClass.getTagByName( TAG_INFO );
if ( null == avalonConfigName ) avalonConfigName =
m_javaClass.getTagByName( TAG_NAME );
- setAttribute( META_NAME, ( avalonConfigName == null ) ?
Service.createShortName( m_javaClass.getName() ) : avalonConfigName.getNamedParameter(
ATTR_NAME ) );
+ String name =
org.apache.avalon.fortress.util.Service.createShortName(m_javaClass.getName());
+
+ if ( avalonConfigName != null )
+ {
+ name = avalonConfigName.getNamedParameter( ATTR_NAME );
+ }
+
+ setAttribute( META_NAME, name );
}
private void discoverLifecycleType()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
