Changeset 5868 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-04-15T19:12:01+02:00 (11 years ago)

Author:

stoecker

Message:

see #8606 - use JOSM agent also for WebStart, join help browser and WikiReader

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• help/HelpContentReader.java (modified) (3 diffs)
• layer/TMSLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -51 +51 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -292 +293 @@
                 System.out.println("Reading preferences from " + i);
                 try {
-                    URL url = new URL(i);
-                    config.openAndReadXML(url.openStream());
+                    config.openAndReadXML(Utils.openURL(new URL(i)));
                 } catch (Exception ex) {
                     throw new RuntimeException(ex);

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

@@ -21 +21 @@
  * It also has to be <strong>transformed</strong> because the internal help browser required slightly
  * different HTML than what is provided by the Wiki.
- *
- * @see WikiReader
  */
-public class HelpContentReader {
-
-    /** the base url */
-    private String baseUrl;
+public class HelpContentReader extends WikiReader {
 
     /**
@@ -35 +30 @@
      */
     public HelpContentReader(String baseUrl) {
-        this.baseUrl = baseUrl;
+        super(baseUrl);
     }
 
@@ -90 +85 @@
      */
     protected String prepareHelpContent(BufferedReader in, boolean dotest) throws HelpContentReaderException {
-        boolean isInContent = false;
-        boolean isInTranslationsSideBar = false;
-        boolean isExistingHelpPage = false;
-        StringBuffer sball = new StringBuffer();
-        StringBuffer sb = new StringBuffer();
+        String s = "";
         try {
-            for (String line = in.readLine(); line != null; line = in.readLine()) {
-                sball.append(line);
-                sball.append("\n");
-                if (line.contains("<div id=\"searchable\">")) {
-                    isInContent = true;
-                } else if (line.contains("<div class=\"wiki-toc trac-nav\"")) {
-                    isInTranslationsSideBar = true;
-                } else if (line.contains("<div class=\"wikipage searchable\">")) {
-                    isInContent = true;
-                } else if (line.contains("<div class=\"buttons\">")) {
-                    isInContent = false;
-                } else if (line.contains("<h3>Attachments</h3>")) {
-                    isInContent = false;
-                } else if (line.contains("<div id=\"attachments\">")) {
-                    isInContent = false;
-                } else if (line.contains("<div class=\"trac-modifiedby\">")) {
-                    continue;
-                } else if (line.contains("<input type=\"submit\" name=\"attachfilebutton\"")) {
-                    // heuristic: if we find a button for uploading images we are in an
-                    // existing pages. Otherwise this is probably the stub page for a not yet
-                    // existing help page
-                    isExistingHelpPage = true;
-                }
-                if (isInContent && !isInTranslationsSideBar) {
-                    // add a border="0" attribute to images, otherwise the internal help browser
-                    // will render a thick  border around images inside an <a> element
-                    //
-                    // Also make sure image URLs are absolute
-                    //
-                    line = line.replaceAll("<img ([^>]*)src=\"/", "<img border=\"0\" \\1src=\"" + baseUrl + "/").replaceAll("href=\"/",
-                            "href=\"" + baseUrl + "/").replaceAll(" />", ">");
-                    sb.append(line);
-                    sb.append("\n");
-                } else if (isInTranslationsSideBar && line.contains("</div>")) {
-                    isInTranslationsSideBar = false;
-                }
-            }
+            s = readFromTrac(in);
         } catch(IOException e) {
             throw new HelpContentReaderException(e);
         }
-        if(!dotest && sb.length() == 0)
-            sb = sball;
-        else if (dotest && !isExistingHelpPage)
+        if(dotest && s.isEmpty())
             throw new MissingHelpContentException();
-        sb.insert(0, "<html>");
-        sb.append("<html>");
-        return sb.toString();
+        return s;
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -77 +77 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -321 +322 @@
             protected byte[] updateData() throws IOException {
                 URL u = getAttributionUrl();
-                UTFInputStreamReader in = UTFInputStreamReader.create(u.openStream(), "utf-8");
+                UTFInputStreamReader in = UTFInputStreamReader.create(Utils.openURL(u), "utf-8");
                 String r = new Scanner(in).useDelimiter("\\A").next();
                 in.close();