();
-
+
public Shape(String asString, String separator) throws IllegalArgumentException {
CheckParameterUtil.ensureParameterNotNull(asString, "asString");
@@ -49,5 +49,5 @@
return coords;
}
-
+
public boolean contains(LatLon latlon) {
if (latlon == null)
@@ -65,5 +65,5 @@
double lat, lon;
-
+
try {
lat = Double.parseDouble(sLat);
@@ -81,5 +81,5 @@
throw new IllegalArgumentException(MessageFormat.format("Illegal double value ''{0}''", sLon));
}
-
+
coords.add(new Coordinate(LatLon.roundToOsmPrecision(lat), LatLon.roundToOsmPrecision(lon)));
}
Index: trunk/src/org/openstreetmap/josm/data/imagery/types/EntryType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/types/EntryType.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/imagery/types/EntryType.java (revision 6069)
@@ -21,7 +21,7 @@
/**
* Java class for entry complex type.
- *
+ *
*
The following schema fragment specifies the expected content contained within this class.
- *
+ *
*
* <complexType name="entry">
@@ -40,6 +40,6 @@
* </complexType>
*
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@@ -70,5 +70,5 @@
/**
* Gets the value of the pixelPerDegree property.
- *
+ *
*/
public double getPixelPerDegree() {
@@ -78,5 +78,5 @@
/**
* Sets the value of the pixelPerDegree property.
- *
+ *
*/
public void setPixelPerDegree(double value) {
@@ -86,5 +86,5 @@
/**
* Gets the value of the east property.
- *
+ *
*/
public double getEast() {
@@ -94,5 +94,5 @@
/**
* Sets the value of the east property.
- *
+ *
*/
public void setEast(double value) {
@@ -102,5 +102,5 @@
/**
* Gets the value of the north property.
- *
+ *
*/
public double getNorth() {
@@ -110,5 +110,5 @@
/**
* Sets the value of the north property.
- *
+ *
*/
public void setNorth(double value) {
@@ -118,9 +118,9 @@
/**
* Gets the value of the lastUsed property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public Calendar getLastUsed() {
@@ -130,9 +130,9 @@
/**
* Sets the value of the lastUsed property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setLastUsed(Calendar value) {
@@ -142,9 +142,9 @@
/**
* Gets the value of the lastModified property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public Calendar getLastModified() {
@@ -154,9 +154,9 @@
/**
* Sets the value of the lastModified property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setLastModified(Calendar value) {
@@ -166,9 +166,9 @@
/**
* Gets the value of the filename property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getFilename() {
@@ -178,9 +178,9 @@
/**
* Sets the value of the filename property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setFilename(String value) {
Index: trunk/src/org/openstreetmap/josm/data/imagery/types/ObjectFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/types/ObjectFactory.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/imagery/types/ObjectFactory.java (revision 6069)
@@ -1,7 +1,7 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
-// See http://java.sun.com/xml/jaxb
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.09 at 07:33:18 PM CET
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// See http://java.sun.com/xml/jaxb
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.09 at 07:33:18 PM CET
//
@@ -13,16 +13,16 @@
/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.openstreetmap.josm.data.imagery.types package.
- * An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.openstreetmap.josm.data.imagery.types package.
+ *
An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
* provided in this class.
- *
+ *
*/
@XmlRegistry
@@ -32,5 +32,5 @@
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.openstreetmap.josm.data.imagery.types
- *
+ *
*/
public ObjectFactory() {
@@ -39,5 +39,5 @@
/**
* Create an instance of {@link WmsCacheType }
- *
+ *
*/
public WmsCacheType createWmsCacheType() {
@@ -47,5 +47,5 @@
/**
* Create an instance of {@link ProjectionType }
- *
+ *
*/
public ProjectionType createProjectionType() {
@@ -55,5 +55,5 @@
/**
* Create an instance of {@link EntryType }
- *
+ *
*/
public EntryType createEntryType() {
Index: trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java (revision 6069)
@@ -1,7 +1,7 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
-// See http://java.sun.com/xml/jaxb
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.09 at 07:33:18 PM CET
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// See http://java.sun.com/xml/jaxb
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.09 at 07:33:18 PM CET
//
@@ -19,7 +19,7 @@
/**
*
Java class for projection complex type.
- *
+ *
*
The following schema fragment specifies the expected content contained within this class.
- *
+ *
*
* <complexType name="projection">
@@ -35,6 +35,6 @@
* </complexType>
*
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@@ -52,5 +52,5 @@
/**
* Gets the value of the entry property.
- *
+ *
*
* This accessor method returns a reference to the live list,
@@ -58,5 +58,5 @@
* returned list will be present inside the JAXB object.
* This is why there is not a set method for the entry property.
- *
+ *
*
* For example, to add a new item, do as follows:
@@ -64,11 +64,11 @@
* getEntry().add(newItem);
*
- *
- *
+ *
+ *
*
* Objects of the following type(s) are allowed in the list
* {@link EntryType }
- *
- *
+ *
+ *
*/
public List getEntry() {
@@ -81,9 +81,9 @@
/**
* Gets the value of the name property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getName() {
@@ -93,9 +93,9 @@
/**
* Sets the value of the name property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setName(String value) {
@@ -105,9 +105,9 @@
/**
* Gets the value of the cacheDirectory property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getCacheDirectory() {
@@ -117,9 +117,9 @@
/**
* Sets the value of the cacheDirectory property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setCacheDirectory(String value) {
Index: trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java (revision 6069)
@@ -1,7 +1,7 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
-// See http://java.sun.com/xml/jaxb
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.09 at 07:33:18 PM CET
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// See http://java.sun.com/xml/jaxb
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.09 at 07:33:18 PM CET
//
@@ -20,7 +20,7 @@
/**
* Java class for anonymous complex type.
- *
+ *
*
The following schema fragment specifies the expected content contained within this class.
- *
+ *
*
* <complexType>
@@ -36,6 +36,6 @@
* </complexType>
*
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@@ -54,5 +54,5 @@
/**
* Gets the value of the projection property.
- *
+ *
*
* This accessor method returns a reference to the live list,
@@ -60,5 +60,5 @@
* returned list will be present inside the JAXB object.
* This is why there is not a set method for the projection property.
- *
+ *
*
* For example, to add a new item, do as follows:
@@ -66,11 +66,11 @@
* getProjection().add(newItem);
*
- *
- *
+ *
+ *
*
* Objects of the following type(s) are allowed in the list
* {@link ProjectionType }
- *
- *
+ *
+ *
*/
public List getProjection() {
@@ -83,5 +83,5 @@
/**
* Gets the value of the tileSize property.
- *
+ *
*/
public int getTileSize() {
@@ -91,5 +91,5 @@
/**
* Sets the value of the tileSize property.
- *
+ *
*/
public void setTileSize(int value) {
@@ -99,5 +99,5 @@
/**
* Gets the value of the totalFileSize property.
- *
+ *
*/
public int getTotalFileSize() {
@@ -107,5 +107,5 @@
/**
* Sets the value of the totalFileSize property.
- *
+ *
*/
public void setTotalFileSize(int value) {
Index: trunk/src/org/openstreetmap/josm/data/imagery/types/package-info.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/types/package-info.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/imagery/types/package-info.java (revision 6069)
@@ -1,7 +1,7 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
-// See http://java.sun.com/xml/jaxb
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.09 at 07:33:18 PM CET
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
+// See http://java.sun.com/xml/jaxb
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.09 at 07:33:18 PM CET
//
Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 6069)
@@ -64,5 +64,5 @@
* at the given API url. URL parameters are only set if the URL equals {@link OsmApi#DEFAULT_API_URL}
* or references the domain "dev.openstreetmap.org", otherwise they may be null.
- *
+ *
* @param apiUrl The API URL for which the OAuth default parameters are created. If null or empty, the default OSM API url is used.
* @return a set of default parameters for the given {@code apiUrl}
@@ -133,5 +133,5 @@
/**
* Constructs a new, unitialized, {@code OAuthParameters}.
- *
+ *
* @see #createDefault
* @see #createFromPreferences
@@ -162,5 +162,5 @@
return consumerKey;
}
-
+
/**
* Sets the consumer key.
@@ -170,7 +170,7 @@
this.consumerKey = consumerKey;
}
-
- /**
- * Gets the consumer secret.
+
+ /**
+ * Gets the consumer secret.
* @return The consumer secret
*/
@@ -178,5 +178,5 @@
return consumerSecret;
}
-
+
/**
* Sets the consumer secret.
@@ -186,5 +186,5 @@
this.consumerSecret = consumerSecret;
}
-
+
/**
* Gets the request token URL.
@@ -194,5 +194,5 @@
return requestTokenUrl;
}
-
+
/**
* Sets the request token URL.
@@ -202,5 +202,5 @@
this.requestTokenUrl = requestTokenUrl;
}
-
+
/**
* Gets the access token URL.
@@ -210,5 +210,5 @@
return accessTokenUrl;
}
-
+
/**
* Sets the access token URL.
@@ -218,5 +218,5 @@
this.accessTokenUrl = accessTokenUrl;
}
-
+
/**
* Gets the authorise URL.
@@ -226,5 +226,5 @@
return authoriseUrl;
}
-
+
/**
* Sets the authorise URL.
Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 6069)
@@ -658,7 +658,7 @@
public boolean hasSameTags(OsmPrimitive other) {
// We cannot directly use Arrays.equals(keys, other.keys) as keys is not ordered by key
- // but we can at least check if both arrays are null or of the same size before creating
+ // but we can at least check if both arrays are null or of the same size before creating
// and comparing the key maps (costly operation, see #7159)
- return (keys == null && other.keys == null)
+ return (keys == null && other.keys == null)
|| (keys != null && other.keys != null && keys.length == other.keys.length && (keys.length == 0 || getKeys().equals(other.getKeys())));
}
Index: trunk/src/org/openstreetmap/josm/data/osm/BBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/BBox.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/BBox.java (revision 6069)
@@ -175,5 +175,5 @@
return new LatLon(ymin, xmax);
}
-
+
public LatLon getCenter() {
return new LatLon(ymin + (ymax-ymin)/2.0, xmin + (xmax-xmin)/2.0);
Index: trunk/src/org/openstreetmap/josm/data/osm/Changeset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (revision 6069)
@@ -17,8 +17,8 @@
*/
public final class Changeset implements Tagged {
-
+
/** The maximum changeset comment text length allowed by API 0.6 **/
public static final int MAX_COMMENT_LENGTH = 255;
-
+
/** the changeset id */
private int id;
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 6069)
@@ -135,5 +135,5 @@
return targetDataSet.getPrimitiveById(targetId);
}
-
+
protected void addConflict(Conflict c) {
c.setMergedMap(mergedMap);
@@ -221,5 +221,5 @@
}
}
-
+
private final void resetPrimitive(OsmPrimitive osm) {
if (osm instanceof Way) {
Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 6069)
@@ -63,5 +63,5 @@
/**
* Replies the projected east/north coordinates.
- *
+ *
* Uses the {@link Main#getProjection() global projection} to project the lan/lon-coordinates.
* Internally caches the projected coordinates.
@@ -69,10 +69,10 @@
* Caveat: doesn't listen to projection changes. Clients must
* {@link #invalidateEastNorthCache() invalidate the internal cache}.
- *
+ *
* Replies {@code null} if this node doesn't know lat/lon-coordinates, i.e. because it is an incomplete node.
- *
+ *
* @return the east north coordinates or {@code null}
* @see #invalidateEastNorthCache()
- *
+ *
*/
@Override
@@ -305,5 +305,5 @@
public void updatePosition() {
}
-
+
@Override
public boolean isDrawable() {
@@ -314,7 +314,7 @@
/**
* Check whether this node connects 2 ways.
- *
+ *
* @return true if isReferredByWays(2) returns true
- * @see #isReferredByWays(int)
+ * @see #isReferredByWays(int)
*/
public boolean isConnectionNode() {
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6069)
@@ -30,5 +30,5 @@
/**
* The base class for OSM objects ({@link Node}, {@link Way}, {@link Relation}).
- *
+ *
* It can be created, deleted and uploaded to the OSM-Server.
*
@@ -620,5 +620,5 @@
private static volatile Collection uninteresting = null;
private static volatile Collection discardable = null;
-
+
/**
* Returns a list of "uninteresting" keys that do not make an object
@@ -658,5 +658,5 @@
return discardable;
}
-
+
/**
* Returns a list of "work in progress" keys that do not make an object
@@ -762,5 +762,5 @@
return (flags & FLAG_TAGGED) != 0;
}
-
+
/**
* Determines if this object is considered "annotated". To be "annotated", an object
Index: trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (revision 6069)
@@ -21,9 +21,9 @@
return memberId;
}
-
+
public String getRole() {
return role;
}
-
+
public OsmPrimitiveType getMemberType() {
return memberType;
Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 6069)
@@ -105,5 +105,5 @@
return nodes.length;
}
-
+
/**
* Replies the real number of nodes in this way (full number of nodes minus one if this way is closed)
@@ -111,5 +111,5 @@
* @return the real number of nodes in this way.
* @since 5847
- *
+ *
* @see #getNodesCount()
* @see #isClosed()
@@ -183,7 +183,7 @@
/**
- * Replies the ordered {@link List} of chunks of this way. Each chunk is replied as a {@link Pair} of {@link Node nodes}.
- * @param sort If true, the nodes of each pair are sorted as defined by {@link Pair#sort}.
- * If false, Pair.a and Pair.b are in the way order (i.e for a given Pair(n), Pair(n-1).b == Pair(n).a, Pair(n).b == Pair(n+1).a, etc.)
+ * Replies the ordered {@link List} of chunks of this way. Each chunk is replied as a {@link Pair} of {@link Node nodes}.
+ * @param sort If true, the nodes of each pair are sorted as defined by {@link Pair#sort}.
+ * If false, Pair.a and Pair.b are in the way order (i.e for a given Pair(n), Pair(n-1).b == Pair(n).a, Pair(n).b == Pair(n+1).a, etc.)
* @return The ordered list of chunks of this way.
* @since 3348
@@ -494,5 +494,5 @@
return nodes.length >= 3 && nodes[nodes.length-1] == nodes[0];
}
-
+
/**
* Determines if this way denotes an area (closed way with at least three distinct nodes).
@@ -682,5 +682,5 @@
/**
* Tests if this way is a oneway.
- * @return {@code 1} if the way is a oneway,
+ * @return {@code 1} if the way is a oneway,
* {@code -1} if the way is a reversed oneway,
* {@code 0} otherwise.
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (revision 6069)
@@ -15,5 +15,5 @@
*/
public class HistoryNode extends HistoryOsmPrimitive {
-
+
/** the coordinates. May be null for deleted nodes */
private LatLon coords;
@@ -21,5 +21,5 @@
/**
* Constructs a new {@code HistoryNode}.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
@@ -38,5 +38,5 @@
* Constructs a new {@code HistoryNode} with a configurable checking of historic parameters.
* This is needed to build virtual HistoryNodes for modified nodes, which do not have a timestamp and a changeset id.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6069)
@@ -88,5 +88,5 @@
tags = new HashMap();
}
-
+
/**
* Constructs a new {@code HistoryOsmPrimitive} from an existing {@link OsmPrimitive}.
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 6069)
@@ -25,5 +25,5 @@
/**
* Constructs a new {@code HistoryWay}.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
@@ -41,5 +41,5 @@
* Constructs a new {@code HistoryWay} with a configurable checking of historic parameters.
* This is needed to build virtual HistoryWays for modified ways, which do not have a timestamp and a changeset id.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
@@ -58,5 +58,5 @@
/**
* Constructs a new {@code HistoryWay} with a given list of node ids.
- *
+ *
* @param id the id (> 0 required)
* @param version the version (> 0 required)
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java (revision 6069)
@@ -48,5 +48,5 @@
if (m.isNode()) visit(m.getNode());
}
-
+
/**
* Replies all nodes contained by the given primitives
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/PrimitiveVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/PrimitiveVisitor.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/PrimitiveVisitor.java (revision 6069)
@@ -11,5 +11,5 @@
*/
public interface PrimitiveVisitor {
-
+
/**
* Visiting call for points.
@@ -17,5 +17,5 @@
*/
void visit(INode n);
-
+
/**
* Visiting call for lines.
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 6069)
@@ -28,5 +28,5 @@
/** the map viewport - provides projection and hit detection functionality */
protected NavigatableComponent nc;
-
+
/** if true, the paint visitor shall render OSM objects such that they
* look inactive. Example: rendering of data in an inactive layer using light gray as color only. */
@@ -50,8 +50,8 @@
/** Preference: minimum space (displayed way length) to display segment numbers */
protected int segmentNumberSpace;
-
+
/**
* Creates an abstract paint visitor
- *
+ *
* @param g the graphics context. Must not be null.
* @param nc the map viewport. Must not be null.
@@ -68,5 +68,5 @@
this.isInactiveMode = isInactiveMode;
}
-
+
/**
* Draw the node as small rectangle with the given color.
@@ -80,5 +80,5 @@
* Draw an number of the order of the two consecutive nodes within the
* parents way
- *
+ *
* @param p1 First point of the way segment.
* @param p2 Second point of the way segment.
@@ -102,5 +102,5 @@
}
}
-
+
/**
* Draws virtual nodes.
@@ -134,5 +134,5 @@
g.draw(path);
} catch (ArrayIndexOutOfBoundsException e) {
- // Silently ignore any ArrayIndexOutOfBoundsException that may be raised
+ // Silently ignore any ArrayIndexOutOfBoundsException that may be raised
// if the way has changed while being rendered (fix #7979)
// TODO: proper solution ?
@@ -142,5 +142,5 @@
}
}
-
+
/**
* Reads the color definitions from preferences. This function is public, so that
@@ -154,5 +154,5 @@
this.highlightColor = PaintColors.HIGHLIGHT.get();
}
-
+
/**
* Reads all the settings from preferences. Calls the @{link #getColors}
@@ -167,5 +167,5 @@
getColors();
}
-
+
/**
* Checks if a way segemnt is large enough for additional information display.
@@ -181,5 +181,5 @@
return (xd+yd > space);
}
-
+
/**
* Checks if segment is visible in display.
@@ -196,5 +196,5 @@
return true;
}
-
+
/**
* Creates path for drawing virtual nodes for one way.
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 6069)
@@ -21,5 +21,5 @@
* MapRendererFactory manages a list of map renderer classes and associated
* meta data (display name, description).
- *
+ *
* Plugins can implement and supply their own map renderers.
* Sample code in a plugin
@@ -28,10 +28,10 @@
* // ....
* }
- *
+ *
* // to be called when the plugin is created
* MapRendererFactory factory = MapRendererFactory.getInstance();
* factory.register(MyMapRenderer.class, "My map renderer", "This is is a fast map renderer");
* factory.activate(MyMapRenderer.class);
- *
+ *
*
*
@@ -40,5 +40,5 @@
/** preference key for the renderer class name. Default: class name for {@link StyledMapRenderer}
- *
+ *
*/
static public final String PREF_KEY_RENDERER_CLASS_NAME = "mappaint.renderer-class-name";
@@ -161,5 +161,5 @@
* Replies true, if {@code Renderer} is already a registered map renderer
* class.
- *
+ *
* @param renderer the map renderer class. Must not be null.
* @return true, if {@code Renderer} is already a registered map renderer
@@ -177,5 +177,5 @@
/**
* Registers a map renderer class.
- *
+ *
* @param renderer the map renderer class. Must not be null.
* @param displayName the display name to be displayed in UIs (i.e. in the preference dialog)
@@ -201,7 +201,7 @@
* If the respective class is also the active renderer, the renderer is reset
* to the default renderer.
- *
+ *
* @param renderer the map renderer class. Must not be null.
- *
+ *
*/
public void unregister(Class renderer) {
@@ -225,9 +225,9 @@
*
* The renderer class must already be registered.
- *
+ *
* @param renderer the map renderer class. Must not be null.
* @throws IllegalArgumentException thrown if {@code renderer} is null
* @throws IllegalStateException thrown if {@code renderer} isn't registered yet
- *
+ *
*/
public void activate(Class renderer) throws IllegalArgumentException, IllegalStateException{
@@ -247,5 +247,5 @@
*
* @throws IllegalStateException thrown if the default renderer {@link StyledMapRenderer} isn't registered
- *
+ *
*/
public void activateDefault() throws IllegalStateException{
@@ -283,5 +283,5 @@
/**
* Replies the (unmodifiable) list of map renderer descriptors.
- *
+ *
* @return the descriptors
*/
@@ -293,10 +293,10 @@
* Replies true, if currently the wireframe map renderer is active. Otherwise,
* false.
- *
+ *
* There is a specific method for {@link WireframeMapRenderer} for legacy support.
* Until 03/2011 there were only two possible map renderers in JOSM: the wireframe
* renderer and the styled renderer. For the time being there are still UI elements
* (menu entries, etc.) which toggle between these two renderers only.
- *
+ *
* @return true, if currently the wireframe map renderer is active. Otherwise,
* false
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/Rendering.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/Rendering.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/Rendering.java (revision 6069)
@@ -11,5 +11,5 @@
/**
* Renders the OSM data in {@code data}
- *
+ *
* @param data the data set to be rendered
* @param renderVirtualNodes if true, renders virtual nodes. Otherwise, ignores them.
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 6069)
@@ -222,5 +222,5 @@
}
}
-
+
private static class StyleRecord implements Comparable {
final ElemStyle style;
@@ -310,5 +310,5 @@
private Color relationSelectedColor;
private Color highlightColorTransparent;
-
+
private static final int FLAG_NORMAL = 0;
private static final int FLAG_DISABLED = 1;
@@ -321,5 +321,5 @@
private Collection highlightWaySegments;
-
+
// highlight customization fields
private int highlightLineWidth;
@@ -327,5 +327,5 @@
private int widerHighlight;
private int highlightStep;
-
+
//flag that activate wider highlight mode
private boolean useWiderHighlight;
@@ -441,5 +441,5 @@
}
}
-
+
protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, TextElement text) {
@@ -514,5 +514,5 @@
}
}
-
+
public void drawArea(Relation r, Color color, MapImage fillImage, TextElement text) {
Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
@@ -529,5 +529,5 @@
}
}
-
+
public void drawArea(Way w, Color color, MapImage fillImage, TextElement text) {
drawArea(w, getPath(w), color, fillImage, text);
@@ -732,5 +732,5 @@
}
}
-
+
public void drawNodeIcon(Node n, Image img, float alpha, boolean selected, boolean member) {
Point p = nc.getPoint(n);
@@ -760,5 +760,5 @@
}
}
-
+
public void drawNodeSymbol(Node n, Symbol s, Color fillColor, Color strokeColor) {
Point p = nc.getPoint(n);
@@ -850,5 +850,5 @@
StyledMapRenderer.this.drawOrderNumber(p1, p2, orderNumber, clr);
}
-
+
/**
* highlights a given GeneralPath using the settings from BasicStroke to match the line's
@@ -883,5 +883,5 @@
}
}
-
+
public void drawRestriction(Image img, Point pVia, double vx, double vx2, double vy, double vy2, double angle, boolean selected) {
/* rotate image with direction last node in from to */
@@ -898,5 +898,5 @@
}
}
-
+
public void drawRestriction(Relation r, MapImage icon) {
Way fromWay = null;
@@ -1073,5 +1073,5 @@
pVia, vx, vx2, vy, vy2, iconAngle, r.isSelected());
}
-
+
public void drawTextOnPath(Way way, TextElement text) {
if (way == null || text == null)
@@ -1110,5 +1110,5 @@
double[] p1 = pointAt(t1, poly, pathLength);
double[] p2 = pointAt(t2, poly, pathLength);
-
+
if (p1 == null || p2 == null)
return;
@@ -1164,5 +1164,5 @@
}
}
-
+
/**
* draw way
@@ -1304,5 +1304,5 @@
this.backgroundColor = PaintColors.getBackgroundColor();
}
-
+
@Override
protected void getSettings(boolean virtual) {
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 6069)
@@ -96,5 +96,5 @@
/**
* Creates an wireframe render
- *
+ *
* @param g the graphics context. Must not be null.
* @param nc the map viewport. Must not be null.
@@ -158,5 +158,5 @@
this.ds = data;
getSettings(virtual);
-
+
for (final Relation rel : data.searchRelations(bbox)) {
if (rel.isDrawable() && !ds.isSelected(rel) && !rel.isDisabledAndHidden()) {
@@ -181,5 +181,5 @@
}
displaySegments();
-
+
// Display highlighted ways after the other ones (fix #8276)
for (List specialWays : Arrays.asList(new List[]{untaggedWays, highlightedWays})) {
@@ -190,5 +190,5 @@
displaySegments();
}
-
+
for (final OsmPrimitive osm : data.getSelected()) {
if (osm.isDrawable()) {
@@ -274,5 +274,5 @@
}
}
-
+
private boolean isNodeTagged(Node n) {
return n.isTagged() || n.isAnnotated();
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 6069)
@@ -50,8 +50,8 @@
* member role indicates that the member belongs to an outer or an
* inner polygon.
- *
+ *
* The decision is taken based on preference settings, see the four preference keys
* above.
- *
+ *
*/
private static class MultipolygonRoleMatcher implements PreferenceChangedListener{
@@ -209,5 +209,5 @@
buildPoly();
}
-
+
private void buildPoly() {
boolean initial = true;
@@ -238,5 +238,5 @@
this.inners = new ArrayList(copy.inners);
}
-
+
public Intersection contains(Path2D.Double p) {
int contains = 0;
@@ -262,5 +262,5 @@
appendInner(inner.poly);
}
-
+
private void appendInner(Path2D.Double inner) {
poly.append(inner.getPathIterator(null), false);
@@ -277,9 +277,9 @@
return bounds;
}
-
+
public Collection getWayIds() {
return wayIds;
}
-
+
private void resetNodes(DataSet dataSet) {
if (!nodes.isEmpty()) {
@@ -309,5 +309,5 @@
}
}
-
+
private void resetPoly() {
poly.reset();
@@ -315,5 +315,5 @@
bounds = null;
}
-
+
public void nodeMoved(NodeMovedEvent event) {
final Node n = event.getNode();
@@ -329,5 +329,5 @@
}
}
-
+
public void wayNodesChanged(WayNodesChangedEvent event) {
final Long wayId = event.getChangedWay().getUniqueId();
@@ -350,5 +350,5 @@
private final List outerPolygons = new ArrayList();
private final List combinedPolygons = new ArrayList();
-
+
private boolean incomplete;
@@ -389,5 +389,5 @@
}
}
-
+
public final boolean isIncomplete() {
return incomplete;
@@ -518,5 +518,5 @@
}
}
-
+
if (insideCount == 1)
return insidePolygon;
@@ -560,5 +560,5 @@
}
}
-
+
// Clear inner and outer polygons to reduce memory footprint
innerPolygons.clear();
Index: trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java (revision 6069)
@@ -53,5 +53,5 @@
Main.pref.put(getKey(), String.valueOf(getDefaultValue()));
}
-
+
/**
* Replies the value of this property.
@@ -60,5 +60,5 @@
*/
public abstract T get();
-
+
/**
* Sets this property to the specified value.
Index: trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java (revision 6069)
@@ -50,8 +50,8 @@
return updateCount;
}
-
- @Override
- public T getDefaultValue() {
- return fromString(getDefaultValueAsString());
+
+ @Override
+ public T getDefaultValue() {
+ return fromString(getDefaultValueAsString());
}
Index: trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java (revision 6069)
@@ -100,5 +100,5 @@
return degree + (minute/60.0) + (second/3600.0);
}
-
+
public void dump() {
System.err.println("x_0="+x_0);
Index: trunk/src/org/openstreetmap/josm/data/projection/Projection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Projection.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/projection/Projection.java (revision 6069)
@@ -50,5 +50,5 @@
* If projection supports parameters, return a different code
* for each set of parameters.
- *
+ *
* The EPSG code can be used (if defined for the projection).
*
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java (revision 6069)
@@ -5,5 +5,5 @@
abstract public class AbstractDatum implements Datum {
-
+
protected String name;
protected String proj4Id;
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/Datum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/Datum.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/Datum.java (revision 6069)
@@ -7,5 +7,5 @@
/**
* Represents a geodetic datum.
- *
+ *
* Basically it provides conversion functions from and to the WGS84 datum.
*/
@@ -23,5 +23,5 @@
*/
String getProj4Id();
-
+
/**
* @return the ellipsoid associated with this datum
@@ -33,5 +33,5 @@
*/
LatLon toWGS84(LatLon ll);
-
+
/**
* Convert lat/lon from WGS84 to this datum.
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (revision 6069)
@@ -17,5 +17,5 @@
public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/BETA2007.gsb");
public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/ntf_r93_b.gsb");
-
+
private NTV2GridShiftFile instance = null;
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java (revision 6069)
@@ -7,19 +7,19 @@
/**
* Datum provides general conversion from one ellipsoid to another.
- *
+ *
* Seven parameters can be specified:
* - 3D offset
* - general rotation
* - scale
- *
+ *
* This method is described by EPSG as EPSG::9606.
* Also known as Bursa-Wolf.
*/
public class SevenParameterDatum extends AbstractDatum {
-
+
protected double dx, dy, dz, rx, ry, rz, s;
/**
- *
+ *
* @param name name of the datum
* @param proj4Id Proj.4 identifier for this datum (or null)
@@ -61,4 +61,4 @@
return this.ellps.cart2LatLon(new double[] { x, y, z });
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/ThreeParameterDatum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/ThreeParameterDatum.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/ThreeParameterDatum.java (revision 6069)
@@ -9,5 +9,5 @@
*/
public class ThreeParameterDatum extends AbstractDatum {
-
+
protected double dx, dy, dz;
@@ -36,4 +36,4 @@
return this.ellps.cart2LatLon(xyz);
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/data/validation/Test.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/Test.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/Test.java (revision 6069)
@@ -225,5 +225,5 @@
return progressMonitor.isCanceled();
}
-
+
/**
* Build a Delete command on all primitives that have not yet been deleted manually by user, or by another error fix.
Index: trunk/src/org/openstreetmap/josm/data/validation/TestError.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/TestError.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/TestError.java (revision 6069)
@@ -290,5 +290,5 @@
public int compareTo(TestError o) {
if (equals(o)) return 0;
-
+
MultipleNameVisitor v1 = new MultipleNameVisitor();
MultipleNameVisitor v2 = new MultipleNameVisitor();
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java (revision 6069)
@@ -39,5 +39,5 @@
protected static final int MULTIPLE_STREET_RELATIONS = 2604;
protected static final int HOUSE_NUMBER_TOO_FAR = 2605;
-
+
protected static final String ADDR_HOUSE_NUMBER = "addr:housenumber";
protected static final String ADDR_INTERPOLATION = "addr:interpolation";
@@ -45,5 +45,5 @@
protected static final String ADDR_STREET = "addr:street";
protected static final String ASSOCIATED_STREET = "associatedStreet";
-
+
protected class AddressError extends TestError {
@@ -58,5 +58,5 @@
}
}
-
+
/**
* Constructor
@@ -65,5 +65,5 @@
super(tr("Addresses"), tr("Checks for errors in addresses and associatedStreet relations."));
}
-
+
protected List getAndCheckAssociatedStreets(OsmPrimitive p) {
List list = OsmPrimitive.getFilteredList(p.getReferrers(), Relation.class);
@@ -150,5 +150,5 @@
List list = map.get(key);
if (list.size() > 1) {
- errors.add(new AddressError(DUPLICATE_HOUSE_NUMBER, list,
+ errors.add(new AddressError(DUPLICATE_HOUSE_NUMBER, list,
tr("Duplicate house numbers"), tr(description_en, key), description_en));
}
@@ -156,5 +156,5 @@
// Report wrong street names
if (!wrongStreetNames.isEmpty()) {
- errors.add(new AddressError(MULTIPLE_STREET_NAMES, wrongStreetNames,
+ errors.add(new AddressError(MULTIPLE_STREET_NAMES, wrongStreetNames,
tr("Multiple street names in relation")));
}
@@ -169,5 +169,5 @@
}
}
-
+
protected void checkDistance(OsmPrimitive house, Collection street) {
EastNorth centroid;
@@ -207,5 +207,5 @@
List errorList = new ArrayList(street);
errorList.add(0, house);
- errors.add(new AddressError(HOUSE_NUMBER_TOO_FAR, errorList,
+ errors.add(new AddressError(HOUSE_NUMBER_TOO_FAR, errorList,
tr("House number too far from street")));
}
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java (revision 6069)
@@ -81,5 +81,5 @@
}
}
-
+
protected boolean sameLayers(Way w1, Way w2) {
String l1 = w1.get("layer") != null ? w1.get("layer") : "0";
@@ -87,5 +87,5 @@
return l1.equals(l2);
}
-
+
protected boolean isWayInsideMultiPolygon(Way object, Relation multiPolygon) {
// Extract outer/inner members from multipolygon
@@ -115,17 +115,17 @@
return false;
}
-
+
@Override
public void endTest() {
for (final OsmPrimitive p : primitivesToCheck) {
Collection outers = new FilteredCollection(index.search(p.getBBox()), new Predicate() {
-
+
protected boolean evaluateNode(Node n, Way object) {
return isInPolygon(n, object.getNodes()) || object.getNodes().contains(n);
}
-
+
protected boolean evaluateWay(Way w, Way object) {
if (w.equals(object)) return false;
-
+
// Get all multipolygons referencing object
Collection buildingMultiPolygons = new FilteredCollection(object.getReferrers(), new Predicate() {
@@ -135,5 +135,5 @@
}
}) ;
-
+
// if there's none, test if w is inside object
if (buildingMultiPolygons.isEmpty()) {
@@ -153,5 +153,5 @@
}
}
-
+
protected boolean evaluateRelation(Relation r, Way object) {
MultiPolygonMembers mpm = new MultiPolygonMembers((Relation) p);
@@ -163,5 +163,5 @@
return false;
}
-
+
@Override
public boolean evaluate(Way object) {
@@ -177,5 +177,5 @@
}
});
-
+
if (!outers.isEmpty()) {
errors.add(new TestError(this, Severity.WARNING,
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 6069)
@@ -145,5 +145,5 @@
continue;
}
-
+
// report errors
errors.addAll(buildTestErrors(this, nodes));
@@ -401,5 +401,5 @@
target = nodes.iterator().next();
}
-
+
if (DeleteCommand.checkAndConfirmOutlyingDelete(Main.main.getCurrentDataSet().getDataSourceArea(), nodes, Collections.singleton(target)))
return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 6069)
@@ -92,5 +92,5 @@
/** Bag of all ways, regardless of tags */
private MultiMap waysNoTags;
-
+
/** Set of known hashcodes for list of coordinates **/
private Set knownHashCodes;
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 6069)
@@ -252,8 +252,8 @@
}
}
-
+
private void addRelationIfNeeded(TestError error, Relation r) {
- // Fix #8212 : if the error references only incomplete primitives,
- // add multipolygon in order to let user select something and fix the error
+ // Fix #8212 : if the error references only incomplete primitives,
+ // add multipolygon in order to let user select something and fix the error
Collection primitives = error.getPrimitives();
if (!primitives.contains(r)) {
@@ -268,5 +268,5 @@
}
}
-
+
private void addError(Relation r, TestError error) {
addRelationIfNeeded(error, r);
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/NodesDuplicatingWayTags.java (revision 6069)
@@ -20,5 +20,5 @@
*
* See JOSM ticket #7639 for the original request.
- *
+ *
* @author Mrwojo
*/
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 6069)
@@ -419,7 +419,7 @@
if (checkValues && value != null && value.length() > 0 && presetsValueData != null) {
final Set values = presetsValueData.get(key);
- final boolean keyInPresets = values != null;
+ final boolean keyInPresets = values != null;
final boolean tagInPresets = values != null && (values.isEmpty() || values.contains(prop.getValue()));
-
+
boolean ignore = false;
for (String a : ignoreDataStartsWith) {
@@ -438,5 +438,5 @@
}
}
-
+
if (!tagInPresets) {
for (IgnoreKeyPair a : ignoreDataKeyPair) {
@@ -446,5 +446,5 @@
}
}
-
+
if (!ignore) {
if (!keyInPresets) {
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java (revision 6069)
@@ -157,5 +157,5 @@
Way previous = (Way) via.get(i - 1);
Way current = (Way) via.get(i);
- checkIfConnected(previous, current,
+ checkIfConnected(previous, current,
tr("The \"via\" ways are not connected."), UNCONNECTED_VIA);
}
@@ -165,5 +165,5 @@
return;
}
- checkIfConnected((Way) via.get(via.size() - 1), toWay,
+ checkIfConnected((Way) via.get(via.size() - 1), toWay,
tr("The last \"via\" and the \"to\" way are not connected."), TO_VIA_WAY);
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (revision 6069)
@@ -52,5 +52,5 @@
NAMED_WAYS.add( "pedestrian" ); ;
}
-
+
/** Whitelist of roles allowed to reference an untagged way */
public static final Set WHITELIST = new HashSet();
Index: trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java (revision 6068)
+++ trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java (revision 6069)
@@ -20,5 +20,5 @@
{
public static final int MULTIPLE_NAME_MAX_LENGTH = 80;
-
+
/** The class name of the combined primitives */
private String multipleClassname;