Changeset 9954 in josm for trunk

Timestamp:

2016-03-08T01:22:33+01:00 (9 years ago)

Author:

Don-vip

Message:

make MapScaler and SizeButton implement Accessible interface, add unit tests, fix checkstyle violation

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MapScaler.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/bbox/SizeButton.java (modified) (5 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/TestUtils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/MapScalerTest.java (added)
• test/unit/org/openstreetmap/josm/gui/bbox (added)
• test/unit/org/openstreetmap/josm/gui/bbox/SizeButtonTest.java (added)

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

@@ -9 +9 @@
 import java.awt.geom.Rectangle2D;
 
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleValue;
 import javax.swing.JComponent;
 
@@ -14 +17 @@
 import org.openstreetmap.josm.gui.help.Helpful;
 
-public class MapScaler extends JComponent implements Helpful {
+/**
+ * Map scale bar, displaying the distance in meter that correspond to 100 px on screen.
+ * @since 115
+ */
+public class MapScaler extends JComponent implements Helpful, Accessible {
 
     private final NavigatableComponent mv;
@@ -20 +27 @@
     private static final int PADDING_RIGHT = 100;
 
+    /**
+     * Constructs a new {@code MapScaler}.
+     * @param mv map view
+     */
     public MapScaler(NavigatableComponent mv) {
         this.mv = mv;
@@ -41 +52 @@
     }
 
+    /**
+     * Returns the color of map scaler.
+     * @return the color of map scaler
+     */
     public static Color getColor() {
         return Main.pref.getColor(marktr("scale"), Color.white);
@@ -49 +64 @@
         return ht("/MapView/Scaler");
     }
+
+    @Override
+    public AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            accessibleContext = new AccessibleMapScaler();
+        }
+        return accessibleContext;
+    }
+
+    class AccessibleMapScaler extends AccessibleJComponent implements AccessibleValue {
+
+        @Override
+        public Number getCurrentAccessibleValue() {
+            return mv.getDist100Pixel();
+        }
+
+        @Override
+        public boolean setCurrentAccessibleValue(Number n) {
+            return false;
+        }
+
+        @Override
+        public Number getMinimumAccessibleValue() {
+            return null;
+        }
+
+        @Override
+        public Number getMaximumAccessibleValue() {
+            return null;
+        }
+    }
 }

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

