Changeset 197 in josm for src/org/openstreetmap

Timestamp:

2007-01-14T05:00:46+01:00 (17 years ago)

Author:

imi

Message:

• fixed a bug in merging code (hopefully the same that causes the exception in conflict dialog)

Location:

src/org/openstreetmap/josm

Files:

• actions/search/QuickSearchAction.java (deleted)
• data/ServerSidePreferences.java (modified) (1 diff)
• data/osm/visitor/MergeVisitor.java (modified) (1 diff)

src/org/openstreetmap/josm/data/ServerSidePreferences.java

@@ -99 +99 @@
          * Do nothing on load. Preferences are loaded with download().
          */
-        @Override public void load() throws IOException {
+        @Override public void load() {
         }
 

src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -82 +82 @@
          */
         public void visit(Segment other) {
-                if (other.incomplete)
-                        return; // won't merge in an incomplete line segment!
-                
                 if (mergeAfterId(mergedSegments, ds.segments, other))
                         return;