jvanzyl 2004/01/10 08:27:14
Modified: maven-core/src/java/org/apache/maven/jelly/tags/jeez
MavenJeezTagLibrary.java
Removed: maven-core/src/java/org/apache/maven/jelly/tags/jeez
TagDefTag.java TargetTag.java
Log:
o collapsing that which could never have been used.
Revision Changes Path
1.3 +5 -39
maven-components/maven-core/src/java/org/apache/maven/jelly/tags/jeez/MavenJeezTagLibrary.java
Index: MavenJeezTagLibrary.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/jeez/MavenJeezTagLibrary.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenJeezTagLibrary.java 10 Jan 2004 08:37:09 -0000 1.2
+++ MavenJeezTagLibrary.java 10 Jan 2004 16:27:14 -0000 1.3
@@ -10,57 +10,22 @@
import org.apache.maven.jelly.tags.werkz.MavenWerkzTagLibrary;
import org.xml.sax.Attributes;
-/** Convenience taglib that puts jelly:core, jelly:werkz and jelly:ant
- * into a single namespace.
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">bob mcwhirter</a>
- * @version $Revision$
- */
public class MavenJeezTagLibrary
extends DynamicTagLibrary
{
- /** jelly:werkz taglib. */
private TagLibrary werkzTagLib = new MavenWerkzTagLibrary();
- /** jelly:ant taglib. */
private AntTagLibrary antTagLib = new AntTagLibrary();
- public TagScript createTagScript(
- final String name,
- Attributes attrs
- ) throws JellyException
+ public TagScript createTagScript( String name, Attributes attrs )
+ throws JellyException
{
-
- if ( name.equals( "tagdef" ) )
- {
- return new TagScript(
- new TagFactory()
- {
- public Tag createTag( String name, Attributes attributes )
- {
- return new TagDefTag( MavenJeezTagLibrary.this );
- }
- }
- );
- }
- if ( name.equals( "target" ) )
- {
- return new TagScript(
- new TagFactory()
- {
- public Tag createTag( String name, Attributes attributes )
- {
- return new TargetTag();
- }
- }
- );
- }
-
TagScript script = werkzTagLib.createTagScript( name, attrs );
if ( script == null )
{
script = antTagLib.createCustomTagScript( name, attrs );
+
if ( script == null )
{
return new TagScript(
@@ -68,8 +33,8 @@
{
public Tag createTag( String name, Attributes attributes )
throws JellyException
{
- // lets try create a dynamic tag first
Tag tag = MavenJeezTagLibrary.this.createTag( name,
attributes );
+
if ( tag != null )
{
return tag;
@@ -83,6 +48,7 @@
);
}
}
+
return script;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
