Changeset 17172 in josm for trunk

Timestamp:

2020-10-12T15:12:32+02:00 (4 years ago)

Author:

GerdP

Message:

see #19913: IOOBE: Index 254 out of bounds for length 0: Saving a relation, after splitting a child member with open relation editor
see #19915: Crash in relation editor when saving after undo

• enable Refresh button when snapshot is different to data in layer
• enable Apply button also when relation was removed by undoing the creation of it
• move some dispose() code from RelationEditor to GenericRelationEditor

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditor.java (modified) (5 diffs)
• RelationEditor.java (modified) (1 diff)
• actions/ApplyAction.java (modified) (1 diff)
• actions/RefreshAction.java (modified) (1 diff)
• actions/SavingAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -51 +51 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -115 +117 @@
  * @since 343
  */
-public class GenericRelationEditor extends RelationEditor {
+public class GenericRelationEditor extends RelationEditor implements CommandQueueListener {
     /** the tag table and its model */
     private final TagEditorPanel tagEditorPanel;
@@ -310 +312 @@
         memberTableModel.setSelectedMembers(selectedMembers);
         HelpUtil.setHelpContext(getRootPane(), ht("/Dialog/RelationEditor"));
+        UndoRedoHandler.getInstance().addCommandQueueListener(this);
     }
 
@@ -836 +839 @@
     public void dispose() {
         refreshAction.destroy();
+        UndoRedoHandler.getInstance().removeCommandQueueListener(this);
+        setRelation(null);
         super.dispose();
     }
@@ -1015 +1020 @@
 
     }
+
+    @Override
+    public void commandChanged(int queueSize, int redoSize) {
+        Relation r = getRelation();
+        if (r != null && r.getDataSet() == null) {
+            // see #19915
+            setRelation(null);
+            applyAction.updateEnabledState();
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -158 +158 @@
     public void dispose() {
         layer.setRecentRelation(relation);
-        setRelation(null);
         super.dispose();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java

@@ -35 +35 @@
 
     @Override
-    protected void updateEnabledState() {
+    public void updateEnabledState() {
         setEnabled(isEditorDirty());
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java

@@ -68 +68 @@
     @Override
     public void updateEnabledState() {
-        Relation snapshot = editorAccess.getEditor().getRelationSnapshot();
-        setEnabled((!getMemberTableModel().hasSameMembersAs(snapshot) || getTagModel().isDirty())
-                && !(snapshot == null && getTagModel().getTags().isEmpty()));
+        Relation snapshot = getEditor().getRelationSnapshot();
+        Relation relation = getEditor().getRelation();
+        if (relation != null && relation.getDataSet() == null)
+            relation = null; // see #19915
+        if (relation != null && snapshot != null && snapshot.getDataSet() == null) {
+            // relation was changed outside of the editor
+            // either it was modified or deleted or changed by an undo
+            setEnabled(!snapshot.hasEqualSemanticAttributes(relation));
+            return;
+        }
+        setEnabled(false);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java

@@ -178 +178 @@
     protected boolean isEditorDirty() {
         Relation snapshot = editorAccess.getEditor().getRelationSnapshot();
-        return (snapshot != null && !getMemberTableModel().hasSameMembersAs(snapshot)) || getTagModel().isDirty();
+        return (snapshot != null && !getMemberTableModel().hasSameMembersAs(snapshot)) || getTagModel().isDirty()
+                || getEditor().getRelation() == null || getEditor().getRelation().getDataSet() == null;
     }
 }