LMS-1186 use property data type for cell value type

SVN: 12702

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/EntityPropertyColDef.java

@@ -106,6 +106,22 @@ public class EntityPropertyColDef<T extends IEntityPropertiesHolder> extends
         return null;
     }
 
+    @Override
+    public Comparable<?> getComparableValue(T rowModel)
+    {
+        String valueAsString = tryGetValue(rowModel);
+        DataTypeCode dataType = propertyType.getDataType().getCode();
+        switch (dataType)
+        {
+            case INTEGER:
+                return valueAsString == null ? new Integer(Integer.MIN_VALUE) : new Integer(valueAsString);
+            case REAL:
+                return valueAsString == null ? new Double(-Double.MAX_VALUE) : new Double(valueAsString);
+            default:
+                return super.getComparableValue(rowModel);
+        }
+    }
+
     public IEntityProperty tryGetProperty(T entity)
     {
         for (IEntityProperty prop : getProperties(entity))

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/FilterUtils.java

@@ -55,14 +55,14 @@ public class FilterUtils
             this.row = row;
         }
 
-        public String get(String columnID)
+        public Object get(String columnID)
         {
             IColumnDefinition<T> columnDefinition = map.get(columnID);
             if (columnDefinition == null)
             {
                 throw new IllegalArgumentException("Undefined column: " + columnID);
             }
-            return columnDefinition.getValue(row);
+            return columnDefinition.getComparableValue(row);
         }
     }