lots of bugfixes

Author: Daniel

src/main/java/com/daniel/jsoneditor/controller/impl/commands/CommandManager.java

@@ -64,3 +64,4 @@ interface UnsavedChangesCallback
         void onUnsavedChangesCountChanged(int unsavedChangesCount);
     }
 }
+

src/main/java/com/daniel/jsoneditor/controller/impl/commands/CommandManagerImpl.java

@@ -79,7 +79,7 @@ public List<ModelChange> executeCommand(final Command cmd)
         // notify UI regardless of undoability when something happened
         if (!changes.isEmpty())
         {
-            model.sendEvent(new Event(EventEnum.COMMAND_APPLIED, cmd.getLabel(), cmd.getCategory(), "EXECUTE", changes));
+            model.sendEvent(new Event(EventEnum.COMMAND_APPLIED, cmd, "EXECUTE", changes));
         }
         return changes;
     }
@@ -98,8 +98,7 @@ public List<ModelChange> undo()
         notifyUnsavedChangesCount(); // Notify about changes count update
         if (!inverted.isEmpty())
         {
-            model.sendEvent(new Event(EventEnum.COMMAND_APPLIED, entry.getCommand().getLabel(), entry.getCommand().getCategory(), "UNDO",
-                    inverted));
+            model.sendEvent(new Event(EventEnum.COMMAND_APPLIED, entry.getCommand(), "UNDO", inverted));
         }
         return inverted; // return inverse (REMOVE for previous ADD)
     }
@@ -117,8 +116,7 @@ public List<ModelChange> redo()
         notifyUnsavedChangesCount(); // Notify about changes count update
         if (!entry.getChanges().isEmpty())
         {
-            model.sendEvent(new Event(EventEnum.COMMAND_APPLIED, entry.getCommand().getLabel(), entry.getCommand().getCategory(), "REDO",
-                    entry.getChanges()));
+            model.sendEvent(new Event(EventEnum.COMMAND_APPLIED, entry.getCommand(), "REDO", entry.getChanges()));
         }
         return entry.getChanges();
     }

src/main/java/com/daniel/jsoneditor/model/WritableModel.java

@@ -62,9 +62,4 @@ public interface WritableModel extends ReadableModel
      * sets a path to a node, replacing everything that was there before
      */
     void setNode(String path, JsonNode content);
-
-    /**
-     * adds a new node to the JSON for the
-     */
-    void addReferenceableObjectNodeWithKey(String pathOfReferenceableObject, String key);
 }

src/main/java/com/daniel/jsoneditor/model/commands/ReferenceableObjectCommand.java

@@ -0,0 +1,13 @@
+package com.daniel.jsoneditor.model.commands;
+
+/**
+ * Marker interface for commands that create referenceable objects.
+ * Used by the UI layer to detect when special handling is needed.
+ */
+public interface ReferenceableObjectCommand extends Command
+{
+    /**
+     * @return the path of the newly created referenceable object after execution
+     */
+    String getCreatedObjectPath();
+}

src/main/java/com/daniel/jsoneditor/model/commands/impl/CreateReferenceableObjectCommand.java

@@ -2,15 +2,17 @@
 
 import com.daniel.jsoneditor.model.WritableModelInternal;
 import com.daniel.jsoneditor.model.changes.ModelChange;
+import com.daniel.jsoneditor.model.commands.ReferenceableObjectCommand;
 import com.daniel.jsoneditor.model.json.schema.reference.ReferenceHelper;
 import com.daniel.jsoneditor.model.json.schema.reference.ReferenceableObject;
 import com.fasterxml.jackson.databind.JsonNode;
 import java.util.List;
 
-public class CreateReferenceableObjectCommand extends BaseCommand
+public class CreateReferenceableObjectCommand extends BaseCommand implements ReferenceableObjectCommand
 {
     private final String referenceableObjectPath;
     private final String key;
+    private String createdObjectPath;
 
     public CreateReferenceableObjectCommand(final WritableModelInternal model, final String referenceableObjectPath, final String key)
     {
@@ -33,7 +35,6 @@ public List<ModelChange> execute()
         {
             return noChanges();
         }
-        // ensure path points to an array container
         String path = refObj.getPath();
         JsonNode newItem = model.makeArrayNode(path);
         int addedIndex = model.addNodeToArray(path, newItem);
@@ -42,9 +43,15 @@ public List<ModelChange> execute()
             return noChanges();
         }
         String newNodePath = path + "/" + addedIndex;
-        // set key of instance
+        this.createdObjectPath = newNodePath;
         ReferenceHelper.setKeyOfInstance(model, refObj, newNodePath, key);
+        
         return List.of(ModelChange.add(newNodePath, model.getNodeForPath(newNodePath).getNode()));
     }
