Ignore:
Timestamp:
2010-02-04T21:04:02+01:00 (12 years ago)
Author:
jttt
Message:

Fixed #4408 confict manager: do not have to solve tag- and element-conficts when deleting

File:
1 edited

Legend:

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

    r2512 r2936  
    3737public class OsmHistoryReader {
    3838
    39     private InputStream in;
    40     private HistoryDataSet data;
     39    private final InputStream in;
     40    private final HistoryDataSet data;
    4141
    4242    private class Parser extends DefaultHandler {
     
    131131                throwException(tr("Missing mandatory attribute ''{0}''.", name));
    132132            }
    133             if (v.equals("true")) return true;
    134             if (v.equals("false")) return false;
     133            if ("true".equals(v)) return true;
     134            if ("false".equals(v)) return false;
    135135            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v));
    136136            // not reached
     
    231231    public OsmHistoryReader(InputStream source) {
    232232        this.in = source;
    233         data = new HistoryDataSet();
     233        this.data = new HistoryDataSet();
    234234    }
    235235
Note: See TracChangeset for help on using the changeset viewer.