Changeset 14835 in josm for trunk/src/org

Timestamp:

2019-03-05T15:04:58+01:00 (6 years ago)

Author:

GerdP

Message:

see #17343: prepare solution

updateEnabledState() should be called in ValidatorDialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ValidateAction.java (modified) (2 diffs)
• data/osm/DataSet.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

@@ -12 +12 @@
 import java.util.Optional;
 
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
@@ -95 +96 @@
     @Override
     public void updateEnabledState() {
-        setEnabled(getLayerManager().getActiveDataSet() != null);
+        DataSet ds = getLayerManager().getActiveDataSet() ;
+        setEnabled(ds != null && !ds.isEmpty());
     }
 

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -1201 +1201 @@
         this.remark = remark;
     }
+
+    /**
+     * @return true if this Dataset contains no primitives
+     * @since 14835
+     */
+    public boolean isEmpty() {
+        return allPrimitives.isEmpty();
+    }
 }