Fix: (of fix!) labels for vertices and edges are now updated during c…

…alls to update() or updateAndWait().
brunomnsilva · Mar 7, 2020 · e7d5f93 · e7d5f93
1 parent d2dac77
commit e7d5f93
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/releases/JavaFXSmartGraph-0.9.jar b/releases/JavaFXSmartGraph-0.9.jar
diff --git a/releases/JavaFXSmartGraph-0.9.zip b/releases/JavaFXSmartGraph-0.9.zip
diff --git a/src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java b/src/com/brunomnsilva/smartgraph/graphview/SmartGraphPanel.java
@@ -677,16 +677,23 @@ private void updateLabels() {
         theGraph.vertices().forEach((v) -> {
             SmartGraphVertexNode<V> vertexNode = vertexNodes.get(v);
             if (vertexNode != null) {
-                vertexNode.getAttachedLabel().setText(v.toString());
+                SmartLabel label = vertexNode.getAttachedLabel();
+                if(label != null) {
+                    label.setText(v.element().toString());
+                }
+
             }
         });
 
-        for (Edge<E, V> e : theGraph.edges()) {
+        theGraph.edges().forEach((e) -> {
             SmartGraphEdgeBase edgeNode = edgeNodes.get(e);
-            if(edgeNode != null) {
-                edgeNode.getAttachedLabel().setText(e.toString());
+            if (edgeNode != null) {
+                SmartLabel label = edgeNode.getAttachedLabel();
+                if (label != null) {
+                    label.setText(e.element().toString());
+                }
             }
-        }
+        });
     }
 
     /**