From 6a6b7c44fd028b773cdc1f13e8e4aa7ca675775b Mon Sep 17 00:00:00 2001
From: izabel <izabel>
Date: Mon, 31 May 2010 09:00:55 +0000
Subject: [PATCH] [LMS-1436] Custom Columns Don't Work the Same in Queries as
in Other Grids
SVN: 16211
---
.../ch/systemsx/cisd/common/evaluator/Evaluator.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/common/source/java/ch/systemsx/cisd/common/evaluator/Evaluator.java b/common/source/java/ch/systemsx/cisd/common/evaluator/Evaluator.java
index 92e9f9e67db..dbf7ab3e13e 100644
--- a/common/source/java/ch/systemsx/cisd/common/evaluator/Evaluator.java
+++ b/common/source/java/ch/systemsx/cisd/common/evaluator/Evaluator.java
@@ -23,6 +23,7 @@ import org.python.core.PyCode;
import org.python.core.PyException;
import org.python.core.PyFloat;
import org.python.core.PyInteger;
+import org.python.core.PyJavaInstance;
import org.python.core.PyLong;
import org.python.core.PyNone;
import org.python.core.PyObject;
@@ -195,6 +196,15 @@ public final class Evaluator
} else if (obj instanceof PyNone)
{
return null;
+ } else if (obj instanceof PyJavaInstance)
+ {
+ Object proxy = ((PyJavaInstance) obj).__tojava__(Object.class);
+ if (proxy instanceof Long == false && proxy instanceof Double == false
+ && proxy instanceof String == false)
+ {
+ return proxy.toString();
+ }
+ return proxy;
} else
{
return obj.toString();
--
GitLab