Changeset 2936 in josm for trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java

Timestamp:

04.02.2010 21:04:02 (2 years ago)

Author:

jttt

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java

@@ -37 +37 @@
 public class OsmHistoryReader {
 
-    private InputStream in;
-    private HistoryDataSet data;
+    private final InputStream in;
+    private final HistoryDataSet data;
 
     private class Parser extends DefaultHandler {
@@ -131 +131 @@
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
-            if (v.equals("true")) return true;
-            if (v.equals("false")) return false;
+            if ("true".equals(v)) return true;
+            if ("false".equals(v)) return false;
             throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v));
             // not reached
@@ -231 +231 @@
     public OsmHistoryReader(InputStream source) {
         this.in = source;
-        data = new HistoryDataSet();
+        this.data = new HistoryDataSet();
     }