Changeset 6069 in josm for trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java

Timestamp:

2013-07-17T00:01:07+02:00 (11 years ago)

Author:

stoecker

Message:

see #8853 remove tabs, trailing spaces, windows line ends, strange characters

File:

• trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (modified) (2 diffs)

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

@@ -39 +39 @@
         if (targetLayer == null)
             return;
-        if (getEditLayer().isUploadDiscouraged() && targetLayer instanceof OsmDataLayer && !((OsmDataLayer)targetLayer).isUploadDiscouraged() 
+        if (getEditLayer().isUploadDiscouraged() && targetLayer instanceof OsmDataLayer && !((OsmDataLayer)targetLayer).isUploadDiscouraged()
                 && getEditLayer().data.getAllSelected().size() > 1) {
             if (warnMergingUploadDiscouragedObjects(targetLayer)) {
@@ -68 +68 @@
         setEnabled(selection != null && !selection.isEmpty());
     }
-    
+
     /**
      * returns true if the user wants to cancel, false if they want to continue