Changeset 1842 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-07-25T18:17:36+02:00 (15 years ago)

Author:

Gubaer

Message:

removed global static variable
replaced usage of JOptionPane by OptionPaneUtil

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DrawAction.java (modified) (2 diffs)
• SelectAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -50 +50 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
@@ -338 +339 @@
             n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY()));
             if (n.getCoor().isOutSideWorld()) {
-                JOptionPane.showMessageDialog(Main.parent,
-                        tr("Cannot add a node outside of the world."));
+                OptionPaneUtil.showMessageDialog(
+                        Main.parent,
+                        tr("Cannot add a node outside of the world."),
+                        tr("Warning"),
+                        JOptionPane.WARNING_MESSAGE
+                );
                 return;
             }

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -45 +45 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.PlatformHookOsx;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -58 +59 @@
  */
 public class SelectAction extends MapMode implements SelectionEnded {
-    public static boolean needMouseMove = false;
+
+    /**
+     * Replies true if we are currently running on OSX
+     * 
+     * @return true if we are currently running on OSX
+     */
+    public static boolean isPlatformOsx() {
+        return Main.platform != null
+        && Main.platform instanceof PlatformHookOsx;
+    }
+
     enum Mode { move, rotate, select }
     private Mode mode = null;
@@ -254 +265 @@
     }
 
-    /**
-     * Mac OSX simulates with  ctrl + mouse 1  the second mouse button hence no dragging events get fired.
-     *
-     */
+
     @Override public void mouseMoved(MouseEvent e) {
-        if (needMouseMove && mode == Mode.rotate) {
+        // Mac OSX simulates with  ctrl + mouse 1  the second mouse button hence no dragging events get fired.
+        //
+        if (isPlatformOsx() && mode == Mode.rotate) {
             mouseDragged(e);
         }