Merge remote-tracking branch 'origin/master' into release/1.35.2

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / contributions / NetworkElementActionMenuContribution.java

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/NetworkElementActionMenuContribution.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/NetworkElementActionMenuContribution.java
index cca371728d8dcb13a95feb81ca26589f0f5bd009..e29d11a22e2f0ec919d9c5e397b6b78c606344c8 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/NetworkElementActionMenuContribution.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/NetworkElementActionMenuContribution.java
@@ -62,6 +62,9 @@ public class NetworkElementActionMenuContribution {
             return;
         }
         
+        if (actions == null || actions.isEmpty())
+            return;
+        
         items.add(MMenuFactory.INSTANCE.createMenuSeparator());
         MMenu subMenu = MMenuFactory.INSTANCE.createMenu();
         List<MMenuElement> children = subMenu.getChildren();