Changeset 108 in josm


Ignore:
Timestamp:
2006-07-10T23:02:15+02:00 (18 years ago)
Author:
imi
Message:
  • fixed some typos (thanks to SteveC :)
  • fixed that Selection dialog does not show multiple new objects of same type
  • fixed that dialogs refresh selection when deleting data layer
Location:
src/org/openstreetmap/josm/gui
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r104 r108  
    183183                        for (LayerChangeListener l : listeners)
    184184                                l.layerRemoved(layer);
    185                 if (layer == editLayer)
     185                if (layer == editLayer) {
    186186                        editLayer = null;
     187                        Main.ds.clearSelection();
     188                }
    187189        }
    188190

  • src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

    r104 r108  
    3939        private boolean closeDialogCalled = false;
    4040
    41         protected final JLabel currentAction = new JLabel(tr("Contact OSM server..."));
     41        protected final JLabel currentAction = new JLabel(tr("Contacting the OSM server..."));
    4242        protected final BoundedRangeModel progress = progressBar.getModel();
    4343

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

    r104 r108  
    136136
    137137                JPanel p = new JPanel(new BorderLayout());
    138                 p.add(new JLabel(trn("<html>This will change {0} object.<br>br>Please select a key",
    139                                 "<html>This will change {0} objects.<br>br>Please select a key",
     138                p.add(new JLabel(trn("<html>This will change {0} object.<br><br>Please select a key",
     139                                "<html>This will change {0} objects.<br><br>Please select a key",
    140140                                sel.size(),sel.size())),
    141141                                BorderLayout.NORTH);

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

    r104 r108  
    1717import java.net.URL;
    1818import java.net.URLConnection;
     19import java.util.Arrays;
    1920import java.util.Collection;
    2021import java.util.LinkedList;
    2122import java.util.Map;
    22 import java.util.TreeSet;
    2323
    2424import javax.swing.ButtonGroup;
    … …  
    216216         */
    217217        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
    218                 TreeSet<OsmPrimitive> sortedSel = new TreeSet<OsmPrimitive>(newSelection);
    219218                if (list == null)
    220219                        return; // selection changed may be received in base class constructor before init
    221                 list.setSize(sortedSel.size());
     220                OsmPrimitive[] selArr = new OsmPrimitive[newSelection.size()];
     221                selArr = newSelection.toArray(selArr);
     222                Arrays.sort(selArr);
     223                list.setSize(selArr.length);
    222224                int i = 0;
    223                 for (OsmPrimitive osm : sortedSel)
     225                for (OsmPrimitive osm : selArr)
    224226                        list.setElementAt(osm, i++);
    225227        }
Note: See TracChangeset for help on using the changeset viewer.