Changeset 2621 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2009-12-12T17:51:39+01:00 (14 years ago)

Author:

Gubaer

Message:

Moved layer listener management from Layer to MapView
Made sure that listeners also unregister when they register for layer change events.

This will certainly break plugins. Plugin updates will follow later.

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• Layer.java (modified) (2 diffs)
• geoimage/GeoImageLayer.java (modified) (24 diffs)

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

@@ -11 +11 @@
 import java.beans.PropertyChangeSupport;
 import java.io.File;
-import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.AbstractAction;
@@ -49 +47 @@
 
     /**
-     * Interface to notify listeners of the change of the active layer.
-     * @author imi
-     */
-    public interface LayerChangeListener {
-        void activeLayerChange(Layer oldLayer, Layer newLayer);
-        void layerAdded(Layer newLayer);
-        void layerRemoved(Layer oldLayer);
-    }
-
-    /**
-     * The listener of the active layer changes. You may register/deregister yourself
-     * while an LayerChangeListener - action is executed.
-     * 
-     * @deprecated use {@see #addLayerChangeListener(LayerChangeListener)}
-     * and {@see #removeLayerChangeListener(LayerChangeListener)}
-     */
-    @Deprecated
-    public static final Collection<LayerChangeListener> listeners = new CopyOnWriteArrayList<LayerChangeListener>();
-
-    /**
-     * Adds a layer change listener
-     * 
-     * @param listener the listener. Ignored if null or already registered.
-     */
-    public static void addLayerChangeListener(LayerChangeListener listener) {
-        if (listener != null && ! listeners.contains(listener)) {
-            listeners.add(listener);
-        }
-    }
-
-    /**
-     * Removes a layer change listener
-     * 
-     * @param listener the listener. Ignored if null or already registered.
-     */
-    public static void removeLayerChangeListener(LayerChangeListener listener) {
-        if (listener != null && listeners.contains(listener)) {
-            listeners.remove(listener);
-        }
-    }
-
-    /**
      * The visibility state of the layer.
      *

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

@@ -16 +16 @@
 import java.awt.Graphics2D;
 import java.awt.Image;
-import java.awt.MediaTracker;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Toolkit;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
 import java.io.File;
 import java.io.IOException;
@@ -30 +28 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.Collection;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
-import java.util.HashSet;
 import java.util.List;
 
@@ -50 +48 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -102 +101 @@
         }
         public int compareTo(ImageEntry image) {
-            if (time != null && image.time != null) {
+            if (time != null && image.time != null)
                 return time.compareTo(image.time);
-            } else if (time == null && image.time == null) {
+            else if (time == null && image.time == null)
                 return 0;
-            } else if (time == null) {
+            else if (time == null)
                 return -1;
-            } else {
+            else
                 return 1;
-            }
         }
     }
@@ -147 +145 @@
             }
 
-            if (cancelled) {
+            if (cancelled)
                 return;
-            }
             progressMonitor.subTask(tr("Read photos..."));
             progressMonitor.setTicksCount(files.size());
@@ -205 +202 @@
                         e.printStackTrace();
                         rememberError(tr("Unable to get canonical path for directory {0}\n",
-                                           f.getAbsolutePath()));
+                                f.getAbsolutePath()));
                     }
 
@@ -228 +225 @@
 
                 } else {
-                      files.add(f);
-                }
-            }
-
-            if (nullFile) {
+                    files.add(f);
+                }
+            }
+
+            if (nullFile)
                 throw new NullPointerException();
-            }
         }
 
@@ -265 +261 @@
                 Main.main.addLayer(layer);
                 layer.hook_up_mouse_events(); // Main.map.mapView should exist
-                                              // now. Can add mouse listener
+                // now. Can add mouse listener
 
                 if (! cancelled && layer.data.size() > 0) {
@@ -329 +325 @@
                 new JSeparator(),
                 correlateItem
-                };
+        };
     }
 
@@ -336 +332 @@
         int i = 0;
         for (ImageEntry e : data)
-            if (e.pos != null)
+            if (e.pos != null) {
                 i++;
+            }
         return data.size() + " " + trn("image", "images", data.size())
-                + " loaded. " + tr("{0} were found to be gps tagged.", i);
+        + " loaded. " + tr("{0} were found to be gps tagged.", i);
     }
 
@@ -406 +403 @@
 
         return new Dimension(
-            (int) Math.round(f * thumb.getWidth(null)),
-            (int) Math.round(f * thumb.getHeight(null)));
+                (int) Math.round(f * thumb.getWidth(null)),
+                (int) Math.round(f * thumb.getHeight(null)));
     }
 
@@ -432 +429 @@
 
                 for (ImageEntry e : data) {
-                    if (e.pos == null)
+                    if (e.pos == null) {
                         continue;
+                    }
                     Point p = mv.getPoint(e.pos);
                     if (e.thumbnail != null) {
@@ -444 +442 @@
                     else { // thumbnail not loaded yet
                         icon.paintIcon(mv, tempG,
-                                   p.x - icon.getIconWidth() / 2,
-                                   p.y - icon.getIconHeight() / 2);
+                                p.x - icon.getIconWidth() / 2,
+                                p.y - icon.getIconHeight() / 2);
                     }
                 }
@@ -454 +452 @@
         else {
             for (ImageEntry e : data) {
-                if (e.pos == null)
+                if (e.pos == null) {
                     continue;
+                }
                 Point p = mv.getPoint(e.pos);
                 icon.paintIcon(mv, g,
-                           p.x - icon.getIconWidth() / 2,
-                           p.y - icon.getIconHeight() / 2);
+                        p.x - icon.getIconWidth() / 2,
+                        p.y - icon.getIconHeight() / 2);
             }
         }
@@ -475 +474 @@
                 } else {
                     selectedIcon.paintIcon(mv, g,
-                                p.x - selectedIcon.getIconWidth() / 2,
-                                p.y - selectedIcon.getIconHeight() / 2);
+                            p.x - selectedIcon.getIconWidth() / 2,
+                            p.y - selectedIcon.getIconHeight() / 2);
                 }
             }
@@ -484 +483 @@
     @Override
     public void visitBoundingBox(BoundingXYVisitor v) {
-        for (ImageEntry e : data)
+        for (ImageEntry e : data) {
             v.visit(e.pos);
+        }
     }
 
@@ -508 +508 @@
 
             Rational[] components = dir
-                    .getRationalArray(GpsDirectory.TAG_GPS_LONGITUDE);
+            .getRationalArray(GpsDirectory.TAG_GPS_LONGITUDE);
 
             deg = components[0].intValue();
@@ -516 +516 @@
             lon = (deg + (min / 60) + (sec / 3600));
 
-            if (dir.getString(GpsDirectory.TAG_GPS_LONGITUDE_REF).charAt(0) == 'W')
+            if (dir.getString(GpsDirectory.TAG_GPS_LONGITUDE_REF).charAt(0) == 'W') {
                 lon = -lon;
+            }
 
             // latitude
@@ -529 +530 @@
             lat = (deg + (min / 60) + (sec / 3600));
 
-            if (dir.getString(GpsDirectory.TAG_GPS_LATITUDE_REF).charAt(0) == 'S')
+            if (dir.getString(GpsDirectory.TAG_GPS_LATITUDE_REF).charAt(0) == 'S') {
                 lat = -lat;
+            }
 
             // Store values
@@ -569 +571 @@
 
     public void checkPreviousNextButtons() {
-//        System.err.println("showing image " + currentPhoto);
+        //        System.err.println("showing image " + currentPhoto);
         ImageViewerDialog.setNextEnabled(currentPhoto < data.size() - 1);
         ImageViewerDialog.setPreviousEnabled(currentPhoto > 0);
@@ -596 +598 @@
             @Override public void mousePressed(MouseEvent e) {
 
-                if (e.getButton() != MouseEvent.BUTTON1) {
+                if (e.getButton() != MouseEvent.BUTTON1)
                     return;
-                }
-                if (isVisible())
+                if (isVisible()) {
                     Main.map.mapView.repaint();
+                }
             }
 
             @Override public void mouseReleased(MouseEvent ev) {
-                if (ev.getButton() != MouseEvent.BUTTON1) {
+                if (ev.getButton() != MouseEvent.BUTTON1)
                     return;
-                }
-                if (!isVisible()) {
+                if (!isVisible())
                     return;
-                }
 
                 for (int i = data.size() - 1; i >= 0; --i) {
                     ImageEntry e = data.get(i);
-                    if (e.pos == null)
+                    if (e.pos == null) {
                         continue;
+                    }
                     Point p = Main.map.mapView.getPoint(e.pos);
                     Rectangle r;
@@ -622 +623 @@
                     } else {
                         r = new Rectangle(p.x - icon.getIconWidth() / 2,
-                                            p.y - icon.getIconHeight() / 2,
-                                            icon.getIconWidth(),
-                                            icon.getIconHeight());
+                                p.y - icon.getIconHeight() / 2,
+                                icon.getIconWidth(),
+                                icon.getIconHeight());
                     }
                     if (r.contains(ev.getPoint())) {
@@ -636 +637 @@
         };
         Main.map.mapView.addMouseListener(mouseAdapter);
-        Layer.listeners.add(new LayerChangeListener() {
+        MapView.addLayerChangeListener(new LayerChangeListener() {
             public void activeLayerChange(Layer oldLayer, Layer newLayer) {
                 if (newLayer == GeoImageLayer.this && currentPhoto >= 0) {
@@ -656 +657 @@
                     data.clear();
                     data = null;
+                    // stop listening to layer change events
+                    MapView.removeLayerChangeListener(this);
                 }
             }