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

Timestamp:

2016-01-28T09:29:14+01:00 (8 years ago)

Author:

Don-vip

Message:

fix/cleanup unit tests

File:

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

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

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
-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.IRelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
@@ -47 +46 @@
         putValue(SMALL_ICON, ImageProvider.get("dialogs/refresh"));
         putValue(NAME, tr("Refresh"));
-        getEditor().getRootPane().getActionMap().put("refresh", this);
-        getEditor().getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), "refresh");
+        if (editor instanceof JComponent) {
+            ((JComponent) editor).getRootPane().getActionMap().put("refresh", this);
+            ((JComponent) editor).getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), "refresh");
+        }
         Main.main.undoRedo.addCommandQueueListener(this);
         updateEnabledState();
-    }
-
-    private GenericRelationEditor getEditor() {
-        return (GenericRelationEditor) editor;
     }
 
@@ -70 +67 @@
         if (isEditorDirty() && confirmDiscardDirtyData() != 0)
             return;
-        getEditor().reloadDataFromRelation();
+        editor.reloadDataFromRelation();
     }