Changeset 15292 in josm

Timestamp:

2019-08-08T01:01:59+02:00 (6 years ago)

Author:

Don-vip

Message:

checkstyle/pmd/sonar

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/AbstractMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• gui/dialogs/SearchDialog.java (modified) (1 diff)
• gui/layer/gpx/GpxDrawHelper.java (modified) (1 diff)
• gui/mappaint/BooleanStyleSettingGui.java (modified) (1 diff)
• tools/ColorScale.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -118 +118 @@
 
             g.setColor(backgroundColor);
-            g.fill(new Rectangle2D.Double(x-1, y-12, 8*strlen+1, 14));
+            g.fill(new Rectangle2D.Double(x-1, y-12, 8*strlen+1d, 14));
             g.setColor(clr);
             g.drawString(on, (int) x, (int) y);

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -757 +757 @@
                 g.setColor(color);
             }
-            Rectangle2D rect = new Rectangle2D.Double(p.getInViewX()-radius-1, p.getInViewY()-radius-1, size + 1, size + 1);
+            Rectangle2D rect = new Rectangle2D.Double(p.getInViewX()-radius-1d, p.getInViewY()-radius-1d, size + 1d, size + 1d);
             if (fill) {
                 g.fill(rect);
@@ -843 +843 @@
         temporaryGraphics.drawImage(img.getImage(disabled), drawX, drawY, nc);
         if (selected || member) {
-            selectionDrawer.accept(temporaryGraphics, new Rectangle2D.Double(drawX - 2, drawY - 2, img.getWidth() + 4, img.getHeight() + 4));
+            selectionDrawer.accept(temporaryGraphics, new Rectangle2D.Double(drawX - 2d, drawY - 2d, img.getWidth() + 4d, img.getHeight() + 4d));
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java

@@ -188 +188 @@
                     return true;
                 } catch (SearchParseError | MapCSSException e) {
+                    Logging.trace(e);
                     return false;
                 }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -1418 +1418 @@
 
         // collect frequently used items
-        final int fromX = (int) fromPnt.getX(); final int deltaX = (int) (toPnt.getX() - fromX);
-        final int fromY = (int) fromPnt.getY(); final int deltaY = (int) (toPnt.getY() - fromY);
+        final long fromX = (long) fromPnt.getX(); final long deltaX = (long) (toPnt.getX() - fromX);
+        final long fromY = (long) fromPnt.getY(); final long deltaY = (long) (toPnt.getY() - fromY);
 
         // use same random values for each point

trunk/src/org/openstreetmap/josm/gui/mappaint/BooleanStyleSettingGui.java

@@ -32 +32 @@
 
     static class BooleanStyleSettingCheckBoxMenuItem extends JCheckBoxMenuItem {
-        boolean noRepaint = false;
+        boolean noRepaint;
 
-        public BooleanStyleSettingCheckBoxMenuItem(BooleanStyleSetting setting) {
+        BooleanStyleSettingCheckBoxMenuItem(BooleanStyleSetting setting) {
             setAction(new AbstractAction(setting.label) {
                 @Override

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

@@ -33 +33 @@
         ColorScale sc = new ColorScale();
         sc.colors = Utils.copyArray(colors);
-        sc.setRange(0, colors.length - 1);
+        sc.setRange(0, colors.length - 1d);
         sc.addBounds();
         return sc;