Ignore:
Timestamp:
2012-07-22T22:36:44+02:00 (7 years ago)
Author:
Don-vip
Message:

see #7847, see #7884 - Fix 2 NPE when dealing with nodes without coordinates + display "(none)" in history when coordinates are missing to distinguish this fact from the deleted state (and be homogenous with conflict dialog)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

    r5346 r5356  
    262262            // display the coordinates
    263263            //
    264             lblLat.setText(coord != null ? coord.latToString(CoordinateFormat.DECIMAL_DEGREES) : tr("Deleted"));
    265             lblLon.setText(coord != null ? coord.lonToString(CoordinateFormat.DECIMAL_DEGREES) : tr("Deleted"));
     264            lblLat.setText(coord != null ? coord.latToString(CoordinateFormat.DECIMAL_DEGREES) : tr("(none)"));
     265            lblLon.setText(coord != null ? coord.lonToString(CoordinateFormat.DECIMAL_DEGREES) : tr("(none)"));
    266266
    267267            // update background color to reflect differences in the coordinates
     
    342342            } else {
    343343                lblDistance.setBackground(coord != oppositeCoord ? BGCOLOR_DIFFERENCE : Color.WHITE);
    344                 lblDistance.setText(tr("Deleted"));
     344                lblDistance.setText(tr("(none)"));
    345345            }
    346346        }
Note: See TracChangeset for help on using the changeset viewer.