Changeset 9668 in josm

Timestamp:

2016-01-29T11:55:03+01:00 (9 years ago)

Author:

bastiK

Message:

applied #12409 - arrow on edit relation button lists recent relations (patch by kolesar)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateMultipolygonAction.java (modified) (1 diff)
• actions/relation/RecentRelationsAction.java (added)
• gui/SideButton.java (modified) (2 diffs)
• gui/dialogs/RelationListDialog.java (modified) (4 diffs)
• gui/dialogs/relation/RelationEditor.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -121 +121 @@
                                 editor.setModal(true);
                                 editor.setVisible(true);
+                            } else {
+                                Main.main.getEditLayer().setRecentRelation(relation);
                             }
                         }

trunk/src/org/openstreetmap/josm/gui/SideButton.java

@@ -90 +90 @@
     }
 
-    public void createArrow(ActionListener listener) {
+    public BasicArrowButton createArrow(ActionListener listener) {
         setMargin(new Insets(0, 0, 0, 0));
         BasicArrowButton arrowButton = new BasicArrowButton(SwingConstants.SOUTH, null, null, Color.BLACK, null);
@@ -96 +96 @@
         add(arrowButton, BorderLayout.EAST);
         arrowButton.addActionListener(listener);
+        return arrowButton;
     }
 

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

@@ -42 +42 @@
 import org.openstreetmap.josm.actions.relation.DuplicateRelationAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
+import org.openstreetmap.josm.actions.relation.RecentRelationsAction;
 import org.openstreetmap.josm.actions.relation.SelectMembersAction;
 import org.openstreetmap.josm.actions.relation.SelectRelationAction;
@@ -123 +124 @@
     private final transient HighlightHelper highlightHelper = new HighlightHelper();
     private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
+    private RecentRelationsAction recentRelationsAction;
 
     /**
@@ -169 +171 @@
         pane.add(filter, BorderLayout.NORTH);
         pane.add(new JScrollPane(displaylist), BorderLayout.CENTER);
+
+        SideButton editButton = new SideButton(editAction, false);
+        recentRelationsAction = new RecentRelationsAction(editButton);
+
         createLayout(pane, false, Arrays.asList(new SideButton[]{
                 new SideButton(newAction, false),
-                new SideButton(editAction, false),
+                editButton,
                 new SideButton(duplicateAction, false),
                 new SideButton(deleteRelationsAction, false),
@@ -191 +197 @@
 
         updateActionsRelationLists();
+    }
+
+    public void enableRecentRelations() {
+        recentRelationsAction.enableArrow();
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -67 +67 @@
         this.layer = layer;
         setRelation(relation);
+        layer.removeRecentRelation(relation);
     }
 
@@ -190 +191 @@
         this.support.removePropertyChangeListener(listener);
     }
+
+    @Override
+    public void dispose() {
+        layer.setRecentRelation(relation);
+        super.dispose();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -25 +25 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -75 +77 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -122 +125 @@
     public final List<TestError> validationErrors = new ArrayList<>();
 
+    public static final int DEFAULT_RECENT_RELATIONS_NUMBER = 20;
+    public static final IntegerProperty PROPERTY_RECENT_RELATIONS_NUMBER = new IntegerProperty("properties.last-closed-relations-size",
+            DEFAULT_RECENT_RELATIONS_NUMBER);
+
+    /** List of recent relations */
+    private final Map<Relation, Void> recentRelations = new LinkedHashMap<Relation, Void>(PROPERTY_RECENT_RELATIONS_NUMBER.get()+1, 1.1f, true) {
+        @Override
+        protected boolean removeEldestEntry(Map.Entry<Relation, Void> eldest) {
+            return size() > PROPERTY_RECENT_RELATIONS_NUMBER.get();
+        }
+    };
+
+    /**
+     * Returns list of recently closed relations or null if none.
+     */
+    public ArrayList<Relation> getRecentRelations() {
+        ArrayList<Relation> list = new ArrayList<Relation>(recentRelations.keySet());
+        Collections.reverse(list);
+        return list;
+    }
+
+    public void setRecentRelation(Relation relation) {
+        recentRelations.put(relation, null);
+        Main.map.relationListDialog.enableRecentRelations();
+    }
+
+    public void removeRecentRelation(Relation relation) {
+        recentRelations.remove(relation);
+        Main.map.relationListDialog.enableRecentRelations();
+    }
+
     protected void setRequiresSaveToFile(boolean newValue) {
         boolean oldValue = requiresSaveToFile;