Index: src/org/openstreetmap/josm/gui/help/HelpBrowser.java
===================================================================
--- src/org/openstreetmap/josm/gui/help/HelpBrowser.java (Revision 5921)
+++ src/org/openstreetmap/josm/gui/help/HelpBrowser.java (Arbeitskopie)
@@ -385,7 +385,7 @@
"Failed to open help page for url {0}.
"
+ "This is most likely due to a network problem, please check
"
+ "your internet connection",
- url.toString()
+ url
),
tr("Failed to open URL"),
JOptionPane.ERROR_MESSAGE,
Index: src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
===================================================================
--- src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (Revision 5921)
+++ src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (Arbeitskopie)
@@ -51,7 +51,7 @@
public void setCurrentUrl(String url) {
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) {
// do nothing just append
@@ -64,8 +64,8 @@
}
if(add)
{
- history.add(url);
- historyPos = history.size()-1;
+ history.add(url);
+ historyPos = history.size()-1;
}
setChanged();
notifyObservers();
Index: src/org/openstreetmap/josm/plugins/PluginListParser.java
===================================================================
--- src/org/openstreetmap/josm/plugins/PluginListParser.java (Revision 5921)
+++ src/org/openstreetmap/josm/plugins/PluginListParser.java (Arbeitskopie)
@@ -37,7 +37,7 @@
new ByteArrayInputStream(manifest.getBytes("utf-8")),
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);
} catch (PluginException e) {
@@ -72,7 +72,7 @@
C;
}
B;
- */
+ */
for (String line = r.readLine(); line != null; line = r.readLine()) {
if (line.startsWith("\t")) {
line = line.substring(1);
@@ -86,7 +86,7 @@
addPluginInformation(ret, name, url, manifest.toString());
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];
manifest = new StringBuilder();
@@ -102,7 +102,7 @@
private static void addPluginInformation(List ret, String name, String url, String manifest) {
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) {
if (plugin.getPluginInformation().name.equals(info.getName())) {