Author: dlr
Date: Fri Nov 19 18:29:54 2004
New Revision: 105917
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
Log:
* src/java/org/apache/velocity/runtime/parser/Parser.java
* src/java/org/apache/velocity/runtime/parser/Parser.jj
* src/java/org/apache/velocity/runtime/parser/Parser.jjt
isDirective(String): Removed extraneous code.
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
==============================================================================
---
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
(original)
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
Fri Nov 19 18:29:54 2004
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.java,v 1.84 2004/03/20 03:35:50 dlr Exp $
+ * @version $Id$
*/
public class Parser/[EMAIL PROTECTED](jjtree)*/implements ParserTreeConstants,
ParserConstants {/[EMAIL PROTECTED](jjtree)*/
protected JJTParserState jjtree = new JJTParserState();/**
@@ -154,10 +154,7 @@
*/
public boolean isDirective(String directive)
{
- if (directives.containsKey(directive))
- return true;
- else
- return false;
+ return directives.containsKey(directive);
}
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
==============================================================================
---
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
(original)
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
Fri Nov 19 18:29:54 2004
@@ -111,7 +111,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.jj,v 1.79 2004/01/04 23:23:48 dlr Exp $
+ * @version $Id$
*/
public class Parser/[EMAIL PROTECTED](jjtree)*/implements
ParserTreeConstants/[EMAIL PROTECTED]/
{/[EMAIL PROTECTED](jjtree)*/
@@ -247,10 +247,7 @@
*/
public boolean isDirective(String directive)
{
- if (directives.containsKey(directive))
- return true;
- else
- return false;
+ return directives.containsKey(directive);
}
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
==============================================================================
---
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
(original)
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
Fri Nov 19 18:29:54 2004
@@ -135,7 +135,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.jjt,v 1.83 2003/12/30 20:09:51 geirm Exp $
+ * @version $Id$
*/
public class Parser
{
@@ -268,10 +268,7 @@
*/
public boolean isDirective(String directive)
{
- if (directives.containsKey(directive))
- return true;
- else
- return false;
+ return directives.containsKey(directive);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
