Changeset 1415 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

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

Author:

stoecker

Message:

applied patch #2185 by bruce89

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• DiffResultReader.java (modified) (2 diffs)
• NmeaReader.java (modified) (2 diffs)
• OsmReader.java (modified) (3 diffs)
• OsmServerObjectReader.java (modified) (1 diff)
• OsmServerWriter.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)

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

@@ -11 +11 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -202 +201 @@
             }
             rd.close();
-            Object[] wparr = ps.waypoints.toArray();
             currentTrack.trackSegs.add(ps.waypoints);
             data.recalculateBounds();

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

@@ -7 +7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.FileInputStream;
-import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -436 +434 @@
 
           // Cache the ways here for much better search performance
-          HashMap hm = new HashMap(10000);
+          HashMap<Long, Way> hm = new HashMap<Long, Way>(10000);
           for (Way wy : ds.ways)
             hm.put(wy.id, wy);
@@ -454 +452 @@
                          }
                     } else if (emd.type.equals("way")) {
-                         em.member = (OsmPrimitive)hm.get(emd.id);
+                         em.member = hm.get(emd.id);
                          if (em.member == null)
                             em.member = findWay(emd.id);

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

@@ -28 +28 @@
     /**
      * Method to download single objects from OSM server. ways, relations, nodes
-     * @param id Object ID
-     * @param type way node relation
-     * @param full download with or without child objects
      * @return the data requested
      * @throws SAXException

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -13 +12 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.lang.Math;