Index: /src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /src/org/openstreetmap/josm/gui/MapView.java (revision 107)
+++ /src/org/openstreetmap/josm/gui/MapView.java (revision 108)
@@ -183,6 +183,8 @@
for (LayerChangeListener l : listeners)
l.layerRemoved(layer);
- if (layer == editLayer)
+ if (layer == editLayer) {
editLayer = null;
+ Main.ds.clearSelection();
+ }
}
Index: /src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
===================================================================
--- /src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 107)
+++ /src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 108)
@@ -39,5 +39,5 @@
private boolean closeDialogCalled = false;
- protected final JLabel currentAction = new JLabel(tr("Contact OSM server..."));
+ protected final JLabel currentAction = new JLabel(tr("Contacting the OSM server..."));
protected final BoundedRangeModel progress = progressBar.getModel();
Index: /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 107)
+++ /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 108)
@@ -136,6 +136,6 @@
JPanel p = new JPanel(new BorderLayout());
- p.add(new JLabel(trn("This will change {0} object.
br>Please select a key",
- "This will change {0} objects.
br>Please select a key",
+ p.add(new JLabel(trn("This will change {0} object.
Please select a key",
+ "This will change {0} objects.
Please select a key",
sel.size(),sel.size())),
BorderLayout.NORTH);
Index: /src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 107)
+++ /src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 108)
@@ -17,8 +17,8 @@
import java.net.URL;
import java.net.URLConnection;
+import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Map;
-import java.util.TreeSet;
import javax.swing.ButtonGroup;
@@ -216,10 +216,12 @@
*/
public void selectionChanged(Collection newSelection) {
- TreeSet sortedSel = new TreeSet(newSelection);
if (list == null)
return; // selection changed may be received in base class constructor before init
- list.setSize(sortedSel.size());
+ OsmPrimitive[] selArr = new OsmPrimitive[newSelection.size()];
+ selArr = newSelection.toArray(selArr);
+ Arrays.sort(selArr);
+ list.setSize(selArr.length);
int i = 0;
- for (OsmPrimitive osm : sortedSel)
+ for (OsmPrimitive osm : selArr)
list.setElementAt(osm, i++);
}