Changeset 9705 in josm

Timestamp:

2016-02-01T16:41:36+01:00 (8 years ago)

Author:

simon04

Message:

fix #12409 - Refactor ImageProvider.ImageSizes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/relation/RecentRelationsAction.java (modified) (1 diff)
• gui/OsmPrimitivRenderer.java (modified) (2 diffs)
• gui/SideButton.java (modified) (1 diff)
• gui/dialogs/relation/MemberTableMemberCellRenderer.java (modified) (3 diffs)
• gui/dialogs/relation/SelectionTableCellRenderer.java (modified) (3 diffs)
• tools/ImageProvider.java (modified) (8 diffs)
• tools/ImageResource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java

@@ -154 +154 @@
                     first = false;
                 }
-                menuItem.setIcon(ImageProvider.getPadded(relation, new Rectangle(16, 16)));
+                menuItem.setIcon(ImageProvider.getPadded(relation, ImageProvider.ImageSizes.MENU.getImageDimension()));
                 add(menuItem);
             }

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

@@ -3 +3 @@
 
 import java.awt.Component;
-import java.awt.Rectangle;
 
 import javax.swing.DefaultListCellRenderer;
@@ -76 +75 @@
             ImageIcon icon = ImageProvider.getPadded(value,
                 // Height of component no yet known, assume the default 16px.
-                new Rectangle(16, 16));
+                    ImageProvider.ImageSizes.SMALLICON.getImageDimension());
             if (icon != null) {
                 ((JLabel) def).setIcon(icon);

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

@@ -25 +25 @@
  */
 public class SideButton extends JButton implements Destroyable {
-    private static final int iconHeight = ImageProvider.getImageSizes(ImageProvider.ImageSizes.SIDEBUTTON).height;
+    private static final int iconHeight = ImageProvider.ImageSizes.SIDEBUTTON.getImageSize();
 
     private transient PropertyChangeListener propertyChangeListener;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java

@@ -3 +3 @@
 
 import java.awt.Component;
-import java.awt.Rectangle;
+import java.awt.Dimension;
 
 import javax.swing.JTable;
@@ -23 +23 @@
     }
 
-    protected void renderPrimitive(OsmPrimitive primitive, Rectangle cellSize) {
+    protected void renderPrimitive(OsmPrimitive primitive, Dimension cellSize) {
         // Make icon the full height of the table cell. Icon background is square.
         setIcon(ImageProvider.getPadded(primitive, cellSize));
@@ -38 +38 @@
             return this;
 
-        Rectangle cellSize = table.getCellRect(row, column, false);
+        Dimension cellSize = table.getCellRect(row, column, false).getSize();
 
         OsmPrimitive primitive = (OsmPrimitive) value;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Rectangle;
+import java.awt.Dimension;
 
 import javax.swing.JLabel;
@@ -60 +60 @@
     }
 
-    protected void renderPrimitive(OsmPrimitive primitive, Rectangle cellSize) {
+    protected void renderPrimitive(OsmPrimitive primitive, Dimension cellSize) {
         setIcon(ImageProvider.getPadded(primitive, cellSize));
         setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
@@ -74 +74 @@
             return this;
 
-        Rectangle cellSize = table.getCellRect(row, column, false);
+        Dimension cellSize = table.getCellRect(row, column, false).getSize();
 
         renderBackground((OsmPrimitive) value);

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

@@ -12 +12 @@
 import java.awt.Image;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Toolkit;
@@ -134 +133 @@
     public enum ImageSizes {
         /** SMALL_ICON value of on Action */
-        SMALLICON,
+        SMALLICON(Main.pref.getInteger("iconsize.smallicon", 16)),
         /** LARGE_ICON_KEY value of on Action */
-        LARGEICON,
+        LARGEICON(Main.pref.getInteger("iconsize.largeicon", 24)),
         /** map icon */
-        MAP,
+        MAP(Main.pref.getInteger("iconsize.map", 16)),
         /** map icon maximum size */
-        MAPMAX,
+        MAPMAX(Main.pref.getInteger("iconsize.mapmax", 48)),
         /** cursor icon size */
-        CURSOR,
+        CURSOR(Main.pref.getInteger("iconsize.cursor", 32)),
         /** cursor overlay icon size */
-        CURSOROVERLAY,
+        CURSOROVERLAY(CURSOR.imageSize),
         /** menu icon size */
-        MENU,
+        MENU(SMALLICON.imageSize),
         /** menu icon size in popup menus
          * @since 8323
          */
-        POPUPMENU,
+        POPUPMENU(LARGEICON.imageSize),
         /** Layer list icon size
          * @since 8323
          */
-        LAYER,
+        LAYER(Main.pref.getInteger("iconsize.layer", 16)),
         /** Toolbar button icon size
          * @since 9253
          */
-        TOOLBAR,
+        TOOLBAR(LARGEICON.imageSize),
         /** Side button maximum height
          * @since 9253
          */
-        SIDEBUTTON
+        SIDEBUTTON(Main.pref.getInteger("iconsize.sidebutton", 20)),
+        /**
+         * The default image size
+         * @since 9705
+         */
+        DEFAULT(Main.pref.getInteger("iconsize.default", 24));
+
+        private final int imageSize;
+
+        ImageSizes(int imageSize) {
+            this.imageSize = imageSize;
+        }
+
+        /**
+         * Returns the image size in pixels
+         * @return the image size in pixels
+         */
+        public int getImageSize() {
+            return imageSize;
+        }
+
+        /**
+         * Returns the image size as dimension
+         * @return the image size as dimension
+         */
+        public Dimension getImageDimension() {
+            return new Dimension(imageSize, imageSize);
+        }
     }
 
@@ -354 +380 @@
      * @return dimension of image in pixels
      * @since 7687
-     */
+     * @deprecated Use {@link ImageSizes#getImageDimension()} instead
+     */
+    @Deprecated
     public static Dimension getImageSizes(ImageSizes size) {
-        int sizeval;
-        switch(size) {
-        case MAPMAX: sizeval = Main.pref.getInteger("iconsize.mapmax", 48); break;
-        case MAP: sizeval = Main.pref.getInteger("iconsize.mapmax", 16); break;
-        case SIDEBUTTON: sizeval = Main.pref.getInteger("iconsize.sidebutton", 20); break;
-        case TOOLBAR: /* TOOLBAR is LARGELICON - only provided in case of future changes */
-        case POPUPMENU: /* POPUPMENU is LARGELICON - only provided in case of future changes */
-        case LARGEICON: sizeval = Main.pref.getInteger("iconsize.largeicon", 24); break;
-        case MENU: /* MENU is SMALLICON - only provided in case of future changes */
-        case SMALLICON: sizeval = Main.pref.getInteger("iconsize.smallicon", 16); break;
-        case CURSOROVERLAY: /* same as cursor - only provided in case of future changes */
-        case CURSOR: sizeval = Main.pref.getInteger("iconsize.cursor", 32); break;
-        case LAYER: sizeval = Main.pref.getInteger("iconsize.layer", 16); break;
-        default: sizeval = Main.pref.getInteger("iconsize.default", 24); break;
-        }
-        return new Dimension(sizeval, sizeval);
+        return (size == null ? ImageSizes.DEFAULT : size).getImageDimension();
     }
 
@@ -398 +411 @@
      */
     public ImageProvider setSize(ImageSizes size) {
-        return setSize(getImageSizes(size));
+        return setSize(size.getImageDimension());
     }
 
@@ -474 +487 @@
      */
     public ImageProvider setMaxSize(ImageSizes size) {
-        return setMaxSize(getImageSizes(size));
+        return setMaxSize(size.getImageDimension());
     }
 
@@ -1305 +1318 @@
      * @since 8903
      */
-    public static ImageIcon getPadded(OsmPrimitive primitive, Rectangle iconSize) {
+    public static ImageIcon getPadded(OsmPrimitive primitive, Dimension iconSize) {
         // Check if the current styles have special icon for tagged nodes.
         if (primitive instanceof org.openstreetmap.josm.data.osm.Node) {
@@ -1314 +1327 @@
                     MapImage icon = nodeStyle.mapImage;
                     if (icon != null) {
-                        int backgroundWidth = iconSize.height;
+                        int backgroundWidth = iconSize.width;
                         int backgroundHeight = iconSize.height;
                         int iconWidth = icon.getWidth();
@@ -1769 +1782 @@
 
     /**
-     * Determines if the given {@code BufferedImage} has a transparent color determiend by a previous call to {@link #read}.
+     * Determines if the given {@code BufferedImage} has a transparent color determined by a previous call to {@link #read}.
      * @param bi The {@code BufferedImage} to test
      * @return {@code true} if {@code bi} has a transparent color determined by a previous call to {@code read}.

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

@@ -88 +88 @@
      */
     public void getImageIcon(AbstractAction a) {
-        ImageIcon icon = getImageIconBounded(ImageProvider.getImageSizes(ImageProvider.ImageSizes.SMALLICON));
+        ImageIcon icon = getImageIconBounded(ImageProvider.ImageSizes.SMALLICON.getImageDimension());
         a.putValue(Action.SMALL_ICON, icon);
-        icon = getImageIconBounded(ImageProvider.getImageSizes(ImageProvider.ImageSizes.LARGEICON));
+        icon = getImageIconBounded(ImageProvider.ImageSizes.LARGEICON.getImageDimension());
         a.putValue(Action.LARGE_ICON_KEY, icon);
     }