Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 9659)
@@ -254,7 +254,5 @@
     }
 
-    /**
-     * Reloads data from relation.
-     */
+    @Override
     public void reloadDataFromRelation() {
         setRelation(getRelation());
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IRelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IRelationEditor.java	(revision 9659)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IRelationEditor.java	(revision 9659)
@@ -0,0 +1,47 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs.relation;
+
+import org.openstreetmap.josm.data.osm.Relation;
+
+/**
+ * Super interface of relation editors.
+ * @since 9659
+ */
+public interface IRelationEditor {
+
+    /**
+     * Replies the currently edited relation
+     *
+     * @return the currently edited relation
+     */
+    Relation getRelation();
+
+    /**
+     * Sets the currently edited relation. Creates a snapshot of the current
+     * state of the relation. See {@link #getRelationSnapshot()}
+     *
+     * @param relation the relation
+     */
+    void setRelation(Relation relation);
+
+    /**
+     * Replies the state of the edited relation when the editor has been launched.
+     * @return the state of the edited relation when the editor has been launched
+     */
+    Relation getRelationSnapshot();
+
+    /**
+     * Replies true if the currently edited relation has been changed elsewhere.
+     *
+     * In this case a relation editor can't apply updates to the relation directly. Rather,
+     * it has to create a conflict.
+     *
+     * @return true if the currently edited relation has been changed elsewhere.
+     */
+    boolean isDirtyRelation();
+
+    /**
+     * Reloads data from relation.
+     */
+    void reloadDataFromRelation();
+}
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationAware.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationAware.java	(revision 9658)
+++ 	(revision )
@@ -1,42 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.relation;
-
-import org.openstreetmap.josm.data.osm.Relation;
-
-/**
- * Super interface of relation-aware editors.
- * @since 9496
- */
-public interface RelationAware {
-
-    /**
-     * Replies the currently edited relation
-     *
-     * @return the currently edited relation
-     */
-    Relation getRelation();
-
-    /**
-     * Sets the currently edited relation. Creates a snapshot of the current
-     * state of the relation. See {@link #getRelationSnapshot()}
-     *
-     * @param relation the relation
-     */
-    void setRelation(Relation relation);
-
-    /**
-     * Replies the state of the edited relation when the editor has been launched.
-     * @return the state of the edited relation when the editor has been launched
-     */
-    Relation getRelationSnapshot();
-
-    /**
-     * Replies true if the currently edited relation has been changed elsewhere.
-     *
-     * In this case a relation editor can't apply updates to the relation directly. Rather,
-     * it has to create a conflict.
-     *
-     * @return true if the currently edited relation has been changed elsewhere.
-     */
-    boolean isDirtyRelation();
-}
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java	(revision 9659)
@@ -23,5 +23,5 @@
  * @since 1599
  */
-public abstract class RelationEditor extends ExtendedDialog implements RelationAware {
+public abstract class RelationEditor extends ExtendedDialog implements IRelationEditor {
 
     /** the property name for the current relation.
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java	(revision 9659)
@@ -10,5 +10,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -21,5 +21,5 @@
     protected final MemberTableModel memberTableModel;
     protected final transient OsmDataLayer layer;
-    protected final transient RelationAware editor;
+    protected final transient IRelationEditor editor;
 
     protected AbstractRelationEditorAction(MemberTable memberTable, MemberTableModel memberTableModel, String actionMapKey) {
@@ -28,5 +28,5 @@
 
     protected AbstractRelationEditorAction(MemberTable memberTable, MemberTableModel memberTableModel, String actionMapKey,
-            OsmDataLayer layer, RelationAware editor) {
+            OsmDataLayer layer, IRelationEditor editor) {
         this.memberTable = memberTable;
         this.memberTableModel = memberTableModel;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddFromSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddFromSelectionAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddFromSelectionAction.java	(revision 9659)
@@ -13,5 +13,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTable;
 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
@@ -28,5 +28,5 @@
 
     protected AddFromSelectionAction(MemberTable memberTable, MemberTableModel memberTableModel, SelectionTable selectionTable,
-            SelectionTableModel selectionTableModel, String actionMapKey, OsmDataLayer layer, RelationAware editor) {
+            SelectionTableModel selectionTableModel, String actionMapKey, OsmDataLayer layer, IRelationEditor editor) {
         super(memberTable, memberTableModel, actionMapKey, layer, editor);
         this.selectionTable = selectionTable;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAfterSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAfterSelection.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAfterSelection.java	(revision 9659)
@@ -9,5 +9,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.AddAbortException;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -25,5 +25,5 @@
      * @param editor relation editor
      */
-    public AddSelectedAfterSelection(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, RelationAware editor) {
+    public AddSelectedAfterSelection(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, IRelationEditor editor) {
         super(null, memberTableModel, null, selectionTableModel, null, null, editor);
         putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last selected member"));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtEndAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtEndAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtEndAction.java	(revision 9659)
@@ -9,5 +9,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.AddAbortException;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -25,5 +25,5 @@
      * @param editor relation editor
      */
-    public AddSelectedAtEndAction(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, RelationAware editor) {
+    public AddSelectedAtEndAction(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, IRelationEditor editor) {
         super(null, memberTableModel, null, selectionTableModel, null, null, editor);
         putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member"));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtStartAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtStartAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtStartAction.java	(revision 9659)
@@ -9,5 +9,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.AddAbortException;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -25,5 +25,5 @@
      * @param editor relation editor
      */
-    public AddSelectedAtStartAction(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, RelationAware editor) {
+    public AddSelectedAtStartAction(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, IRelationEditor editor) {
         super(null, memberTableModel, null, selectionTableModel, null, null, editor);
         putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset before the first member"));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedBeforeSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedBeforeSelection.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedBeforeSelection.java	(revision 9659)
@@ -9,5 +9,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.AddAbortException;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -25,5 +25,5 @@
      * @param editor relation editor
      */
-    public AddSelectedBeforeSelection(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, RelationAware editor) {
+    public AddSelectedBeforeSelection(MemberTableModel memberTableModel, SelectionTableModel selectionTableModel, IRelationEditor editor) {
         super(null, memberTableModel, null, selectionTableModel, null, null, editor);
         putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset before the first selected member"));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java	(revision 9659)
@@ -5,5 +5,4 @@
 
 import java.awt.event.ActionEvent;
-
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -12,8 +11,7 @@
 import javax.swing.event.TableModelListener;
 
-import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
+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.RelationAware;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
@@ -35,5 +33,5 @@
      */
     public ApplyAction(MemberTable memberTable, MemberTableModel memberTableModel, TagEditorModel tagModel, OsmDataLayer layer,
-            RelationAware editor) {
+            IRelationEditor editor) {
         super(memberTable, memberTableModel, tagModel, layer, editor, null);
         putValue(SHORT_DESCRIPTION, tr("Apply the current updates"));
@@ -48,5 +46,5 @@
     public void actionPerformed(ActionEvent e) {
         if (applyChanges()) {
-            ((GenericRelationEditor) editor).reloadDataFromRelation();
+            editor.reloadDataFromRelation();
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java	(revision 9659)
@@ -18,5 +18,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
@@ -40,5 +40,5 @@
      */
     public CancelAction(MemberTable memberTable, MemberTableModel memberTableModel, TagEditorModel tagModel, OsmDataLayer layer,
-            RelationAware editor, AutoCompletingTextField tfRole) {
+            IRelationEditor editor, AutoCompletingTextField tfRole) {
         super(memberTable, memberTableModel, tagModel, layer, editor, tfRole);
         putValue(SHORT_DESCRIPTION, tr("Cancel the updates and close the dialog"));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CopyMembersAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CopyMembersAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CopyMembersAction.java	(revision 9659)
@@ -10,5 +10,5 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -25,5 +25,5 @@
      * @param editor relation editor
      */
-    public CopyMembersAction(MemberTableModel memberTableModel, OsmDataLayer layer, RelationAware editor) {
+    public CopyMembersAction(MemberTableModel memberTableModel, OsmDataLayer layer, IRelationEditor editor) {
         super(null, memberTableModel, null, null, null, layer, editor);
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DeleteCurrentRelationAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DeleteCurrentRelationAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DeleteCurrentRelationAction.java	(revision 9659)
@@ -11,5 +11,5 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -26,5 +26,5 @@
      * @param editor relation editor
      */
-    public DeleteCurrentRelationAction(OsmDataLayer layer, RelationAware editor) {
+    public DeleteCurrentRelationAction(OsmDataLayer layer, IRelationEditor editor) {
         super(null, null, null, layer, editor);
         putValue(SHORT_DESCRIPTION, tr("Delete the currently edited relation"));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadIncompleteMembersAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadIncompleteMembersAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadIncompleteMembersAction.java	(revision 9659)
@@ -12,5 +12,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -33,5 +33,5 @@
      */
     public DownloadIncompleteMembersAction(MemberTable memberTable, MemberTableModel memberTableModel, String actionMapKey,
-            OsmDataLayer layer, RelationAware editor) {
+            OsmDataLayer layer, IRelationEditor editor) {
         super(memberTable, memberTableModel, actionMapKey, layer, editor);
         Shortcut sc = Shortcut.registerShortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java	(revision 9659)
@@ -11,5 +11,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -31,5 +31,5 @@
      */
     public DownloadSelectedIncompleteMembersAction(MemberTable memberTable, MemberTableModel memberTableModel, String actionMapKey,
-            OsmDataLayer layer, RelationAware editor) {
+            OsmDataLayer layer, IRelationEditor editor) {
         super(memberTable, memberTableModel, actionMapKey, layer, editor);
         //  Shortcut.register Shortcut("relationeditor:downloadincomplete", tr("Relation Editor: Download Members"),
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java	(revision 9659)
@@ -9,5 +9,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
@@ -30,5 +30,5 @@
      */
     public OKAction(MemberTable memberTable, MemberTableModel memberTableModel, TagEditorModel tagModel, OsmDataLayer layer,
-            RelationAware editor, AutoCompletingTextField tfRole) {
+            IRelationEditor editor, AutoCompletingTextField tfRole) {
         super(memberTable, memberTableModel, tagModel, layer, editor, tfRole);
         putValue(SHORT_DESCRIPTION, tr("Apply the updates and close the dialog"));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java	(revision 9659)
@@ -16,5 +16,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor.AddAbortException;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -31,5 +31,5 @@
      * @param editor relation editor
      */
-    public PasteMembersAction(MemberTableModel memberTableModel, OsmDataLayer layer, RelationAware editor) {
+    public PasteMembersAction(MemberTableModel memberTableModel, OsmDataLayer layer, IRelationEditor editor) {
         super(null, memberTableModel, null, null, null, layer, editor);
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java	(revision 9659)
@@ -17,5 +17,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
@@ -39,5 +39,5 @@
      */
     public RefreshAction(MemberTable memberTable, MemberTableModel memberTableModel, TagEditorModel tagModel, OsmDataLayer layer,
-            RelationAware editor) {
+            IRelationEditor editor) {
         super(memberTable, memberTableModel, tagModel, layer, editor, null);
         // CHECKSTYLE.OFF: LineLength
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java	(revision 9658)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java	(revision 9659)
@@ -23,5 +23,5 @@
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTableModel;
-import org.openstreetmap.josm.gui.dialogs.relation.RelationAware;
+import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
@@ -41,5 +41,5 @@
 
     protected SavingAction(MemberTable memberTable, MemberTableModel memberTableModel, TagEditorModel tagModel, OsmDataLayer layer,
-            RelationAware editor, AutoCompletingTextField tfRole) {
+            IRelationEditor editor, AutoCompletingTextField tfRole) {
         super(memberTable, memberTableModel, null, layer, editor);
         this.tagModel = tagModel;