Changeset 12682 in josm for trunk/src

Timestamp:

2017-08-28T11:50:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - move GuiSizesHelper from gui.util to tools (only called from there)

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• GuiSizesHelper.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/util/GuiSizesHelper.java ) (3 diffs)
• ImageProvider.java (modified) (1 diff)
• ImageResource.java (modified) (1 diff)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.util;
+package org.openstreetmap.josm.tools;
 
 import java.awt.Dimension;
@@ -12 +12 @@
  * This is needed, because display resolution may vary a lot and a common set
  * of sizes wont work for all users alike.
+ * @since 12682 (moved from {@code gui.util} package)
  * @since 10358
  */
@@ -29 +30 @@
     private static float getScreenDPI() {
         if (screenDPI == -1) {
-            synchronized (GuiHelper.class) {
+            synchronized (GuiSizesHelper.class) {
                 if (screenDPI == -1) {
                     float scalePref = (float) Main.pref.getDouble("gui.scale", 1.0);

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

@@ -70 +70 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.gui.util.GuiSizesHelper;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.plugins.PluginHandler;

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

@@ -15 +15 @@
 import javax.swing.JPanel;
 import javax.swing.UIManager;
-
-import org.openstreetmap.josm.gui.util.GuiSizesHelper;
 
 import com.kitfox.svg.SVGDiagram;