@@ -204 +204 @@
             ScaleList scaleList = nativeScaleLayer.getNativeScales();
             if (scaleList != null) {
-                if ( PROP_ZOOM_INTERMEDIATE_STEPS.get()) {
+                if (PROP_ZOOM_INTERMEDIATE_STEPS.get()) {
                     scaleList = scaleList.withIntermediateSteps(PROP_ZOOM_RATIO.get());
                 }
@@ -323 +323 @@
     }
 
+    /**
+     * Returns the text describing the distance in meter that correspond to 100 px on screen.
+     * @return the text describing the distance in meter that correspond to 100 px on screen
+     */
     public String getDist100PixelText() {
         return getDistText(getDist100Pixel());

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

@@ -6 +6 @@
 import java.awt.Dimension;
 import java.awt.Graphics;
-import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleContext;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
@@ -16 +18 @@
 
 /**
+ * Button allowing to control the dimension of a slippy map between two states (normal/enlarged).
  * @author Tim Haussmann
+ * @since 1390
  */
-public class SizeButton extends JComponent {
-
-    private int x;
-    private int y;
+public class SizeButton extends JComponent implements Accessible {
 
     private final ImageIcon enlargeImage;
@@ -28 +29 @@
     private final SlippyMapBBoxChooser slippyMapBBoxChooser;
 
+    private final transient MouseAdapter mouseAdapter = new MouseAdapter() {
+        @Override
+        public void mouseReleased(MouseEvent e) {
+            if (e.getButton() == MouseEvent.BUTTON1) {
+                toggle();
+            }
+        }
+    };
+
+    /**
+     * Constructs a new {@code SizeButton}.
+     * @param slippyMapBBoxChooser the associated slippy map
+     */
     public SizeButton(SlippyMapBBoxChooser slippyMapBBoxChooser) {
         this.slippyMapBBoxChooser = slippyMapBBoxChooser;
@@ -33 +47 @@
         shrinkImage = ImageProvider.get("view-fullscreen-revert");
         setPreferredSize(new Dimension(enlargeImage.getIconWidth(), enlargeImage.getIconHeight()));
-        addMouseListener(mouseListener);
+        addMouseListener(mouseAdapter);
         setToolTipText(tr("Enlarge"));
     }
-
-    private final transient MouseAdapter mouseListener = new MouseAdapter() {
-        @Override
-        public void mouseReleased(MouseEvent e) {
-            if (e.getButton() == MouseEvent.BUTTON1) {
-                toggle();
-                slippyMapBBoxChooser.resizeSlippyMap();
-            }
-        }
-    };
 
     @Override
@@ -51 +55 @@
         if (isEnlarged) {
             if (shrinkImage != null)
-                g.drawImage(shrinkImage.getImage(), x, y, null);
+                g.drawImage(shrinkImage.getImage(), 0, 0, null);
         } else {
             if (enlargeImage != null)
-                g.drawImage(enlargeImage.getImage(), x, y, null);
+                g.drawImage(enlargeImage.getImage(), 0, 0, null);
         }
     }
 
+    /**
+     * Toggles button state.
+     */
     public void toggle() {
         isEnlarged = !isEnlarged;
         setToolTipText(isEnlarged ? tr("Shrink") : tr("Enlarge"));
+        slippyMapBBoxChooser.resizeSlippyMap();
     }
 
+    /**
+     * Determines if the slippy map is enlarged.
+     * @return {@code true} if the slippy map is enlarged, {@code false} otherwise
+     */
     public boolean isEnlarged() {
         return isEnlarged;
     }
 
-    public boolean hit(Point point) {
-        if (x < point.x && point.x < x + enlargeImage.getIconWidth()) {
-            if (y < point.y && point.y < y + enlargeImage.getIconHeight()) {
-                return true;
-            }
+    @Override
+    public AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            accessibleContext = new AccessibleSizeButton();
         }
-        return false;
+        return accessibleContext;
     }
 
+    class AccessibleSizeButton extends AccessibleJComponent implements AccessibleAction {
+
+        @Override
+        public int getAccessibleActionCount() {
+            return 1;
+        }
+
+        @Override
+        public String getAccessibleActionDescription(int i) {
+            return "toggle";
+        }
+
+        @Override
+        public boolean doAccessibleAction(int i) {
+            toggle();
+            return true;
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -92 +92 @@
     private static final char[] DEFAULT_STRIP = {'\u200B', '\uFEFF'};
 
+    private static final String[] SIZE_UNITS = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
+
     /**
      * Tests whether {@code predicate} applies to at least one element from {@code collection}.
@@ -1042 +1044 @@
             throw new IllegalArgumentException("bytes must be >= 0");
         }
-        final String[] units = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
         int unitIndex = 0;
         double value = bytes;
-        while (value >= 1024 && unitIndex < units.length) {
+        while (value >= 1024 && unitIndex < SIZE_UNITS.length) {
             value /= 1024;
             unitIndex++;
         }
         if (value > 100 || unitIndex == 0) {
-            return String.format(locale, "%.0f %s", value, units[unitIndex]);
+            return String.format(locale, "%.0f %s", value, SIZE_UNITS[unitIndex]);
         } else if (value > 10) {
-            return String.format(locale, "%.1f %s", value, units[unitIndex]);
+            return String.format(locale, "%.1f %s", value, SIZE_UNITS[unitIndex]);
         } else {
-            return String.format(locale, "%.2f %s", value, units[unitIndex]);
+            return String.format(locale, "%.2f %s", value, SIZE_UNITS[unitIndex]);
         }
     }

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -474 +474 @@
             @Override
             public FontRenderContext getFontRenderContext() {
-                return null;
+                return new FontRenderContext(null, false, false);
             }