diff --git a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java index 4f7c5aa..9d2ca14 100644 --- a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java +++ b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java @@ -120,6 +120,8 @@ public class CreateMultipolygonAction extends JosmAction { editor.setModal(true); editor.setVisible(true); + } else { + Main.main.getEditLayer().setRecentRelation(relation); } } }); diff --git a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java new file mode 100644 index 0000000..382cf71 --- /dev/null +++ b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java @@ -0,0 +1,162 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.actions.relation; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.awt.Rectangle; +import java.util.Collection; +import java.util.List; + +import javax.swing.AbstractAction; +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; +import javax.swing.KeyStroke; +import javax.swing.plaf.basic.BasicArrowButton; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener; +import org.openstreetmap.josm.gui.DefaultNameFormatter; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.MapView.LayerChangeListener; +import org.openstreetmap.josm.gui.SideButton; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * Action for accessing recent relations. + */ +public class RecentRelationsAction implements ActionListener, CommandQueueListener, LayerChangeListener{ + + private SideButton editButton; + private BasicArrowButton arrow; + private Shortcut shortcut; + + /** + * Constructs a new RecentRelationsAction. + */ + public RecentRelationsAction(SideButton editButton) { + this.editButton = editButton; + arrow = editButton.createArrow(this); + arrow.setToolTipText(tr("List of recent relations")); + Main.main.undoRedo.addCommandQueueListener(this); + MapView.addLayerChangeListener(this); + enableArrow(); + shortcut = Shortcut.registerShortcut( + "relationeditor:editrecentrelation", + tr("Relation Editor: {0}", tr("Open recent relation")), + KeyEvent.VK_ESCAPE, + Shortcut.SHIFT + ); + Main.registerActionShortcut(new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + EditRelationAction.launchEditor(getLastRelation()); + } + }, shortcut); + } + + public void enableArrow() { + arrow.setEnabled(getLastRelation() != null); + } + + public static Relation getLastRelation() { + List recentRelations = getRecentRelationsOnActiveLayer(); + if (recentRelations == null || recentRelations.isEmpty()) return null; + for (Relation relation: recentRelations) { + if (!isRelationListable(relation)) continue; + return relation; + } + return null; + } + + public static boolean isRelationListable(Relation relation) { + return relation != null && + !relation.isDeleted() && + Main.main.getCurrentDataSet().containsRelation(relation); + } + + @Override + public void actionPerformed(ActionEvent e) { + RecentRelationsPopupMenu.launch(editButton, shortcut.getKeyStroke()); + } + + @Override + public void commandChanged(int queueSize, int redoSize) { + enableArrow(); + } + + @Override + public void activeLayerChange(Layer oldLayer, Layer newLayer) { + enableArrow(); + } + + @Override + public void layerAdded(Layer newLayer) { + enableArrow(); + } + + @Override + public void layerRemoved(Layer oldLayer) { + enableArrow(); + } + + public static List getRecentRelationsOnActiveLayer() { + if (Main.map == null || Main.map.mapView == null) return null; + Layer activeLayer = Main.map.mapView.getActiveLayer(); + if (!(activeLayer instanceof OsmDataLayer)) { + return null; + } else { + return ((OsmDataLayer) activeLayer).getRecentRelations(); + } + } + + protected static class RecentRelationsPopupMenu extends JPopupMenu { + public static void launch(Component parent, KeyStroke keystroke) { + List recentRelations = getRecentRelationsOnActiveLayer(); + JPopupMenu menu = new RecentRelationsPopupMenu(recentRelations, keystroke); + Rectangle r = parent.getBounds(); + menu.show(parent, r.x, r.y + r.height); + } + + /** + * Constructs a new {@code SearchPopupMenu}. + */ + public RecentRelationsPopupMenu(List recentRelations, KeyStroke keystroke) { + boolean first = true; + for (Relation relation: recentRelations) { + if (!isRelationListable(relation)) continue; + JMenuItem menuItem = new RecentRelationsMenuItem(relation); + if (first) { + menuItem.setAccelerator(keystroke); + first = false; + } + add(menuItem); + } + } + } + + /** + * A specialized {@link JMenuItem} for presenting one entry of the relation history + */ + protected static class RecentRelationsMenuItem extends JMenuItem implements ActionListener { + protected final transient Relation relation; + + public RecentRelationsMenuItem(Relation relation) { + super(relation.getDisplayName(DefaultNameFormatter.getInstance())); + this.relation = relation; + addActionListener(this); + } + + @Override + public void actionPerformed(ActionEvent e) { + EditRelationAction.launchEditor(relation); + } + } +} diff --git a/src/org/openstreetmap/josm/gui/SideButton.java b/src/org/openstreetmap/josm/gui/SideButton.java index 88539ba..b1705b0 100644 --- a/src/org/openstreetmap/josm/gui/SideButton.java +++ b/src/org/openstreetmap/josm/gui/SideButton.java @@ -89,12 +89,13 @@ public class SideButton extends JButton implements Destroyable { setMargin(new Insets(0, 0, 0, 0)); } - 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); arrowButton.setBorder(BorderFactory.createEmptyBorder()); add(arrowButton, BorderLayout.EAST); arrowButton.addActionListener(listener); + return arrowButton; } @Override diff --git a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java index 53cb4da..c7c3439 100644 --- a/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java +++ b/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java @@ -41,6 +41,7 @@ import org.openstreetmap.josm.actions.relation.DownloadMembersAction; import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction; 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; import org.openstreetmap.josm.actions.search.SearchCompiler; @@ -122,6 +123,7 @@ public class RelationListDialog extends ToggleDialog private final transient HighlightHelper highlightHelper = new HighlightHelper(); private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); + private RecentRelationsAction recentRelationsAction; /** * Constructs RelationListDialog @@ -168,9 +170,13 @@ public class RelationListDialog extends ToggleDialog JPanel pane = new JPanel(new BorderLayout()); 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), new SideButton(selectRelationAction, false) @@ -192,6 +198,10 @@ public class RelationListDialog extends ToggleDialog updateActionsRelationLists(); } + public void enableRecentRelations() { + recentRelationsAction.enableArrow(); + } + // inform all actions about list of relations they need private void updateActionsRelationLists() { List sel = model.getSelectedRelations(); diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java index 8c04d22..5514ba3 100644 --- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java +++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java @@ -66,6 +66,7 @@ public abstract class RelationEditor extends ExtendedDialog implements RelationA CheckParameterUtil.ensureParameterNotNull(layer, "layer"); this.layer = layer; setRelation(relation); + layer.removeRecentRelation(relation); } /** @@ -189,4 +190,10 @@ public abstract class RelationEditor extends ExtendedDialog implements RelationA public final void removePropertyChangeListener(PropertyChangeListener listener) { this.support.removePropertyChangeListener(listener); } + + @Override + public void dispose() { + layer.setRecentRelation(relation); + super.dispose(); + } } diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java index 7a22bdc..ef28d98 100644 --- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java +++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java @@ -24,6 +24,8 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -74,6 +76,7 @@ import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory; 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; import org.openstreetmap.josm.gui.ExtendedDialog; @@ -121,6 +124,37 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S */ public final List 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 recentRelations = new LinkedHashMap(PROPERTY_RECENT_RELATIONS_NUMBER.get()+1, 1.1f, true) { + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { + return size() > PROPERTY_RECENT_RELATIONS_NUMBER.get(); + } + }; + + /** + * Returns list of recently closed relations or null if none. + */ + public ArrayList getRecentRelations() { + ArrayList list = new ArrayList(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; requiresSaveToFile = newValue;