Changeset 5923 in josm for trunk/src

Timestamp:

2013-05-04T03:30:57+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8655 - Removed unecessary toString() calls on Strings (patch by Skyman)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/help/HelpBrowser.java (modified) (2 diffs)
• gui/help/HelpBrowserHistory.java (modified) (2 diffs)
• plugins/PluginListParser.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -222 +222 @@
     }
 
+    /**
+     * Constructs a new {@code HelpBrowser}.
+     */
     public HelpBrowser() {
         reader = new HelpContentReader(HelpUtil.getWikiBaseUrl());
@@ -386 +389 @@
                                 + "This is most likely due to a network problem, please check<br>"
                                 + "your internet connection</html>",
-                                url.toString()
+                                url
                         ),
                         tr("Failed to open URL"),

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

@@ -52 +52 @@
         boolean add=true;
 
-        if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).toString().equals(url.toString())) {
+        if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url.toString())) {
             add = false;
         } else if (historyPos == history.size() -1) {
@@ -65 +65 @@
         if(add)
         {
-          history.add(url);
-          historyPos = history.size()-1;
+            history.add(url);
+            historyPos = history.size()-1;
         }
         setChanged();

trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java

@@ -38 +38 @@
                     name.substring(0, name.length() - 4),
                     url
-            );
+                    );
         } catch(UnsupportedEncodingException e) {
             throw new PluginListParseException(tr("Failed to create plugin information from manifest for plugin ''{0}''", name), e);
@@ -73 +73 @@
                 }
                 B;
-            */
+             */
             for (String line = r.readLine(); line != null; line = r.readLine()) {
                 if (line.startsWith("\t")) {
@@ -87 +87 @@
                 String x[] = line.split(";");
                 if(x.length != 2)
-                  throw new IOException(tr("Illegal entry in plugin list."));
+                    throw new IOException(tr("Illegal entry in plugin list."));
                 name = x[0];
                 url = x[1];
@@ -103 +103 @@
         try {
             if (name != null) {
-                PluginInformation info = createInfo(name, url, manifest.toString());
+                PluginInformation info = createInfo(name, url, manifest);
                 if (info != null) {
                     for (PluginProxy plugin : PluginHandler.pluginList) {