Changeset 10484 in josm for trunk

Timestamp:

2016-06-24T22:35:50+02:00 (8 years ago)

Author:

stoecker

Message:

see #9995 - don't expose GuiSizesHelper for image purpose

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/NoteLayer.java (modified) (3 diffs)
• tools/ImageProvider.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.io.UploadNoteLayerTask;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.gui.util.GuiSizesHelper;
 import org.openstreetmap.josm.io.NoteExporter;
 import org.openstreetmap.josm.io.OsmApi;
@@ -108 +107 @@
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds box) {
-        final int iconHeight = GuiSizesHelper.getSizeDpiAdjusted(ImageProvider.ImageSizes.SMALLICON.getVirtualHeight());
-        final int iconWidth = GuiSizesHelper.getSizeDpiAdjusted(ImageProvider.ImageSizes.SMALLICON.getVirtualWidth());
+        final int iconHeight = ImageProvider.ImageSizes.SMALLICON.getAdjustedHeight();
+        final int iconWidth = ImageProvider.ImageSizes.SMALLICON.getAdjustedWidth();
 
         for (Note note : noteData.getNotes()) {
@@ -247 +246 @@
         double snapDistance = 10;
         double minDistance = Double.MAX_VALUE;
-        final int iconHeight = GuiSizesHelper.getSizeDpiAdjusted(ImageProvider.ImageSizes.SMALLICON.getVirtualHeight());
+        final int iconHeight = ImageProvider.ImageSizes.SMALLICON.getAdjustedHeight();
         Note closestNote = null;
         for (Note note : noteData.getNotes()) {

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

@@ -208 +208 @@
          * Returns the image width in virtual pixels
          * @return the image width in virtual pixels
+         * @since 9705
          */
         public int getVirtualWidth() {
@@ -220 +221 @@
         public int getVirtualHeight() {
             return virtualHeight;
+        }
+
+        /**
+         * Returns the image width in pixels to use for display
+         * @return the image width in pixels to use for display
+         * @since 10484
+         */
+        public int getAdjustedWidth() {
+            return  GuiSizesHelper.getSizeDpiAdjusted(virtualWidth);
+        }
+
+        /**
+         * Returns the image height in pixels to use for display
+         * @return the image height in pixels to use for display
+         * @since 10484
+         */
+        public int getAdjustedHeight() {
+            return  GuiSizesHelper.getSizeDpiAdjusted(virtualHeight);
         }