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

Timestamp:

2009-08-02T23:15:26+02:00 (15 years ago)

Author:

Gubaer

Message:

update: rewrite of layer dialog
new: allows multiple selection of layers in the dialog
new: move up, move down, toggle visibility, and delete on multiple layers
new: merge from an arbitrary layer into another layer, not only from the first into the second
new: new action for merging of the currently selected primitives on an arbitrary layer
new: make "active" layer explicit (special icon); activating a layer automatically moves it in the first position
refactoring: public fields 'name' and 'visible' on Layer are @deprecated. Use the setter/getters instead, Layer now emits PropertyChangeEvents if name or visibility are changed.

File:

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

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

@@ -266 +266 @@
             MapFrame frame = Main.map;
             if (frame != null) {
-              frame.mapView.repaint();
+                frame.mapView.repaint();
             }
         }
@@ -276 +276 @@
         private final GpxLayer gpxLayer;
         public Loader(Collection<File> files, GpxLayer gpxLayer) {
-            super(tr("Images for {0}", gpxLayer.name));
+            super(tr("Images for {0}", gpxLayer.getName()));
             this.files = files;
             this.gpxLayer = gpxLayer;
@@ -412 +412 @@
                     return;
                 mousePressed  = true;
-                if (visible) {
+                if (isVisible()) {
                     Main.map.mapView.repaint();
                 }
@@ -420 +420 @@
                     return;
                 mousePressed = false;
-                if (!visible)
+                if (!isVisible())
                     return;
                 for (int i = data.size(); i > 0; --i) {
@@ -699 +699 @@
         });
         return new Component[]{
-                new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
-                new JMenuItem(new LayerListDialog.DeleteLayerAction(this)),
+                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
+                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
                 new JSeparator(),
                 sync,