Combo property support for annotated property tabs

[simantics/3d.git] / org.simantics.g3d / src / org / simantics / g3d / property / DoublePropertyManipulator.java

diff --git a/org.simantics.g3d/src/org/simantics/g3d/property/DoublePropertyManipulator.java b/org.simantics.g3d/src/org/simantics/g3d/property/DoublePropertyManipulator.java
index 47f6ca7d21fb93066971e9982c93485bad242573..4f7c670fc71ab186e722c31ff72adc0bab35ca71 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/property/DoublePropertyManipulator.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/property/DoublePropertyManipulator.java
@@ -41,7 +41,9 @@ public class DoublePropertyManipulator implements PropertyManipulator {
                if (editMode)
                        return editValue;
                try {
-                       return provider.getValue(input).toString();
+                       Object value = provider.getValue(input);
+                       if (value == null) return null;
+                       return value.toString();
                } catch (Exception e) {
                        return null;
                }