Changeset 4465 in josm for trunk/src/org

Timestamp:

2011-09-25T19:48:57+02:00 (13 years ago)

Author:

simon04

Message:

fix #6892 - JOSM crashed while selecting area. use OpenBrowser to display attribution (patch by Don-vip)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• bbox/SlippyMapBBoxChooser.java (modified) (4 diffs)
• layer/TMSLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -3 +3 @@
 
 import java.awt.Color;
-import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -12 +11 @@
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40 +37 @@
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
+import org.openstreetmap.josm.tools.OpenBrowser;
 
 public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
@@ -223 +221 @@
         /* TODO: Somehow indicate the link is clickable state to user */
 
-        try {
-            if((attrImageBounds != null && attrImageBounds.contains(p))
-            || (attrTextBounds != null && attrTextBounds.contains(p))) {
-                if(click)
-                    Desktop.getDesktop().browse(new URI(ts.getAttributionLinkURL()));
-                /*else
-                    Main.warn(ts.getAttributionLinkURL());*/
-                return true;
-            } else if(attrToUBounds != null && attrToUBounds.contains(p)) {
-                if(click)
-                    Desktop.getDesktop().browse(new URI(ts.getTermsOfUseURL()));
-                /*else
-                    Main.warn(ts.getTermsOfUseURL());*/
-                return true;
-            }
-        } catch (IOException e1) {
-            e1.printStackTrace();
-        } catch (URISyntaxException e1) {
-            e1.printStackTrace();
+        if ((attrImageBounds != null && attrImageBounds.contains(p))
+                || (attrTextBounds != null && attrTextBounds.contains(p))) {
+            if (click)
+                OpenBrowser.displayUrl(ts.getAttributionLinkURL());
+            /*else
+                Main.warn(ts.getAttributionLinkURL());*/
+            return true;
+        } else if (attrToUBounds != null && attrToUBounds.contains(p)) {
+            if (click)
+                OpenBrowser.displayUrl(ts.getTermsOfUseURL());
+            /*else
+                Main.warn(ts.getTermsOfUseURL());*/
+            return true;
         }
         return false;

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

@@ -20 +20 @@
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -70 +68 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.tools.OpenBrowser;
 
 /**
@@ -478 +477 @@
                             tileOptionMenu.show(e.getComponent(), e.getX(), e.getY());
                         } else if (e.getButton() == MouseEvent.BUTTON1) {
-                            if(!tileSource.requiresAttribution())
+                            if (!tileSource.requiresAttribution())
                                 return;
 
-                            if((attrImageBounds != null && attrImageBounds.contains(e.getPoint()))
-                            || (attrTextBounds != null && attrTextBounds.contains(e.getPoint()))) {
-                                try {
-                                    java.awt.Desktop desktop = java.awt.Desktop.getDesktop();
-                                    desktop.browse(new URI(tileSource.getAttributionLinkURL()));
-                                } catch (IOException e1) {
-                                    e1.printStackTrace();
-                                } catch (URISyntaxException e1) {
-                                    e1.printStackTrace();
-                                }
-                            } else if(attrToUBounds != null && attrToUBounds.contains(e.getPoint())) {
-                                try {
-                                    java.awt.Desktop desktop = java.awt.Desktop.getDesktop();
-                                    desktop.browse(new URI(tileSource.getTermsOfUseURL()));
-                                } catch (IOException e1) {
-                                    e1.printStackTrace();
-                                } catch (URISyntaxException e1) {
-                                    e1.printStackTrace();
-                                }
+                            if ((attrImageBounds != null && attrImageBounds.contains(e.getPoint()))
+                                    || (attrTextBounds != null && attrTextBounds.contains(e.getPoint()))) {
+                                OpenBrowser.displayUrl(tileSource.getAttributionLinkURL());
+                            } else if (attrToUBounds != null && attrToUBounds.contains(e.getPoint())) {
+                                OpenBrowser.displayUrl(tileSource.getTermsOfUseURL());
                             }
                         }