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

Timestamp:

2009-08-02T18:02:44+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed two issues in #3141: conflict resolution flags false conflicts on nodes

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (5 diffs)
• OsmConnection.java (modified) (1 diff)
• OsmReader.java (modified) (1 diff)

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

@@ -63 +63 @@
     private DataSet outputDataSet;
 
+    private boolean cancelled = false;
+
     /**
      * constructor
@@ -230 +232 @@
      *
      */
-    public MultiFetchServerObjectReader append(Collection<OsmPrimitive> primitives) {
+    public MultiFetchServerObjectReader append(Collection<? extends OsmPrimitive> primitives) {
         if (primitives == null) return this;
         for (OsmPrimitive primitive : primitives) {
@@ -363 +365 @@
         for (long id : pkg) {
             try {
+                progressMonitor.setCustomText(tr("Fetching {0} with id {1} from ''{2}''", type.getLocalizedDisplayNameSingular(), id, OsmApi.getOsmApi().getBaseUrl()));
                 singleGetId(type, id, progressMonitor);
             } catch(OsmApiException e) {
@@ -394 +397 @@
      */
     protected void fetchPrimitives(Set<Long> ids, OsmPrimitiveType type, ProgressMonitor progressMonitor) throws OsmTransferException{
+        progressMonitor.setCustomText(tr("Fetching a package of {0} from ''{1}''", type.getLocalizedDisplayNameSingular(), OsmApi.getOsmApi().getBaseUrl()));
         Set<Long> toFetch = new HashSet<Long>(ids);
         toFetch.addAll(ids);
-        while(! toFetch.isEmpty()) {
+        while(! toFetch.isEmpty() && !isCanceled()) {
             Set<Long> pkg = extractIdPackage(toFetch);
             try {
@@ -435 +439 @@
         try {
             missingPrimitives = new HashSet<Long>();
-
+            if (isCanceled())return null;
             fetchPrimitives(nodes,OsmPrimitiveType.NODE, progressMonitor);
+            if (isCanceled())return null;
             fetchPrimitives(ways,OsmPrimitiveType.WAY, progressMonitor);
+            if (isCanceled())return null;
             fetchPrimitives(relations,OsmPrimitiveType.RELATION, progressMonitor);
             return outputDataSet;

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

@@ -145 +145 @@
         con.addRequestProperty("Authorization", "Basic "+Base64.encode(bytes));
     }
+
+    /**
+     * Replies true if this connection is canceled
+     * 
+     * @return true if this connection is canceled
+     * @return
+     */
+    public boolean isCanceled() {
+        return cancel;
+    }
 }

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

@@ -329 +329 @@
         for (Entry<OsmPrimitiveData, Collection<Long>> e : ways.entrySet()) {
             Way w = new Way(e.getKey().id);
-            boolean failed = false;
+            boolean incomplete = false;
             for (long id : e.getValue()) {
                 Node n = findNode(id);
                 if (n == null) {
-                    failed = true;
-                    break;
+                    n = new Node(id);
+                    n.incomplete = true;
+                    incomplete = true;
                 }
                 w.nodes.add(n);
             }
-            if (failed) {
-                logger.warning(tr("marked way {0} incomplete because referred nodes are missing in the loaded data", e.getKey().id));
+            if (incomplete) {
+                logger.warning(tr("marked way {0} with {1} nodes incomplete because at least one node was missing in the loaded data and is therefore incomplete too", e.getKey().id, w.nodes.size()));
                 e.getKey().copyTo(w);
                 w.incomplete = true;
-                w.nodes.clear();
                 ds.addPrimitive(w);
             } else {