Changeset 86 in josm for src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

• src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (6 diffs)

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

@@ -11 +11 @@
 import java.awt.event.MouseEvent;
 import java.util.Collection;
+import java.util.LinkedList;
 
 import javax.swing.ButtonGroup;
@@ -61 +62 @@
                 displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
                 displaylist.addMouseListener(new MouseAdapter(){
-                        @Override
-                        public void mouseClicked(MouseEvent e) {
+                        @Override public void mouseClicked(MouseEvent e) {
                                 if (e.getClickCount() < 2)
                                         return;
@@ -122 +122 @@
                                 lastSearch = input.getText();
                                 SearchCompiler.Match matcher = SearchCompiler.compile(lastSearch);
-                                for (OsmPrimitive osm : Main.main.ds.allNonDeletedPrimitives()) {
-                                        if (replace.isSelected())
-                                                osm.setSelected(matcher.match(osm));
-                                        else if (add.isSelected() && !osm.isSelected() && matcher.match(osm))
-                                                osm.setSelected(true);
-                                        else if (remove.isSelected() && osm.isSelected() && matcher.match(osm))
-                                                osm.setSelected(false);
+                                Collection<OsmPrimitive> sel = Main.ds.getSelected();
+                                for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
+                                        if (replace.isSelected()) {
+                                                if (matcher.match(osm))
+                                                        sel.add(osm);
+                                                else
+                                                        sel.remove(osm);
+                                        } else if (add.isSelected() && !osm.selected && matcher.match(osm))
+                                                sel.add(osm);
+                                        else if (remove.isSelected() && osm.selected && matcher.match(osm))
+                                                sel.remove(osm);
                                 }
-                                selectionChanged(Main.main.ds.getSelected());
-                                Main.main.getMapFrame().repaint();
+                                Main.ds.setSelected(sel);
                         }
                 });
@@ -137 +140 @@
                 
                 add(buttonPanel, BorderLayout.SOUTH);
-                selectionChanged(Main.main.ds.getSelected());
+                selectionChanged(Main.ds.getSelected());
         }
 
-        @Override
-        public void setVisible(boolean b) {
+        @Override public void setVisible(boolean b) {
                 if (b) {
-                        Main.main.ds.addSelectionChangedListener(this);
-                        selectionChanged(Main.main.ds.getSelected());
+                        Main.ds.addSelectionChangedListener(this);
+                        selectionChanged(Main.ds.getSelected());
                 } else {
-                        Main.main.ds.removeSelectionChangedListener(this);
+                        Main.ds.removeSelectionChangedListener(this);
                 }
                 super.setVisible(b);
@@ -158 +160 @@
          */
         public void selectionChanged(Collection<OsmPrimitive> newSelection) {
+                if (list == null)
+                        return; // selection changed may be received in base class constructor before init
                 list.removeAllElements();
                 list.setSize(newSelection.size());
@@ -169 +173 @@
          */
         public void updateMap() {
-                Main.main.ds.clearSelection();
+                Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
                 for (int i = 0; i < list.getSize(); ++i)
                         if (displaylist.isSelectedIndex(i))
-                                ((OsmPrimitive)list.get(i)).setSelected(true);
-                Main.main.getMapFrame().repaint();
+                                sel.add((OsmPrimitive)list.get(i));
+                Main.ds.setSelected(sel);
         }
 }