Changeset 14027 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java

Timestamp:

2018-07-12T23:02:02+02:00 (8 years ago)

Author:

michael2402

Message:

See #16388: New mechanism for plugins to register relation editor actions.

File:

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

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

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
-import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
-import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
@@ -38 +34 @@
  */
 abstract class SavingAction extends AbstractRelationEditorAction {
+        private static final long serialVersionUID = 1L;
 
-    protected final TagEditorModel tagModel;
     protected final AutoCompletingTextField tfRole;
 
-    protected SavingAction(MemberTable memberTable, MemberTableModel memberTableModel, TagEditorModel tagModel, OsmDataLayer layer,
-            IRelationEditor editor, AutoCompletingTextField tfRole) {
-        super(memberTable, memberTableModel, null, layer, editor);
-        this.tagModel = tagModel;
-        this.tfRole = tfRole;
+    protected SavingAction(IRelationEditorActionAccess editorAccess, IRelationEditorUpdateOn... updateOn) {
+        super(editorAccess, updateOn);
+        this.tfRole = editorAccess.getTextFieldRole();
     }
 
@@ -56 +50 @@
         final Relation newRelation = new Relation();
         tagEditorModel.applyToPrimitive(newRelation);
-        memberTableModel.applyToRelation(newRelation);
+        getMemberTableModel().applyToRelation(newRelation);
         List<RelationMember> newMembers = new ArrayList<>();
         for (RelationMember rm: newRelation.getMembers()) {
@@ -73 +67 @@
         if (newRelation.getMembersCount() == 0 && !newRelation.hasKeys())
             return;
-        MainApplication.undoRedo.add(new AddCommand(layer.getDataSet(), newRelation));
+        MainApplication.undoRedo.add(new AddCommand(getLayer().getDataSet(), newRelation));
 
         // make sure everybody is notified about the changes
         //
-        editor.setRelation(newRelation);
-        if (editor instanceof RelationEditor) {
+        getEditor().setRelation(newRelation);
+        if (getEditor() instanceof RelationEditor) {
             RelationDialogManager.getRelationDialogManager().updateContext(
-                    layer, editor.getRelation(), (RelationEditor) editor);
+                    getLayer(), getEditor().getRelation(), (RelationEditor) getEditor());
         }
         // Relation list gets update in EDT so selecting my be postponed to following EDT run
@@ -91 +85 @@
      */
     protected void applyExistingConflictingRelation(TagEditorModel tagEditorModel) {
-        Relation editedRelation = new Relation(editor.getRelation());
+        Relation editedRelation = new Relation(editorAccess.getEditor().getRelation());
         tagEditorModel.applyToPrimitive(editedRelation);
-        memberTableModel.applyToRelation(editedRelation);
-        Conflict<Relation> conflict = new Conflict<>(editor.getRelation(), editedRelation);
-        MainApplication.undoRedo.add(new ConflictAddCommand(layer.getDataSet(), conflict));
+        editorAccess.getMemberTableModel().applyToRelation(editedRelation);
+        Conflict<Relation> conflict = new Conflict<>(editorAccess.getEditor().getRelation(), editedRelation);
+        MainApplication.undoRedo.add(new ConflictAddCommand(getLayer().getDataSet(), conflict));
     }
 
@@ -103 +97 @@
      */
     protected void applyExistingNonConflictingRelation(TagEditorModel tagEditorModel) {
-        Relation originRelation = editor.getRelation();
+        Relation originRelation = editorAccess.getEditor().getRelation();
         Relation editedRelation = new Relation(originRelation);
         tagEditorModel.applyToPrimitive(editedRelation);
-        memberTableModel.applyToRelation(editedRelation);
+        getMemberTableModel().applyToRelation(editedRelation);
         if (!editedRelation.hasEqualSemanticAttributes(originRelation, false)) {
             MainApplication.undoRedo.add(new ChangeCommand(originRelation, editedRelation));
@@ -153 +147 @@
                         + "''{1}''.<br>"
                         + "Please resolve this conflict first, then try again.</html>",
-                        Utils.escapeReservedCharactersHTML(layer.getName()),
-                        Utils.escapeReservedCharactersHTML(editor.getRelation().getDisplayName(DefaultNameFormatter.getInstance()))
+                        Utils.escapeReservedCharactersHTML(getLayer().getName()),
+                        Utils.escapeReservedCharactersHTML(getEditor().getRelation().getDisplayName(DefaultNameFormatter.getInstance()))
                 ),
                 tr("Double conflict"),
@@ -167 +161 @@
 
     protected boolean applyChanges() {
-        if (editor.getRelation() == null) {
-            applyNewRelation(tagModel);
+        if (editorAccess.getEditor().getRelation() == null) {
+            applyNewRelation(getTagModel());
         } else if (isEditorDirty()) {
-            if (editor.isDirtyRelation()) {
+            if (editorAccess.getEditor().isDirtyRelation()) {
                 if (confirmClosingBecauseOfDirtyState()) {
-                    if (layer.getConflicts().hasConflictForMy(editor.getRelation())) {
+                    if (getLayer().getConflicts().hasConflictForMy(editorAccess.getEditor().getRelation())) {
                         warnDoubleConflict();
                         return false;
                     }
-                    applyExistingConflictingRelation(tagModel);
+                    applyExistingConflictingRelation(getTagModel());
                     hideEditor();
                 } else
                     return false;
             } else {
-                applyExistingNonConflictingRelation(tagModel);
+                applyExistingNonConflictingRelation(getTagModel());
             }
         }
-        editor.setRelation(editor.getRelation());
+        editorAccess.getEditor().setRelation(editorAccess.getEditor().getRelation());
         return true;
     }
 
     protected void hideEditor() {
-        if (editor instanceof Component) {
-            ((Component) editor).setVisible(false);
+        if (editorAccess.getEditor() instanceof Component) {
+            ((Component) editorAccess.getEditor()).setVisible(false);
         }
     }
 
     protected boolean isEditorDirty() {
-        Relation snapshot = editor.getRelationSnapshot();
-        return (snapshot != null && !memberTableModel.hasSameMembersAs(snapshot)) || tagModel.isDirty();
+        Relation snapshot = editorAccess.getEditor().getRelationSnapshot();
+        return (snapshot != null && !getMemberTableModel().hasSameMembersAs(snapshot)) || getTagModel().isDirty();
     }
 }