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

Timestamp:

2009-07-15T17:22:56+02:00 (16 years ago)

Author:

Gubaer

Message:

Relation Editor: complete rework
Relation Editor: had to temporarily remove code for "link information" and "sorting"
IO Subsystem: clean up in exception handling
some cosmetics

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (5 diffs)
• OsmImporter.java (modified) (1 diff)
• OsmReader.java (modified) (8 diffs)
• OsmServerHistoryReader.java (modified) (1 diff)
• OsmServerLocationReader.java (modified) (2 diffs)
• OsmServerObjectReader.java (modified) (2 diffs)

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

@@ -62 +62 @@
     private HashSet<Long> relations;
     private HashSet<Long> missingPrimitives;
-    private HashSet<Long> skippedWayIds;
     private DataSet outputDataSet;
 
@@ -320 +319 @@
         try {
             final OsmReader osm = OsmReader.parseDataSetOsm(in, Main.pleaseWaitDlg);
-            skippedWayIds.addAll(osm.getSkippedWayIds());
             merge(osm.getDs());
-        } catch(IOException e) {
-            throw new OsmTransferException(e);
-        } catch(SAXException e) {
+        } catch(Exception e) {
             throw new OsmTransferException(e);
         }
@@ -346 +342 @@
         try {
             final OsmReader osm = OsmReader.parseDataSetOsm(in,Main.pleaseWaitDlg);
-            skippedWayIds.addAll(osm.getSkippedWayIds());
             merge(osm.getDs());
-        } catch(IOException e) {
-            throw new OsmTransferException(e);
-        } catch(SAXException e) {
+        } catch(Exception e) {
             throw new OsmTransferException(e);
         }
@@ -440 +433 @@
     @Override
     public DataSet parseOsm() throws OsmTransferException {
-        skippedWayIds = new HashSet<Long>();
         missingPrimitives = new HashSet<Long>();
 
@@ -450 +442 @@
 
     /**
-     * replies the set of {@see Way}s which were present in the data fetched from the
-     * server but which were not included in the JOSM dataset because they referred
-     * to nodes not present in the dataset
-     * 
-     * @return  the set of ids of skipped ways
-     */
-    public Set<Long> getSkippedWays() {
-        return skippedWayIds;
-    }
-
-    /**
      * replies the set of ids of all primitives for which a fetch request to the
      * server was submitted but which are not available from the server (the server

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

@@ -51 +51 @@
         Main.main.addLayer(layer);
         layer.fireDataChange();
-        if (osm.getParseNotes().length() != 0) {
-            /* display at most five lines */
-            String notes = osm.getParseNotes();
-            int j = 0;
-            for (int i = 0; i < 5; i++) {
-                j = notes.indexOf('\n', j + 1);
-            }
-            j = j >= 0 ? j : notes.length();
-            JOptionPane.showMessageDialog(Main.parent, notes.substring(0, j));
-        }
     }
 }

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

@@ -16 +16 @@
 import java.util.Set;
 import java.util.Map.Entry;
-
+import java.util.logging.Logger;
+
+import javax.swing.SwingUtilities;
 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;
@@ -50 +51 @@
  */
 public class OsmReader {
+    static private final Logger logger = Logger.getLogger(OsmReader.class.getName());
 
     /**
@@ -56 +58 @@
     private DataSet ds = new DataSet();
     public DataSet getDs() { return ds; }
-
-    /**
-     * Record warnings.  If there were any data inconsistencies, append
-     * a newline-terminated string.
-     */
-    private String parseNotes = new String();
-    private int parseNotesCount = 0;
-    public String getParseNotes() {
-        return parseNotes;
-    }
-
-    /** the list of ids of skipped {@see Way}s, i.e. ways which referred to nodes
-     * not included in the parsed data
-     */
-    private Set<Long> skippedWayIds = new HashSet<Long>();
 
     /**
@@ -350 +337 @@
     protected void createWays() {
         for (Entry<OsmPrimitiveData, Collection<Long>> e : ways.entrySet()) {
-            Way w = new Way();
+            Way w = new Way(e.getKey().id);
             boolean failed = false;
             for (long id : e.getValue()) {
                 Node n = findNode(id);
                 if (n == null) {
-                    /* don't report ALL of them, just a few */
-                    if (parseNotesCount++ < 6) {
-                        parseNotes += tr("Skipping a way because it includes a node that doesn''t exist: {0}\n", id);
-                    } else if (parseNotesCount == 6) {
-                        parseNotes += "...\n";
-                    }
                     failed = true;
                     break;
@@ -367 +348 @@
             }
             if (failed) {
-                skippedWayIds.add(e.getKey().id);
-                continue;
-            }
-            e.getKey().copyTo(w);
-            adder.visit(w);
-        }
-
+                logger.warning(tr("marked way {0} incomplete because referred nodes are missing in the loaded data", e.getKey().id));
+                e.getKey().copyTo(w);
+                w.incomplete = true;
+                w.nodes.clear();
+            } else {
+                e.getKey().copyTo(w);
+                w.incomplete = false;
+                adder.visit(w);
+            }
+        }
     }
 
