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

Timestamp:

2009-10-29T19:45:49+01:00 (17 years ago)

Author:

Gubaer

Message:

applied #3780: patch by hansendc: Shift selection is broken

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (2 diffs)
• MapView.java (modified) (1 diff)
• dialogs/PropertiesDialog.java (modified) (4 diffs)
• dialogs/RelationListDialog.java (modified) (2 diffs)
• dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)
• dialogs/relation/MemberTable.java (modified) (1 diff)
• io/UploadLayerTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -333 +333 @@
                 }
             }
-            DataSet.fireSelectionChanged(ds.getSelected());
+            ds.fireSelectionChanged();
         }
 
@@ -463 +463 @@
                     // Let the user toggle the selection
                     ds.toggleSelected(osm);
-                    DataSet.fireSelectionChanged(ds.getSelected());
                     l.validate();
                 }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -503 +503 @@
             if (getCurrentDataSet() != null) {
                 getCurrentDataSet().setSelected();
-                DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+                getCurrentDataSet().fireSelectionChanged();
             }
         }

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

@@ -267 +267 @@
         }
 
-        DataSet.fireSelectionChanged(sel);
+        Main.main.getCurrentDataSet().fireSelectionChanged();
         selectionChanged(sel); // update whole table
         Main.parent.repaint(); // repaint all - drawing could have been changed
@@ -355 +355 @@
             return;
         Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
-        DataSet.fireSelectionChanged(sel);
+        Main.main.getCurrentDataSet().fireSelectionChanged();
         selectionChanged(sel); // update table
         Main.parent.repaint(); // repaint all - drawing could have been changed
@@ -826 +826 @@
             Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
             Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, null));
-            DataSet.fireSelectionChanged(sel);
+            Main.main.getCurrentDataSet().fireSelectionChanged();
             selectionChanged(sel); // update table
 
@@ -852 +852 @@
             }
             Main.main.undoRedo.add(new ChangeCommand(cur, rel));
-            DataSet.fireSelectionChanged(sel);
+            Main.main.getCurrentDataSet().fireSelectionChanged();
             selectionChanged(sel); // update whole table
         }

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

@@ -517 +517 @@
             }
             Main.map.mapView.getEditLayer().data.setSelected(selection);
-            DataSet.fireSelectionChanged(selection);
+            Main.map.mapView.getEditLayer().data.fireSelectionChanged();
         }
 
@@ -545 +545 @@
             }
             Main.map.mapView.getEditLayer().data.setSelected(members);
-            DataSet.fireSelectionChanged(members);
         }
 

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

@@ -883 +883 @@
         public void actionPerformed(ActionEvent e) {
             getLayer().data.setSelected(memberTableModel.getSelectedChildPrimitives());
-            DataSet.fireSelectionChanged(getLayer().data.getSelected());
         }
 
@@ -1006 +1005 @@
             // make sure everybody is notified about the changes
             //
-            DataSet.fireSelectionChanged(getLayer().data.getSelected());
+            getLayer().data.fireSelectionChanged();
             getLayer().fireDataChange();
             GenericRelationEditor.this.setRelation(newRelation);
@@ -1039 +1038 @@
             memberTableModel.applyToRelation(editedRelation);
             Main.main.undoRedo.add(new ChangeCommand(getRelation(), editedRelation));
-            DataSet.fireSelectionChanged(getLayer().data.getSelected());
+            getLayer().data.fireSelectionChanged();
             getLayer().fireDataChange();
             // this will refresh the snapshot and update the dialog title

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

@@ -204 +204 @@
             OsmPrimitive primitive = getMemberTableModel().getReferredPrimitive(row);
             layer.data.setSelected(primitive);
-            DataSet.fireSelectionChanged(layer.data.getSelected());
             AutoScaleAction action = new AutoScaleAction("selection");
             action.autoScale();

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -144 +144 @@
             return;
         layer.cleanupAfterUpload(processedPrimitives);
-        DataSet.fireSelectionChanged(layer.data.getSelected());
+        layer.data.fireSelectionChanged();;
         layer.fireDataChange();
         layer.onPostUploadToServer();