Changeset 4751 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-12-30T17:31:00+01:00 (12 years ago)

Author:

jttt

Message:

Extend Jump to next/previous marker to georefimage layer and made it easily possible to add jumping to any layer where it makes sense

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/LayerListDialog.java (modified) (3 diffs)
• layer/JumpToMarkerActions.java (added)
• layer/geoimage/GeoImageLayer.java (modified) (8 diffs)
• layer/markerlayer/MarkerLayer.java (modified) (5 diffs)

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

@@ -59 +59 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
@@ -92 +93 @@
         MultikeyActionsHandler.getInstance().addAction(instance.new ShowHideLayerAction(false));
         MultikeyActionsHandler.getInstance().addAction(instance.new ActivateLayerAction());
+        JumpToMarkerActions.initialize();
     }
 
@@ -1555 +1557 @@
     }
 
-    public static List<MultikeyInfo> getLayerInfoByClass(Class<? extends Layer> layerClass) {
+    // This is not Class<? extends Layer> on purpose, to allow asking for layers implementing some interface
+    public static List<MultikeyInfo> getLayerInfoByClass(Class<?> layerClass) {
 
         List<MultikeyInfo> result = new ArrayList<MultikeyShortcutAction.MultikeyInfo>();

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -55 +55 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToMarkerLayer;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToNextMarker;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToPreviousMarker;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.ExifReader;
@@ -68 +71 @@
 import com.drew.metadata.exif.GpsDirectory;
 
-public class GeoImageLayer extends Layer implements PropertyChangeListener {
+public class GeoImageLayer extends Layer implements PropertyChangeListener, JumpToMarkerLayer {
 
     List<ImageEntry> data;
@@ -230 +233 @@
                         tr("Error"),
                         JOptionPane.ERROR_MESSAGE
-                );
+                        );
             }
             if (layer != null) {
@@ -299 +302 @@
         }
         entries.add(SeparatorLayerAction.INSTANCE);
+        entries.add(new JumpToNextMarker(this));
+        entries.add(new JumpToPreviousMarker(this));
+        entries.add(SeparatorLayerAction.INSTANCE);
         entries.add(new LayerListPopup.InfoAction(this));
 
@@ -312 +318 @@
             }
         return trn("{0} image loaded.", "{0} images loaded.", data.size(), data.size())
-        + " " + trn("{0} was found to be GPS tagged.", "{0} were found to be GPS tagged.", i, i);
+                + " " + trn("{0} was found to be GPS tagged.", "{0} were found to be GPS tagged.", i, i);
     }
 
@@ -529 +535 @@
         } catch (MetadataException ex) {
         }
-        
+
         try {
             // longitude
@@ -694 +700 @@
                             tr("Error"),
                             JOptionPane.ERROR_MESSAGE
-                    );
+                            );
                 }
 
@@ -818 +824 @@
         return copy;
     }
+
+    public void jumpToNextMarker() {
+        showNextPhoto();
+    }
+
+    public void jumpToPreviousMarker() {
+        showPreviousPhoto();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -12 +12 @@
 import java.awt.Point;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
-import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.util.ArrayList;
@@ -41 +39 @@
 import org.openstreetmap.josm.gui.layer.CustomizeColor;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToMarkerLayer;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToNextMarker;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToPreviousMarker;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.AudioPlayer;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.MultikeyActionsHandler;
-import org.openstreetmap.josm.tools.MultikeyShortcutAction;
-import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -59 +57 @@
  * The data is read only.
  */
-public class MarkerLayer extends Layer {
+public class MarkerLayer extends Layer implements JumpToMarkerLayer {
 
     /**
@@ -138 +136 @@
         });
     }
-
-    static {
-        MultikeyActionsHandler.getInstance().addAction(new JumpToNextMarker(null));
-        MultikeyActionsHandler.getInstance().addAction(new JumpToPreviousMarker(null));
-    }
-
 
     /**
@@ -450 +442 @@
     }
 
-    public static final class JumpToNextMarker extends AbstractAction implements MultikeyShortcutAction {
-
-        private final MarkerLayer layer;
-        private WeakReference<MarkerLayer> lastLayer;
-
-        public JumpToNextMarker(MarkerLayer layer) {
-            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:nextMarker", "", 'J', Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK + KeyEvent.CTRL_DOWN_MASK).getKeyStroke());
-            putValue(SHORT_DESCRIPTION, tr("Jump to next marker"));
-            putValue(NAME, tr("Jump to next marker"));
-
-            this.layer = layer;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            execute(layer);
-        }
-
-        @Override
-        public void executeMultikeyAction(int index, boolean repeat) {
-            Layer l = LayerListDialog.getLayerForIndex(index);
-            if (l != null) {
-                if (l instanceof MarkerLayer) {
-                    execute((MarkerLayer) l);
-                }
-            } else if (repeat && lastLayer != null) {
-                l = lastLayer.get();
-                if (LayerListDialog.isLayerValid(l)) {
-                    execute((MarkerLayer) l);
-                }
-            }
-        }
-
-
-        private void execute(MarkerLayer l) {
-            l.jumpToNextMarker();
-            lastLayer = new WeakReference<MarkerLayer>(l);
-        }
-
-        @Override
-        public List<MultikeyInfo> getMultikeyCombinations() {
-            return LayerListDialog.getLayerInfoByClass(MarkerLayer.class);
-        }
-
-        @Override
-        public MultikeyInfo getLastMultikeyAction() {
-            if (lastLayer != null)
-                return LayerListDialog.getLayerInfo(lastLayer.get());
-            else
-                return null;
-        }
-
-    }
-
-    public static final class JumpToPreviousMarker extends AbstractAction implements MultikeyShortcutAction {
-
-        private WeakReference<MarkerLayer> lastLayer;
-        private final MarkerLayer layer;
-
-        public JumpToPreviousMarker(MarkerLayer layer) {
-            this.layer = layer;
-
-            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:previousMarker", "", 'P', Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK + KeyEvent.CTRL_DOWN_MASK).getKeyStroke());
-            putValue(SHORT_DESCRIPTION, tr("Jump to previous marker"));
-            putValue(NAME, tr("Jump to previous marker"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            execute(layer);
-        }
-
-        @Override
-        public void executeMultikeyAction(int index, boolean repeat) {
-            Layer l = LayerListDialog.getLayerForIndex(index);
-            if (l != null) {
-                if (l instanceof MarkerLayer) {
-                    execute((MarkerLayer) l);
-                }
-            } else if (repeat && lastLayer != null) {
-                l = lastLayer.get();
-                if (LayerListDialog.isLayerValid(l)) {
-                    execute((MarkerLayer) l);
-                }
-            }
-        }
-
-        private void execute(MarkerLayer l) {
-            l.jumpToPreviousMarker();
-            lastLayer = new WeakReference<MarkerLayer>(l);
-        }
-
-        @Override
-        public List<MultikeyInfo> getMultikeyCombinations() {
-            return LayerListDialog.getLayerInfoByClass(MarkerLayer.class);
-        }
-
-        @Override
-        public MultikeyInfo getLastMultikeyAction() {
-            if (lastLayer != null)
-                return LayerListDialog.getLayerInfo(lastLayer.get());
-            else
-                return null;
-        }
-
-    }
 
     private class SynchronizeAudio extends AbstractAction {