Addressed issues #9 and #19. See README's What's new.

Author: brunomnsilva

README.md

@@ -27,6 +27,16 @@ In windows the JVM machine should automatically take care of that, while in Linu
 
 ## Getting Started
 
+### What's **new**?
+
+- (0.9.4) You can now annotate a method with `@SmartLabelSource` within a model class to provide the displayed label for a vertex/edge; see the example at `com.brunomnsilva.smartgraph.example`. If no annotation is present, then the `toString()` method is used to obtain the label's text.
+
+- (0.9.4) You can mannualy alter a vertex position on the panel at anytime, through `SmartGraphPanel.setVertexPosition(Vertex<V> v)`; see the example at `com.brunomnsilva.smartgraph.example`.
+
+- (0.9.4) You can override specific default properties by using a *String* parameter to the `SmartGraphProperties` constructor; see the example at `com.brunomnsilva.smartgraph.example`. This is useful if you want to display visually different graphs within the same application.
+
+- (0.9.4) You can now style labels and arrows individually.
+
 ### Basic usage
 
 ```java

releases/JavaFXSmartGraph-0.9.4.jar

@@ -0,0 +1,47 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.brunomnsilva.smartgraph.example;
+
+import com.brunomnsilva.smartgraph.graphview.SmartLabelSource;
+
+/**
+ *
+ * @author brunomnsilva
+ */
+public class City {
+    private String name;
+    private int population;
+
+    public City(String name, int age) {
+        this.name = name;
+        this.population = age;
+    }
+
+    @SmartLabelSource
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    
+    public int getPopulation() {
+        return population;
+    }
+
+    public void setPopulation(int population) {
+        this.population = population;
+    }
+
+    @Override
+    public String toString() {
+        return "City{" + "name=" + name + ", population=" + population + '}';
+    }
+   
+    
+}

releases/JavaFXSmartGraph-0.9.4.zip

@@ -0,0 +1,46 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.brunomnsilva.smartgraph.example;
+
+import com.brunomnsilva.smartgraph.graphview.SmartLabelSource;
+
+/**
+ *
+ * @author brunomnsilva
+ */
+public class Distance {
+    private int distance;
+
+    public Distance(int distance) {
+        this.distance = distance;
+    }
+
+    public int getDistance() {
+        return distance;
+    }
+
+    public void setDistance(int distance) {
+        this.distance = distance;
+    }
+    
+    @SmartLabelSource
+    public String getDisplayDistance() {
+        /* If the above annotation is not present, the toString()
+        will be used as the edge label. */
+        
+        return distance + " km";
+    }
+
+    @Override
+    public String toString() {
+        return "Distance{" + "distance=" + distance + '}';
+    }
+
+    
+
+    
+    
+}

src/com/brunomnsilva/smartgraph/example/City.java

@@ -0,0 +1,83 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.brunomnsilva.smartgraph.example;
+
+import com.brunomnsilva.smartgraph.containers.SmartGraphDemoContainer;
+import com.brunomnsilva.smartgraph.graph.Graph;
+import com.brunomnsilva.smartgraph.graph.GraphEdgeList;
+import com.brunomnsilva.smartgraph.graph.Vertex;
+import com.brunomnsilva.smartgraph.graphview.SmartCircularSortedPlacementStrategy;
+import com.brunomnsilva.smartgraph.graphview.SmartGraphPanel;
+import com.brunomnsilva.smartgraph.graphview.SmartGraphProperties;
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
+
+/**
+ *
+ * @author brunomnsilva
+ */
+public class ExampleMain extends Application {
+
+    @Override
+    public void start(Stage ignored) {
+        
+        Graph<City, Distance> distances = new GraphEdgeList<>();
+        
+        Vertex<City> prague = distances.insertVertex(new City("Prague", 0));
+        Vertex<City> tokyo = distances.insertVertex(new City("Tokyo", 0));
+        Vertex<City> beijing = distances.insertVertex(new City("Beijing", 0));
+        Vertex<City> newYork = distances.insertVertex(new City("New York", 0));
+        Vertex<City> london = distances.insertVertex(new City("London", 0));
+        Vertex<City> helsinky = distances.insertVertex(new City("Helsinky", 0));
+        
+        distances.insertEdge(tokyo, newYork, new Distance(10838));
+        distances.insertEdge(beijing, newYork, new Distance(11550));
+        distances.insertEdge(beijing, tokyo, new Distance(1303));
+        distances.insertEdge(london, newYork, new Distance(5567));
+        distances.insertEdge(london, prague, new Distance(1264));
+        distances.insertEdge(helsinky, tokyo, new Distance(7815));
+        distances.insertEdge(prague, helsinky, new Distance(1845));
+        distances.insertEdge(beijing, london, new Distance(8132));
+        
+        /* Only Java 15 allows for multi-line strings */
+        String customProps = "edge.label = true" + "\n" + "edge.arrow = false";
+                
+        SmartGraphProperties properties = new SmartGraphProperties(customProps);
+        
+        SmartGraphPanel<City, Distance> graphView = new SmartGraphPanel<>(distances, properties, new SmartCircularSortedPlacementStrategy());
+        
+        Scene scene = new Scene(new SmartGraphDemoContainer(graphView), 1024, 768);
+
+        Stage stage = new Stage(StageStyle.DECORATED);
+        stage.setTitle("JavaFX SmartGraph City Distances");
+        stage.setMinHeight(500);
+        stage.setMinWidth(800);
+        stage.setScene(scene);
+        stage.show();
+        
+        graphView.init();
+        
+        //graphView.setAutomaticLayout(true);
+        
+        /* You can mannualy place vertices at any time. However, these are
+        absolute coordinates inside the container panel. */
+        graphView.setVertexPosition(beijing, 100, 100);
+        graphView.setVertexPosition(helsinky, 924, 100);
+        graphView.setVertexPosition(london, 200, 668);
+        graphView.setVertexPosition(prague, 824, 668);
+        graphView.setVertexPosition(tokyo, 512, 300);
+        graphView.setVertexPosition(newYork, 512, 400);
+        
+        graphView.getStylableLabel(tokyo).setStyle("-fx-stroke: red; -fx-fill: red;");
+        
+    }
+    
+    public static void main(String[] args) {
+        launch(args);
+    }
+}

src/com/brunomnsilva/smartgraph/example/Distance.java

@@ -59,4 +59,11 @@ public interface SmartGraphEdge<E, V> extends SmartStylableNode {
      * @return arrow reference; null if does not exist.
      */
     public SmartStylableNode getStylableArrow();
+    
+    /**
+     * Returns the label node for further styling.
+     * 
+     * @return the label node.
+     */
+    public SmartStylableNode getStylableLabel();
 }

src/com/brunomnsilva/smartgraph/example/ExampleMain.java

@@ -223,4 +223,9 @@ public SmartArrow getAttachedArrow() {
     public SmartStylableNode getStylableArrow() {
         return this.attachedArrow;
     }
+
+    @Override
+    public SmartStylableNode getStylableLabel() {
+        return this.attachedLabel;
+    }
 }

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

@@ -140,4 +140,9 @@ public SmartStylableNode getStylableArrow() {
         return this.attachedArrow;
     }
 
+    @Override
+    public SmartStylableNode getStylableLabel() {
+        return this.attachedLabel;
+    }
+    
 }

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

@@ -58,6 +58,8 @@
 import static com.brunomnsilva.smartgraph.graphview.UtilitiesJavaFX.pick;
 import static com.brunomnsilva.smartgraph.graphview.UtilitiesPoint2D.attractiveForce;
 import static com.brunomnsilva.smartgraph.graphview.UtilitiesPoint2D.repellingForce;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -99,6 +101,7 @@ public class SmartGraphPanel<V, E> extends Pane {
     private final Map<Tuple<SmartGraphVertexNode>, Integer> placedEdges = new HashMap<>();
     private boolean initialized = false;
     private final boolean edgesWithArrows;
+    
     /*
     INTERACTION WITH VERTICES AND EDGES
      */
@@ -480,9 +483,7 @@ private SmartGraphEdgeBase createEdge(Edge<E, V> edge, SmartGraphVertexNode<V> g
     private void addVertex(SmartGraphVertexNode<V> v) {
         this.getChildren().add(v);
 
-        String labelText = (v.getUnderlyingVertex().element() != null) ? 
-                    v.getUnderlyingVertex().element().toString() :
-                    "<NULL>";
+        String labelText = generateVertexLabel(v.getUnderlyingVertex().element());
 
         if (graphProperties.getUseVertexTooltip()) {            
             Tooltip t = new Tooltip(labelText);
@@ -503,9 +504,7 @@ private void addEdge(SmartGraphEdgeBase e, Edge<E, V> edge) {
         this.getChildren().add(0, (Node) e);
         edgeNodes.put(edge, e);
 
-        String labelText = (edge.element() != null) ? 
-                    edge.element().toString() :
-                    "<NULL>";
+        String labelText = generateEdgeLabel(edge.element());
 
         if (graphProperties.getUseEdgeTooltip()) {
             Tooltip t = new Tooltip(labelText);
@@ -703,7 +702,8 @@ private void updateLabels() {
             if (vertexNode != null) {
                 SmartLabel label = vertexNode.getAttachedLabel();
                 if(label != null) {
-                    label.setText(v.element() != null ? v.element().toString() : "<NULL>");
+                    String text = generateVertexLabel(v.element());
+                    label.setText( text );
                 }
 
             }
@@ -714,12 +714,49 @@ private void updateLabels() {
             if (edgeNode != null) {
                 SmartLabel label = edgeNode.getAttachedLabel();
                 if (label != null) {
-                    label.setText(e.element() != null ? e.element().toString() : "<NULL>");
+                    String text = generateEdgeLabel(e.element());
+                    label.setText( text );
                 }
             }
         });
     }
 
+    private String generateVertexLabel(V vertex) {
+        
+        try {
+            Class<?> clazz = vertex.getClass();
+            for (Method method : clazz.getDeclaredMethods()) {
+                if (method.isAnnotationPresent(SmartLabelSource.class)) {
+                    method.setAccessible(true);
+                    Object value = method.invoke(vertex);
+                    return value.toString();
+                }
+            }
+        } catch (SecurityException | IllegalAccessException  | IllegalArgumentException |InvocationTargetException ex) {
+            Logger.getLogger(SmartGraphPanel.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        
+        return vertex != null ? vertex.toString() : "<NULL>";
+    }
+    
+    private String generateEdgeLabel(E edge) {
+        
+        try {
+            Class<?> clazz = edge.getClass();
+            for (Method method : clazz.getDeclaredMethods()) {
+                if (method.isAnnotationPresent(SmartLabelSource.class)) {
+                    method.setAccessible(true);
+                    Object value = method.invoke(edge);
+                    return value.toString();
+                }
+            }
+        } catch (SecurityException | IllegalAccessException  | IllegalArgumentException |InvocationTargetException ex) {
+            Logger.getLogger(SmartGraphPanel.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        
+        return edge != null ? edge.toString() : "<NULL>";
+    }
+    
     /**
      * Computes the bounding box from all displayed vertices.
      *
@@ -1001,7 +1038,31 @@ public SmartStylableNode getStylableEdge(E edgeElement) {
         }
         return null;
     }
+    
+    /**
+     * Returns the associated stylable element with a graph vertex.
+     *
+     * @param v underlying vertex
+     * @return stylable element (label)
+     */
+    public SmartStylableNode getStylableLabel(Vertex<V> v) {
+        SmartGraphVertexNode<V> vertex = vertexNodes.get(v);
+        
+        return vertex != null ? vertex.getStylableLabel() : null;
+    }
+    
+    /**
+     * Returns the associated stylable element with a graph edge.
+     *
+     * @param e underlying graph edge
+     * @return stylable element (label)
+     */
+    public SmartStylableNode getStylableLabel(Edge<E,V> e) {
+        SmartGraphEdgeBase edge = edgeNodes.get(e);
 
+        return edge != null ? edge.getStylableLabel() : null;
+    }
+   
 
     /**
      * Loads the stylesheet and applies the .graph class to this panel.