morgand 2003/01/25 15:02:17 Modified: jelly/jelly-tags/antlr/src/java/org/apache/commons/jelly/tags/antlr AntlrTag.java GrammarTag.java Log: converted antlr taglib from Exception to JellyTagException Revision Changes Path 1.2 +5 -5 jakarta-commons-sandbox/jelly/jelly-tags/antlr/src/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java Index: AntlrTag.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/antlr/src/java/org/apache/commons/jelly/tags/antlr/AntlrTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AntlrTag.java 5 Jan 2003 08:11:36 -0000 1.1 +++ AntlrTag.java 25 Jan 2003 23:02:17 -0000 1.2 @@ -61,7 +61,7 @@ import org.apache.commons.jelly.XMLOutput; import org.apache.commons.jelly.TagSupport; import org.apache.commons.jelly.MissingAttributeException; -import org.apache.commons.jelly.JellyException; +import org.apache.commons.jelly.JellyTagException; import antlr.Tool; @@ -91,7 +91,7 @@ * Evaluate the body to register all the various goals and pre/post conditions * then run all the current targets */ - public void doTag(final XMLOutput output) throws Exception + public void doTag(final XMLOutput output) throws MissingAttributeException, JellyTagException { if ( this.outputDir == null ) { @@ -148,7 +148,7 @@ { if ( ! e.getMessage().equals( "exitVM-0" ) ) { - throw new JellyException( e ); + throw new JellyTagException( e ); } } finally @@ -158,7 +158,7 @@ } } - protected File getGeneratedFile(String grammar) throws JellyException + protected File getGeneratedFile(String grammar) throws JellyTagException { File grammarFile = new File( grammar ); @@ -185,7 +185,7 @@ } in.close(); } catch (Exception e) { - throw new JellyException("Unable to determine generated class", + throw new JellyTagException("Unable to determine generated class", e); } if (generatedFileName == null) { 1.2 +3 -3 jakarta-commons-sandbox/jelly/jelly-tags/antlr/src/java/org/apache/commons/jelly/tags/antlr/GrammarTag.java Index: GrammarTag.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/antlr/src/java/org/apache/commons/jelly/tags/antlr/GrammarTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GrammarTag.java 5 Jan 2003 08:11:36 -0000 1.1 +++ GrammarTag.java 25 Jan 2003 23:02:17 -0000 1.2 @@ -60,7 +60,7 @@ import org.apache.commons.jelly.XMLOutput; import org.apache.commons.jelly.TagSupport; -import org.apache.commons.jelly.JellyException; +import org.apache.commons.jelly.JellyTagException; public class GrammarTag extends TagSupport { @@ -72,7 +72,7 @@ // Tag interface //------------------------------------------------------------------------- - public void doTag(final XMLOutput output) throws Exception + public void doTag(final XMLOutput output) throws JellyTagException { String grammar = getBodyText(); @@ -80,7 +80,7 @@ if ( antlr == null ) { - throw new JellyException( "<grammar> should only be used within an <antlr> block." ); + throw new JellyTagException( "<grammar> should only be used within an <antlr> block." ); } antlr.addGrammar( grammar );
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>