Fixed filtering of connection points when any drilling is done

gitlab #324

Change-Id: Iad676ddea1ab4625f6bdc615dc83605707107260

diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/ConnectionBrowser.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/ConnectionBrowser.java
index 60fee19b20b9298aebe90b086d4788f445ad9b8a..11a49f01705e002a73a44c7e1d2d36aa90d4fafc 100644 (file)
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/ConnectionBrowser.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/ConnectionBrowser.java
@@ -624,47 +624,41 @@ public class ConnectionBrowser {
                                needDrill = new THashSet<VariableConnectionPointDescriptor>(climbed.size());
                        needDrill.add(desc);
                } else {
+                if(relationType != null) {
+                    if(!filterByRelationType(graph, desc, relationType))
+                        continue;
+                }
                        if(result == null)
                                result = new THashSet<VariableConnectionPointDescriptor>(climbed.size());
                        result.add(desc);
                }
         }
         
-        if(needDrill == null) {
-               /*
-                * All descriptors were already flat - just take case of filtering
-                */
-            if(relationType != null) {
-                ArrayList<VariableConnectionPointDescriptor> filtered = new ArrayList<VariableConnectionPointDescriptor>(climbed.size());
-                for(VariableConnectionPointDescriptor desc : climbed)
-                    if(filterByRelationType(graph, desc, relationType))
-                        filtered.add(desc);
-                return filtered;
-            } else {
-                return climbed;
+        if(needDrill != null) {
+            /*
+             * There were some descriptors that require drill
+             */
+            for(VariableConnectionPointDescriptor top : needDrill) {
+                Collection<VariableConnectionPointDescriptor> drilled = drill(graph, top);
+                if(drilled != null) {
+                    for(VariableConnectionPointDescriptor drill : drilled) {
+                        if(relationType != null) {
+                            if(!filterByRelationType(graph, drill, relationType))
+                                continue;
+                        }
+                        if(result == null)
+                            result = new THashSet<VariableConnectionPointDescriptor>(climbed.size());
+                        result.add(drill);
+                    }
+                }
             }
         }
-        
 
-        /*
-         * There were some descriptors that require drill
-         */
-        for(VariableConnectionPointDescriptor top : needDrill) {
-               Collection<VariableConnectionPointDescriptor> drilled = drill(graph, top);
-            if(drilled != null) {
-               for(VariableConnectionPointDescriptor drill : drilled) {
-                       if(relationType != null) {
-                               if(!filterByRelationType(graph, drill, relationType))
-                                       continue;
-                       }
-                       if(result == null)
-                               result = new THashSet<VariableConnectionPointDescriptor>(climbed.size());
-                       result.add(drill);
-               }
-            }
+        if (result != null) {
+            return result;
+        } else {
+            return Collections.emptySet();
         }
-        return result;
-        
     }
     
     private static boolean filterByRelationType(ReadGraph graph, VariableConnectionPointDescriptor desc, Resource relationType) throws DatabaseException {