Changeset 10409 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-06-17T02:58:36+02:00 (8 years ago)

Author:

Don-vip

Message:

• remove duplicated code
• fix various sonar warnings
• add some javadoc and unit tests

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NavigatableComponent.java (modified) (3 diffs)
• util/GuiSizesHelper.java (modified) (8 diffs)

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

@@ -141 +141 @@
     // The only events that may move/resize this map view are window movements or changes to the map view size.
     // We can clean this up more by only recalculating the state on repaint.
-    private final HierarchyListener hierarchyListener = new HierarchyListener() {
+    private final transient HierarchyListener hierarchyListener = new HierarchyListener() {
         @Override
         public void hierarchyChanged(HierarchyEvent e) {
@@ -151 +151 @@
     };
 
-    private final ComponentAdapter componentListener = new ComponentAdapter() {
+    private final transient ComponentAdapter componentListener = new ComponentAdapter() {
         @Override
         public void componentShown(ComponentEvent e) {
@@ -170 +170 @@
      * The current state (scale, center, ...) of this map view.
      */
-    private MapViewState state;
+    private transient MapViewState state;
 
     /**

trunk/src/org/openstreetmap/josm/gui/util/GuiSizesHelper.java

@@ -3 +3 @@
 
 import java.awt.Dimension;
-import java.awt.HeadlessException;
+import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
 
@@ -20 +20 @@
     }
 
-
     /** cache value for screen resolution */
     private static float screenDPI = -1;
 
-    /** Request the screen resolution (cached)
+    /**
+     * Request the screen resolution (cached)
      * @return screen resolution in DPI
      */
@@ -35 +35 @@
                         screenDPI = 96f * scalePref;
                     } else {
-                        try {
+                        if (!GraphicsEnvironment.isHeadless()) {
                             screenDPI = Toolkit.getDefaultToolkit().getScreenResolution();
-                        } catch (HeadlessException e) {
+                        } else {
                             screenDPI = 96;
                         }
@@ -53 +53 @@
      */
     public static float getPixelDensity() {
-        float pixelPerInch = getScreenDPI();
-        return pixelPerInch / 96f;
+        return getScreenDPI() / 96f;
     }
 
@@ -72 +71 @@
     public static int getSizeDpiAdjusted(int size) {
         if (size <= 0) return size;
-        float pixelPerInch = getScreenDPI();
-        return Math.round(size * pixelPerInch / 96);
+        return Math.round(size * getScreenDPI() / 96);
     }
 
@@ -83 +81 @@
     public static float getSizeDpiAdjusted(float size) {
         if (size <= 0f) return size;
-        float pixelPerInch = getScreenDPI();
-        return size * pixelPerInch / 96;
+        return size * getScreenDPI() / 96;
     }
 
@@ -94 +91 @@
     public static double getSizeDpiAdjusted(double size) {
         if (size <= 0d) return size;
-        float pixelPerInch = getScreenDPI();
-        return size * pixelPerInch / 96;
+        return size * getScreenDPI() / 96;
     }
 
@@ -105 +101 @@
     public static Dimension getDimensionDpiAdjusted(Dimension dim) {
         float pixelPerInch = getScreenDPI();
-        int width = dim.width, height = dim.height;
+        int width = dim.width;
+        int height = dim.height;
         if (dim.width > 0) {
             width = Math.round(dim.width * pixelPerInch / 96);