X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Fdiagram%2Fstyle%2FConnectionPointNameStyle.java;h=57b0bd9b86af26ce112aff5101b4bff12be24133;hb=f102c41489c2cbd78116d513cd0e351434bb43eb;hp=a4f32e81139a5f22d699af3e7d15a5ee7ba3578b;hpb=c26409b1caf2f1e560d37c5befd11b442399c3fe;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/style/ConnectionPointNameStyle.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/style/ConnectionPointNameStyle.java
index a4f32e811..57b0bd9b8 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/style/ConnectionPointNameStyle.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/style/ConnectionPointNameStyle.java
@@ -66,10 +66,10 @@ public class ConnectionPointNameStyle extends StyleBase<List<ConnectionPointName
         }
     }
 
-    protected static final String PARENT_NODE_NAME_PREFIX = "_tNames";
-    protected static final String NODE_NAME_PREFIX        = "_";
+    protected static final String PARENT_NODE_NAME_PREFIX = "_tNames"; //$NON-NLS-1$
+    protected static final String NODE_NAME_PREFIX        = "_"; //$NON-NLS-1$
 
-    protected static final Font   FONT = Font.decode("Arial 6");
+    protected static final Font   FONT = Font.decode("Arial 6"); //$NON-NLS-1$
 
     protected static final double DEFAULT_SCALE = 0.05;
 
@@ -159,11 +159,11 @@ public class ConnectionPointNameStyle extends StyleBase<List<ConnectionPointName
         // always clean up old items before drawing new items
         cleanupStyleForNode(_node);
 
-        int count = resultList.size();
-        if (resultList == null || count < 2)
+        int count = resultList != null ? resultList.size() : 0;
+        if (count < 2)
             return;
 
-        G2DParentNode parentNode = ProfileVariables.claimChild(_node, "", PARENT_NODE_NAME_PREFIX, G2DParentNode.class, observer);
+        G2DParentNode parentNode = ProfileVariables.claimChild(_node, "", PARENT_NODE_NAME_PREFIX, G2DParentNode.class, observer); //$NON-NLS-1$
         parentNode.setTransform(resultList.get(0).getTransform());
         parentNode.setZIndex(Integer.MAX_VALUE >> 1);
 
@@ -171,7 +171,7 @@ public class ConnectionPointNameStyle extends StyleBase<List<ConnectionPointName
 
         for (int i = 1; i < count; ++i) {
             Result result = resultList.get(i);
-            TextNode node = ProfileVariables.claimChild(parentNode, "", NODE_NAME_PREFIX + i, TextNode.class, observer);
+            TextNode node = ProfileVariables.claimChild(parentNode, "", NODE_NAME_PREFIX + i, TextNode.class, observer); //$NON-NLS-1$
             node.setZIndex(i);
             node.setBackgroundColor(backgroundColor);
             node.setColor(textColor);
@@ -231,7 +231,7 @@ public class ConnectionPointNameStyle extends StyleBase<List<ConnectionPointName
     @Override
     protected void cleanupStyleForNode(INode node) {
         if (node instanceof SingleElementNode) {
-            ProfileVariables.denyChild(node, "", PARENT_NODE_NAME_PREFIX);
+            ProfileVariables.denyChild(node, "", PARENT_NODE_NAME_PREFIX); //$NON-NLS-1$
         }
     }