Changeset 26964 in osm for applications/editors

Timestamp:

2011-10-24T23:18:39+02:00 (13 years ago)

Author:

donvip

Message:

tag2link 0.2d: Mail icon

Location:

applications/editors/josm/plugins/tag2link

Files:

• images/tag2mailv3_24x24.png (added)
• src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkConstants.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/tag2link/action/OpenMailAction.java (added)
• src/org/openstreetmap/josm/plugins/tag2link/listeners/AbstractPopupListener.java (modified) (2 diffs)

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkConstants.java

@@ -39 +39 @@
         public static String ICON_24 = "tag2linkv2_24x24.png";
     public static String ICON_48 = "tag2linkv2_48x48.png";
+    
+    public static String MAIL_ICON_24 = "tag2mailv3_24x24.png";
 }

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java

@@ -29 +29 @@
  * @author Don-vip
  * History:
+ * 0.2d 24-Oct-2011 Icon for Mail action
  * 0.2c 24-Oct-2011 Another MHS rule
  * 0.2b 24-Oct-2011 UNESCO WHC rule working

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Desktop;
 import java.awt.event.ActionEvent;
-import java.net.URI;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -24 +22 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (url.matches("mailto:.*")) {
-                if (Desktop.isDesktopSupported()) {
-                        try {
-                                System.out.println("Sending "+url);
-                                        Desktop.getDesktop().mail(new URI(url));
-                                } catch (Exception ex) {
-                                        ex.printStackTrace();
-                                }
-                }
-        }
         System.out.println("Opening "+url);
         OpenBrowser.displayUrl(url);

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/listeners/AbstractPopupListener.java

@@ -24 +24 @@
 import javax.swing.event.PopupMenuListener;
 
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.tag2link.action.OpenLinkAction;
+import org.openstreetmap.josm.plugins.tag2link.action.OpenMailAction;
 import org.openstreetmap.josm.plugins.tag2link.data.Link;
 
@@ -52 +54 @@
     
     protected void addLink(JPopupMenu popup, Link link) {
-        itemList.add(popup.add(new OpenLinkAction(link)));
+        JosmAction action = null;
+        if (link.url.matches("mailto:.*")) {
+                action = new OpenMailAction(link);
+        } else {
+                action = new OpenLinkAction(link);
+        }
+
+        itemList.add(popup.add(action));
     }
 }