Changeset 5819 in josm for trunk

Timestamp:

2013-03-31T21:39:37+02:00 (12 years ago)

Author:

stoecker

Message:

add system name to user agent string, remove direct setting of user agent in two functions, as this strips the Java part of string and is unnecessary

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Version.java (modified) (1 diff)
• io/imagery/WMSGrabber.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -214 +214 @@
             s += " SVN";
         }
-        return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
+        return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+") " + System.getProperty("os.name");
     }
 }

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -51 +51 @@
             props.put("Cookie", layer.getInfo().getCookies());
         }
-        props.put("User-Agent", Main.pref.get("imagery.wms.user_agent", Version.getInstance().getAgentString()));
         Pattern pattern = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
         StringBuffer output = new StringBuffer();

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -554 +554 @@
         }
         HttpURLConnection connection = (HttpURLConnection) httpURL.openConnection();
-        connection.setRequestProperty("User-Agent", Version.getInstance().getAgentString());
         return connection;
     }