Index: trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 16441) +++ trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 16442) @@ -116,5 +116,5 @@ 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,5 +150,5 @@ fixNodes.addAll(inside); - fixNodes.addAll(collectNodesWithExternReferers(ways)); + fixNodes.addAll(collectNodesWithExternReferrers(ways)); nodes = collectNodesAnticlockwise(ways); if (nodes.size() < 4) { @@ -246,5 +246,5 @@ * @return List of nodes with more than one referrer */ - private static List collectNodesWithExternReferers(List ways) { + private static List collectNodesWithExternReferrers(List ways) { return ways.stream().flatMap(w -> w.getNodes().stream()).filter(n -> n.getReferrers().size() > 1).collect(Collectors.toList()); } Index: trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 16441) +++ trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 16442) @@ -204,5 +204,5 @@ 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 involvedWays; @@ -266,17 +266,17 @@ } Collection cmds = new ArrayList<>(nodes.size()); - List referers = new ArrayList<>(ways.size()); + List 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.")); Index: trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 16441) +++ trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 16442) @@ -82,5 +82,5 @@ * * @param primitive 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) * */ @@ -93,7 +93,7 @@ * 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 <= 0 @@ -199,7 +199,7 @@ * *
    - *
  • if this reader reads referers for a {@link org.openstreetmap.josm.data.osm.Node}, referring ways are always + *
  • 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.
    • - *
  • if this reader reads referers for an {@link Way} or a {@link Relation}, referring relations + *
  • 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.
    • *
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 16441) +++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 16442) @@ -242,6 +242,6 @@ assertNotNull(w); - DataSet referers = new OsmServerBackreferenceReader(n).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); - printNumberOfPrimitives(referers); + DataSet referrers = new OsmServerBackreferenceReader(n).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); + printNumberOfPrimitives(referrers); Set expectedNodeIds = new HashSet<>(); @@ -260,19 +260,19 @@ } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - assertEquals(expectedWayIds.size(), referers.getWays().size()); - assertEquals(expectedRelationIds.size(), referers.getRelations().size()); - - for (Node node : referers.getNodes()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + assertEquals(expectedWayIds.size(), referrers.getWays().size()); + assertEquals(expectedRelationIds.size(), referrers.getRelations().size()); + + for (Node node : referrers.getNodes()) { assertTrue(expectedNodeIds.contains(node.getId())); assertFalse(node.isIncomplete()); } - for (Way way : referers.getWays()) { + for (Way way : referrers.getWays()) { assertTrue(expectedWayIds.contains(way.getId())); assertEquals(n.getReferrers().contains(way), !way.isIncomplete()); } - for (Relation relation : referers.getRelations()) { + for (Relation relation : referrers.getRelations()) { assertTrue(expectedRelationIds.contains(relation.getId())); assertFalse(relation.isIncomplete()); @@ -280,8 +280,8 @@ } - private void printNumberOfPrimitives(DataSet referers) { - System.out.println("#nodes=" + referers.getNodes().size() + - " #ways=" + referers.getWays().size() + - " #relations=" + referers.getRelations().size()); + private void printNumberOfPrimitives(DataSet referrers) { + System.out.println("#nodes=" + referrers.getNodes().size() + + " #ways=" + referrers.getWays().size() + + " #relations=" + referrers.getRelations().size()); } @@ -296,6 +296,6 @@ assertNotNull(n); - DataSet referers = new OsmServerBackreferenceReader(n).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); - printNumberOfPrimitives(referers); + DataSet referrers = new OsmServerBackreferenceReader(n).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); + printNumberOfPrimitives(referrers); Set expectedNodeIds = new HashSet<>(); @@ -313,19 +313,19 @@ } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - assertEquals(expectedWayIds.size(), referers.getWays().size()); - assertEquals(expectedRelationIds.size(), referers.getRelations().size()); - - for (Node node : referers.getNodes()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + assertEquals(expectedWayIds.size(), referrers.getWays().size()); + assertEquals(expectedRelationIds.size(), referrers.getRelations().size()); + + for (Node node : referrers.getNodes()) { assertTrue(expectedNodeIds.contains(node.getId())); assertFalse(node.isIncomplete()); } - for (Way way : referers.getWays()) { + for (Way way : referrers.getWays()) { assertTrue(expectedWayIds.contains(way.getId())); assertFalse(way.isIncomplete()); } - for (Relation relation : referers.getRelations()) { + for (Relation relation : referrers.getRelations()) { assertTrue(expectedRelationIds.contains(relation.getId())); assertFalse(relation.isIncomplete()); @@ -345,6 +345,6 @@ // - DataSet referers = new OsmServerBackreferenceReader(w).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); - printNumberOfPrimitives(referers); + DataSet referrers = new OsmServerBackreferenceReader(w).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); + printNumberOfPrimitives(referrers); Set expectedNodeIds = new HashSet<>(); @@ -360,17 +360,17 @@ } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - assertEquals(expectedWayIds.size(), referers.getWays().size()); - assertEquals(expectedRelationIds.size(), referers.getRelations().size()); - - for (Way w1 : referers.getWays()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + assertEquals(expectedWayIds.size(), referrers.getWays().size()); + assertEquals(expectedRelationIds.size(), referrers.getRelations().size()); + + for (Way w1 : referrers.getWays()) { assertTrue(w1.isIncomplete()); } - assertEquals(2, referers.getRelations().size()); // two relations referring to w - - Relation r = lookupRelation(referers, 0); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 1); + assertEquals(2, referrers.getRelations().size()); // two relations referring to w + + Relation r = lookupRelation(referrers, 0); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 1); assertFalse(r.isIncomplete()); } @@ -388,12 +388,12 @@ // - DataSet referers = new OsmServerBackreferenceReader(w).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(6, referers.getWays().size()); // 6 ways referred by two relations - for (Way w1 : referers.getWays()) { + DataSet referrers = new OsmServerBackreferenceReader(w).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); + assertEquals(6, referrers.getWays().size()); // 6 ways referred by two relations + for (Way w1 : referrers.getWays()) { assertFalse(w1.isIncomplete()); } - assertEquals(2, referers.getRelations().size()); // two relations referring to + assertEquals(2, referrers.getRelations().size()); // two relations referring to Set expectedNodeIds = new HashSet<>(); - for (Way way : referers.getWays()) { + for (Way way : referrers.getWays()) { Way orig = (Way) ds.getPrimitiveById(way); for (Node n : orig.getNodes()) { @@ -401,13 +401,13 @@ } } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - for (Node n : referers.getNodes()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + for (Node n : referrers.getNodes()) { assertTrue(expectedNodeIds.contains(n.getId())); } - Relation r = lookupRelation(referers, 0); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 1); + Relation r = lookupRelation(referrers, 0); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 1); assertFalse(r.isIncomplete()); } @@ -426,26 +426,26 @@ // - DataSet referers = new OsmServerBackreferenceReader(r).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); - printNumberOfPrimitives(referers); + DataSet referrers = new OsmServerBackreferenceReader(r).setReadFull(false).parseOsm(NullProgressMonitor.INSTANCE); + printNumberOfPrimitives(referrers); Set referringRelationsIds = new HashSet<>(); - Relation r6 = lookupRelation(referers, 6); + Relation r6 = lookupRelation(referrers, 6); assertNotNull(r6); assertFalse(r6.isIncomplete()); referringRelationsIds.add(r6.getId()); - Relation r7 = lookupRelation(referers, 7); + Relation r7 = lookupRelation(referrers, 7); assertNotNull(r7); assertFalse(r7.isIncomplete()); referringRelationsIds.add(r7.getId()); - Relation r8 = lookupRelation(referers, 8); + Relation r8 = lookupRelation(referrers, 8); assertNotNull(r8); assertFalse(r8.isIncomplete()); referringRelationsIds.add(r8.getId()); - Relation r9 = lookupRelation(referers, 9); + Relation r9 = lookupRelation(referrers, 9); assertNotNull(r9); assertFalse(r9.isIncomplete()); referringRelationsIds.add(r9.getId()); - for (Relation r1 : referers.getRelations()) { + for (Relation r1 : referrers.getRelations()) { if (!referringRelationsIds.contains(r1.getId())) { assertTrue(r1.isIncomplete()); @@ -478,6 +478,6 @@ } - assertEquals(expectedWayIds.size(), referers.getWays().size()); - for (Way w1 : referers.getWays()) { + assertEquals(expectedWayIds.size(), referrers.getWays().size()); + for (Way w1 : referrers.getWays()) { assertTrue(expectedWayIds.contains(w1.getId())); assertTrue(w1.isIncomplete()); @@ -491,5 +491,5 @@ } } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); } @@ -544,16 +544,16 @@ // - DataSet referers = new OsmServerBackreferenceReader(r).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); - - r = lookupRelation(referers, 6); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 7); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 8); - assertNotNull(r); - assertFalse(r.isIncomplete()); - r = lookupRelation(referers, 9); + DataSet referrers = new OsmServerBackreferenceReader(r).setReadFull(true).parseOsm(NullProgressMonitor.INSTANCE); + + r = lookupRelation(referrers, 6); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 7); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 8); + assertNotNull(r); + assertFalse(r.isIncomplete()); + r = lookupRelation(referrers, 9); assertNotNull(r); assertFalse(r.isIncomplete()); @@ -561,5 +561,5 @@ // all relations are fully loaded // - for (Relation r1 : referers.getRelations()) { + for (Relation r1 : referrers.getRelations()) { assertFalse(r1.isIncomplete()); } @@ -590,5 +590,5 @@ } for (long id : expectedWayIds) { - Way w = (Way) referers.getPrimitiveById(id, OsmPrimitiveType.WAY); + Way w = (Way) referrers.getPrimitiveById(id, OsmPrimitiveType.WAY); assertNotNull(w); assertFalse(w.isIncomplete()); @@ -601,6 +601,6 @@ } - assertEquals(expectedNodeIds.size(), referers.getNodes().size()); - for (Node n : referers.getNodes()) { + assertEquals(expectedNodeIds.size(), referrers.getNodes().size()); + for (Node n : referrers.getNodes()) { assertTrue(expectedNodeIds.contains(n.getId())); }