Changeset 2512 in josm for trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

Timestamp:

2009-11-24T10:45:04+01:00 (16 years ago)

Author:

stoecker

Message:

i18n updated, fixed files to reduce problems when applying patches, fix #4017

File:

• trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (5 diffs)

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

@@ -40 +40 @@
 /**
  * Merges a collection of nodes into one node.
- * 
+ *
  */
 public class MergeNodesAction extends JosmAction {
@@ -77 +77 @@
      * The last selected node will become the target node the remaining
      * nodes are merged to.
-     * 
+     *
      * @param candidates the collection of candidate nodes
      * @return the selected target node
@@ -92 +92 @@
      * Merges the nodes in <code>node</code> onto one of the nodes. Uses the dataset
      * managed by <code>layer</code> as reference.
-     * 
+     *
      * @param layer the reference data layer. Must not be null.
      * @param nodes the collection of nodes. Ignored if null.
@@ -98 +98 @@
      * @throws IllegalArgumentException thrown if layer is null
      * @throws IllegalArgumentException thrown if targetNode is null
-     * 
+     *
      */
     public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetNode) throws IllegalArgumentException{
@@ -115 +115 @@
     /**
      * Fixes the parent ways referring to one of the nodes.
-     * 
+     *
      * Replies null, if the ways could not be fixed, i.e. because a way would have to be deleted
      * which is referred to by a relation.
-     * 
+     *
      * @param backreferences the backreference data set
      * @param nodesToDelete the collection of nodes to be deleted