Changeset 1881 in josm for trunk/src/org/openstreetmap/josm/io/OsmConnection.java

Timestamp:

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

Author:

Gubaer

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) (1 diff)

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;
+    }
 }