Index: /trunk/src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 1479) +++ /trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 1480) @@ -17,4 +17,5 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.Properties; import javax.swing.BorderFactory; @@ -84,4 +85,10 @@ static public String getTextBlock() { return revision.getText(); + } + + static public void setUserAgent() { + Properties sysProp = System.getProperties(); + sysProp.put("http.agent", "JOSM/1.5 ("+version+")"); + System.setProperties(sysProp); } Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 1479) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 1480) @@ -522,6 +522,6 @@ private void setSystemProperties() { - Properties sysProp = System.getProperties(); if (getBoolean(ProxyPreferences.PROXY_ENABLE)) { + Properties sysProp = System.getProperties(); sysProp.put("proxySet", "true"); sysProp.put("http.proxyHost", get(ProxyPreferences.PROXY_HOST)); @@ -531,12 +531,7 @@ sysProp.put("proxyPassword", get(ProxyPreferences.PROXY_PASS)); } - }/* else { - sysProp.put("proxySet", "false"); - sysProp.remove("http.proxyHost"); - sysProp.remove("proxyPort"); - sysProp.remove("proxyUser"); - sysProp.remove("proxyPassword"); - }*/ - System.setProperties(sysProp); + System.setProperties(sysProp); + } + AboutAction.setUserAgent(); } } Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 1479) +++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 1480) @@ -274,5 +274,7 @@ curVersion, latest, myVersion) + ""; - } catch(Exception e) {e.printStackTrace();} + } catch(Exception e) { + // e.printStackTrace(); + } return ""; Index: /trunk/src/org/openstreetmap/josm/tools/WikiReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/WikiReader.java (revision 1479) +++ /trunk/src/org/openstreetmap/josm/tools/WikiReader.java (revision 1480) @@ -14,5 +14,4 @@ public class WikiReader { - public static final String JOSM_EXTERN = "http://josm-extern."; private final String baseurl; @@ -38,16 +37,15 @@ private String readNormal(BufferedReader in) throws IOException { - String b = ""; + String b = ""; for (String line = in.readLine(); line != null; line = in.readLine()) { - line = adjustText(line); if(!line.contains("[[TranslatedPages]]")) - b += line + "\n"; + b += line.replaceAll(" />", ">") + "\n"; } - return b; + return "" + b + ""; } private String readFromTrac(BufferedReader in, String url) throws IOException { boolean inside = false; - StringBuilder b = new StringBuilder(""); + String b = ""; for (String line = in.readLine(); line != null; line = in.readLine()) { if (line.contains("
")) @@ -58,20 +56,10 @@ inside = false; if (inside) { - line = line.replaceAll("Describe \"([^\"]+)\" here

", "

Describe \"$1\" here

"); - line = adjustText(line); - b.append(line); - b.append("\n"); + b += line.replaceAll("", ">") + "\n"; } } - b.append(""); - return b.toString(); - } - - private String adjustText(String text) { - text = text.replaceAll(" />", ">"); - return text; + return "" + b + ""; } }