undo graph not a node.

Author: i-make-robots

src/main/java/com/marginallyclever/nodegraphcore/Graph.java

@@ -21,7 +21,7 @@
  * @author Dan Royer
  * @since 2022-02-01
  */
-public class Graph {
+public class Graph extends Node {
     private static final Logger logger = LoggerFactory.getLogger(Graph.class);
 
     /**
@@ -48,7 +48,7 @@ public class Graph {
      * Constructor for subclasses to call.  Creates an empty {@link Graph}.
      */
     public Graph() {
-        super();
+        super("Graph");
     }
 
     /**
@@ -149,7 +149,7 @@ public void remove(Graph graph) {
      * @param n the subject from which all connections should be removed.
      */
     public void removeConnectionsToNode(Node n) {
-        ArrayList<Connection> toRemove = new ArrayList<>();
+        var toRemove = new ArrayList<Connection>();
         for(Connection c : connections) {
             for(int i = 0; i<n.getNumPorts(); ++i) {
                 Port<?> v = n.getPort(i);
@@ -368,16 +368,20 @@ public void updateBounds() {
     }
 
     public @Nonnull JSONObject toJSON() {
-        JSONObject jo = new JSONObject();
+        JSONObject jo = super.toJSON();
         jo.put("nodes",getAllNodesAsJSON());
         jo.put("connections",getAllNodeConnectionsAsJSON());
+        // TODO save input and output ports.
         return jo;
     }
 
+
     public void fromJSON(JSONObject jo) throws JSONException {
         clear();
+        super.fromJSON(jo);
         parseAllNodesFromJSON(jo.getJSONArray("nodes"));
         parseAllConnectionsFromJSON(jo.getJSONArray("connections"));
+        // TODO load input and output ports.
     }
 
     private void parseAllNodesFromJSON(JSONArray arr) throws JSONException {

src/test/java/com/marginallyclever/nodegraphcore/TestGraphCore.java

@@ -54,7 +54,10 @@ public void beforeEach() {
     @Test
     public void testSaveEmptyGraph() {
         var json = graph.toJSON();
-        assertEquals("{\"nodes\":[],\"connections\":[]}",
+        json.put("uniqueID","19781eb0-4009-4f5e-bc68-4e70de1b5181");
+        assertEquals("{\"variables\":[],\"nodes\":[],\"name\":\"Graph\","
+                +"\"rectangle\":{\"x\":0,\"width\":150,\"y\":0,\"height\":50},"
+                +"\"label\":\"\",\"uniqueID\":\"19781eb0-4009-4f5e-bc68-4e70de1b5181\",\"connections\":[]}",
                 json.toString());
     }
 
@@ -158,7 +161,7 @@ public void testAllNodesToJSONAndBack() {
      * confirm a {@link Graph} can be serialized and de-serialized.
      */
     @Test
-    public void testModelToJSONAndBack() {
+    public void testGraphToJSONAndBack() {
         buildAddTwoConstants();
         JSONObject a = graph.toJSON();
         Graph modelB = new Graph();
@@ -170,7 +173,7 @@ public void testModelToJSONAndBack() {
      * confirm clearing a {@link Graph} really does set it back to nothing.
      */
     @Test
-    public void testModelClears() {
+    public void testGraphClears() {
         buildAddTwoConstants();
         graph.clear();
         assertEquals((new Graph()).toString(), graph.toString());
@@ -180,8 +183,8 @@ public void testModelClears() {
      * confirm registering an already registered node does not throw an exception and does not double-register.
      */
     @Test
-    public void testFactoryWontRegisterTwoNodesWithSameName() throws Exception {
-        assertThrows(GraphException.class,()-> NodeFactory.loadRegistries());
+    public void testFactoryWontRegisterTwoNodesWithSameName() {
+        assertThrows(GraphException.class, NodeFactory::loadRegistries);
     }
 
     /**
@@ -192,7 +195,7 @@ public void testFactoryWontRegisterTwoNodesWithSameName() throws Exception {
      * @param <T>
      * @throws Exception
      */
-    private <T> void testNodeVariableToJSONAndBack(Class<T> myClass,T instA,T instB) throws Exception {
+    private <T> void testNodeVariableToJSONAndBack(Class<T> myClass,T instA,T instB) {
         Port<?> a = new Input<>(myClass.getSimpleName(),myClass,instA);
         Port<?> b = new Input<>(myClass.getSimpleName(),myClass,instB);
 
@@ -214,7 +217,7 @@ private <T> void testNodeVariableToJSONAndBack(Class<T> myClass,T instA,T instB)
      * @throws Exception if serialization fails.
      */
     @Test
-    public void testNodeVariablesToJSONAndBack() throws Exception {
+    public void testNodeVariablesToJSONAndBack() {
         /* removed: it's not possible to serialize back to abstract classes
         testNodeVariableToJSONAndBack(Object.class, new Object(),new Object());
         testNodeVariableToJSONAndBack(Number.class, 1.2,0.0);
@@ -234,7 +237,7 @@ public void testNodeVariablesToJSONAndBack() throws Exception {
      * </ul>
      */
     @Test
-    public void testAddTwoModelsTogether() {
+    public void testAddTwoGraphsTogether() {
         buildAddTwoConstants();
 
         ThreadPoolScheduler scheduler = new ThreadPoolScheduler();
@@ -260,6 +263,8 @@ public void testAddTwoModelsTogether() {
         modelB.add(new Connection(a0,2,m,0));
         modelB.add(new Connection(a1,2,m,1));
 
+        // TODO and input and output ports.
+
         // submit all the Adds to the scheduler
         int count = 0;
         for(Node n : modelB.getNodes()) {