Index: branch/0.5/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- branch/0.5/src/org/openstreetmap/josm/data/Preferences.java (revision 341) +++ branch/0.5/src/org/openstreetmap/josm/data/Preferences.java (revision 342) @@ -60,10 +60,8 @@ protected static final SortedMap override = new TreeMap(); static { - override.put("osm-server.version", "0.5"); - override.put("osm-server.additional-versions", ""); - override.put("osm-server.url", "http://openstreetmap.gryph.de/api"); - override.put("osm-server.username", "fred@remote.org"); - override.put("osm-server.password", "fredfred"); - override.put("plugins", null); + //override.put("osm-server.version", "0.5"); + //override.put("osm-server.additional-versions", ""); + //override.put("osm-server.url", "http://openstreetmap.gryph.de/api"); + //override.put("plugins", null); } Index: branch/0.5/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- branch/0.5/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 341) +++ branch/0.5/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 342) @@ -12,4 +12,5 @@ import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.JTextField; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; @@ -48,10 +49,20 @@ panel = new JPanel(new GridBagLayout()); - panel.add(new JLabel("

You are running a technology preview with support for API 0.5.

" + - "

API 0.5 supports object relationships, and segments have been removed.

" + - "

This version is hard-coded to use the API 0.5 running on openstreetmap.gryph.de which has data from a recent planet file."+ - "
Please be gentle with that machine and request only moderate bounding boxes.
" + - "
Username and password are also hardcoded, so your real username and password are not transmitted.
" + + panel.add(new JLabel("

You are running the new JOSM version compatible with the 0.5 API.

" + + "

You cannot load old OSM files with this version, but there are converter scripts to make your 0.4 files 0.5 compatible.

"+ + "

The JOSM interface hasn't changed a lot: Segments are gone, and Relations have been added.
You will find general information about the changes on the OSM wiki,
and there's a page on working with relations in the JOSM online help." + "

"), GBC.eol()); + + // remove these two keys from preferences if present + boolean changePrefs = ! ( + "0.5".equals(Main.pref.get("osm-server.version", "0.5")) && + "0.5".equals(Main.pref.get("osm-server.additionalVersions", "0.5")) + ); + + if (changePrefs) {; + Main.pref.put("osm-server.version", null); + Main.pref.put("osm-server.additional-versions", null); + panel.add(new JLabel("

Your preferences have been changed by removing osm-server.version and/or osm-server.additional-versions which were still to referring 0.4.

"), GBC.eol()); + } addLine("wiki", "Read the [Wiki page on API 0.5]");