Fixed removal of individual edges from the underlying graph not

being represented in the panel. Only edges connected to removed
vertices were being removed.

Author: brunomnsilva

src/com/brunomnsilva/smartgraph/Main.java

@@ -38,6 +38,7 @@
 import com.brunomnsilva.smartgraph.containers.SmartGraphDemoContainer;
 import com.brunomnsilva.smartgraph.graph.Digraph;
 import com.brunomnsilva.smartgraph.graph.DigraphEdgeList;
+import com.brunomnsilva.smartgraph.graph.Edge;
 import com.brunomnsilva.smartgraph.graphview.SmartCircularSortedPlacementStrategy;
 
 /**
@@ -102,6 +103,11 @@ public void start(Stage ignored) {
             System.out.println("Edge contains element: " + graphEdge.getUnderlyingEdge().element());
             //dynamically change the style when clicked
             graphEdge.setStyle("-fx-stroke: black; -fx-stroke-width: 2;");
+            
+            //uncomment to see edges being removed after click
+            //Edge<String, String> underlyingEdge = graphEdge.getUnderlyingEdge();
+            //g.removeEdge(underlyingEdge);
+            //graphView.update();
         });
 
         /*

src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java

@@ -556,6 +556,7 @@ private void removeNodes() {
         Set<SmartGraphVertexNode<V>> verticesToRemove = new HashSet<>();
         Set<SmartGraphEdgeBase> edgesToRemove = new HashSet<>();
 
+        //filter vertices to remove and their adjacent edges
         for (Vertex<V> v : removedVertices) {
 
             for (SmartGraphEdgeBase edge : values) {
@@ -581,6 +582,14 @@ private void removeNodes() {
             vertexNodes.remove(v.getUnderlyingVertex());
             removeVertice(v);
         }
+        
+        //permanently remove remaining edges that were removed from the underlying graph
+        Collection<Edge<E, V>> removedEdges = removedEdges();
+        for (Edge<E, V> e : removedEdges) {
+            SmartGraphEdgeBase edgeToRemove = edgeNodes.get(e);
+            edgeNodes.remove(e);
+            removeEdge(edgeToRemove);
+        }
 
         //remove adjacencies from remaining vertices
         for (SmartGraphVertexNode<V> v : vertexNodes.values()) {
@@ -739,7 +748,7 @@ private Collection<Vertex<V>> unplottedVertices() {
     }
 
     /**
-     * Computes the vertex collection that are currently being displayed but do
+     * Computes the collection for vertices that are currently being displayed but do
      * not longer exist in the underlying graph.
      *
      * @return collection of vertices
@@ -758,6 +767,27 @@ private Collection<Vertex<V>> removedVertices() {
 
         return removed;
     }
+    
+    /**
+     * Computes the collection for edges that are currently being displayed but do
+     * not longer exist in the underlying graph.
+     *
+     * @return collection of edges
+     */
+    private Collection<Edge<E, V>> removedEdges() {
+        List<Edge<E, V>> removed = new LinkedList<>();
+
+        Collection<Edge<E, V>> graphEdges = theGraph.edges();
+        Collection<SmartGraphEdgeBase> plotted = edgeNodes.values();
+
+        for (SmartGraphEdgeBase e : plotted) {
+            if (!graphEdges.contains(e.getUnderlyingEdge())) {
+                removed.add(e.getUnderlyingEdge());
+            }
+        }
+
+        return removed;
+    }
 
     /**
      * Computes the edge collection of the underlying graph that are not