1.5.11

robust recovery from missing elements

Author: i-make-robots

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.marginallyclever</groupId>
     <artifactId>nodegraphcore</artifactId>
-    <version>1.5.10</version>
+    <version>1.5.11</version>
 
     <name>NodeGraphCore</name>
     <description>Flow based programming in Java.</description>

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

@@ -381,7 +381,6 @@ public void fromJSON(JSONObject jo) throws JSONException {
         // older files might be missing these values.
         if(!jo.has("name")) jo.put("name",getName());
         if(!jo.has("uniqueID")) jo.put("uniqueID",getUniqueID());
-        if(!jo.has("label")) jo.put("label", getLabel());
         // proceed now that missing values are added.
         super.fromJSON(jo);
         parseAllNodesFromJSON(jo.getJSONArray("nodes"));

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

@@ -288,8 +288,10 @@ public void moveRelative(int dx, int dy) {
     }
 
     public void fromJSON(JSONObject jo) throws JSONException {
-        String joName = jo.getString("name");
-        if(!name.equals(joName)) throw new JSONException("Node types do not match: "+name+", "+joName);
+        if(jo.has("name")) {
+            String joName = jo.getString("name");
+            if (!name.equals(joName)) throw new JSONException("Node types do not match: " + name + ", " + joName);
+        }
 
         Object uid = jo.get("uniqueID");
         uniqueID = (uid instanceof String) ? (String)uid : uid.toString();
@@ -298,11 +300,15 @@ public void fromJSON(JSONObject jo) throws JSONException {
             String s = jo.getString("label");
             if(!s.equals("null")) label = s;
         }
-        // bounds
-        RectangleDAO4JSON dao = new RectangleDAO4JSON();
-        rectangle.setBounds(dao.fromJSON(jo.getJSONObject("rectangle")));
-        // all ports
-        parseAllPortsFromJSON(jo.getJSONArray("variables"));
+        if(jo.has("rectangle")) {
+            // get the rectangle
+            RectangleDAO4JSON dao = new RectangleDAO4JSON();
+            rectangle.setBounds(dao.fromJSON(jo.getJSONObject("rectangle")));
+        }
+        if(jo.has("ports")) {
+            // all ports
+            parseAllPortsFromJSON(jo.getJSONArray("variables"));
+        }
     }
 
     protected void parseAllPortsFromJSON(JSONArray vars) throws JSONException {