Changeset 13957 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2018-06-18T21:53:59+02:00 (6 years ago)

Author:

Don-vip

Message:

use IRelation in RelationListDialog and *RelationActions

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (29 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -35 +35 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
-import org.openstreetmap.josm.actions.OsmPrimitiveAction;
+import org.openstreetmap.josm.actions.IPrimitiveAction;
 import org.openstreetmap.josm.actions.relation.AddSelectionToRelations;
 import org.openstreetmap.josm.actions.relation.DeleteRelationsAction;
@@ -50 +50 @@
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -72 +74 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -79 +80 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.widgets.CompileSearchTextDecorator;
@@ -90 +90 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -100 +101 @@
         implements DataSetListener, NavigatableComponent.ZoomChangeListener, ExpertToggleAction.ExpertModeChangeListener {
     /** The display list. */
-    private final JList<Relation> displaylist;
+    private final JList<IRelation<?>> displaylist;
     /** the list model used */
     private final RelationListModel model;
@@ -222 +223 @@
     // inform all actions about list of relations they need
     private void updateActionsRelationLists() {
-        List<Relation> sel = model.getSelectedRelations();
+        List<IRelation<?>> sel = model.getSelectedRelations();
         popupMenuHandler.setPrimitives(sel);
 
@@ -228 +229 @@
 
         //update highlights
-        if (highlightEnabled && focused == displaylist && MainApplication.isDisplayingMapView() && highlightHelper.highlightOnly(sel)) {
+        if (highlightEnabled && focused == displaylist && MainApplication.isDisplayingMapView()
+                && highlightHelper.highlightOnly(Utils.filteredCollection(sel, Relation.class))) {
             MainApplication.getMap().mapView.repaint();
         }
@@ -261 +263 @@
 
     /**
-     * Initializes the relation list dialog from a layer. If <code>layer</code> is null
-     * or if it isn't an {@link OsmDataLayer} the dialog is reset to an empty dialog.
+     * Initializes the relation list dialog from a dataset. If <code>data</code> is null
+     * the dialog is reset to an empty dialog.
      * Otherwise it is initialized with the list of non-deleted and visible relations
-     * in the layer's dataset.
+     * in the dataset.
      *
-     * @param layer the layer. May be null.
-     */
-    protected void initFromLayer(Layer layer) {
-        if (!(layer instanceof OsmDataLayer)) {
+     * @param data the dataset. May be null.
+     * @since 13957
+     */
+    protected void initFromData(OsmData<?, ?, ?, ?> data) {
+        if (data == null) {
             model.setRelations(null);
             return;
         }
-        OsmDataLayer l = (OsmDataLayer) layer;
-        model.setRelations(l.data.getRelations());
+        model.setRelations(data.getRelations());
         model.updateTitle();
         updateActionsRelationLists();
@@ -282 +284 @@
      * @return The selected relation in the list
      */
-    private Relation getSelected() {
+    private IRelation<?> getSelected() {
         if (model.getSize() == 1) {
             displaylist.setSelectedIndex(0);
@@ -301 +303 @@
      * Selects the relations in the list of relations.
      * @param relations  the relations to be selected
-     */
-    public void selectRelations(Collection<Relation> relations) {
+     * @since 13957 (signature)
+     */
+    public void selectRelations(Collection<? extends IRelation<?>> relations) {
         if (relations == null || relations.isEmpty()) {
             model.setSelectedRelations(null);
@@ -348 +351 @@
 
         protected void editCurrentRelation() {
-            EditRelationAction.launchEditor(getSelected());
+            IRelation<?> rel = getSelected();
+            if (rel instanceof Relation) {
+                EditRelationAction.launchEditor((Relation) rel);
+            }
         }
 
@@ -412 +418 @@
      * The list model for the list of relations displayed in the relation list dialog.
      */
-    private class RelationListModel extends AbstractListModel<Relation> {
-        private final transient List<Relation> relations = new ArrayList<>();
-        private transient List<Relation> filteredRelations;
+    private class RelationListModel extends AbstractListModel<IRelation<?>> {
+        private final transient List<IRelation<?>> relations = new ArrayList<>();
+        private transient List<IRelation<?>> filteredRelations;
         private final DefaultListSelectionModel selectionModel;
         private transient SearchCompiler.Match filter;
@@ -439 +445 @@
         }
 
-        private boolean isValid(Relation r) {
+        private boolean isValid(IRelation<?> r) {
             return !r.isDeleted() && !r.isIncomplete();
         }
 
-        public void setRelations(Collection<Relation> relations) {
-            List<Relation> sel = getSelectedRelations();
+        public void setRelations(Collection<? extends IRelation<?>> relations) {
+            List<IRelation<?>> sel = getSelectedRelations();
             this.relations.clear();
             this.filteredRelations = null;
@@ -452 +458 @@
                 return;
             }
-            for (Relation r: relations) {
+            for (IRelation<?> r: relations) {
                 if (isValid(r)) {
                     this.relations.add(r);
@@ -487 +493 @@
             }
             if (added) {
-                List<Relation> sel = getSelectedRelations();
+                List<IRelation<?>> sel = getSelectedRelations();
                 sort();
                 updateFilteredRelations();
@@ -520 +526 @@
             }
             if (size != relations.size()) {
-                List<Relation> sel = getSelectedRelations();
+                List<IRelation<?>> sel = getSelectedRelations();
                 sort();
                 fireContentsChanged(this, 0, getSize());
@@ -538 +544 @@
             this.filter = filter;
             updateFilteredRelations();
-            List<Relation> sel = getSelectedRelations();
+            List<IRelation<?>> sel = getSelectedRelations();
             fireContentsChanged(this, 0, getSize());
             setSelectedRelations(sel);
@@ -544 +550 @@
         }
 
-        private List<Relation> getVisibleRelations() {
+        private List<IRelation<?>> getVisibleRelations() {
             return filteredRelations == null ? relations : filteredRelations;
         }
 
-        private Relation getVisibleRelation(int index) {
+        private IRelation<?> getVisibleRelation(int index) {
             if (index < 0 || index >= getVisibleRelations().size()) return null;
             return getVisibleRelations().get(index);
@@ -554 +560 @@
 
         @Override
-        public Relation getElementAt(int index) {
+        public IRelation<?> getElementAt(int index) {
             return getVisibleRelation(index);
         }
@@ -568 +574 @@
          *
          * @return the list of selected, non-new relations.
+         * @since 13957 (signature)
          */
-        public List<Relation> getSelectedRelations() {
-            List<Relation> ret = new ArrayList<>();
+        public List<IRelation<?>> getSelectedRelations() {
+            List<IRelation<?>> ret = new ArrayList<>();
             for (int i = 0; i < getSize(); i++) {
                 if (!selectionModel.isSelectedIndex(i)) {
@@ -584 +591 @@
          *
          * @param sel the list of selected relations
+         * @since 13957 (signature)
          */
-        public void setSelectedRelations(Collection<Relation> sel) {
+        public void setSelectedRelations(Collection<? extends IRelation<?>> sel) {
             selectionModel.setValueIsAdjusting(true);
             selectionModel.clearSelection();
@@ -592 +600 @@
                     resetFilter();
                 }
-                for (Relation r: sel) {
+                for (IRelation<?> r: sel) {
                     Integer i = getVisibleRelationIndex(r);
                     if (i != null) {
@@ -602 +610 @@
         }
 
-        private Integer getVisibleRelationIndex(Relation rel) {
+        private Integer getVisibleRelationIndex(IRelation<?> rel) {
             int i = getVisibleRelations().indexOf(rel);
             if (i < 0)
@@ -655 +663 @@
             public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
                 for (JMenuItem mi: checkDisabled) {
-                    mi.setVisible(((OsmPrimitiveAction) mi.getAction()).isEnabled());
+                    mi.setVisible(((IPrimitiveAction) mi.getAction()).isEnabled());
 
                     Component sep = popupMenu.getComponent(
@@ -692 +700 @@
      * Replies the list of selected relations. Empty list, if there are no selected relations.
      * @return the list of selected, non-new relations.
-     */
-    public Collection<Relation> getSelectedRelations() {
+     * @since 13957 (signature)
+     */
+    public Collection<IRelation<?>> getSelectedRelations() {
         return model.getSelectedRelations();
     }
@@ -725 +734 @@
     @Override
     public void relationMembersChanged(final RelationMembersChangedEvent event) {
-        List<Relation> sel = model.getSelectedRelations();
+        List<IRelation<?>> sel = model.getSelectedRelations();
         model.sort();
         model.setSelectedRelations(sel);
@@ -737 +746 @@
             return;
         // trigger a sort of the relation list because the display name may have changed
-        List<Relation> sel = model.getSelectedRelations();
+        List<IRelation<?>> sel = model.getSelectedRelations();
         model.sort();
         model.setSelectedRelations(sel);
@@ -745 +754 @@
     @Override
     public void dataChanged(DataChangedEvent event) {
-        initFromLayer(MainApplication.getLayerManager().getActiveDataLayer());
+        initFromData(MainApplication.getLayerManager().getActiveData());
     }