Changeset 5360 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2012-07-25T00:33:41+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7776 - Selection of deleted objects

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• ChangesetDialog.java (modified) (2 diffs)
• HistoryDialog.java (modified) (2 diffs)
• InspectPrimitiveDialog.java (modified) (1 diff)
• SelectionListDialog.java (modified) (2 diffs)
• UserListDialog.java (modified) (4 diffs)
• ValidatorDialog.java (modified) (1 diff)
• changeset/ChangesetInSelectionListModel.java (modified) (1 diff)
• relation/SelectionTableModel.java (modified) (2 diffs)

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

@@ -127 +127 @@
             Main.main.getEditLayer().data.addDataSetListener(inActiveDataLayerModel);
             inActiveDataLayerModel.initFromDataSet(Main.main.getEditLayer().data);
-            inSelectionModel.initFromPrimitives(Main.main.getEditLayer().data.getSelected());
+            inSelectionModel.initFromPrimitives(Main.main.getEditLayer().data.getAllSelected());
         }
     }
@@ -234 +234 @@
     protected void initWithCurrentData() {
         if (Main.main.getEditLayer() != null) {
-            inSelectionModel.initFromPrimitives(Main.main.getEditLayer().data.getSelected());
+            inSelectionModel.initFromPrimitives(Main.main.getEditLayer().data.getAllSelected());
             inActiveDataLayerModel.initFromDataSet(Main.main.getEditLayer().data);
         }

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

@@ -121 +121 @@
             model.selectionChanged(null);
         } else {
-            model.selectionChanged(Main.main.getCurrentDataSet().getSelected());
+            model.selectionChanged(Main.main.getCurrentDataSet().getAllSelected());
         }
     }
@@ -197 +197 @@
             if (Main.main.getCurrentDataSet() == null)
                 return;
-            for (OsmPrimitive primitive: Main.main.getCurrentDataSet().getSelected()) {
+            for (OsmPrimitive primitive: Main.main.getCurrentDataSet().getAllSelected()) {
                 if (primitive.isNew()) {
                     continue;

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

@@ -319 +319 @@
 
     protected void createMapPaintText() {
-        final Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
+        final Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getAllSelected();
         ElemStyles elemstyles = MapPaintStyles.getStyles();
         NavigatableComponent nc = Main.map.mapView;

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

@@ -161 +161 @@
         model.editLayerChanged(null, Main.map.mapView.getEditLayer());
         if (Main.map.mapView.getEditLayer() != null) {
-            model.setJOSMSelection(Main.map.mapView.getEditLayer().data.getSelected());
+            model.setJOSMSelection(Main.map.mapView.getEditLayer().data.getAllSelected());
         }
         actSearch.updateEnabledState();
@@ -664 +664 @@
             } else {
                 history = newLayer.data.getSelectionHistory();
-                setJOSMSelection(newLayer.data.getSelected());
+                setJOSMSelection(newLayer.data.getAllSelected());
             }
         }

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

@@ -136 +136 @@
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
         if (newLayer instanceof OsmDataLayer) {
-            refresh(((OsmDataLayer) newLayer).data.getSelected());
+            refresh(((OsmDataLayer) newLayer).data.getAllSelected());
         } else {
             refresh(null);
@@ -165 +165 @@
         Layer layer = Main.main.getActiveLayer();
         if (layer instanceof OsmDataLayer) {
-            refresh(((OsmDataLayer)layer).data.getSelected());
+            refresh(((OsmDataLayer)layer).data.getAllSelected());
         }
 
@@ -275 +275 @@
             Layer layer = Main.main.getActiveLayer();
             if (layer instanceof OsmDataLayer) {
-                refresh(((OsmDataLayer)layer).data.getSelected());
+                refresh(((OsmDataLayer)layer).data.getAllSelected());
             }
             setEnabled(false);
@@ -390 +390 @@
                 users.add(data.get(index).user);
             }
-            Collection<OsmPrimitive> selected = Main.main.getCurrentDataSet().getSelected();
+            Collection<OsmPrimitive> selected = Main.main.getCurrentDataSet().getAllSelected();
             Collection<OsmPrimitive> byUser = new LinkedList<OsmPrimitive>();
             for (OsmPrimitive p : selected) {

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

@@ -168 +168 @@
         DataSet ds = Main.main.getCurrentDataSet();
         if (ds != null) {
-            updateSelection(ds.getSelected());
+            updateSelection(ds.getAllSelected());
         }
         MapView.addLayerChangeListener(this);

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetInSelectionListModel.java

@@ -30 +30 @@
             setChangesets(null);
         } else {
-            initFromPrimitives((newLayer).data.getSelected());
+            initFromPrimitives((newLayer).data.getAllSelected());
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java

@@ -64 +64 @@
         }
         if (newLayer == layer) {
-            cache.addAll(((OsmDataLayer)newLayer).data.getSelected());
+            cache.addAll(((OsmDataLayer)newLayer).data.getAllSelected());
         }
         fireTableDataChanged();
@@ -102 +102 @@
      */
     protected void populateSelectedPrimitives(OsmDataLayer layer) {
-        selectionChanged(layer.data.getSelected());
+        selectionChanged(layer.data.getAllSelected());
     }