/ - Diff - Application: gvSIG desktop - gvSIG

             for( int n=0; n<count; n++ ) {
                 Object condition_o = getObject(interpreter, args, n);
                 Boolean condition = (Boolean) toBoolean.coerce(condition_o);
                 if( condition ) {
                 if( condition!=null && condition==true ) {
                     needElse = false;
                     value = getObject(interpreter, args, n+firstValue);
+                }

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             int type = this.getType(op1, op2);
             if( (type & TYPE_DOUBLE) == TYPE_DOUBLE ) {
                 double value = getDouble(op1,1) / getDouble(op2,2);

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             int type = this.getType(op1, op2);
             if( (type & TYPE_DOUBLE) == TYPE_DOUBLE ) {
                 double value = getDouble(op1,1) + getDouble(op2,2);

         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             String re = Objects.toString(op2, "");
             Pattern exp = (Pattern) interpreter.getCache().get(this.getClass(), re);
             if( exp == null ) {

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             int type = this.getType(op1, op2);
             if( (type & TYPE_NULL) == TYPE_NULL ) {
                 return false;

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             int type = this.getType(op1, op2);
             if( (type & TYPE_DOUBLE) == TYPE_DOUBLE ) {
                 double value = getDouble(op1,1) * getDouble(op2,2);

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             int type = this.getType(op1, op2);
             if( (type & TYPE_DOUBLE) == TYPE_DOUBLE ) {
                 double value = getDouble(op1,1) - getDouble(op2,2);

         @Override
         public Object call(Interpreter interpreter, Object arg) {
             if (arg==null) {
                 return null;
+            }
             if( ! (arg instanceof Boolean) ) {
                 throw new IllegalArgumentException("NOT operator require a boolean");
+            }

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             int type = this.getType(op1, op2);
             if( (type & TYPE_NULL) == TYPE_NULL ) {
                 return false;

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if( op1 instanceof Boolean && op2 instanceof Boolean ) {
                 boolean value = getBoolean(op1,1) && getBoolean(op2,2);
                 return value;
+            }
             if (op1==null && op2==null) {
                 return null;
             } else if (op1==null||op2==null) {
                 Boolean boolValue = null;
                 if (op2 == null && op1 instanceof Boolean) {
                     boolValue = getBoolean(op1,1);
                 } else if (op1 == null && op2 instanceof Boolean){
                     boolValue = getBoolean(op2,2);
+                }
                 if (boolValue==null || boolValue==true) {
                     return null;
                 } else {
                     return false;
+                }
+            }
             throw new IllegalArgumentException("Types not allowed in '"+name()+"' operand.");
+        }

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             if( op1==op2 ) {
                 return false;
+            }

         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             if( op1==op2 ) {
                 return true;
+            }

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/operator/ConcatOperator.java
26	26	}
27	27
28	28	@Override
29		public Object call(Interpreter interpreter, Object op1, Object op2) {
	29	public Object call(Interpreter interpreter, Object op1, Object op2) {
	30	if (op1 == null \|\| op2 == null) {
	31	return null;
	32	}
30	33	return Objects.toString(op1, "")+Objects.toString(op2, "");
31	34	}
32	35

         @Override
         public Object call(Interpreter interpreter, Object arg) {
             if (arg == null) {
                 return null;
+            }
             if( !(arg instanceof Number) ) {
                 throw new IllegalArgumentException("NEGATE function require a number");
+            }

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             int type = this.getType(op1, op2);
             if( (type & TYPE_NULL) == TYPE_NULL ) {
                 return false;

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if (op1 == null || op2 == null) {
                 return null;
+            }
             int type = this.getType(op1, op2);
             if( (type & TYPE_NULL) == TYPE_NULL ) {
                 return false;

+        }
         @Override
         public Object call(Interpreter interpreter, Object op1, Object op2) {
         public Object call(Interpreter interpreter, Object op1, Object op2) {
             if( op1 instanceof Boolean && op2 instanceof Boolean ) {
                 boolean value = getBoolean(op1,1) || getBoolean(op2,2);
                 return value;
+            }
             if (op1==null && op2==null) {
                 return null;
             } else if (op1==null||op2==null) {
                 Boolean boolValue = null;
                 if (op2 == null && op1 instanceof Boolean) {
                     boolValue = getBoolean(op1,1);
                 } else if (op1 == null && op2 instanceof Boolean){
                     boolValue = getBoolean(op2,2);
+                }
                 if (boolValue==null || boolValue==false) {
                     return null;
                 } else {
                     return true;
+                }
+            }
             throw new IllegalArgumentException("Types not allowed in '"+name()+"' operand.");
+        }

Application: gvSIG desktop

Revision 45307