+    
+    @Override
+    public String getCreatedObjectPath()
+    {
+        return createdObjectPath;
+    }
 }
-

src/main/java/com/daniel/jsoneditor/model/commands/impl/DuplicateReferenceAndLinkCommand.java

@@ -5,6 +5,7 @@
 
 import com.daniel.jsoneditor.model.WritableModelInternal;
 import com.daniel.jsoneditor.model.changes.ModelChange;
+import com.daniel.jsoneditor.model.commands.ReferenceableObjectCommand;
 import com.daniel.jsoneditor.model.json.JsonNodeWithPath;
 import com.daniel.jsoneditor.model.json.schema.paths.PathHelper;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -13,10 +14,11 @@
  * Duplicates an object at pathToItemToDuplicate and updates the referencing node at referencePath to point to the new key.
  * Undo removes the duplicated object and restores the referencing node snapshot (via REPLACE inversion).
  */
-public class DuplicateReferenceAndLinkCommand extends BaseCommand
+public class DuplicateReferenceAndLinkCommand extends BaseCommand implements ReferenceableObjectCommand
 {
     private final String referencePath;
     private final String pathToItemToDuplicate;
+    private String createdObjectPath;
 
     public DuplicateReferenceAndLinkCommand(final WritableModelInternal model, final String referencePath, final String pathToItemToDuplicate)
     {
@@ -40,11 +42,10 @@ public List<ModelChange> execute()
         {
             return noChanges();
         }
-        // compute new item path (duplicate inserted after original index)
         final String parentPath = PathHelper.getParentPath(pathToItemToDuplicate);
         final int originalIndex = Integer.parseInt(PathHelper.getLastPathSegment(pathToItemToDuplicate));
         final String newItemPath = parentPath + "/" + (originalIndex + 1);
-        // perform duplication and linking using existing model method
+        this.createdObjectPath = newItemPath;
         model.duplicateNodeAndLink(referencePath, pathToItemToDuplicate);
         JsonNode newItem = model.getNodeForPath(newItemPath).getNode();
         if (newItem == null || newItem.isMissingNode())
@@ -56,9 +57,15 @@ public List<ModelChange> execute()
         out.add(ModelChange.add(newItemPath, newItem));
         if (!oldRefSnapshot.equals(newRefSnapshot))
         {
-            out.add(ModelChange.replace(referencePath, (JsonNode) oldRefSnapshot, (JsonNode) newRefSnapshot));
+            out.add(ModelChange.replace(referencePath, oldRefSnapshot, newRefSnapshot));
         }
+        
         return out;
     }
+    
+    @Override
+    public String getCreatedObjectPath()
+    {
+        return createdObjectPath;
+    }
 }
-

src/main/java/com/daniel/jsoneditor/model/impl/ModelImpl.java

@@ -658,13 +658,6 @@ public ReferenceableObject getReferenceableObjectByReferencingKey(String referen
         return ReferenceHelper.getReferenceableObject(this, referencingKey);
     }
 
-    @Override
-    public void addReferenceableObjectNodeWithKey(String pathOfReferenceableObject, String key)
-    {
-        ReferenceHelper.createAndInsertReferenceableObject(this, this, pathOfReferenceableObject, key);
-        // TODO switch state
-    }
-    
     @Override
     public void setNode(String path, JsonNode content)
     {

src/main/java/com/daniel/jsoneditor/model/json/schema/SchemaHelper.java

@@ -33,10 +33,10 @@ public static boolean validateJsonWithSchema(JsonNode json, JsonSchema schema)
         for (ValidationMessage message : messages)
         {
             final JsonNode elementContent = json.at(convertToJSONPointer(message.getPath()));
-            final String contentPreview = elementContent.toString().length() > 100
-                ? elementContent.toString().substring(0, 100) + "..."
+            final String contentPreview = elementContent.toString().length() > 100 
+                ? elementContent.toString().substring(0, 100) + "..." 
                 : elementContent.toString();
-            logger.error("Validation Error: {} at path {} with element preview: {}",
+            logger.error("Validation Error: {} at path {} with element preview: {}", 
                 message.getMessage(), message.getPath(), contentPreview);
         }
         return messages.isEmpty();

src/main/java/com/daniel/jsoneditor/model/json/schema/reference/ReferenceHelper.java

@@ -5,13 +5,9 @@
 import java.util.List;
 
 import com.daniel.jsoneditor.model.ReadableModel;
-import com.daniel.jsoneditor.model.WritableModel;
-import com.daniel.jsoneditor.model.WritableModelInternal;
 import com.daniel.jsoneditor.model.json.JsonNodeWithPath;
 import com.daniel.jsoneditor.model.json.schema.SchemaHelper;
 import com.daniel.jsoneditor.model.json.schema.paths.PathHelper;
-import com.daniel.jsoneditor.model.statemachine.impl.Event;
-import com.daniel.jsoneditor.model.statemachine.impl.EventEnum;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.IntNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -63,7 +59,7 @@ public static String resolveReference(JsonNodeWithPath node, ReadableModel model
                 }
                 index++;
             }
-            return objectNode.getPath() + "/" + 0;
+            return null;
         }
         else
         {
@@ -119,35 +115,6 @@ public static List<ReferenceableObjectInstance> getReferenceableObjectInstances(
         }
     }
 
