git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@16905 ac1ea38d-2e2b...

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveFactory.java
index d231adbdadd28a2efcd2c0badec86466a628a2b7..a9774e5cb3d7ed601dfe31a18fb6701351f13eaf 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveFactory.java
@@ -135,6 +135,9 @@ public class ValveFactory extends SysdynElementFactory {
                 public void hintChanged(IHintObservable sender, Key key, Object oldValue, Object newValue) {\r
                     IElement e = (IElement)sender;\r
                     HoverShapeNode shape = (HoverShapeNode) e.getHint(NODE);\r
+                    if(shape == null) {\r
+                        return;\r
+                    }\r
                     boolean hover = ElementUtils.isHovering(e);\r
                     shape.setHover(hover);\r
                 }\r

diff --git a/org.simantics.sysdyn/build.properties b/org.simantics.sysdyn/build.properties
index b088bf189f5cea2ed5bd984e45bc934ad442ca44..886d03ee265ee765899ed3c77fa70bb1da819f3e 100644 (file)
--- a/org.simantics.sysdyn/build.properties
+++ b/org.simantics.sysdyn/build.properties
@@ -12,4 +12,5 @@
 source.. = src/\r
 output.. = bin/\r
 bin.includes = META-INF/,\\r
-               .\r
+               .,\\r
+               adapters.xml\r