Changeset 11747 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2017-03-19T15:55:27+01:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Bounds.java
r11587 r11747 186 186 * @throws IllegalArgumentException if coords does not contain 4 double values 187 187 */ 188 public Bounds(double 188 public Bounds(double... coords) { 189 189 this(coords, true); 190 190 } -
trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
r11288 r11747 344 344 * over all routes 345 345 */ 346 public Iterable<Collection<WayPoint>> getLinesIterable(final boolean 346 public Iterable<Collection<WayPoint>> getLinesIterable(final boolean... trackVisibility) { 347 347 return () -> new LinesIterator(this, trackVisibility); 348 348 } … … 397 397 * included in the iteration. Can be null, then all tracks are included. 398 398 */ 399 public LinesIterator(GpxData data, boolean 399 public LinesIterator(GpxData data, boolean... trackVisibility) { 400 400 itTracks = data.tracks.iterator(); 401 401 idxTracks = -1; -
trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
r11453 r11747 118 118 * @throws XMLStreamException See {@link XMLStreamReader} 119 119 */ 120 public static boolean moveReaderToTag(XMLStreamReader reader, QName 120 public static boolean moveReaderToTag(XMLStreamReader reader, QName... tags) throws XMLStreamException { 121 121 QName stopTag = reader.getName(); 122 122 int currentLevel = 0; -
trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
r11608 r11747 731 731 * @since 11587 732 732 */ 733 public boolean hasKey(String 733 public boolean hasKey(String... keys) { 734 734 return keys != null && Arrays.stream(keys).anyMatch(this::hasKey); 735 735 } -
trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java
r11553 r11747 50 50 * @since 6305 51 51 */ 52 public boolean hasRole(String 52 public boolean hasRole(String... roles) { 53 53 return Arrays.asList(roles).contains(role); 54 54 } -
trunk/src/org/openstreetmap/josm/data/osm/TagMap.java
r11553 r11747 50 50 * @param tags The tags array. It is never changed but should also not be changed by you. 51 51 */ 52 TagEntryInterator(String 52 TagEntryInterator(String... tags) { 53 53 super(); 54 54 this.tags = tags; … … 89 89 * @param tags The tags array. It is never changed but should also not be changed by you. 90 90 */ 91 TagEntrySet(String 91 TagEntrySet(String... tags) { 92 92 super(); 93 93 this.tags = tags; … … 142 142 * @param tags The tags array. It is not modified by this map. 143 143 */ 144 public TagMap(String 144 public TagMap(String... tags) { 145 145 if (tags == null || tags.length == 0) { 146 146 this.tags = EMPTY_TAGS; -
trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
r10748 r11747 322 322 * @return The corresponding latitude and longitude in degrees 323 323 */ 324 public LatLon cart2LatLon(double 324 public LatLon cart2LatLon(double... xyz) { 325 325 return cart2LatLon(xyz, 1e-11); 326 326 } -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
r10680 r11747 167 167 * @return an array of top level Sub Grids with lower level Sub Grids set. 168 168 */ 169 private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid 169 private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid... subGrid) { 170 170 int topLevelCount = 0; 171 171 Map<String, List<NTV2SubGrid>> subGridMap = new HashMap<>(); -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
r11553 r11747 281 281 * @param subGrid subgrids 282 282 */ 283 public void setSubGridArray(NTV2SubGrid 283 public void setSubGridArray(NTV2SubGrid... subGrid) { 284 284 this.subGrid = Utils.copyArray(subGrid); 285 285 } -
trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
r11586 r11747 1925 1925 * @since 1.5.0 1926 1926 */ 1927 public static synchronized void updateTLDOverride(ArrayType table, String 1927 public static synchronized void updateTLDOverride(ArrayType table, String... tlds) { 1928 1928 if (inUse) { 1929 1929 throw new IllegalStateException("Can only invoke this method before calling getInstance"); -
trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java
r10680 r11747 102 102 * validate against 103 103 */ 104 public RegexValidator(String 104 public RegexValidator(String... regexs) { 105 105 this(regexs, true); 106 106 } -
trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
r11452 r11747 218 218 * ignore the contents of schemes. 219 219 */ 220 public UrlValidator(String 220 public UrlValidator(String... schemes) { 221 221 this(schemes, 0L); 222 222 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
r11129 r11747 78 78 } 79 79 80 private static boolean isKeyValid3Parts(String 80 private static boolean isKeyValid3Parts(String... parts) { 81 81 return parts.length == 3 && isRestrictionType(parts[0]) && isTransportationMode(parts[1]) && isDirection(parts[2]); 82 82 } 83 83 84 private static boolean isKeyValid2Parts(String 84 private static boolean isKeyValid2Parts(String... parts) { 85 85 return parts.length == 2 && ((isRestrictionType(parts[0]) && (isTransportationMode(parts[1]) || isDirection(parts[1]))) 86 86 || (isTransportationMode(parts[0]) && isDirection(parts[1]))); 87 87 } 88 88 89 private static boolean isKeyValid1Part(String 89 private static boolean isKeyValid1Part(String... parts) { 90 90 return parts.length == 1 && (isRestrictionType(parts[0]) || isTransportationMode(parts[0])); 91 91 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
r11129 r11747 253 253 private final String replacement; 254 254 255 public SynonymRule(String replacement, String 255 public SynonymRule(String replacement, String... words) { 256 256 this.replacement = replacement.toLowerCase(Locale.ENGLISH); 257 257 this.words = words;
Note:
See TracChangeset
for help on using the changeset viewer.