Changeset 10655 in josm


Ignore:
Timestamp:
2016-07-27T00:07:20+02:00 (5 years ago)
Author:
Don-vip
Message:

see #12472 - fix warning "OperatorPrecedence"

Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/Main.java

    r10605 r10655  
    14081408
    14091409    private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
    1410         if (newValue == null ^ oldValue == null
     1410        if ((newValue == null ^ oldValue == null)
    14111411                || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
    14121412            if (Main.map != null) {
  • trunk/src/org/openstreetmap/josm/data/osm/Storage.java

    r9980 r10655  
    275275     */
    276276    private static int rehash(int h) {
    277         return 1103515245*h >> 2;
     277        return (1103515245*h) >> 2;
    278278    }
    279279
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java

    r9099 r10655  
    151151     */
    152152    public Color getSelectedColor(int alpha) {
    153         return new Color(selectedColor.getRGB() & 0x00ffffff | (alpha << 24), true);
     153        return new Color((selectedColor.getRGB() & 0x00ffffff) | (alpha << 24), true);
    154154    }
    155155
     
    176176     */
    177177    public Color getRelationSelectedColor(int alpha) {
    178         return new Color(relationSelectedColor.getRGB() & 0x00ffffff | (alpha << 24), true);
     178        return new Color((relationSelectedColor.getRGB() & 0x00ffffff) | (alpha << 24), true);
    179179    }
    180180
Note: See TracChangeset for help on using the changeset viewer.