Changeset 8365 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-05-16T15:13:38+02:00 (10 years ago)

Author:

Don-vip

Message:

fix Findbugs performance issues

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageOverlay.java (modified) (1 diff)
• WindowGeometry.java (modified) (1 diff)

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

@@ -72 +72 @@
         int height = -1;
         if (offsetRight > 0 && offsetLeft > 0) {
-            width = new Double(w*(offsetRight-offsetLeft)).intValue();
+            width = (int) (w*(offsetRight-offsetLeft));
         }
         if (offsetTop > 0 && offsetBottom > 0) {
-            width = new Double(h*(offsetBottom-offsetTop)).intValue();
+            width = (int) (h*(offsetBottom-offsetTop));
         }
         ImageIcon overlay;

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

@@ -187 +187 @@
             final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(arg);
             if (m.matches()) {
-                int w = Integer.valueOf(m.group(1));
-                int h = Integer.valueOf(m.group(2));
+                int w = Integer.parseInt(m.group(1));
+                int h = Integer.parseInt(m.group(2));
                 int x = screenDimension.x, y = screenDimension.y;
                 if (m.group(3) != null) {
-                    x = Integer.valueOf(m.group(5));
-                    y = Integer.valueOf(m.group(7));
+                    x = Integer.parseInt(m.group(5));
+                    y = Integer.parseInt(m.group(7));
                     if ("-".equals(m.group(4))) {
                         x = screenDimension.x + screenDimension.width - x - w;