Changeset 18793 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-08-07T19:39:39+02:00 (12 months ago)

Author:

taylor.smock

Message:

Fix #23091: Opening a preset from inside a relation editor causes a DataIntegrityProblemException

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (8 diffs)

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

@@ -124 +124 @@
     private final TagEditorPanel tagEditorPanel;
     private final ReferringRelationsBrowser referrerBrowser;
-    private final ReferringRelationsBrowserModel referrerModel;
 
     /** the member table and its model */
@@ -154 +153 @@
     private final SelectAction selectAction;
     /**
-     * Action for performing the {@link DuplicateRelationAction}
-     */
-    private final DuplicateRelationAction duplicateAction;
-    /**
-     * Action for performing the {@link DeleteCurrentRelationAction}
-     */
-    private final DeleteCurrentRelationAction deleteAction;
-    /**
-     * Action for performing the {@link OKAction}
-     */
-    private final OKAction okAction;
-    /**
      * Action for performing the {@link CancelAction}
      */
@@ -175 +162 @@
 
     private Component selectedTabPane;
-    private JTabbedPane tabbedPane;
+    private final JTabbedPane tabbedPane;
 
     /**
      * Creates a new relation editor for the given relation. The relation will be saved if the user
      * selects "ok" in the editor.
-     *
+     * <p>
      * If no relation is given, will create an editor for a new relation.
      *
@@ -202 +189 @@
             @Override
             public Collection<OsmPrimitive> getSelection() {
-                Relation relation = new Relation();
-                tagEditorPanel.getModel().applyToPrimitive(relation);
-                return Collections.<OsmPrimitive>singletonList(relation);
+                return Collections.singletonList(getRelation());
             }
         };
@@ -214 +199 @@
         selectionTableModel = new SelectionTableModel(getLayer());
         selectionTableModel.register();
-        referrerModel = new ReferringRelationsBrowserModel(relation);
+        ReferringRelationsBrowserModel referrerModel = new ReferringRelationsBrowserModel(relation);
 
         tagEditorPanel = new TagEditorPanel(relation, presetHandler);
@@ -271 +256 @@
         applyAction = new ApplyAction(actionAccess);
         selectAction = new SelectAction(actionAccess);
-        duplicateAction = new DuplicateRelationAction(actionAccess);
-        deleteAction = new DeleteCurrentRelationAction(actionAccess);
+        // Action for performing the {@link DuplicateRelationAction}
+        final DuplicateRelationAction duplicateAction = new DuplicateRelationAction(actionAccess);
+        // Action for performing the {@link DeleteCurrentRelationAction}
+        final DeleteCurrentRelationAction deleteAction = new DeleteCurrentRelationAction(actionAccess);
 
         this.memberTableModel.addTableModelListener(applyAction);
@@ -279 +266 @@
         addPropertyChangeListener(deleteAction);
 
-        okAction = new OKAction(actionAccess);
+        // Action for performing the {@link OKAction}
+        final OKAction okAction = new OKAction(actionAccess);
         cancelAction = new CancelAction(actionAccess);
 
@@ -518 +506 @@
      * @return the panel for the relation member editor
      */
-    protected static JPanel buildMemberEditorPanel(
+    static JPanel buildMemberEditorPanel(
             LeftButtonToolbar leftButtonToolbar, IRelationEditorActionAccess editorAccess) {
         final JPanel pnl = new JPanel(new GridBagLayout());