Index: /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 10383)
@@ -160,5 +160,5 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.getSelected().isEmpty());
+        setEnabled(ds != null && !ds.selectionEmpty());
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 10383)
@@ -376,5 +376,5 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.getSelected().isEmpty());
+        setEnabled(ds != null && !ds.selectionEmpty());
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java	(revision 10383)
@@ -418,5 +418,5 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.getSelected().isEmpty());
+        setEnabled(ds != null && !ds.selectionEmpty());
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 10383)
@@ -344,5 +344,5 @@
         switch (mode) {
         case "selection":
-            setEnabled(ds != null && !ds.getSelected().isEmpty());
+            setEnabled(ds != null && !ds.selectionEmpty());
             break;
         case "layer":
Index: /trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 10383)
@@ -38,5 +38,5 @@
     public void actionPerformed(ActionEvent ae) {
         DataSet set = getLayerManager().getEditDataSet();
-        if (set != null && !set.getAllSelected().isEmpty()) {
+        if (set != null && !set.selectionEmpty()) {
             HistoryBrowserDialogManager.getInstance().showHistory(set.getAllSelected());
         } else {
Index: /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 10383)
@@ -64,5 +64,5 @@
     public void actionPerformed(ActionEvent e) {
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
-        if (editLayer == null || editLayer.data.getAllSelected().isEmpty())
+        if (editLayer == null || editLayer.data.selectionEmpty())
             return;
         mergeSelected();
Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 10383)
@@ -619,5 +619,5 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.getSelected().isEmpty());
+        setEnabled(ds != null && !ds.selectionEmpty());
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java	(revision 10383)
@@ -337,5 +337,5 @@
         }
         // buffer listening slows down the program and is not very good for arbitrary text in buffer
-        setEnabled(!ds.getSelected().isEmpty());
+        setEnabled(!ds.selectionEmpty());
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 10383)
@@ -186,5 +186,5 @@
         // update selection to reflect which way being modified
         DataSet currentDataSet = getLayerManager().getEditDataSet();
-        if (getCurrentBaseNode() != null && currentDataSet != null && !currentDataSet.getSelected().isEmpty()) {
+        if (getCurrentBaseNode() != null && currentDataSet != null && !currentDataSet.selectionEmpty()) {
             Way continueFrom = getWayForNode(getCurrentBaseNode());
             if (alt && continueFrom != null && (!getCurrentBaseNode().isSelected() || continueFrom.isSelected())) {
@@ -1085,6 +1085,5 @@
 
         // This happens when nothing is selected, but we still want to highlight the "target node"
-        if (mouseOnExistingNode == null && getLayerManager().getEditDataSet().getSelected().isEmpty()
-                && mousePos != null) {
+        if (mouseOnExistingNode == null && getLayerManager().getEditDataSet().selectionEmpty() && mousePos != null) {
             mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         }
@@ -1249,5 +1248,5 @@
         DataSet ds = getLayerManager().getEditDataSet();
         if (ds == null) return null;
-        if (getCurrentBaseNode() != null && !ds.getSelected().isEmpty()) {
+        if (getCurrentBaseNode() != null && !ds.selectionEmpty()) {
             Way continueFrom = getWayForNode(getCurrentBaseNode());
             if (continueFrom != null)
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 10383)
@@ -428,5 +428,5 @@
             //  if nothing was selected, select primitive under cursor for scaling or rotating
             DataSet ds = getLayerManager().getEditDataSet();
-            if (ds.getSelected().isEmpty()) {
+            if (ds.selectionEmpty()) {
                 ds.setSelected(asColl(nearestPrimitive));
             }
@@ -594,5 +594,5 @@
 
             // Select Draw Tool if no selection has been made
-            if (getLayerManager().getEditDataSet().getSelected().isEmpty() && !cancelDrawMode) {
+            if (getLayerManager().getEditDataSet().selectionEmpty() && !cancelDrawMode) {
                 Main.map.selectDrawTool(true);
                 updateStatusLine();
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 10383)
@@ -342,5 +342,5 @@
 
         protected void updateEnabledState() {
-            setEnabled(!model.getSelected().isEmpty());
+            setEnabled(!model.isSelectionEmpty());
         }
 
@@ -378,5 +378,5 @@
         protected void updateEnabledState(int osmSelectionSize) {
             // See #10830 - allow to click on history button is a single object is selected, even if not selected again in the list
-            setEnabled(!model.getSelected().isEmpty() || osmSelectionSize == 1);
+            setEnabled(!model.isSelectionEmpty() || osmSelectionSize == 1);
         }
 
@@ -459,5 +459,5 @@
 
         protected void updateEnabledState() {
-            setEnabled(!model.getSelected().isEmpty());
+            setEnabled(!model.isSelectionEmpty());
         }
 
@@ -561,6 +561,14 @@
 
         /**
-         * Replies the collection of OSM primitives currently selected in the view
-         * of this model
+         * Determines if no OSM primitives are currently selected.
+         * @return {@code true} if no OSM primitives are currently selected
+         * @since 10383
+         */
+        public boolean isSelectionEmpty() {
+            return selectionModel.isSelectionEmpty();
+        }
+
+        /**
+         * Replies the collection of OSM primitives currently selected in the view of this model
          *
          * @return choosen elements in the view
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveSelectedAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveSelectedAction.java	(revision 10382)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveSelectedAction.java	(revision 10383)
@@ -34,5 +34,5 @@
     protected void updateEnabledState() {
         DataSet ds = layer.data;
-        if (ds == null || ds.getSelected().isEmpty()) {
+        if (ds == null || ds.selectionEmpty()) {
             setEnabled(false);
             return;