Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 10548)
@@ -245,10 +245,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-            return;
-        }
-        updateEnabledState(ds.getSelected());
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 10548)
@@ -263,10 +263,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/InfoAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/InfoAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/InfoAction.java	(revision 10548)
@@ -43,10 +43,5 @@
     @Override
     public void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getAllSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 10548)
@@ -353,10 +353,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getAllSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 10548)
@@ -71,10 +71,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getAllSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java	(revision 10548)
@@ -56,10 +56,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java	(revision 10548)
@@ -130,10 +130,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 10548)
@@ -751,10 +751,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java	(revision 10548)
@@ -113,10 +113,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getAllSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 10547)
+++ /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 10548)
@@ -58,10 +58,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(ds.getAllSelected());
-        }
+        updateEnabledStateOnCurrentSelection();
     }