@@ -475 +459 @@
     }
 
-    public static OsmReader parseDataSetOsm(InputStream source,PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
+    public static OsmReader parseDataSetOsm(InputStream source, final PleaseWaitDialog pleaseWaitDlg) throws SAXException, IOException {
         OsmReader osm = new OsmReader();
 
@@ -487 +471 @@
         }
 
-        Main.pleaseWaitDlg.currentAction.setText(tr("Prepare OSM data..."));
-        Main.pleaseWaitDlg.setIndeterminate(true);
+        SwingUtilities.invokeLater(
+                new Runnable() {
+                    public void run() {
+                        pleaseWaitDlg.currentAction.setText(tr("Prepare OSM data..."));
+                        pleaseWaitDlg.setIndeterminate(true);
+                    }
+                }
+        );
 
         for (Node n : osm.nodes.values()) {
@@ -508 +498 @@
             }
 
-        Main.pleaseWaitDlg.setIndeterminate(false);
-        Main.pleaseWaitDlg.progress.setValue(0);
+        SwingUtilities.invokeLater(
+                new Runnable() {
+                    public void run() {
+                        pleaseWaitDlg.setIndeterminate(false);
+                        pleaseWaitDlg.progress.setValue(0);
+                    }
+                }
+        );
 
         return osm;
     }
-
-    /**
-     * replies a set of ids of skipped {@see Way}s, i.e. ways which were included in the downloaded
-     * data but which referred to nodes <strong>not</strong>  available in the downloaded data
-     * 
-     * @return the set of ids
-     */
-    public Set<Long> getSkippedWayIds() {
-        return skippedWayIds;
-    }
 }

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

@@ -74 +74 @@
             HistoryDataSet data = reader.parse(Main.pleaseWaitDlg);
             return data;
-        } catch (IOException e) {
-            if (cancel)
-                return null;
-            throw new OsmTransferException(e);
-        } catch (SAXException e) {
-            throw new OsmTransferException(e);
         } catch(OsmTransferException e) {
             throw e;

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

@@ -24 +24 @@
     @Override
     public DataSet parseOsm() throws OsmTransferException {
+        InputStream in = null;
         try {
             Main.pleaseWaitDlg.progress.setValue(0);
             Main.pleaseWaitDlg.currentAction.setText(tr("Contacting Server..."));
 
-            final InputStream in = getInputStreamRaw(url, Main.pleaseWaitDlg);
+            in = getInputStreamRaw(url, Main.pleaseWaitDlg);
             if (in == null)
                 return null;
             Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
-            final DataSet data = OsmReader.parseDataSet(in, Main.pleaseWaitDlg);
-            in.close();
-            activeConnection = null;
-            return data;
-        } catch (IOException e) {
-            if (cancel)
-                return null;
-            throw new OsmTransferException(e);
-        } catch (SAXException e) {
-            throw new OsmTransferException(e);
+            return OsmReader.parseDataSet(in, Main.pleaseWaitDlg);
         } catch(OsmTransferException e) {
             throw e;
@@ -48 +40 @@
                 return null;
             throw new OsmTransferException(e);
+        } finally {
+            try {
+                if (in != null) {
+                    in.close();
+                }
+                activeConnection = null;
+            } catch(Exception e) {/* ignore it */}
         }
     }

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
-
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -51 +49 @@
             final DataSet data = osm.getDs();
 
-            if (osm.getParseNotes().length() != 0) {
-                JOptionPane.showMessageDialog(Main.parent, osm.getParseNotes());
-            }
             in.close();
             activeConnection = null;