diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index 743e05f4e0..7ab8f6638f 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -47,6 +47,7 @@ import javax.swing.JTabbedPane;
import javax.swing.JTable;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
+import javax.swing.event.TableModelListener;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.command.ChangeMembersCommand;
@@ -276,7 +277,7 @@ public class GenericRelationEditor extends RelationEditor implements CommandQueu
getContentPane().add(buildToolBar(refreshAction, applyAction, selectAction, duplicateAction, deleteAction), BorderLayout.NORTH);
getContentPane().add(tabbedPane, BorderLayout.CENTER);
- getContentPane().add(buildOkCancelButtonPanel(okAction, cancelAction), BorderLayout.SOUTH);
+ getContentPane().add(buildOkCancelButtonPanel(okAction, deleteAction, cancelAction), BorderLayout.SOUTH);
setSize(findMaxDialogSize());
@@ -407,11 +408,32 @@ public class GenericRelationEditor extends RelationEditor implements CommandQueu
*
* @return the panel with the OK and the Cancel button
*/
- protected static JPanel buildOkCancelButtonPanel(OKAction okAction, CancelAction cancelAction) {
+ protected JPanel buildOkCancelButtonPanel(OKAction okAction, DeleteCurrentRelationAction deleteAction,
+ CancelAction cancelAction) {
JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
- pnl.add(new JButton(okAction));
+ final JButton okButton = new JButton(okAction);
+ final JButton deleteButton = new JButton(deleteAction);
+ okButton.setPreferredSize(deleteButton.getPreferredSize());
+ pnl.add(okButton);
+ pnl.add(deleteButton);
pnl.add(new JButton(cancelAction));
pnl.add(new JButton(new ContextSensitiveHelpAction(ht("/Dialog/RelationEditor"))));
+ // Keep users from saving invalid relations -- a relation MUST have at least a tag with the key "type"
+ // AND must contain at least one other OSM object.
+ final TableModelListener listener = l -> {
+ final boolean delete = this.memberTableModel.getRowCount() == 0
+ || !this.tagEditorPanel.getModel().includesTag("type");
+ okButton.setVisible(!delete || this.getRelationSnapshot() == null);
+ deleteButton.setVisible(delete && this.getRelationSnapshot() != null);
+ if (this.getRelationSnapshot() == null && delete) {
+ okButton.setText(tr("Delete"));
+ } else {
+ okButton.setText(tr("OK"));
+ }
+ };
+ listener.tableChanged(null);
+ this.memberTableModel.addTableModelListener(listener);
+ this.tagEditorPanel.getModel().addTableModelListener(listener);
return pnl;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java
index 6efdaeabdf..c41649b396 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java
@@ -82,6 +82,10 @@ public class CancelAction extends SavingAction {
)
};
+ // Keep users from saving invalid relations -- a relation MUST have at least a tag with the key "type"
+ // AND must contain at least one other OSM object.
+ options[0].setEnabled(getMemberTableModel().getRowCount() > 0 && getTagModel().includesTag("type"));
+
return HelpAwareOptionPane.showOptionDialog(
MainApplication.getMainFrame(),
tr("The relation has been changed.
Do you want to save your changes?"),
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
index 26813f23c1..d83ba8f6cd 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
@@ -54,8 +54,8 @@ abstract class SavingAction extends AbstractRelationEditorAction {
tagEditorModel.applyToPrimitive(newRelation);
getMemberTableModel().applyToRelation(newRelation);
// If the user wanted to create a new relation, but hasn't added any members or
- // tags, don't add an empty relation
- if (newRelation.isEmpty() && !newRelation.hasKeys())
+ // tags (specifically the "type" tag), don't add the relation
+ if (newRelation.isEmpty() || !newRelation.hasKey("type"))
return;
UndoRedoHandler.getInstance().add(new AddCommand(getLayer().getDataSet(), newRelation));