Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (4 diffs)

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

@@ -77 +77 @@
      */
     public static Preferences pref = new Preferences();
-    /**
-     * The global dataset.
-     */
-    public static DataSet ds = new DataSet();
+
     /**
      * The global paste buffer.
@@ -167 +164 @@
         if (map != null) {
             map.mapView.removeLayer(layer);
-            if (layer instanceof OsmDataLayer) {
-                ds = new DataSet();
-            }
             if (map.mapView.getAllLayers().isEmpty()) {
                 setMapFrame(null);
@@ -224 +218 @@
         map.mapView.addLayer(layer);
     }
-    /**
-     * Replies the current edit layer. Creates one if no {@see OsmDataLayer}
-     * exists. Replies null, if the currently active layer isn't an instance
-     * of {@see OsmDataLayer}.
+
+    /**
+     * Replies true if there is an edit layer which is currently
+     * active
      *
-     * @return the current edit layer
-     */
-    public final OsmDataLayer createOrGetEditLayer() {
-        if (map == null || map.mapView.getEditLayer() == null) {
-            menu.newAction.actionPerformed(null);
-        }
-        return map.mapView.getEditLayer();
-    }
-
-    /**
-     * Replies true if this map view has an edit layer
-     *
-     * @return true if this map view has an edit layer
-     */
-    public boolean hasEditLayer() {
+     * @return true if there is an edit layer which is currently
+     * active
+     */
+    public boolean hasActiveEditLayer() {
         if (map == null) return false;
         if (map.mapView == null) return false;
         if (map.mapView.getEditLayer() == null) return false;
         return true;
+    }
+
+    /**
+     * Replies the current edit layer
+     * 
+     * @return the current edit layer. null, if no current edit layer exists
+     */
+    public OsmDataLayer getEditLayer() {
+        if (map == null) return null;
+        if (map.mapView == null) return null;
+        return map.mapView.getEditLayer();
+    }
+
+    /**
+     * Replies the current data set.
+     *
+     * @return the current data set. null, if no current data set exists
+     */
+    public DataSet getCurrentDataSet() {
+        if (!hasActiveEditLayer()) return null;
+        return getEditLayer().data;
     }
 
@@ -495 +499 @@
         pref.put("gui.geometry", newGeometry);
     }
+
+
 }