Check for null values in property manipulators

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

diff --git a/org.simantics.g3d/src/org/simantics/g3d/property/IntegerPropertyManipulator.java b/org.simantics.g3d/src/org/simantics/g3d/property/IntegerPropertyManipulator.java
index d0f5e1d6b4b4f645ad2295d740cfcf5cf267b48f..045aa83072cdc6ed4bdb9879e5321fd8a143bafd 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/property/IntegerPropertyManipulator.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/property/IntegerPropertyManipulator.java
@@ -42,7 +42,9 @@ public class IntegerPropertyManipulator implements PropertyManipulator {
                if (editMode)\r
                        return editValue;\r
                try {\r
-                       return provider.getValue(input).toString();\r
+                       Object value = provider.getValue(input);\r
+                       if (value == null) return null;\r
+                       return value.toString();\r
                } catch (Exception e) {\r
                        return null;\r
                }\r