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

Timestamp:

2009-07-19T19:04:49+02:00 (16 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• GpxImporter.java (modified) (2 diffs)
• OsmReader.java (modified) (11 diffs)
• OsmServerHistoryReader.java (modified) (2 diffs)
• OsmServerWriter.java (modified) (5 diffs)

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

@@ -29 +29 @@
             GpxReader r = null;
             InputStream is;
-            if (file.getName().endsWith(".gpx.gz"))
+            if (file.getName().endsWith(".gpx.gz")) {
                 is = new GZIPInputStream(new FileInputStream(file));
-            else
+            } else {
                 is = new FileInputStream(file);
+            }
             // Workaround for SAX BOM bug
             // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6206835
             if (!((is.read() == 0xef) && (is.read() == 0xbb) && (is.read() == 0xbf))) {
                 is.close();
-                if (file.getName().endsWith(".gpx.gz"))
+                if (file.getName().endsWith(".gpx.gz")) {
                     is = new GZIPInputStream(new FileInputStream(file));
-                else
+                } else {
                     is = new FileInputStream(file);
+                }
             }
             r = new GpxReader(is, file.getAbsoluteFile().getParentFile());
@@ -48 +50 @@
             if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
                 MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer);
-                if (ml.data.size() > 0)
+                if (ml.data.size() > 0) {
                     Main.main.addLayer(ml);
+                }
             }
         } catch (FileNotFoundException e) {

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

@@ -29 +29 @@
 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.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.DateUtils;
@@ -55 +54 @@
     private DataSet ds = new DataSet();
     public DataSet getDs() { return ds; }
-
-    /**
-     * The visitor to use to add the data to the set.
-     */
-    private AddVisitor adder = new AddVisitor(ds);
 
     /**
@@ -349 +343 @@
                 w.incomplete = true;
                 w.nodes.clear();
-                adder.visit(w);
+                ds.addPrimitive(w);
             } else {
                 e.getKey().copyTo(w);
                 w.incomplete = false;
-                adder.visit(w);
+                ds.addPrimitive(w);
             }
         }
@@ -401 +395 @@
             Relation en = new Relation();
             e.getKey().copyTo(en);
-            adder.visit(en);
+            ds.addPrimitive(en);
         }
 
@@ -421 +415 @@
                     if (em.member == null) {
                         em.member = new Node(emd.id);
-                        adder.visit((Node)em.member);
+                        ds.addPrimitive(em.member);
                     }
                 } else if (emd.type.equals("way")) {
@@ -430 +424 @@
                     if (em.member == null) {
                         em.member = new Way(emd.id);
-                        adder.visit((Way)em.member);
+                        ds.addPrimitive(em.member);
                     }
                 } else if (emd.type.equals("relation")) {
@@ -436 +430 @@
                     if (em.member == null) {
                         em.member = new Relation(emd.id);
-                        adder.visit((Relation)em.member);
+                        ds.addPrimitive(em.member);
                     }
                 } else {
@@ -458 +452 @@
 
     public static OsmReader parseDataSetOsm(InputStream source, ProgressMonitor progressMonitor) throws SAXException, IOException {
-        OsmReader osm = new OsmReader();
+        OsmReader reader = new OsmReader();
 
         // phase 1: Parse nodes and read in raw ways
         InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
         try {
-            SAXParserFactory.newInstance().newSAXParser().parse(inputSource, osm.new Parser());
+            SAXParserFactory.newInstance().newSAXParser().parse(inputSource, reader.new Parser());
         } catch (ParserConfigurationException e1) {
             e1.printStackTrace(); // broken SAXException chaining
@@ -471 +465 @@
         progressMonitor.beginTask(tr("Prepare OSM data...", 2));
         try {
-            for (Node n : osm.nodes.values()) {
-                osm.adder.visit(n);
+            for (Node n : reader.nodes.values()) {
+                reader.ds.addPrimitive(n);
             }
 
@@ -478 +472 @@
 
             try {
-                osm.createWays();
-                osm.createRelations();
+                reader.createWays();
+                reader.createRelations();
             } catch (NumberFormatException e) {
                 e.printStackTrace();
@@ -486 +480 @@
 
             // clear all negative ids (new to this file)
-            for (OsmPrimitive o : osm.ds.allPrimitives())
+            for (OsmPrimitive o : reader.ds.allPrimitives())
                 if (o.id < 0) {
                     o.id = 0;
                 }
 
-            return osm;
+            return reader;
         } finally {
             progressMonitor.finishTask();

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.IOException;
 import java.io.InputStream;
 
@@ -11 +10 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.xml.sax.SAXException;
 
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;

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

@@ -12 +12 @@
 import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
@@ -23 +24 @@
  */
 public class OsmServerWriter {
+    static private final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
     static private final Logger logger = Logger.getLogger(OsmServerWriter.class.getName());
 
@@ -123 +125 @@
                 progressMonitor.setTicksCount(primitives.size());
                 api.createChangeset(getChangesetComment(), progressMonitor.createSubTaskMonitor(0, false));
-                NameVisitor v = new NameVisitor();
                 uploadStartTime = System.currentTimeMillis();
                 for (OsmPrimitive osm : primitives) {
-                    osm.visit(v);
                     int progress = progressMonitor.getTicks();
                     String time_left_str = timeLeft(progress, primitives.size());
@@ -132 +132 @@
                             tr("{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})",
                                     Math.round(100.0*progress/primitives.size()), progress,
-                                    primitives.size(), time_left_str, tr(v.className), v.name, osm.id));
+                                    primitives.size(), time_left_str,
+                                    OsmPrimitiveType.from(osm).getLocalizedDisplayNameSingular(),
+                                    NAME_FORMATTER.getName(osm),
+                                    osm.id));
                     makeApiRequest(osm);
                     processed.add(osm);
@@ -139 +142 @@
                 api.stopChangeset(progressMonitor.createSubTaskMonitor(0, false));
             }
+
         } finally {
             progressMonitor.finishTask();