Changeset 1879 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2009-08-02T14:36:40+02:00 (15 years ago)

Author:

Gubaer

Message:

towards a fix for #3142: JOSM applet class no longer functional

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (15 diffs)
• WikiReader.java (modified) (6 diffs)

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

@@ -43 +43 @@
      * @author imi
      */
-    public static enum OverlayPosition {NORTHWEST, NORTHEAST, SOUTHWEST, SOUTHEAST}
+    public static enum OverlayPosition {
+        NORTHWEST, NORTHEAST, SOUTHWEST, SOUTHEAST
+    }
 
     /**
@@ -51 +53 @@
 
     /**
-     * Add here all ClassLoader whose ressource should be searched.
-     * Plugin's class loaders are added by main.
+     * Add here all ClassLoader whose ressource should be searched. Plugin's class loaders are added
+     * by main.
      */
     public static final List<ClassLoader> sources = new LinkedList<ClassLoader>();
@@ -58 +60 @@
     /**
      * Return an image from the specified location.
-     *
-     * @param subdir    The position of the directory, e.g. "layer"
-     * @param name      The icons name (without the ending of ".png")
+     * 
+     * @param subdir The position of the directory, e.g. "layer"
+     * @param name The icons name (without the ending of ".png")
      * @return The requested Image.
      */
@@ -67 +69 @@
         if (icon == null) {
             String ext = name.indexOf('.') != -1 ? "" : ".png";
-            throw new NullPointerException("/images/"+subdir+"/"+name+ext+" not found");
+            throw new NullPointerException("/images/" + subdir + "/" + name + ext + " not found");
         }
         return icon;
     }
 
