Changeset 6957 in josm

Timestamp:

2014-04-05T15:27:26+02:00 (10 years ago)

Author:

Don-vip

Message:

see #9897 - refactor OSX stuff

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• gui/MapMover.java (modified) (8 diffs)
• gui/preferences/display/LafPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1516 +1516 @@
         return OSM_WEBSITE;
     }
+
+    /**
+     * Determines if we are currently running on OSX.
+     * @return {@code true} if we are currently running on OSX
+     * @since 6957
+     */
+    public static boolean isPlatformOsx() {
+        return Main.platform instanceof PlatformHookOsx;
+    }
 }

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

@@ -56 +56 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.PlatformHookOsx;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -473 +472 @@
     public void mouseMoved(MouseEvent e) {
         // Mac OSX simulates with  ctrl + mouse 1  the second mouse button hence no dragging events get fired.
-        if ((Main.platform instanceof PlatformHookOsx) && (mode == Mode.rotate || mode == Mode.scale)) {
+        if (Main.isPlatformOsx() && (mode == Mode.rotate || mode == Mode.scale)) {
             mouseDragged(e);
             return;

trunk/src/org/openstreetmap/josm/gui/MapMover.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.tools.Destroyable;
-import org.openstreetmap.josm.tools.PlatformHookOsx;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -77 +76 @@
 
     /**
-     * Create a new MapMover
+     * COnstructs a new {@code MapMover}.
      */
     public MapMover(NavigatableComponent navComp, JPanel contentPane) {
@@ -133 +132 @@
                     mousePosMove.east() + center.east() - mouseCenter.east(),
                     mousePosMove.north() + center.north() - mouseCenter.north()));
-        } else
+        } else {
             endMovement();
+        }
     }
 
@@ -140 +140 @@
      * Start the movement, if it was the 3rd button (right button).
      */
-    @Override public void mousePressed(MouseEvent e) {
+    @Override
+    public void mousePressed(MouseEvent e) {
         int offMask = MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK;
         int macMouseMask = MouseEvent.CTRL_DOWN_MASK | MouseEvent.BUTTON1_DOWN_MASK;
         if (e.getButton() == MouseEvent.BUTTON3 && (e.getModifiersEx() & offMask) == 0) {
             startMovement(e);
-        } else if (isPlatformOsx() && e.getModifiersEx() == macMouseMask) {
+        } else if (Main.isPlatformOsx() && e.getModifiersEx() == macMouseMask) {
             startMovement(e);
         }
@@ -153 +154 @@
      * Change the cursor back to it's pre-move cursor.
      */
-    @Override public void mouseReleased(MouseEvent e) {
+    @Override
+    public void mouseReleased(MouseEvent e) {
         if (e.getButton() == MouseEvent.BUTTON3) {
             endMovement();
-        } else if (isPlatformOsx() && e.getButton() == MouseEvent.BUTTON1) {
+        } else if (Main.isPlatformOsx() && e.getButton() == MouseEvent.BUTTON1) {
             endMovement();
         }
@@ -195 +197 @@
 
     /**
-     * Emulates dragging on Mac OSX
+     * Emulates dragging on Mac OSX.
      */
     @Override
@@ -203 +205 @@
         // Mac OSX simulates with  ctrl + mouse 1  the second mouse button hence no dragging events get fired.
         // Is only the selected mouse button pressed?
-        if (isPlatformOsx()) {
+        if (Main.isPlatformOsx()) {
             if (e.getModifiersEx() == MouseEvent.CTRL_DOWN_MASK) {
                 if (mousePosMove == null) {
@@ -216 +218 @@
             }
         }
-    }
-
-    /**
-     * 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 instanceof PlatformHookOsx;
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.PlatformHookOsx;
 
 /**
@@ -63 +62 @@
 
         // let's try to load additional LookAndFeels and put them into the list
-        if (Main.platform instanceof PlatformHookOsx) {
+        if (Main.isPlatformOsx()) {
             try {
                 Class<?> Cquaqua = Class.forName("ch.randelshofer.quaqua.QuaquaLookAndFeel");