Changeset 10383 in josm for trunk

Timestamp:

2016-06-15T13:00:16+02:00 (8 years ago)

Author:

Don-vip

Message:

replace .get*Selected().isEmpty() by .selectionEmpty()

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractInfoAction.java (modified) (1 diff)
• actions/AlignInCircleAction.java (modified) (1 diff)
• actions/AlignInLineAction.java (modified) (1 diff)
• actions/AutoScaleAction.java (modified) (1 diff)
• actions/HistoryInfoAction.java (modified) (1 diff)
• actions/MergeSelectionAction.java (modified) (1 diff)
• actions/OrthogonalizeAction.java (modified) (1 diff)
• actions/PasteTagsAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (3 diffs)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (4 diffs)
• gui/dialogs/relation/actions/RemoveSelectedAction.java (modified) (1 diff)

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

@@ -160 +160 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.getSelected().isEmpty());
+        setEnabled(ds != null && !ds.selectionEmpty());
     }
 

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

@@ -376 +376 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.getSelected().isEmpty());
+        setEnabled(ds != null && !ds.selectionEmpty());
     }
 

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

@@ -418 +418 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.getSelected().isEmpty());
+        setEnabled(ds != null && !ds.selectionEmpty());
     }
 

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

@@ -344 +344 @@
         switch (mode) {
         case "selection":
-            setEnabled(ds != null && !ds.getSelected().isEmpty());
+            setEnabled(ds != null && !ds.selectionEmpty());
             break;
         case "layer":

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

@@ -38 +38 @@
     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 {

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

@@ -64 +64 @@
     public void actionPerformed(ActionEvent e) {
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
-        if (editLayer == null || editLayer.data.getAllSelected().isEmpty())
+        if (editLayer == null || editLayer.data.selectionEmpty())
             return;
         mergeSelected();

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

@@ -619 +619 @@
     protected void updateEnabledState() {
         DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.getSelected().isEmpty());
+        setEnabled(ds != null && !ds.selectionEmpty());
     }
 

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

@@ -337 +337 @@
         }
         // buffer listening slows down the program and is not very good for arbitrary text in buffer
-        setEnabled(!ds.getSelected().isEmpty());
+        setEnabled(!ds.selectionEmpty());
     }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -186 +186 @@
         // 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 +1085 @@
 
         // 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 +1248 @@
         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)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -428 +428 @@
             //  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 +594 @@
 
             // 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();

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -342 +342 @@
 
         protected void updateEnabledState() {
-            setEnabled(!model.getSelected().isEmpty());
+            setEnabled(!model.isSelectionEmpty());
         }
 
@@ -378 +378 @@
         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 +459 @@
 
         protected void updateEnabledState() {
-            setEnabled(!model.getSelected().isEmpty());
+            setEnabled(!model.isSelectionEmpty());
         }
 
@@ -561 +561 @@
 
         /**
-         * 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

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveSelectedAction.java

@@ -34 +34 @@
     protected void updateEnabledState() {
         DataSet ds = layer.data;
-        if (ds == null || ds.getSelected().isEmpty()) {
+        if (ds == null || ds.selectionEmpty()) {
             setEnabled(false);
             return;