Changeset 2904 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

Timestamp:

2010-01-29T21:25:17+01:00 (14 years ago)

Author:

bastiK

Message:

minor cleanup & hooks for plugin

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (6 diffs)

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

@@ -32 +32 @@
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -55 +56 @@
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -289 +291 @@
         return ImageProvider.get("dialogs/geoimage");
     }
-
-    @Override
-    public Object getInfoComponent() {
-        // TODO Auto-generated method stub
-        return null;
+    
+    public static interface LayerMenuAddition {
+        public Component getComponent(Layer layer);
+    }
+
+    private static List<LayerMenuAddition> menuAdditions = new LinkedList<LayerMenuAddition>();
+    public static void registerMenuAddition(LayerMenuAddition addition) {
+        menuAdditions.add(addition);
     }
 
@@ -301 +306 @@
         JMenuItem correlateItem = new JMenuItem(tr("Correlate to GPX"), ImageProvider.get("dialogs/geoimage/gpx2img"));
         correlateItem.addActionListener(new CorrelateGpxWithImages(this));
-
-        return new Component[] {
-                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-                new JMenuItem(new RenameLayerAction(null, this)),
-                new JSeparator(),
-                correlateItem
-        };
-    }
-
-    @Override
-    public String getToolTipText() {
+        
+        List<Component> entries = new ArrayList<Component>();
+        entries.add(new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)));
+        entries.add(new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)));
+        entries.add(new JMenuItem(new RenameLayerAction(null, this)));
+        entries.add(new JSeparator());
+        entries.add(correlateItem);
+        for (LayerMenuAddition addition : menuAdditions) {
+            entries.add(addition.getComponent(this));
+        }
+        entries.add(new JSeparator());
+        entries.add(new JMenuItem(new LayerListPopup.InfoAction(this)));
+
+        return entries.toArray(new Component[0]);
+        
+    }
+
+    private String infoText() {
         int i = 0;
         for (ImageEntry e : data)
@@ -320 +331 @@
         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);
+    }
+    
+    @Override public Object getInfoComponent() {
+        return infoText();
+    }
+
+    @Override
+    public String getToolTipText() {
+        return infoText();
     }
 
@@ -730 +750 @@
         Main.map.mapView.repaint();
     }
+    
+    public List<ImageEntry> getImages() {
+        List<ImageEntry> copy = new ArrayList<ImageEntry>();
+        for (ImageEntry ie : data) {
+            copy.add(ie.clone());
+        }
+        return copy;
+    }
 }