Author: dion
Date: Thu Apr 27 06:22:46 2006
New Revision: 397537
URL: http://svn.apache.org/viewcvs?rev=397537&view=rev
Log:
More checkstyle
Modified:
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNENode.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNotNode.java
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNullLiteral.java
Modified:
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNENode.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNENode.java?rev=397537&r1=397536&r2=397537&view=diff
==============================================================================
---
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNENode.java
(original)
+++
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNENode.java
Thu Apr 27 06:22:46 2006
@@ -1,12 +1,12 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
+ * Copyright 2002-2006 The Apache Software Foundation.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,74 +19,53 @@
import org.apache.commons.jexl.util.Coercion;
/**
- * Not equal to. Use '!=' or 'ne', do not use <>.
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id$
+ * Not equal to. Use '!=' or 'ne', do not use <>.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
+ * @version $Id$
*/
-public class ASTNENode extends SimpleNode
-{
- public ASTNENode(int id)
- {
+public class ASTNENode extends SimpleNode {
+ public ASTNENode(int id) {
super(id);
}
- public ASTNENode(Parser p, int id)
- {
+ public ASTNENode(Parser p, int id) {
super(p, id);
}
-
- /** Accept the visitor. **/
- public Object jjtAccept(ParserVisitor visitor, Object data)
- {
+ /** Accept the visitor. * */
+ public Object jjtAccept(ParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
- public Object value(JexlContext pc)
- throws Exception
- {
- Object left = ( (SimpleNode) jjtGetChild(0)).value(pc);
- Object right = ( (SimpleNode) jjtGetChild(1)).value(pc);
+ public Object value(JexlContext pc) throws Exception {
+ Object left = ((SimpleNode) jjtGetChild(0)).value(pc);
+ Object right = ((SimpleNode) jjtGetChild(1)).value(pc);
- if (left==null && right==null)
- {
+ if (left == null && right == null) {
/*
* first, the possibility that both *are* null
*/
return Boolean.FALSE;
- }
- else if (left==null || right==null)
- {
+ } else if (left == null || right == null) {
/*
* otherwise, both aren't, so it's clear L != R
*/
return Boolean.TRUE;
- }
- else if (left.getClass().equals(right.getClass()))
- {
+ } else if (left.getClass().equals(right.getClass())) {
return (left.equals(right)) ? Boolean.FALSE : Boolean.TRUE;
- }
- else if(left instanceof Float || left instanceof Double ||
- right instanceof Float || right instanceof Double)
- {
- return
(Coercion.coerceDouble(left).equals(Coercion.coerceDouble(right)))
- ? Boolean.FALSE : Boolean.TRUE;
- }
- else if ( left instanceof Number || right instanceof Number ||
- left instanceof Character || right instanceof Character)
- {
- return
(Coercion.coerceLong(left).equals(Coercion.coerceLong(right)))
- ? Boolean.FALSE : Boolean.TRUE;
- }
- else if (left instanceof Boolean || right instanceof Boolean)
- {
- return
(Coercion.coerceBoolean(left).equals(Coercion.coerceBoolean(right)))
- ? Boolean.FALSE : Boolean.TRUE;
- }
- else if (left instanceof java.lang.String || right instanceof String)
- {
+ } else if (left instanceof Float
+ || left instanceof Double
+ || right instanceof Float
+ || right instanceof Double) {
+ return
(Coercion.coerceDouble(left).equals(Coercion.coerceDouble(right))) ?
Boolean.FALSE : Boolean.TRUE;
+ } else if (left instanceof Number || right instanceof Number || left
instanceof Character
+ || right instanceof Character) {
+ return
(Coercion.coerceLong(left).equals(Coercion.coerceLong(right))) ? Boolean.FALSE
: Boolean.TRUE;
+ } else if (left instanceof Boolean || right instanceof Boolean) {
+ return
(Coercion.coerceBoolean(left).equals(Coercion.coerceBoolean(right))) ?
Boolean.FALSE : Boolean.TRUE;
+ } else if (left instanceof java.lang.String || right instanceof
String) {
return (left.toString().equals(right.toString())) ? Boolean.FALSE
: Boolean.TRUE;
}
Modified:
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNotNode.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNotNode.java?rev=397537&r1=397536&r2=397537&view=diff
==============================================================================
---
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNotNode.java
(original)
+++
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNotNode.java
Thu Apr 27 06:22:46 2006
@@ -1,12 +1,12 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
+ * Copyright 2002-2006 The Apache Software Foundation.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,34 +19,27 @@
import org.apache.commons.jexl.util.Coercion;
/**
- * Not : 'not' or '!'
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id$
+ * Not : 'not' or '!'.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
+ * @version $Id$
*/
-public class ASTNotNode extends SimpleNode
-{
- public ASTNotNode(int id)
- {
- super(id);
+public class ASTNotNode extends SimpleNode {
+ public ASTNotNode(int id) {
+ super(id);
}
- public ASTNotNode(Parser p, int id)
- {
+ public ASTNotNode(Parser p, int id) {
super(p, id);
}
-
- /** Accept the visitor. **/
- public Object jjtAccept(ParserVisitor visitor, Object data)
- {
+ /** Accept the visitor. * */
+ public Object jjtAccept(ParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
- public Object value(JexlContext jc)
- throws Exception
- {
+ public Object value(JexlContext jc) throws Exception {
Object val = ((SimpleNode) jjtGetChild(0)).value(jc);
/*
@@ -55,8 +48,9 @@
Boolean b = Coercion.coerceBoolean(val);
- if (b != null)
+ if (b != null) {
return b.booleanValue() ? Boolean.FALSE : Boolean.TRUE;
+ }
throw new Exception("expression not boolean valued");
}
Modified:
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNullLiteral.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNullLiteral.java?rev=397537&r1=397536&r2=397537&view=diff
==============================================================================
---
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNullLiteral.java
(original)
+++
jakarta/commons/proper/jexl/trunk/src/java/org/apache/commons/jexl/parser/ASTNullLiteral.java
Thu Apr 27 06:22:46 2006
@@ -1,12 +1,12 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation.
- *
+ * Copyright 2002-2006 The Apache Software Foundation.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,31 +19,25 @@
import org.apache.commons.jexl.JexlContext;
/**
- * Fill in the blanks for how this is to work
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
+ * 'null'.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
*/
-public class ASTNullLiteral extends SimpleNode
-{
- public ASTNullLiteral(int id)
- {
+public class ASTNullLiteral extends SimpleNode {
+ public ASTNullLiteral(int id) {
super(id);
}
- public ASTNullLiteral(Parser p, int id)
- {
+ public ASTNullLiteral(Parser p, int id) {
super(p, id);
}
-
- /** Accept the visitor. **/
- public Object jjtAccept(ParserVisitor visitor, Object data)
- {
+ /** Accept the visitor. * */
+ public Object jjtAccept(ParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
- public Object value(JexlContext context)
- {
- return null;
+ public Object value(JexlContext context) {
+ return null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
