Handle neighbours case in graph selection

Author: mbastian

modules/engine-core/src/main/java/org/gephi/viz/engine/status/GraphSelection.java

@@ -21,21 +21,17 @@ enum GraphSelectionMode {
 
     boolean isNodeSelected(Node node);
 
-    int getSelectedNodesCount();
-
     Set<Node> getSelectedNodes();
 
-    void setSelectedNodes(Collection<Node> nodes);
-
-    void addSelectedNodes(Collection<Node> nodes);
+    Set<Node> getSelectedNodesWithNeighbours();
 
-    void removeSelectedNodes(Collection<Node> nodes);
+    void setSelectedNodes(Collection<Node> nodes, Collection<Node> neighbours);
 
-    void setSelectedNode(Node node);
+    void addSelectedNodes(Collection<Node> nodes, Collection<Node> neighbours);
 
-    void addSelectedNode(Node node);
+    void setSelectedNode(Node node, Collection<Node> neighbours);
 
-    void removeSelectedNode(Node node);
+    void addSelectedNode(Node node, Collection<Node> neighbours);
 
     void clearSelectedNodes();
 

modules/engine-core/src/main/java/org/gephi/viz/engine/status/GraphSelectionImpl.java

@@ -13,6 +13,7 @@
 public class GraphSelectionImpl implements GraphSelection {
 
     private final Set<Node> nodes = new HashSet<>();
+    private final Set<Node> nodesWithNeighbours = new HashSet<>();
     private final Set<Edge> edges = new HashSet<>();
     private GraphSelection.GraphSelectionMode selectionMode;
 
@@ -27,12 +28,7 @@ public boolean someNodesOrEdgesSelection() {
 
     @Override
     public boolean isNodeSelected(Node node) {
-        return nodes.contains(node);
-    }
-
-    @Override
-    public int getSelectedNodesCount() {
-        return nodes.size();
+        return nodesWithNeighbours.contains(node);
     }
 
     @Override
@@ -41,48 +37,57 @@ public Set<Node> getSelectedNodes() {
     }
 
     @Override
-    public void setSelectedNodes(Collection<Node> nodes) {
-        this.nodes.clear();
-        if (nodes != null) {
-            this.nodes.addAll(nodes);
-        }
+    public Set<Node> getSelectedNodesWithNeighbours() {
+        return Collections.unmodifiableSet(nodesWithNeighbours);
     }
 
     @Override
-    public void addSelectedNodes(Collection<Node> nodes) {
+    public void setSelectedNodes(Collection<Node> nodes, Collection<Node> neighbours) {
+        this.nodes.clear();
+        this.nodesWithNeighbours.clear();
         if (nodes != null) {
             this.nodes.addAll(nodes);
+            this.nodesWithNeighbours.addAll(nodes);
+            if (neighbours != null) {
+                this.nodesWithNeighbours.addAll(neighbours);
+            }
         }
     }
 
     @Override
-    public void removeSelectedNodes(Collection<Node> nodes) {
+    public void addSelectedNodes(Collection<Node> nodes, Collection<Node> neighbours) {
         if (nodes != null) {
-            this.nodes.removeAll(nodes);
+            this.nodes.addAll(nodes);
+            this.nodesWithNeighbours.addAll(nodes);
+            if (neighbours != null) {
+                this.nodesWithNeighbours.addAll(neighbours);
+            }
         }
     }
 
     @Override
-    public void setSelectedNode(Node node) {
+    public void setSelectedNode(Node node, Collection<Node> neighbours) {
         if (node == null) {
             this.clearSelectedNodes();
         } else {
             this.nodes.clear();
             this.nodes.add(node);
+            this.nodesWithNeighbours.clear();
+            this.nodesWithNeighbours.add(node);
+            if (neighbours != null) {
+                this.nodesWithNeighbours.addAll(neighbours);
+            }
         }
     }
 
     @Override
-    public void addSelectedNode(Node node) {
+    public void addSelectedNode(Node node, Collection<Node> neighbours) {
         if (node != null) {
             this.nodes.add(node);
-        }
-    }
-
-    @Override
-    public void removeSelectedNode(Node node) {
-        if (node != null) {
-            this.nodes.remove(node);
+            this.nodesWithNeighbours.add(node);
+            if (neighbours != null) {
+                this.nodesWithNeighbours.addAll(neighbours);
+            }
         }
     }
 

modules/opengl-commons/src/main/java/org/gephi/viz/engine/util/actions/InputActionsProcessor.java

@@ -1,5 +1,6 @@
 package org.gephi.viz.engine.util.actions;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -53,6 +54,7 @@ public void selectNodes(final NodeIterable nodesIterable) {
 
         final Iterator<Node> iterator = nodesIterable.iterator();
         final Set<Node> selectionNodes = new HashSet<>();
+        final Set<Node> selectionNeighbours = new HashSet<>();
         final Set<Edge> selectionEdges = new HashSet<>();
 
         final boolean selectNeighbours = renderingOptions.isAutoSelectNeighbours();
@@ -61,13 +63,19 @@ public void selectNodes(final NodeIterable nodesIterable) {
                 final Node node = iterator.next();
 
                 selectionNodes.add(node);
-                selectionEdges.addAll(graph.getEdges(node).toCollection());
+                Collection<Edge> edges = graph.getEdges(node).toCollection();
+                selectionEdges.addAll(edges);
                 if (selectNeighbours) {
-                    selectionNodes.addAll(graph.getNeighbors(node).toCollection());
+                    for (Edge edge : edges) {
+                        Node oppositeNode = graph.getOpposite(node, edge);
+                        if (oppositeNode != null && oppositeNode != node) {
+                            selectionNeighbours.add(oppositeNode);
+                        }
+                    }
                 }
             }
 
-            selection.setSelectedNodes(selectionNodes);
+            selection.setSelectedNodes(selectionNodes, selectionNeighbours);
             selection.setSelectedEdges(selectionEdges);
         } finally {
             if (iterator.hasNext()) {