Code cleanup.

brunomnsilva · brunomnsilva · commit 83b60c395041 · 2024-03-08T11:24:58.000Z
diff --git a/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java b/src/main/java/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java
@@ -48,7 +48,10 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -398,12 +401,9 @@ public void updateAndWait() {
             throw new IllegalStateException("You must call init() method before any updates.");
         }
         
-        final FutureTask update = new FutureTask(new Callable<Boolean>() {
-            @Override
-            public Boolean call() throws Exception {
-                updateNodes();
-                return true;
-            }
+        final FutureTask<Boolean> update = new FutureTask<>(() -> {
+            updateNodes();
+            return true;
         });
         
         //
@@ -433,7 +433,7 @@ private synchronized void updateNodes() {
     INTERACTION WITH VERTICES AND EDGES
      */
     /**
-     * Sets the action that should be performed when a vertex is double clicked.
+     * Sets the action that should be performed when a vertex is double-clicked.
      *
      * @param action action to be performed
      */
@@ -442,7 +442,7 @@ public void setVertexDoubleClickAction(Consumer<SmartGraphVertex<V>> action) {
     }
 
     /**
-     * Sets the action that should be performed when an edge is double clicked.
+     * Sets the action that should be performed when an edge is double-clicked.
      *
      * @param action action to be performed
      */
@@ -457,7 +457,7 @@ private void initNodes() {
 
         /* create vertex graphical representations */
         for (Vertex<V> vertex : listOfVertices()) {
-            SmartGraphVertexNode<V> vertexAnchor = new SmartGraphVertexNode(vertex, 0, 0,
+            SmartGraphVertexNode<V> vertexAnchor = new SmartGraphVertexNode<>(vertex, 0, 0,
                     graphProperties.getVertexRadius(), graphProperties.getVertexAllowUserMove());
 
             vertexNodes.put(vertex, vertexAnchor);
@@ -486,7 +486,7 @@ private void initNodes() {
                 graphVertexIn.addAdjacentVertex(graphVertexOppositeOut);
                 graphVertexOppositeOut.addAdjacentVertex(graphVertexIn);
 
-                SmartGraphEdgeBase graphEdge = createEdge(edge, graphVertexIn, graphVertexOppositeOut);
+                SmartGraphEdgeBase<E,V> graphEdge = createEdge(edge, graphVertexIn, graphVertexOppositeOut);
 
                 /* Track Edges already placed */
                 connections.put(edge, new Tuple<>(vertex, oppositeVertex));
@@ -511,27 +511,27 @@ private void initNodes() {
         }
     }
 
-    private SmartGraphEdgeBase createEdge(Edge<E, V> edge, SmartGraphVertexNode<V> graphVertexInbound, SmartGraphVertexNode<V> graphVertexOutbound) {
+    private SmartGraphEdgeBase<E,V> createEdge(Edge<E, V> edge, SmartGraphVertexNode<V> graphVertexInbound, SmartGraphVertexNode<V> graphVertexOutbound) {
         /*
         Even if edges are later removed, the corresponding index remains the same. Otherwise, we would have to
         regenerate the appropriate edges.
          */
         int edgeIndex = 0;
-        Integer counter = placedEdges.get(new Tuple(graphVertexInbound, graphVertexOutbound));
+        Integer counter = placedEdges.get(new Tuple<>(graphVertexInbound, graphVertexOutbound));
         if (counter != null) {
             edgeIndex = counter;
         }
 
-        SmartGraphEdgeBase graphEdge;
+        SmartGraphEdgeBase<E,V> graphEdge;
 
         if (getTotalEdgesBetween(graphVertexInbound.getUnderlyingVertex(), graphVertexOutbound.getUnderlyingVertex()) > 1
                 || graphVertexInbound == graphVertexOutbound) {
-            graphEdge = new SmartGraphEdgeCurve(edge, graphVertexInbound, graphVertexOutbound, edgeIndex);
+            graphEdge = new SmartGraphEdgeCurve<>(edge, graphVertexInbound, graphVertexOutbound, edgeIndex);
         } else {
             graphEdge = new SmartGraphEdgeLine<>(edge, graphVertexInbound, graphVertexOutbound);
         }
 
-        placedEdges.put(new Tuple(graphVertexInbound, graphVertexOutbound), ++edgeIndex);
+        placedEdges.put(new Tuple<>(graphVertexInbound, graphVertexOutbound), ++edgeIndex);
 
         return graphEdge;
     }
@@ -555,7 +555,7 @@ private void addVertex(SmartGraphVertexNode<V> v) {
         }
     }
 
-    private void addEdge(SmartGraphEdgeBase e, Edge<E, V> edge) {
+    private void addEdge(SmartGraphEdgeBase<E,V> e, Edge<E, V> edge) {
         //edges to the back
         this.getChildren().add(0, (Node) e);
         edgeNodes.put(edge, e);
@@ -606,7 +606,7 @@ private void insertNodes() {
                     
                     if(existing == null) {
                         /* 
-                        Updates may be coming too fast and we can get out of sync.
+                        Updates may be coming too fast, and we can get out of sync.
                         The opposite vertex exists in the (di)graph, but we have not yet
                         created it for the panel. Therefore, its position is unknown,
                         so place the vertex representation in the middle.
@@ -623,7 +623,7 @@ The opposite vertex exists in the (di)graph, but we have not yet
                     }
                 }
 
-                SmartGraphVertexNode newVertex = new SmartGraphVertexNode<>(vertex,
+                SmartGraphVertexNode<V> newVertex = new SmartGraphVertexNode<>(vertex,
                         x, y, graphProperties.getVertexRadius(), graphProperties.getVertexAllowUserMove());
 
                 //track new nodes
@@ -639,14 +639,14 @@ The opposite vertex exists in the (di)graph, but we have not yet
             for (Edge<E, V> edge : unplottedEdges) {
 
                 Vertex<V>[] vertices = edge.vertices();
-                Vertex<V> u = vertices[0]; //oubound if digraph, by javadoc requirement
+                Vertex<V> u = vertices[0]; //outbound if digraph, by javadoc requirement
                 Vertex<V> v = vertices[1]; //inbound if digraph, by javadoc requirement
 
                 SmartGraphVertexNode<V> graphVertexOut = vertexNodes.get(u);
                 SmartGraphVertexNode<V> graphVertexIn = vertexNodes.get(v);
 
                 /* 
-                Updates may be coming too fast and we can get out of sync.
+                Updates may be coming too fast, and we can get out of sync.
                 Skip and wait for another update call, since they will surely
                 be coming at this pace.
                 */
@@ -657,7 +657,7 @@ The opposite vertex exists in the (di)graph, but we have not yet
                 graphVertexOut.addAdjacentVertex(graphVertexIn);
                 graphVertexIn.addAdjacentVertex(graphVertexOut);
 
-                SmartGraphEdgeBase graphEdge = createEdge(edge, graphVertexIn, graphVertexOut);
+                SmartGraphEdgeBase<E,V> graphEdge = createEdge(edge, graphVertexIn, graphVertexOut);
 
                 if (this.edgesWithArrows) {
                     SmartArrow arrow = new SmartArrow(this.graphProperties.getEdgeArrowSize());
@@ -684,7 +684,7 @@ private void removeNodes() {
          //remove edges (graphical elements) that were removed from the underlying graph
         Collection<Edge<E, V>> removedEdges = removedEdges();
         for (Edge<E, V> e : removedEdges) {
-            SmartGraphEdgeBase edgeToRemove = edgeNodes.get(e);
+            SmartGraphEdgeBase<E,V> edgeToRemove = edgeNodes.get(e);
             edgeNodes.remove(e);
             removeEdge(edgeToRemove);   //remove from panel
 
@@ -712,7 +712,7 @@ private void removeNodes() {
                 
     }
 
-    private void removeEdge(SmartGraphEdgeBase e) {
+    private void removeEdge(SmartGraphEdgeBase<E,V> e) {
         getChildren().remove((Node) e);
 
         SmartArrow attachedArrow = e.getAttachedArrow();
@@ -726,7 +726,7 @@ private void removeEdge(SmartGraphEdgeBase e) {
         }
     }
 
-    private void removeVertex(SmartGraphVertexNode v) {
+    private void removeVertex(SmartGraphVertexNode<V> v) {
         getChildren().remove(v);
 
         Text attachedLabel = v.getAttachedLabel();
@@ -752,7 +752,7 @@ private void updateLabels() {
         });
         
         theGraph.edges().forEach((e) -> {
-            SmartGraphEdgeBase edgeNode = edgeNodes.get(e);
+            SmartGraphEdgeBase<E,V> edgeNode = edgeNodes.get(e);
             if (edgeNode != null) {
                 SmartLabel label = edgeNode.getAttachedLabel();
                 if (label != null) {
@@ -774,7 +774,7 @@ private String generateVertexLabel(V vertex) {
                     return value.toString();
                 }
             }
-        } catch (SecurityException | IllegalAccessException  | IllegalArgumentException |InvocationTargetException ex) {
+        } catch (SecurityException | IllegalAccessException  | IllegalArgumentException | InvocationTargetException ex) {
             Logger.getLogger(SmartGraphPanel.class.getName()).log(Level.SEVERE, null, ex);
         }
         
@@ -830,21 +830,15 @@ private boolean areAdjacent(SmartGraphVertexNode<V> v, SmartGraphVertexNode<V> u
     }
 
     private void updateForces() {
-        vertexNodes.values().forEach((v) -> {
-            v.updateDelta();
-        });
+        vertexNodes.values().forEach((v) -> v.updateDelta());
     }
 
     private void applyForces() {
-        vertexNodes.values().forEach((v) -> {
-            v.moveFromForces();
-        });
+        vertexNodes.values().forEach((v) -> v.moveFromForces());
     }
 
     private void resetForces() {
-        vertexNodes.values().forEach((v) -> {
-            v.resetForces();
-        });
+        vertexNodes.values().forEach((v) -> v.resetForces());
     }
 
     private int getTotalEdgesBetween(Vertex<V> v, Vertex<V> u) {
@@ -861,19 +855,11 @@ private int getTotalEdgesBetween(Vertex<V> v, Vertex<V> u) {
     }
 
     private List<Edge<E, V>> listOfEdges() {
-        List<Edge<E, V>> list = new LinkedList<>();
-        for (Edge<E, V> edge : theGraph.edges()) {
-            list.add(edge);
-        }
-        return list;
+        return new LinkedList<>(theGraph.edges());
     }
 
     private List<Vertex<V>> listOfVertices() {
-        List<Vertex<V>> list = new LinkedList<>();
-        for (Vertex<V> vertex : theGraph.vertices()) {
-            list.add(vertex);
-        }
-        return list;
+        return new LinkedList<>(theGraph.vertices());
     }
 
     /**
@@ -927,7 +913,7 @@ private Collection<Edge<E, V>> removedEdges() {
         Collection<Edge<E, V>> graphEdges = theGraph.edges();
         Collection<SmartGraphEdgeBase<E,V>> plotted = edgeNodes.values();
 
-        for (SmartGraphEdgeBase e : plotted) {
+        for (SmartGraphEdgeBase<E,V> e : plotted) {
             if (!graphEdges.contains(e.getUnderlyingEdge())) {
                 removed.add(e.getUnderlyingEdge());
             }
@@ -1068,7 +1054,7 @@ public SmartStylableNode getStylableLabel(Vertex<V> v) {
      * @return stylable element (label)
      */
     public SmartStylableNode getStylableLabel(Edge<E,V> e) {
-        SmartGraphEdgeBase edge = edgeNodes.get(e);
+        SmartGraphEdgeBase<E,V> edge = edgeNodes.get(e);
         
         return edge != null ? edge.getStylableLabel() : null;
     }
@@ -1096,7 +1082,7 @@ private void loadStylesheet(URI cssFile) {
 
     /**
      * Enables the double click action on this pane.
-     *
+     * <br/>
      * This method identifies the node that was clicked and, if any, calls the
      * appropriate consumer, i.e., vertex or edge consumers.
      */
@@ -1115,13 +1101,12 @@ private void enableDoubleClickListener() {
                     }
 
                     if (node instanceof SmartGraphVertex) {
-                        SmartGraphVertex v = (SmartGraphVertex) node;
+                        SmartGraphVertex<V> v = (SmartGraphVertex<V>) node;
                         vertexClickConsumer.accept(v);
                     } else if (node instanceof SmartGraphEdge) {
-                        SmartGraphEdge e = (SmartGraphEdge) node;
+                        SmartGraphEdge<E,V> e = (SmartGraphEdge<E,V>) node;
                         edgeClickConsumer.accept(e);
                     }
-
                 }
             }
         });
@@ -1132,7 +1117,7 @@ private void enableDoubleClickListener() {
      *
      * @param <T> the type of the tuple
      */
-    private class Tuple<T> {
+    private static class Tuple<T> {
 
         private final T first;
         private final T second;
@@ -1165,10 +1150,7 @@ public boolean equals(Object obj) {
             if (!Objects.equals(this.first, other.first)) {
                 return false;
             }
-            if (!Objects.equals(this.second, other.second)) {
-                return false;
-            }
-            return true;
+            return Objects.equals(this.second, other.second);
         }
     }
 
