Document now stores paths as object, not array

Author: jlbabilino

app/build.gradle.kts

@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.jlbabilino:json:0.2.0")
+    implementation("com.github.jlbabilino:json:master-SNAPSHOT")
     // implementation "javax.measure:unit-api:2.1.3"
     // implementation "tec.units:unit-ri:1.0.3"
     // implementation "tech.units:indriya:2.1.3"

app/src/main/java/org/team2363/helixnavigator/document/DocumentManager.java

@@ -134,7 +134,7 @@ private final boolean openDocument(File file) {
             HDocument openedDocument = JSONDeserializer.deserialize(file, HDocument.class);
             openedDocument.setSaveLocation(file);
             setDocument(openedDocument);
-            logger.info("File \"" + file.getAbsolutePath() + "\" succesffully opened.");
+            logger.info("File \"" + file.getAbsolutePath() + "\" successfully opened.");
             return true;
         } catch (IOException e) {
             logger.finer("Could not read file " + file.getAbsolutePath() + ": " + e.getMessage());

app/src/main/java/org/team2363/helixnavigator/document/HDocument.java

@@ -17,20 +17,21 @@
 package org.team2363.helixnavigator.document;
 
 import java.io.File;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Logger;
 
+import org.team2363.helixnavigator.document.field.image.HFieldImage;
+import org.team2363.helixnavigator.document.field.image.HReferenceFieldImage;
+import org.team2363.helixnavigator.global.Standards;
+
 import com.jlbabilino.json.DeserializedJSONConstructor;
 import com.jlbabilino.json.DeserializedJSONObjectValue;
 import com.jlbabilino.json.DeserializedJSONTarget;
 import com.jlbabilino.json.JSONDeserializable;
+import com.jlbabilino.json.JSONEntry.JSONType;
 import com.jlbabilino.json.JSONSerializable;
 import com.jlbabilino.json.SerializedJSONObjectValue;
-import com.jlbabilino.json.JSONEntry.JSONType;
-
-import org.team2363.helixnavigator.document.field.image.HFieldImage;
-import org.team2363.helixnavigator.document.field.image.HReferenceFieldImage;
-import org.team2363.helixnavigator.global.Standards;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -129,10 +130,22 @@ public HDocument() {
         selectedPathIndex.addListener((currentIndex, oldIndex, newIndex) -> updateSelectedPath());
     }
 
+    // @DeserializedJSONConstructor
+    // public HDocument(@DeserializedJSONObjectValue(key = "paths") List<? extends HPath> initialPaths) {
+    //     this();
+    //     paths.setAll(initialPaths);
+    // }
+
     @DeserializedJSONConstructor
-    public HDocument(@DeserializedJSONObjectValue(key = "paths") List<? extends HPath> initialPaths) {
+    public HDocument(@DeserializedJSONObjectValue(key = "paths") Map<String, HPath> initialPathsMap) {
         this();
-        paths.setAll(initialPaths);
+
+        initialPathsMap.entrySet().stream().sorted((a, b) -> a.getKey().compareTo(b.getKey())).forEach(entry -> {
+            String pathName = entry.getKey();
+            HPath path = entry.getValue();
+            path.setName(pathName);
+            paths.add(path);
+        }); 
     }
 
     /**
@@ -222,12 +235,12 @@ public final DoubleProperty zoomScaleProperty() {
         return zoomScale;
     }
 
-    @DeserializedJSONTarget
+    // @DeserializedJSONTarget
     public final void setZoomScale(@DeserializedJSONObjectValue(key = "zoom_scale") double value) {
         zoomScale.set(value);
     }
 
-    @SerializedJSONObjectValue(key = "zoom_scale")
+    // @SerializedJSONObjectValue(key = "zoom_scale")
     public final double getZoomScale() {
         return zoomScale.get();
     }
@@ -236,12 +249,12 @@ public final DoubleProperty zoomTranslateXProperty() {
         return zoomTranslateX;
     }
 
-    @DeserializedJSONTarget
+    // @DeserializedJSONTarget
     public final void setZoomTranslateX(@DeserializedJSONObjectValue(key = "zoom_translate_x") double value) {
         zoomTranslateX.set(value);
     }
 
-    @SerializedJSONObjectValue(key = "zoom_translate_x")
+    // @SerializedJSONObjectValue(key = "zoom_translate_x")
     public final double getZoomTranslateX() {
         return zoomTranslateX.get();
     }
@@ -250,21 +263,30 @@ public final DoubleProperty zoomTranslateYProperty() {
         return zoomTranslateY;
     }
 
-    @DeserializedJSONTarget
+    // @DeserializedJSONTarget
     public final void setZoomTranslateY(@DeserializedJSONObjectValue(key = "zoom_translate_y") double value) {
         zoomTranslateY.set(value);
     }
 
-    @SerializedJSONObjectValue(key = "zoom_translate_y")
+    // @SerializedJSONObjectValue(key = "zoom_translate_y")
     public final double getZoomTranslateY() {
         return zoomTranslateY.get();
     }
 
-    @SerializedJSONObjectValue(key = "paths")
+    // @SerializedJSONObjectValue(key = "paths")
     public final ObservableList<HPath> getPaths() {
         return paths;
     }
 
+    @SerializedJSONObjectValue(key = "paths")
+    public final Map<String, HPath> getPathsMap() {
+        Map<String, HPath> map = new HashMap<>(getPaths().size());
+        for (HPath path : getPaths()) {
+            map.put(path.getName(), path);
+        }
+        return map;
+    }
+
     public final ReadOnlyIntegerProperty selectedPathIndexProperty() {
         return selectedPathIndex.getReadOnlyProperty();
     }

app/src/main/java/org/team2363/helixnavigator/document/HPath.java

@@ -130,12 +130,12 @@ public final StringProperty nameProperty() {
         return name;
     }
 
-    @DeserializedJSONTarget
+    // @DeserializedJSONTarget
     public final void setName(@DeserializedJSONObjectValue(key = "name") String value) {
         name.set(value);
     }
 
-    @SerializedJSONObjectValue(key = "name")
+    // @SerializedJSONObjectValue(key = "name")
     public final String getName() {
         return name.get();
     }