Changeset 16442 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-05-17T15:57:55+02:00 (4 years ago)

Author:

simon04

Message:

Fix typo "referrer"

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInCircleAction.java (modified) (3 diffs)
• actions/AlignInLineAction.java (modified) (2 diffs)
• io/OsmServerBackreferenceReader.java (modified) (3 diffs)

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

@@ -116 +116 @@
             fixNodes.add(w.lastNode());
             fixNodes.addAll(nodes);
-            fixNodes.addAll(collectNodesWithExternReferers(ways));
+            fixNodes.addAll(collectNodesWithExternReferrers(ways));
             // Temporary closed way used to reorder nodes
             Way closedWay = new Way(w);
@@ -150 +150 @@
 
             fixNodes.addAll(inside);
-            fixNodes.addAll(collectNodesWithExternReferers(ways));
+            fixNodes.addAll(collectNodesWithExternReferrers(ways));
             nodes = collectNodesAnticlockwise(ways);
             if (nodes.size() < 4) {
@@ -246 +246 @@
      * @return List of nodes with more than one referrer
      */
-    private static List<Node> collectNodesWithExternReferers(List<Way> ways) {
+    private static List<Node> collectNodesWithExternReferrers(List<Way> ways) {
         return ways.stream().flatMap(w -> w.getNodes().stream()).filter(n -> n.getReferrers().size() > 1).collect(Collectors.toList());
     }

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

@@ -204 +204 @@
             return alignMultiWay(selectedWays);
         } else if (selectedNodes.size() == 1) {
-            // Only 1 node selected -> align this node relative to referers way
+            // Only 1 node selected -> align this node relative to referrers way
             Node selectedNode = selectedNodes.get(0);
             List<Way> involvedWays;
@@ -266 +266 @@
         }
         Collection<Command> cmds = new ArrayList<>(nodes.size());
-        List<Way> referers = new ArrayList<>(ways.size());
+        List<Way> referrers = new ArrayList<>(ways.size());
         for (Node n: nodes) {
-            referers.clear();
+            referrers.clear();
             for (OsmPrimitive o: n.getReferrers()) {
                 if (ways.contains(o))
-                    referers.add((Way) o);
-            }
-            if (referers.size() == 1) {
-                Way way = referers.get(0);
+                    referrers.add((Way) o);
+            }
+            if (referrers.size() == 1) {
+                Way way = referrers.get(0);
                 if (way.isFirstLastNode(n)) continue;
                 cmds.add(lines.get(way).projectionCommand(n));
-            } else if (referers.size() == 2) {
-                cmds.add(lines.get(referers.get(0)).intersectionCommand(n, lines.get(referers.get(1))));
+            } else if (referrers.size() == 2) {
+                cmds.add(lines.get(referrers.get(0)).intersectionCommand(n, lines.get(referrers.get(1))));
             } else
                 throw new InvalidSelection(tr("Intersection of three or more ways can not be solved. Abort."));

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -82 +82 @@
      *
      * @param primitive the primitive
-     * @param readFull <code>true</code>, if referers should be read fully (i.e. including their immediate children)
+     * @param readFull <code>true</code>, if referrers should be read fully (i.e. including their immediate children)
      *
      */
@@ -93 +93 @@
      * Creates a back reference reader for given primitive id
      *
-     * @param id the id of the primitive whose referers are to be read
+     * @param id the id of the primitive whose referrers are to be read
      * @param type the type of the primitive
-     * @param readFull true, if referers should be read fully (i.e. including their immediate children)
+     * @param readFull true, if referrers should be read fully (i.e. including their immediate children)
      *
      * @throws IllegalArgumentException if id &lt;= 0
@@ -199 +199 @@
      *
      * <ul>
-     *   <li>if this reader reads referers for a {@link org.openstreetmap.josm.data.osm.Node}, referring ways are always
+     *   <li>if this reader reads referrers for a {@link org.openstreetmap.josm.data.osm.Node}, referring ways are always
      *     read fully, unless {@link #setAllowIncompleteParentWays(boolean)} is set to true.</li>
-     *   <li>if this reader reads referers for an {@link Way} or a {@link Relation}, referring relations
+     *   <li>if this reader reads referrers for an {@link Way} or a {@link Relation}, referring relations
      *    are only read fully if {@link #setReadFull(boolean)} is set to true.</li>
      * </ul>