Changeset 3426 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2010-08-08T14:05:15+02:00 (14 years ago)

Author:

stoecker

Message:

see #5303 - some cleanup patches from matthew Bell - partially applied only

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (1 diff)
• DataSetMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -900 +900 @@
     }
 
-    public void clenupDeletedPrimitives() {
+    public void cleanupDeletedPrimitives() {
         beginUpdate();
         try {

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -94 +94 @@
             //
             Collection<? extends OsmPrimitive> candidates = null;
-            switch(source.getType()) {
+            switch (source.getType()) {
             case NODE: candidates = targetDataSet.getNodes(); break;
-            case WAY: candidates  =targetDataSet.getWays(); break;
+            case WAY: candidates  = targetDataSet.getWays(); break;
             case RELATION: candidates = targetDataSet.getRelations(); break;
             default: throw new AssertionError();
@@ -134 +134 @@
     }
 
-    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException{
+    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException {
         PrimitiveId targetId = mergedMap.get(mergeSource.getPrimitiveId());
         if (targetId == null)