-    public static void createAndInsertReferenceableObject(ReadableModel readableModel, WritableModelInternal model, String referenceableObjectPath, String newKey)
-    {
-        // Get the ReferenceableObject using the referenceableObjectPath
-        ReferenceableObject referenceableObject = getReferenceableObjectOfPath(readableModel, referenceableObjectPath);
-        if (referenceableObject == null)
-        {
-            throw new IllegalArgumentException("ReferenceableObject not found for the given path: " + referenceableObjectPath);
-        }
-        
-        // Check if the ReferenceableObject is an array
-        JsonNodeWithPath referenceableObjectNode = readableModel.getNodeForPath(referenceableObject.getPath());
-        if (referenceableObjectNode.isArray())
-        {
-            String path = referenceableObject.getPath();
-            JsonNode newItem = readableModel.makeArrayNode(path);
-            int addedIndex = model.addNodeToArray(path, newItem);
-            String newNodePath = referenceableObject.getPath() + "/" + addedIndex;
-            
-            // Set the key of the new node
-            setKeyOfInstance(readableModel, referenceableObject, newNodePath, newKey);
-            model.sendEvent(new Event(EventEnum.ADDED_REFERENCEABLE_OBJECT, newNodePath));
-        }
-        else
-        {
-            // good point for future development
-            throw new IllegalArgumentException("ReferenceableObject is not an array: " + referenceableObjectPath);
-        }
-    }
-    
     /**
      * returns the referenceable object that is at this path
      */

src/main/java/com/daniel/jsoneditor/model/statemachine/impl/Event.java

@@ -1,6 +1,7 @@
 package com.daniel.jsoneditor.model.statemachine.impl;
 
 import com.daniel.jsoneditor.model.changes.ModelChange;
+import com.daniel.jsoneditor.model.commands.Command;
 
 import java.util.List;
 
@@ -20,6 +21,8 @@ public class Event
 
     private final List<ModelChange> changes;
 
+    private final Command command; // actual command object for type-safe detection
+    
     public Event(EventEnum eventEnum)
     {
         this.eventEnum = eventEnum;
@@ -28,6 +31,7 @@ public Event(EventEnum eventEnum)
         this.commandCategory = null;
         this.commandPhase = null;
         this.changes = null;
+        this.command = null;
     }
 
     public Event(EventEnum eventEnum, String path)
@@ -38,6 +42,7 @@ public Event(EventEnum eventEnum, String path)
         this.commandCategory = null;
         this.commandPhase = null;
         this.changes = null;
+        this.command = null;
     }
 
     /**
@@ -51,6 +56,21 @@ public Event(EventEnum eventEnum, String commandLabel, String commandCategory, S
         this.commandCategory = commandCategory;
         this.commandPhase = commandPhase;
         this.changes = changes;
+        this.command = null;
+    }
+    
+    /**
+     * Enhanced constructor for COMMAND_APPLIED events with actual command object.
+     */
+    public Event(EventEnum eventEnum, Command command, String commandPhase, List<ModelChange> changes)
+    {
+        this.eventEnum = eventEnum;
+        this.path = null;
+        this.commandLabel = command.getLabel();
+        this.commandCategory = command.getCategory();
+        this.commandPhase = commandPhase;
+        this.changes = changes;
+        this.command = command;
     }
 
     public EventEnum getEvent()
@@ -82,4 +102,9 @@ public List<ModelChange> getChanges()
     {
         return changes;
     }
+    
+    public Command getCommand()
+    {
+        return command;
+    }
 }