Changeset 1415 in josm for trunk/src/org/openstreetmap/josm/io/DiffResultReader.java

Timestamp:

2009-02-16T15:14:34+01:00 (15 years ago)

Author:

stoecker

Message:

applied patch #2185 by bruce89

File:

• trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
@@ -77 +64 @@
     /**
      * Parse the given input source and return the dataset.
-     * @param ref The dataset that is search in for references first. If
-     *      the Reference is not found here, Main.ds is searched and a copy of the
-     *  elemet found there is returned.
      */
     public static void parseDiffResult(InputStream source, Collection<OsmPrimitive> osm, Collection<OsmPrimitive> processed, Map<OsmPrimitive,Long> newIdMap, PleaseWaitDialog pleaseWaitDlg)