Pessimistic approach to high-rate calls to SmartGraphPanel#update().

Fixed SmartGraphPanel#getBounds() when panel is empty.

Author: brunomnsilva

releases/JavaFXSmartGraph-0.9.jar

@@ -35,7 +35,7 @@ public DigraphEdgeList() {
 
 
     @Override
-    public Collection<Edge<E, V>> incidentEdges(Vertex<V> inbound) throws InvalidVertexException {
+    public synchronized Collection<Edge<E, V>> incidentEdges(Vertex<V> inbound) throws InvalidVertexException {
         checkVertex(inbound);
 
         List<Edge<E, V>> incidentEdges = new ArrayList<>();
@@ -49,7 +49,7 @@ public Collection<Edge<E, V>> incidentEdges(Vertex<V> inbound) throws InvalidVer
     }
 
     @Override
-    public Collection<Edge<E, V>> outboundEdges(Vertex<V> outbound) throws InvalidVertexException {
+    public synchronized Collection<Edge<E, V>> outboundEdges(Vertex<V> outbound) throws InvalidVertexException {
         checkVertex(outbound);
 
         List<Edge<E, V>> outboundEdges = new ArrayList<>();
@@ -127,7 +127,7 @@ public int numEdges() {
     }
 
     @Override
-    public Collection<Vertex<V>> vertices() {
+    public synchronized Collection<Vertex<V>> vertices() {
         List<Vertex<V>> list = new ArrayList<>();
         vertices.values().forEach((v) -> {
             list.add(v);
@@ -136,7 +136,7 @@ public Collection<Vertex<V>> vertices() {
     }
 
     @Override
-    public Collection<Edge<E, V>> edges() {
+    public synchronized Collection<Edge<E, V>> edges() {
         List<Edge<E, V>> list = new ArrayList<>();
         edges.values().forEach((e) -> {
             list.add(e);
@@ -145,7 +145,7 @@ public Collection<Edge<E, V>> edges() {
     }
 
     @Override
-    public Vertex<V> opposite(Vertex<V> v, Edge<E, V> e) throws InvalidVertexException, InvalidEdgeException {
+    public synchronized Vertex<V> opposite(Vertex<V> v, Edge<E, V> e) throws InvalidVertexException, InvalidEdgeException {
         checkVertex(v);
         MyEdge edge = checkEdge(e);
 

releases/JavaFXSmartGraph-0.9.zip

@@ -474,14 +474,24 @@ private void insertNodes() {
                     Edge<E, V> firstEdge = incidentEdges.iterator().next();
                     Vertex<V> opposite = theGraph.opposite(vertex, firstEdge);
                     SmartGraphVertexNode<V> existing = vertexNodes.get(opposite);
-
-                    /* TODO: fix -- the placing point can be set out of bounds*/
-                    Point2D p = UtilitiesPoint2D.rotate(existing.getPosition().add(50.0, 50.0),
-                            existing.getPosition(), Math.random() * 360);
-
-                    x = p.getX();
-                    y = p.getY();
-
+                    
+                    if(existing == null) {
+                        /* 
+                        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.
+                        */                        
+                        x = mx;
+                        y = my;
+                    } else {
+                        /* TODO: fix -- the placing point can be set out of bounds*/
+                        Point2D p = UtilitiesPoint2D.rotate(existing.getPosition().add(50.0, 50.0),
+                                existing.getPosition(), Math.random() * 360);
+
+                        x = p.getX();
+                        y = p.getY();
+                    }
                 }
 
                 SmartGraphVertexNode newVertex = new SmartGraphVertexNode<>(vertex,
@@ -506,6 +516,15 @@ private void insertNodes() {
                 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.
+                Skip and wait for another update call, since they will surely
+                be coming at this pace.
+                */
+                if(graphVertexIn == null || graphVertexOut == null) {
+                    continue;
+                }
+                
                 graphVertexOut.addAdjacentVertex(graphVertexIn);
                 graphVertexIn.addAdjacentVertex(graphVertexOut);
 
@@ -600,7 +619,9 @@ private void removeVertice(SmartGraphVertexNode v) {
     private Bounds getPlotBounds() {
         double minX = Double.MAX_VALUE, minY = Double.MAX_VALUE,
                 maxX = Double.MIN_VALUE, maxY = Double.MIN_VALUE;
-
+        
+        if(vertexNodes.size() == 0) return new BoundingBox(0, 0, getWidth(), getHeight());
+        
         for (SmartGraphVertexNode<V> v : vertexNodes.values()) {
             minX = Math.min(minX, v.getCenterX());
             minY = Math.min(minY, v.getCenterY());