Changeset 3426 in josm

Timestamp:

Aug 8, 2010 2:05:15 PM (3 years ago)

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UploadSelectionAction.java (modified) (2 diffs)
• data/osm/DataSet.java (modified) (1 diff)
• data/osm/DataSetMerger.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

@@ -93 +93 @@
         UploadSelectionDialog dialog = new UploadSelectionDialog();
         Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(getEditLayer().data.getSelected());
-        Collection<OsmPrimitive> deletedCandiates = getDeletedPrimitives(getEditLayer().data);
-        if (modifiedCandidates.isEmpty() && deletedCandiates.isEmpty()) {
+        Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(getEditLayer().data);
+        if (modifiedCandidates.isEmpty() && deletedCandidates.isEmpty()) {
             JOptionPane.showMessageDialog(
                     Main.parent,
@@ -105 +105 @@
         dialog.populate(
                 modifiedCandidates,
-                deletedCandiates
+                deletedCandidates
         );
         dialog.setVisible(true);

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)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -398 +398 @@
 
         // if uploaded, clean the modified flags as well
-        data.clenupDeletedPrimitives();
+        data.cleanupDeletedPrimitives();
         for (OsmPrimitive p: data.allPrimitives()) {
             if (processed.contains(p)) {