Changeset 1825 in josm

Timestamp:

2009-07-24T08:03:25+02:00 (15 years ago)

Author:

Gubaer

Message:

Changed the way we get an "active data layer" and a "current data set". Now, the "active data layer" is the first OsmDataLayer in the list of layers, or null, if there are no OsmDataLayers. The "current data set" is the dataset of the "active data layer", or nul, if there is no "active data layer".

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -220 +220 @@
 
     /**
-     * Replies true if there is an edit layer which is currently
-     * active
+     * Replies true if there is an edit layer
      *
-     * @return true if there is an edit layer which is currently
-     * active
-     */
-    public boolean hasActiveEditLayer() {
+     * @return true if there is an edit layer
+     */
+    public boolean hasEditLayer() {
         if (map == null) return false;
         if (map.mapView == null) return false;
@@ -250 +248 @@
      */
     public DataSet getCurrentDataSet() {
-        if (!hasActiveEditLayer()) return null;
+        if (!hasEditLayer()) return null;
         return getEditLayer().data;
     }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -417 +417 @@
         if (activeLayer instanceof OsmDataLayer)
             return (OsmDataLayer)activeLayer;
+
+        // the first OsmDataLayer is the edit layer
+        //
+        for (Layer layer : layers) {
+            if (layer instanceof OsmDataLayer)
+                return (OsmDataLayer)layer;
+        }
         return null;
     }