-    public static ImageIcon getIfAvailable(String subdir, String name)
-    {
-        return getIfAvailable((Collection<String>)null, null, subdir, name);
-    }
-    public static final ImageIcon getIfAvailable(String[] dirs, String id, String subdir, String name)
-    {
+    public static ImageIcon getIfAvailable(String subdir, String name) {
+        return getIfAvailable((Collection<String>) null, null, subdir, name);
+    }
+
+    public static final ImageIcon getIfAvailable(String[] dirs, String id, String subdir, String name) {
         return getIfAvailable(Arrays.asList(dirs), id, subdir, name);
     }
 
     /**
-     * Like {@link #get(String)}, but does not throw and return <code>null</code>
-     * in case of nothing is found. Use this, if the image to retrieve is optional.
-     */
-    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name)
-    {
+     * Like {@link #get(String)}, but does not throw and return <code>null</code> in case of nothing
+     * is found. Use this, if the image to retrieve is optional.
+     */
+    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name) {
         if (name == null)
             return null;
-        if (name.startsWith("http://"))
-        {
+        if (name.startsWith("http://")) {
             Image img = cache.get(name);
-            if(img == null)
-            {
-                try
-                {
-                    MirroredInputStream is = new MirroredInputStream(name,
-                            new File(Main.pref.getPreferencesDir(), "images").toString());
-                    if(is != null)
-                    {
+            if (img == null) {
+                try {
+                    MirroredInputStream is = new MirroredInputStream(name, new File(Main.pref.getPreferencesDir(),
+                    "images").toString());
+                    if (is != null) {
                         img = Toolkit.getDefaultToolkit().createImage(is.getFile().toURI().toURL());
                         cache.put(name, img);
                     }
-                }
-                catch(IOException e) {
+                } catch (IOException e) {
                 }
             }
@@ -115 +110 @@
         }
         String ext = name.indexOf('.') != -1 ? "" : ".png";
-        String full_name = subdir+name+ext;
+        String full_name = subdir + name + ext;
         String cache_name = full_name;
         /* cache separately */
-        if(dirs != null && dirs.size() > 0) {
-            cache_name = "id:"+id+":"+full_name;
+        if (dirs != null && dirs.size() > 0) {
+            cache_name = "id:" + id + ":" + full_name;
         }
 
@@ -125 +120 @@
         if (img == null) {
             // getImageUrl() does a ton of "stat()" calls and gets expensive
-            // and redundant when you have a whole ton of objects.  So,
+            // and redundant when you have a whole ton of objects. So,
             // index the cache by the name of the icon we're looking for
             // and don't bother to create a URL unless we're actually
@@ -139 +134 @@
     }
 
-    private static URL getImageUrl(String path, String name)
-    {
-        if(path.startsWith("resource://"))
-        {
+    private static URL getImageUrl(String path, String name) {
+        if (path.startsWith("resource://")) {
             String p = path.substring("resource://".length());
-            for (ClassLoader source : sources)
-            {
+            for (ClassLoader source : sources) {
                 URL res;
-                if ((res = source.getResource(p+name)) != null)
+                if ((res = source.getResource(p + name)) != null)
                     return res;
             }
-        }
-        else
-        {
+        } else {
             try {
                 File f = new File(path, name);
-                if(f.exists())
+                if (f.exists())
                     return f.toURI().toURL();
-            } catch (MalformedURLException e) {}
+            } catch (MalformedURLException e) {
+            }
         }
         return null;
     }
 
-    private static URL getImageUrl(String imageName, Collection<String> dirs)
-    {
-        URL u;
+    private static URL getImageUrl(String imageName, Collection<String> dirs) {
+        URL u = null;
+
         // Try passed directories first
-        if(dirs != null)
-        {
-            for (String name : dirs)
-            {
-                u = getImageUrl(name, imageName);
-                if(u != null) return u;
+        if (dirs != null) {
+            for (String name : dirs) {
+                try {
+                    u = getImageUrl(name, imageName);
+                    if (u != null)
+                        return u;
+                } catch (SecurityException e) {
+                    System.out.println(tr(
+                            "Warning: failed to acccess directory ''{0}'' for security reasons. Exception was: {1}",
+                            name, e.toString()));
+                }
+
             }
         }
         // Try user-preference directory
-        u = getImageUrl(Main.pref.getPreferencesDir()+"images", imageName);
-        if(u != null) return u;
+        String dir = Main.pref.getPreferencesDir() + "images";
+        try {
+            u = getImageUrl(dir, imageName);
+            if (u != null)
+                return u;
+        } catch (SecurityException e) {
+            System.out.println(tr(
+                    "Warning: failed to acccess directory ''{0}'' for security reasons. Exception was: {1}", dir, e
+                    .toString()));
+        }
 
         // Try plugins and josm classloader
         u = getImageUrl("resource://images/", imageName);
-        if(u != null) return u;
+        if (u != null)
+            return u;
 
         // Try all other ressource directories
-        for (String location : Main.pref.getAllPossiblePreferenceDirs())
-        {
-            u = getImageUrl(location+"images", imageName);
-            if(u != null) return u;
+        for (String location : Main.pref.getAllPossiblePreferenceDirs()) {
+            u = getImageUrl(location + "images", imageName);
+            if (u != null)
+                return u;
             u = getImageUrl(location, imageName);
-            if(u != null) return u;
-        }
+            if (u != null)
+                return u;
+        }
+        System.out
+        .println(tr(
+                "Fatal: failed to locate image ''{0}''. This is a serious configuration problem. JOSM will stop working.",
+                imageName));
         return null;
     }
@@ -201 +212 @@
 
     public static Cursor getCursor(String name, String overlay) {
-        ImageIcon img = get("cursor",name);
+        ImageIcon img = get("cursor", name);
         if (overlay != null) {
-            img = overlay(img, "cursor/modifier/"+overlay, OverlayPosition.SOUTHEAST);
+            img = overlay(img, "cursor/modifier/" + overlay, OverlayPosition.SOUTHEAST);
         }
         Cursor c = Toolkit.getDefaultToolkit().createCustomCursor(img.getImage(),
-                name.equals("crosshair") ? new Point(10,10) : new Point(3,2), "Cursor");
+                name.equals("crosshair") ? new Point(10, 10) : new Point(3, 2), "Cursor");
         return c;
     }
 
     /**
-     * @return an icon that represent the overlay of the two given icons. The
-     * second icon is layed on the first relative to the given position.
+     * @return an icon that represent the overlay of the two given icons. The second icon is layed
+     * on the first relative to the given position.
      */
     public static ImageIcon overlay(Icon ground, String overlayImage, OverlayPosition pos) {
-        GraphicsConfiguration conf = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration();
+        GraphicsConfiguration conf = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice()
+        .getDefaultConfiguration();
         int w = ground.getIconWidth();
         int h = ground.getIconHeight();
@@ -221 +233 @@
         int wo = overlay.getIconWidth();
         int ho = overlay.getIconHeight();
-        BufferedImage img = conf.createCompatibleImage(w,h, Transparency.TRANSLUCENT);
+        BufferedImage img = conf.createCompatibleImage(w, h, Transparency.TRANSLUCENT);
         Graphics g = img.createGraphics();
         ground.paintIcon(null, g, 0, 0);
@@ -231 +243 @@
             break;
         case NORTHEAST:
-            x = w-wo;
+            x = w - wo;
             y = 0;
             break;
         case SOUTHWEST:
             x = 0;
-            y = h-ho;
+            y = h - ho;
             break;
         case SOUTHEAST:
-            x = w-wo;
-            y = h-ho;
+            x = w - wo;
+            y = h - ho;
             break;
         }
@@ -256 +268 @@
     }
 
-    /* from: http://www.jidesoft.com/blog/2008/02/29/rotate-an-icon-in-java/
-     * License: "feel free to use"
+    /*
+     * from: http://www.jidesoft.com/blog/2008/02/29/rotate-an-icon-in-java/ License:
+     * "feel free to use"
      */
     final static double DEGREE_90 = 90.0 * Math.PI / 180.0;
@@ -263 +276 @@
     /**
      * Creates a rotated version of the input image.
-     *
-     * @param c            The component to get properties useful for painting, e.g. the foreground
-     *                     or background color.
-     * @param icon         the image to be rotated.
+     * 
+     * @param c The component to get properties useful for painting, e.g. the foreground or
+     * background color.
+     * @param icon the image to be rotated.
      * @param rotatedAngle the rotated angle, in degree, clockwise. It could be any double but we
-     *                     will mod it with 360 before using it.
-     *
+     * will mod it with 360 before using it.
+     * 
      * @return the image after rotating.
      */
@@ -295 +308 @@
             w = (int) (iw * Math.sin(DEGREE_90 - radian) + ih * Math.sin(radian));
             h = (int) (iw * Math.sin(radian) + ih * Math.sin(DEGREE_90 - radian));
-        }
-        else {
+        } else {
             w = (int) (ih * Math.sin(DEGREE_90 - radian) + iw * Math.sin(radian));
             h = (int) (ih * Math.sin(radian) + iw * Math.sin(DEGREE_90 - radian));
@@ -309 +321 @@
 
         // move the graphics center point to the center of the icon.
-        g2d.translate(w/2, h/2);
+        g2d.translate(w / 2, h / 2);
 
         // rotate the graphics about the center point of the icon
@@ -329 +341 @@
         if (type == null)
             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type"));
-        return get("data",type.getAPIName());
+        return get("data", type.getAPIName());
     }
 }

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

@@ -4 +4 @@
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
@@ -10 +11 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 /**
  * Read a trac-wiki page.
- *
+ * 
  * @author imi
  */
@@ -29 +32 @@
     /**
      * Read the page specified by the url and return the content.
-     *
-     * If the url is within the baseurl path, parse it as an trac wikipage and
-     * replace relative pathes etc..
-     *
+     * 
+     * If the url is within the baseurl path, parse it as an trac wikipage and replace relative
+     * pathes etc..
+     * 
      * @return Either the string of the content of the wiki page.
      * @throws IOException Throws, if the page could not be loaded.
@@ -45 +48 @@
     public String readLang(String text) {
         String languageCode = LanguageInfo.getLanguageCodeWiki();
-        String url = baseurl + "/wiki/"+languageCode+text;
+        String url = baseurl + "/wiki/" + languageCode + text;
         String res = "";
+        InputStream in = null;
         try {
-            res = readFromTrac(new BufferedReader(new InputStreamReader(new URL(url).openStream(), "utf-8")));
-        } catch (IOException ioe) {}
-        if(res.length() == 0 && languageCode.length() != 0)
-        {
-            url = baseurl + "/wiki/"+text;
+            in = new URL(url).openStream();
+            res = readFromTrac(new BufferedReader(new InputStreamReader(in, "utf-8")));
+        } catch (IOException ioe) {
+            System.out.println(tr("Warning: failed to read MOTD from ''{0}''. Exception was: {1}", url, ioe
+                    .toString()));
+        } catch(SecurityException e) {
+            System.out.println(tr(
+                    "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception was: {1}", url, e
+                    .toString()));
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                }
+            }
+        }
+        if (res.length() == 0 && languageCode.length() != 0) {
+            url = baseurl + "/wiki/" + text;
             try {
-                res = readFromTrac(new BufferedReader(new InputStreamReader(new URL(url).openStream(), "utf-8")));
-            } catch (IOException ioe) {}
+                in = new URL(url).openStream();
+            } catch (IOException e) {
+                System.out.println(tr("Warning: failed to read MOTD from ''{0}''. Exception was: {1}", url, e
+                        .toString()));
+                return res;
+            } catch (SecurityException e) {
+                System.out.println(tr(
+                        "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception was: {1}", url, e
+                        .toString()));
+                return res;
+            }
+            try {
+                res = readFromTrac(new BufferedReader(new InputStreamReader(in, "utf-8")));
+            } catch (IOException ioe) {
+                System.out.println(tr("Warning: failed to read MOTD from ''{0}''. Exception was: {1}", url, ioe
+                        .toString()));
+                return res;
+            } finally {
+                if (in != null) {
+                    try {
+                        in.close();
+                    } catch (IOException e) {
+                    }
+                }
+            }
         }
         return res;
@@ -63 +104 @@
         String b = "";
         for (String line = in.readLine(); line != null; line = in.readLine()) {
-            if(!line.contains("[[TranslatedPages]]"))
+            if (!line.contains("[[TranslatedPages]]")) {
                 b += line.replaceAll(" />", ">") + "\n";
+            }
         }
         return "<html>" + b + "</html>";
@@ -74 +116 @@
         String b = "";
         for (String line = in.readLine(); line != null; line = in.readLine()) {
-            if (line.contains("<div id=\"searchable\">"))
+            if (line.contains("<div id=\"searchable\">")) {
                 inside = true;
-            else if (line.contains("<div class=\"wiki-toc trac-nav\""))
+            } else if (line.contains("<div class=\"wiki-toc trac-nav\"")) {
                 transl = true;
-            else if (line.contains("<div class=\"wikipage searchable\">"))
+            } else if (line.contains("<div class=\"wikipage searchable\">")) {
                 inside = true;
-            else if (line.contains("<div class=\"buttons\">"))
+            } else if (line.contains("<div class=\"buttons\">")) {
                 inside = false;
+            }
             if (inside && !transl) {
-                b += line.replaceAll("<img src=\"/", "<img src=\""+baseurl+"/")
-                         .replaceAll("href=\"/", "href=\""+baseurl+"/")
-                         .replaceAll(" />", ">") + "\n";
+                b += line.replaceAll("<img src=\"/", "<img src=\"" + baseurl + "/").replaceAll("href=\"/",
+                        "href=\"" + baseurl + "/").replaceAll(" />", ">")
+                        + "\n";
+            } else if (transl && line.contains("</div>")) {
+                transl = false;
             }
-            else if (transl && line.contains("</div>"))
-                transl = false;
         }
-        if(b.indexOf("      Describe ") >= 0)
+        if (b.indexOf("      Describe ") >= 0)
             return "";
         return "<html>" + b + "</html>";