Context Navigation

actions

Timestamp:

2010-09-15T08:21:16+02:00 (14 years ago)

Author:

stoecker

Message:

fix array preferences

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

-              r3217
+              r3530
  * The "surviving" node will be the one with the lowest positive id.
  * (I.e. it was uploaded to the server and is the oldest one.)
+ *
+ *
  * However we use the location of the node that was selected *last*.
  * The "surviving" node will be moved to that location if it is
 …
         return targetNode;
+    }
     /**
      * Find which node to merge into (i.e. which one will be left)
 …
         return targetNode;
+    }
     /**
 …
         return mergeNodes(layer, nodes, targetNode, targetNode);
+    }
     /**
      * Merges the nodes in <code>nodes</code> onto one of the nodes. Uses the dataset

-              r3501
+              r3530
+            }
             msg.append("</ul>");
             HelpAwareOptionPane.showMessageDialogInEDT(
                     Main.parent,
 …
                                 public void run() {
                                     JOptionPane.showMessageDialog(Main.parent, tr(
                                             "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>",
+                                            "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>",
                                             f.getAbsolutePath()), tr("Open file"), JOptionPane.ERROR_MESSAGE);
+                                }
                             });
                             // TODO when changing to Java 6: Don't cancel the
+                            // TODO when changing to Java 6: Don't cancel the
                             // task here but use different modality. (Currently 2 dialogs
                             // would block each other.)

-              r3083
+              r3530
      * Replies true if <code>node</code> is a required node which can't be removed
      * in order to simplify the way.
+     *
+     *
      * @param way the way to be simplified
      * @param node the node to check
 …
     /**
      * Simplifies a way
+     *
+     *
      * @param w the way to simplify
      */
 …
      * Builds the simplified list of nodes for a way segment given by a lower index <code>from</code>
      * and an upper index <code>to</code>
+     *
+     *
      * @param wnew the way to simplify
      * @param from the lower index

-              r2990
+              r3530
      * Makes sure primitives in <code>apiData</code> don't participate in conflicts and
      * runs the installed {@see UploadHook}s.
+     *
+     *
      * @param layer the source layer of the data to be uploaded
      * @param apiData the data to be uploaded
 …
     /**
      * Uploads data to the OSM API.
+     *
+     *
      * @param layer the source layer for the data to upload
      * @param apiData the primitives to be added, updated, or deleted

r3262	r3530
164	164	double xoff = en3.east() - base.east();
165	165	double yoff = en3.north() - base.north();
166
	166
167	167	newN1en = new EastNorth(en1.getX() + xoff, en1.getY() + yoff);
168	168	newN2en = new EastNorth(en2.getX() + xoff, en2.getY() + yoff);

Note: See TracChangeset for help on using the changeset viewer.