Sync git svn branch with SVN repository r33406.

[simantics/platform.git] / bundles / org.simantics.modeling.ui / src / org / simantics / modeling / ui / diagramEditor / DiagramViewerSelectionProvider.java

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerSelectionProvider.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerSelectionProvider.java
index 42c489e24d4b866d310507cf7d1d00d4cc1508cf..27e58b5d1b832a042504a9cf945ae15f13150510 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerSelectionProvider.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/DiagramViewerSelectionProvider.java
@@ -65,6 +65,7 @@ public class DiagramViewerSelectionProvider extends WorkbenchSelectionProvider {
 \r
                             DiagramResource DIA = DiagramResource.getInstance(graph);\r
                             ModelingResources MOD = ModelingResources.getInstance(graph);\r
+                            Layer0 L0 = Layer0.getInstance(graph);\r
 \r
                             String uri = graph.getPossibleRelatedValue(resource, DIA.RuntimeDiagram_HasVariable);\r
                             if (uri == null)\r
@@ -76,6 +77,11 @@ public class DiagramViewerSelectionProvider extends WorkbenchSelectionProvider {
 \r
                             Resource config = graph.getPossibleObject(resource2, MOD.ElementToComponent);\r
                             if (config == null) {\r
+                                if (graph.isInstanceOf(resource2, DIA.Connection)) {\r
+                                    Variable v = FlagUtil.getPossibleConnectionSignal(graph, var, resource2, L0.Entity);\r
+                                    if (v != null)\r
+                                        return v;\r
+                                }\r
                                 // Apros #9646: if resource2 is the diagram\r
                                 // itself, return the diagram composite variable\r
                                 // since it is generally more useful than the\r
@@ -87,7 +93,6 @@ public class DiagramViewerSelectionProvider extends WorkbenchSelectionProvider {
                                 }\r
                                 \r
                                 if(graph.isInstanceOf(resource2, DIA.Flag)) {\r
-                                       Layer0 L0 = Layer0.getInstance(graph);\r
                                        Variable signal = FlagUtil.getPossibleFlagSignal(graph, var, resource2, L0.Entity);\r
                                        if(signal != null)\r
                                                return signal;\r