Changeset 18177 in josm for trunk/src/org
- Timestamp:
- 2021-08-25T21:36:32+02:00 (3 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
r17440 r18177 24 24 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; 25 25 import org.openstreetmap.josm.gui.MainApplication; 26 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor; 26 27 import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager; 27 28 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor; … … 161 162 162 163 protected boolean applyChanges() { 163 if (editorAccess.getEditor().getRelation() == null) { 164 IRelationEditor editor = editorAccess.getEditor(); 165 if (editor.getRelation() == null) { 164 166 applyNewRelation(getTagModel()); 165 167 } else if (isEditorDirty()) { 166 if (editor Access.getEditor().isDirtyRelation()) {168 if (editor.isDirtyRelation()) { 167 169 if (confirmClosingBecauseOfDirtyState()) { 168 if (getLayer().getConflicts().hasConflictForMy(editor Access.getEditor().getRelation())) {170 if (getLayer().getConflicts().hasConflictForMy(editor.getRelation())) { 169 171 warnDoubleConflict(); 170 172 return false; … … 179 181 } 180 182 } 181 editor Access.getEditor().setRelation(editorAccess.getEditor().getRelation());183 editor.setRelation(editor.getRelation()); 182 184 return true; 183 185 } … … 188 190 editorAccess.getEditor().setRelation(null); 189 191 } 190 191 192 } 192 193 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectAction.java
r14030 r18177 21 21 */ 22 22 public SelectAction(IRelationEditorActionAccess editorAccess) { 23 super(editorAccess );23 super(editorAccess, IRelationEditorUpdateOn.TAG_CHANGE); 24 24 putValue(NAME, tr("Select")); 25 25 putValue(SHORT_DESCRIPTION, tr("Select the currently edited relation"));
Note:
See TracChangeset
for help on using the changeset viewer.