Changeset 30372 in osm for applications/editors/josm

Timestamp:

2014-03-26T20:59:59+01:00 (11 years ago)

Author:

mkyral

Message:

PointInfo: Replace openWebPage function by josm.tools.OpenBrowser.

Location:

applications/editors/josm/plugins/pointInfo

Files:

• README.md (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java (modified) (5 diffs)

applications/editors/josm/plugins/pointInfo/README.md

@@ -14 +14 @@
 ##Websites
 
- * OSM wiki - not availavle yet
+ * OSM wiki - not available yet
  * [JOSM svn](https://trac.openstreetmap.org/browser/subversion/applications/editors/josm/plugins/pointInfo)
  * [Github](https://github.com/mkyral/josm-pointInfo)

applications/editors/josm/plugins/pointInfo/build.xml

@@ -15 +15 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="PointInfo: Replace org.json with JOSM embedded (GPL-compliant) jsonp."/>
+    <property name="commit.message" value="PointInfo: Replace openWebPage function by josm.tools.OpenBrowser."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="6238"/>

applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java

@@ -22 +22 @@
 import java.awt.Cursor;
 import java.awt.Point;
-import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
@@ -39 +38 @@
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
-import java.net.URI;
-import java.net.URISyntaxException;
 
 import org.openstreetmap.josm.Main;
@@ -55 +52 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.OpenBrowser;
 import org.xml.sax.SAXException;
 
@@ -91 +89 @@
     private static Cursor getCursor() {
         return ImageProvider.getCursor("crosshair", "info-sml");
-    }
-
-    private static void openWebpage(URI uri) {
-        Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
-        if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) {
-            try {
-                desktop.browse(uri);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
     }
 
@@ -137 +124 @@
                             mRuian.performAction(hle.getURL().toString());
                           } else {
-                            try {
-                                openWebpage(hle.getURL().toURI());
-                            } catch (URISyntaxException e) {
-                                e.printStackTrace();
+                            String ret = OpenBrowser.displayUrl(hle.getURL().toString());
+                            if (ret != null) {
+                              PointInfoUtils.showNotification(ret, "error");
                             }
                           }