s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
Jesus M. Castagnetto 2013-06-19 11:23:11 -05:00
commit b6e8875cd7
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -18,3 +18,4 @@ broker/core/module/MOD-INF/classes/
broker/core/WEB-INF/lib/ broker/core/WEB-INF/lib/
broker/core/data/ broker/core/data/
broker/core/test-output/ broker/core/test-output/
tmp/

2
main/src/com/google/refine/expr/functions/booleans/Xor.java
View File

@ -41,7 +41,7 @@ public class Xor implements Function {
public Object call(Properties bindings, Object[] args) { public Object call(Properties bindings, Object[] args) {
if (args.length == 2 && if (args.length == 2 &&
args[0] != null && args[0] instanceof Boolean && args[0] != null && args[0] instanceof Boolean &&
args[1] != null && args[0] instanceof Boolean) { args[1] != null && args[1] instanceof Boolean) {
boolean o1 = ((Boolean) args[0]).booleanValue(); boolean o1 = ((Boolean) args[0]).booleanValue();
boolean o2 = ((Boolean) args[1]).booleanValue(); boolean o2 = ((Boolean) args[1]).booleanValue();
return o1 != o2; return o1 != o2;

2
main/src/com/google/refine/grel/ControlFunctionRegistry.java
View File

@ -56,6 +56,7 @@ import com.google.refine.expr.functions.arrays.Uniques;
import com.google.refine.expr.functions.booleans.And; import com.google.refine.expr.functions.booleans.And;
import com.google.refine.expr.functions.booleans.Not; import com.google.refine.expr.functions.booleans.Not;
import com.google.refine.expr.functions.booleans.Or; import com.google.refine.expr.functions.booleans.Or;
import com.google.refine.expr.functions.booleans.Xor;
import com.google.refine.expr.functions.date.DatePart; import com.google.refine.expr.functions.date.DatePart;
import com.google.refine.expr.functions.date.Inc; import com.google.refine.expr.functions.date.Inc;
import com.google.refine.expr.functions.date.Now; import com.google.refine.expr.functions.date.Now;
@ -284,6 +285,7 @@ public class ControlFunctionRegistry {
registerFunction("and", new And()); registerFunction("and", new And());
registerFunction("or", new Or()); registerFunction("or", new Or());
registerFunction("not", new Not()); registerFunction("not", new Not());
registerFunction("xor", new Xor());
registerFunction("cross", new Cross()); registerFunction("cross", new Cross());