+ *
* Mechanisms have been improved based on #8561 discussions and this article. * @since 5857 @@ -50,5 +50,5 @@ Main.exitJosm(true, 9); } - + try { restartJOSM(); Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 6829) +++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 6830) @@ -120,5 +120,5 @@ /** - * Creates a new "Save" dialog for a single {@link ExtensionFileFilter} and makes it visible.
+ * Creates a new "Save" dialog for a single {@link ExtensionFileFilter} and makes it visible.
* When the user has chosen a file, checks the file extension, and confirms overwrite if needed. * @@ -135,5 +135,5 @@ /** - * Creates a new "Save" dialog for a given file extension and makes it visible.
+ * Creates a new "Save" dialog for a given file extension and makes it visible.
* When the user has chosen a file, checks the file extension, and confirms overwrite if needed. * Index: trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java (revision 6829) +++ trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java (revision 6830) @@ -111,8 +111,8 @@ /** * Finds out if the current selection can be extended. - * + *
* The members outerNodes, nodes must have been initialized. * How to update these members when extending the selection, @see extend(). - * + *
* @param selection current selection * @return a way by which to extend the selection, or null Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 6829) +++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 6830) @@ -286,8 +286,9 @@ * * assume that OrginalNode is in the way - * - * -> the new node will be put into the parameter newNodes. - * -> the add-node command will be put into the parameter cmds. - * -> the changed way will be returned and must be put into cmds by the caller! + *-
+ *
- the new node will be put into the parameter newNodes. + *
- the add-node command will be put into the parameter cmds. + *
- the changed way will be returned and must be put into cmds by the caller! + *
+ * Play the sound track from the Audio Marker after the one most recently played.
* Play from the first such Marker if none has been played, or repeat the last marker if at the end. * @since 547 Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 6829) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (revision 6830) @@ -16,6 +16,6 @@ /** - * If not playing, play the sound track from the first Audio Marker, or from the point at which it was paused.
- * If playing, pause the sound.
+ * If not playing, play the sound track from the first Audio Marker, or from the point at which it was paused.
+ * If playing, pause the sound.
* If fast forwarding or slow forwarding, resume normal speed. * @since 547 Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 6829) +++ trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (revision 6830) @@ -13,5 +13,5 @@ /** - * Play the sound track from the Audio Marker before the one most recently played.
+ * Play the sound track from the Audio Marker before the one most recently played.
* Play from the first such Marker if none has been played or already at the first marker. * @since 547 Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 6829) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 6830) @@ -96,5 +96,5 @@ * {@link Future}, but make sure not to freeze up JOSM. Example: *
- * Future future = task.download(...);
+ * Future<?> future = task.download(...);
* // DON'T run this on the Swing EDT or JOSM will freeze
* future.get(); // waits for the dowload task to complete
@@ -104,5 +104,5 @@
* the Swing EDT:
*
- * final Future future = task.download(...);
+ * final Future<?> future = task.download(...);
* Runnable runAfterTask = new Runnable() {
* public void run() {
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 6830)
@@ -8,9 +8,9 @@
import java.text.MessageFormat;
import java.util.Collection;
-import java.util.Set;
+import java.util.HashMap;
import java.util.HashSet;
-import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import javax.swing.JOptionPane;
@@ -101,7 +101,7 @@
*
* @param targetLayer the target layer. Must not be null.
- * @param id the primitive id. id > 0 required.
+ * @param id the primitive id. id > 0 required.
* @param type the primitive type. type != null required
- * @exception IllegalArgumentException thrown if id <= 0
+ * @exception IllegalArgumentException thrown if id <= 0
* @exception IllegalArgumentException thrown if type == null
* @exception IllegalArgumentException thrown if targetLayer == null
@@ -124,7 +124,7 @@
* constructor
*
- * @param targetLayer the target layer. Must not be null.
+ * @param targetLayer the target layer. Must not be null.
* @param primitiveId a PrimitiveId object.
- * @exception IllegalArgumentException thrown if id <= 0
+ * @exception IllegalArgumentException thrown if id <= 0
* @exception IllegalArgumentException thrown if targetLayer == null
*
Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java (revision 6830)
@@ -25,5 +25,5 @@
* {@link Future}, but make sure not to freeze up JOSM. Example:
*
- * Future future = task.download(...);
+ * Future<?> future = task.download(...);
* // DON'T run this on the Swing EDT or JOSM will freeze
* future.get(); // waits for the dowload task to complete
@@ -33,5 +33,5 @@
* the Swing EDT:
*
- * final Future future = task.download(...);
+ * final Future<?> future = task.download(...);
* Runnable runAfterTask = new Runnable() {
* public void run() {
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6830)
@@ -52,5 +52,5 @@
/**
- * @author Alexander Kachkaev , 2011
+ * @author Alexander Kachkaev <alexander@kachkaev.ru>, 2011
*/
public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintable,
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java (revision 6830)
@@ -20,5 +20,5 @@
* segment to divide.
*
- * @author Alexander Kachkaev , 2011
+ * @author Alexander Kachkaev <alexander@kachkaev.ru>, 2011
*/
final class ImproveWayAccuracyHelper {
@@ -27,5 +27,5 @@
// Hide default constructor for utils classes
}
-
+
/**
* Finds the way to work on. If the mouse is on the node, extracts one of
Index: trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (revision 6830)
@@ -18,5 +18,5 @@
* Command that changes the role of a relation member
*
- * @author Teemu Koskinen
+ * @author Teemu Koskinen <teemu.koskinen@mbnet.fi>
*/
public class ChangeRelationMemberRoleCommand extends Command {
Index: trunk/src/org/openstreetmap/josm/command/RotateCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 6830)
@@ -16,5 +16,5 @@
* RotateCommand rotates a number of objects around their centre.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*/
public class RotateCommand extends TransformNodesCommand {
Index: trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java (revision 6830)
@@ -20,5 +20,5 @@
* Abstract class with common services for nodes rotation and scaling commands.
*
- * @author Olivier Croquette
+ * @author Olivier Croquette <ocroquette@free.fr>
*/
public abstract class TransformNodesCommand extends Command {
Index: trunk/src/org/openstreetmap/josm/data/Bounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 6830)
@@ -30,5 +30,5 @@
/**
* Returns min latitude of bounds. Efficient shortcut for {@code getMin().lat()}.
- *
+ *
* @return min latitude of bounds.
* @since 6203
@@ -40,5 +40,5 @@
/**
* Returns min longitude of bounds. Efficient shortcut for {@code getMin().lon()}.
- *
+ *
* @return min longitude of bounds.
* @since 6203
@@ -54,5 +54,5 @@
/**
* Returns max latitude of bounds. Efficient shortcut for {@code getMax().lat()}.
- *
+ *
* @return max latitude of bounds.
* @since 6203
@@ -64,5 +64,5 @@
/**
* Returns max longitude of bounds. Efficient shortcut for {@code getMax().lon()}.
- *
+ *
* @return max longitude of bounds.
* @since 6203
@@ -95,5 +95,5 @@
* Single point Bounds defined by lat/lon {@code b}.
* Coordinates will be rounded to osm precision if {@code roundToOsmPrecision} is true.
- *
+ *
* @param b lat/lon of given point.
* @param roundToOsmPrecision defines if lat/lon will be rounded.
@@ -102,9 +102,9 @@
this(b.lat(), b.lon(), roundToOsmPrecision);
}
-
+
/**
* Single point Bounds defined by point [lat,lon].
* Coordinates will be rounded to osm precision if {@code roundToOsmPrecision} is true.
- *
+ *
* @param lat latitude of given point.
* @param lon longitude of given point.
@@ -232,16 +232,16 @@
*
* @param center the center coordinate pair. Must not be null.
- * @param latExtent the latitude extent. > 0 required.
- * @param lonExtent the longitude extent. > 0 required.
+ * @param latExtent the latitude extent. > 0 required.
+ * @param lonExtent the longitude extent. > 0 required.
* @throws IllegalArgumentException thrown if center is null
- * @throws IllegalArgumentException thrown if latExtent <= 0
- * @throws IllegalArgumentException thrown if lonExtent <= 0
+ * @throws IllegalArgumentException thrown if latExtent <= 0
+ * @throws IllegalArgumentException thrown if lonExtent <= 0
*/
public Bounds(LatLon center, double latExtent, double lonExtent) {
CheckParameterUtil.ensureParameterNotNull(center, "center");
if (latExtent <= 0.0)
- throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 exptected, got {1}", "latExtent", latExtent));
+ throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 expected, got {1}", "latExtent", latExtent));
if (lonExtent <= 0.0)
- throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 exptected, got {1}", "lonExtent", lonExtent));
+ throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 expected, got {1}", "lonExtent", lonExtent));
this.minLat = LatLon.roundToOsmPrecision(LatLon.toIntervalLat(center.lat() - latExtent / 2));
@@ -253,5 +253,5 @@
/**
* Creates BBox with same coordinates.
- *
+ *
* @return BBox with same coordinates.
* @since 6203
@@ -260,5 +260,5 @@
return new BBox(minLon, minLat, maxLon, maxLat);
}
-
+
@Override public String toString() {
return "Bounds["+minLat+","+minLon+","+maxLat+","+maxLon+"]";
@@ -277,5 +277,5 @@
*/
public LatLon getCenter() {
- if (crosses180thMeridian()) {
+ if (crosses180thMeridian()) {
double lat = (minLat + maxLat) / 2;
double lon = (minLon + maxLon - 360.0) / 2;
@@ -296,5 +296,5 @@
extend(ll.lat(), ll.lon());
}
-
+
/**
* Extend the bounds if necessary to include the given point [lat,lon].
@@ -358,5 +358,5 @@
/**
* The two bounds intersect? Compared to java Shape.intersects, if does not use
- * the interior but the closure. (">=" instead of ">")
+ * the interior but the closure. (">=" instead of ">")
*/
public boolean intersects(Bounds b) {
@@ -413,5 +413,5 @@
*/
public boolean isCollapsed() {
- return Double.doubleToLongBits(minLat) == Double.doubleToLongBits(maxLat)
+ return Double.doubleToLongBits(minLat) == Double.doubleToLongBits(maxLat)
&& Double.doubleToLongBits(minLon) == Double.doubleToLongBits(maxLon);
}
Index: trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java (revision 6830)
@@ -67,5 +67,5 @@
/**
* The two bounds intersect? Compared to java Shape.intersects, if does not use
- * the interior but the closure. (">=" instead of ">")
+ * the interior but the closure. (">=" instead of ">")
*/
public boolean intersects(ProjectionBounds b) {
Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 6830)
@@ -30,5 +30,5 @@
* where valid values are in the [-180,180] and positive values specify positions east of the prime meridian.
*
- * 
+ *
*
* This class is immutable.
@@ -292,5 +292,5 @@
*
* @param other the "destination" position
- * @return heading in the range 0 <= hd < 2*PI
+ * @return heading in the range 0 <= hd < 2*PI
*/
public double heading(LatLon other) {
Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (revision 6830)
@@ -14,8 +14,8 @@
/**
* Objects of this class represent a gpx file with tracks, waypoints and routes.
- * It uses GPX v1.1, see {@link the spec}
+ * It uses GPX v1.1, see the spec
* for details.
*
- * @author Raphael Mack
+ * @author Raphael Mack <ramack@raphael-mack.de>
*/
public class GpxData extends WithAttributes {
@@ -255,5 +255,5 @@
};
}
-
+
/**
* Iterates over all track segments and then over all routes.
@@ -320,4 +320,4 @@
}
}
-
+
}
Index: trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java (revision 6830)
@@ -11,5 +11,5 @@
* Base class for various classes in the GPX model.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
* @since 444
*/
Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 6830)
@@ -27,5 +27,5 @@
* Class that stores info about an image background layer.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*/
public class ImageryInfo implements Comparable, Attributed {
@@ -83,5 +83,5 @@
*/
public static class ImageryBounds extends Bounds {
-
+
/**
* Constructs a new {@code ImageryBounds} from string.
Index: trunk/src/org/openstreetmap/josm/data/imagery/types/EntryType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/types/EntryType.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/imagery/types/EntryType.java (revision 6830)
@@ -25,20 +25,19 @@
*
*
- * <complexType name="entry">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="pixelPerDegree" type="{http://www.w3.org/2001/XMLSchema}double"/>
- * <element name="east" type="{http://www.w3.org/2001/XMLSchema}double"/>
- * <element name="north" type="{http://www.w3.org/2001/XMLSchema}double"/>
- * <element name="lastUsed" type="{http://www.w3.org/2001/XMLSchema}date"/>
- * <element name="lastModified" type="{http://www.w3.org/2001/XMLSchema}date"/>
- * <element name="filename" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="entry">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="pixelPerDegree" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ * <element name="east" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ * <element name="north" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ * <element name="lastUsed" type="{http://www.w3.org/2001/XMLSchema}date"/>
+ * <element name="lastModified" type="{http://www.w3.org/2001/XMLSchema}date"/>
+ * <element name="filename" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
*
- *
*
*/
Index: trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java (revision 6830)
@@ -5,15 +5,13 @@
// Generated on: 2011.01.09 at 07:33:18 PM CET
//
-
-
package org.openstreetmap.josm.data.imagery.types;
import java.util.ArrayList;
import java.util.List;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
-
/**
@@ -23,17 +21,16 @@
*
*
- * <complexType name="projection">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="entry" type="{http://josm.openstreetmap.de/wms-cache}entry" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="cache-directory" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType name="projection">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="entry" type="{http://josm.openstreetmap.de/wms-cache}entry" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="cache-directory" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
*
- *
*
*/
Index: trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java (revision 6830)
@@ -5,10 +5,9 @@
// Generated on: 2011.01.09 at 07:33:18 PM CET
//
-
-
package org.openstreetmap.josm.data.imagery.types;
import java.util.ArrayList;
import java.util.List;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,5 +15,4 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-
/**
@@ -24,17 +22,16 @@
*
*
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="projection" type="{http://josm.openstreetmap.de/wms-cache}projection" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="tileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- * <attribute name="totalFileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
- * </restriction>
- * </complexContent>
- * </complexType>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="projection" type="{http://josm.openstreetmap.de/wms-cache}projection" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="tileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ * <attribute name="totalFileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
*
- *
*
*/
Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 6830)
@@ -1,6 +1,4 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
-
-import org.openstreetmap.josm.tools.Utils;
import static org.openstreetmap.josm.tools.I18n.tr;
@@ -19,4 +17,6 @@
import java.util.concurrent.atomic.AtomicLong;
+import org.openstreetmap.josm.tools.Utils;
+
/**
* Abstract class to represent common features of the datatypes primitives.
@@ -160,5 +160,5 @@
/**
*
- * @return True if primitive is new (not yet uploaded the server, id <= 0)
+ * @return True if primitive is new (not yet uploaded the server, id <= 0)
*/
@Override
@@ -184,8 +184,8 @@
* is set to false.
*
- * @param id the id. > 0 required
- * @param version the version > 0 required
- * @throws IllegalArgumentException thrown if id <= 0
- * @throws IllegalArgumentException thrown if version <= 0
+ * @param id the id. > 0 required
+ * @param version the version > 0 required
+ * @throws IllegalArgumentException thrown if id <= 0
+ * @throws IllegalArgumentException thrown if version <= 0
* @throws DataIntegrityProblemException If id is changed and primitive was already added to the dataset
*/
@@ -256,7 +256,7 @@
* primitive.
*
- * @param changesetId the id. >= 0 required.
+ * @param changesetId the id. >= 0 required.
* @throws IllegalStateException thrown if this primitive is new.
- * @throws IllegalArgumentException thrown if id < 0
+ * @throws IllegalArgumentException thrown if id < 0
*/
@Override
Index: trunk/src/org/openstreetmap/josm/data/osm/Changeset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (revision 6830)
@@ -52,5 +52,5 @@
/**
- * Creates a changeset with id id. If id > 0, sets incomplete to true.
+ * Creates a changeset with id id. If id > 0, sets incomplete to true.
*
* @param id the id
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 6830)
@@ -778,5 +778,5 @@
* exists
*
- * @param id uniqueId of the primitive. Might be < 0 for newly created primitives
+ * @param id uniqueId of the primitive. Might be < 0 for newly created primitives
* @param type the type of the primitive. Must not be null.
* @return the primitive
Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 6830)
@@ -1,4 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.TreeSet;
import org.openstreetmap.josm.Main;
@@ -11,8 +15,4 @@
import org.openstreetmap.josm.tools.Predicate;
import org.openstreetmap.josm.tools.Utils;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.TreeSet;
/**
@@ -139,6 +139,6 @@
/**
* Constructs an incomplete {@code Node} object with the given id.
- * @param id The id. Must be >= 0
- * @throws IllegalArgumentException if id < 0
+ * @param id The id. Must be >= 0
+ * @throws IllegalArgumentException if id < 0
*/
public Node(long id) throws IllegalArgumentException {
@@ -148,7 +148,7 @@
/**
* Constructs a new {@code Node} with the given id and version.
- * @param id The id. Must be >= 0
+ * @param id The id. Must be >= 0
* @param version The version
- * @throws IllegalArgumentException if id < 0
+ * @throws IllegalArgumentException if id < 0
*/
public Node(long id, int version) throws IllegalArgumentException {
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6830)
@@ -241,5 +241,5 @@
* Creates a new primitive for the given id.
*
- * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
+ * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
* If allowNegativeId is not set, then id will have to be 0 (in that case new unique id will be generated) or
* positive number.
@@ -247,5 +247,5 @@
* @param id the id
* @param allowNegativeId
- * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false
+ * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false
*/
protected OsmPrimitive(long id, boolean allowNegativeId) throws IllegalArgumentException {
@@ -269,14 +269,14 @@
* Creates a new primitive for the given id and version.
*
- * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
+ * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
* If allowNegativeId is not set, then id will have to be 0 (in that case new unique id will be generated) or
* positive number.
*
- * If id is not > 0 version is ignored and set to 0.
+ * If id is not > 0 version is ignored and set to 0.
*
* @param id
* @param version
* @param allowNegativeId
- * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false
+ * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false
*/
protected OsmPrimitive(long id, int version, boolean allowNegativeId) throws IllegalArgumentException {
@@ -356,8 +356,8 @@
* is set to false.
*
- * @param id the id. > 0 required
- * @param version the version > 0 required
- * @throws IllegalArgumentException thrown if id <= 0
- * @throws IllegalArgumentException thrown if version <= 0
+ * @param id the id. > 0 required
+ * @param version the version > 0 required
+ * @throws IllegalArgumentException thrown if id <= 0
+ * @throws IllegalArgumentException thrown if version <= 0
* @throws DataIntegrityProblemException If id is changed and primitive was already added to the dataset
*/
@@ -1143,5 +1143,5 @@
* semantic attributes.
*
- * - equal id
+ * equal id
* both are complete or both are incomplete
* both have the same tags
@@ -1165,10 +1165,10 @@
* technical attributes. The attributes:
*
- * - deleted
- * modified
- * timestamp
- * version
- * visible
- * user
+ * deleted
+ * modified
+ * timestamp
+ * version
+ * visible
+ * user
*
* have to be equal
Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 6830)
@@ -21,5 +21,5 @@
* An relation, having a set of tags and any number (0...n) of members.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*/
public final class Relation extends OsmPrimitive implements IRelation {
@@ -204,9 +204,9 @@
/**
- * Creates a new relation for the given id. If the id > 0, the way is marked
+ * Creates a new relation for the given id. If the id > 0, the way is marked
* as incomplete.
*
- * @param id the id. > 0 required
- * @throws IllegalArgumentException thrown if id < 0
+ * @param id the id. > 0 required
+ * @throws IllegalArgumentException thrown if id < 0
*/
public Relation(long id) throws IllegalArgumentException {
Index: trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (revision 6830)
@@ -48,5 +48,5 @@
/**
- * PrimitiveId implementation. Returns the same value as {@link #getMemberId()()}
+ * PrimitiveId implementation. Returns the same value as {@link #getMemberId()}
*/
@Override
Index: trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 6830)
@@ -14,5 +14,5 @@
* A Set-like class that allows looking up equivalent preexising instance.
* It is useful whereever one would use self-mapping construct like
- * Map.put(t,t), that is, for caches, uniqueness filters or similar.
+ * Map<T,T>.put(t,t), that is, for caches, uniqueness filters or similar.
*
* The semantics of equivalency can be external to the object, using the
@@ -24,5 +24,5 @@
* - A String cache:
*
- * Storage cache = new Storage(); // use default Hash
+ * Storage<String> cache = new Storage(); // use default Hash
* for (String input : data) {
* String onlyOne = cache.putIfUnique(input);
@@ -32,5 +32,5 @@
* - Identity-based set:
*
- * Storage
- *
+ *
*
* @author nenik
Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 6830)
@@ -126,6 +126,6 @@
* @param index the position
* @return the node at position index
- * @exception IndexOutOfBoundsException thrown if index < 0
- * or index >= {@link #getNodesCount()}
+ * @exception IndexOutOfBoundsException thrown if index < 0
+ * or index >= {@link #getNodesCount()}
* @since 1862
*/
@@ -254,9 +254,9 @@
/**
- * Contructs a new {@code Way} for the given id. If the id > 0, the way is marked
+ * Contructs a new {@code Way} for the given id. If the id > 0, the way is marked
* as incomplete. If id == 0 then way is marked as new
*
- * @param id the id. >= 0 required
- * @throws IllegalArgumentException if id < 0
+ * @param id the id. >= 0 required
+ * @throws IllegalArgumentException if id < 0
* @since 343
*/
@@ -267,7 +267,7 @@
/**
* Contructs a new {@code Way} with given id and version.
- * @param id the id. >= 0 required
+ * @param id the id. >= 0 required
* @param version the version
- * @throws IllegalArgumentException if id < 0
+ * @throws IllegalArgumentException if id < 0
* @since 2620
*/
Index: trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java (revision 6830)
@@ -22,5 +22,5 @@
/**
* Returns list of primitives modified by this event.
- *
+ *
* WARNING This value might be incorrect in case
* of {@link DataChangedEvent}. It returns all primitives in the dataset
Index: trunk/src/org/openstreetmap/josm/data/osm/history/History.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/History.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/History.java (revision 6830)
@@ -43,8 +43,8 @@
* Creates a new history for an OSM primitive
*
- * @param id the id. >0 required.
+ * @param id the id. > 0 required.
* @param type the primitive type. Must not be null.
* @param versions a list of versions. Can be null.
- * @throws IllegalArgumentException thrown if id <= 0
+ * @throws IllegalArgumentException thrown if id <= 0
* @throws IllegalArgumentException if type is null
*
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 6830)
@@ -83,7 +83,7 @@
* and version version. null, if no such primitive exists.
*
- * @param id the id of the primitive. > 0 required.
+ * @param id the id of the primitive. > 0 required.
* @param type the primitive type. Must not be null.
- * @param version the version of the primitive. > 0 required
+ * @param version the version of the primitive. > 0 required
* @return the history primitive for the primitive with id id,
* type type, and version version
@@ -135,9 +135,9 @@
* and type type.
*
- * @param id the id the if of the primitive. > 0 required
+ * @param id the id the if of the primitive. > 0 required
* @param type the type of the primitive. Must not be null.
* @return the history. null, if there isn't a history for id and
* type.
- * @throws IllegalArgumentException thrown if id <= 0
+ * @throws IllegalArgumentException thrown if id <= 0
* @throws IllegalArgumentException thrown if type is null
*/
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (revision 6830)
@@ -22,10 +22,10 @@
* Constructs a new {@code HistoryNode}.
*
- * @param id the id (> 0 required)
- * @param version the version (> 0 required)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the node is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required)
- * @param timestamp the timestamp (! null required)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required)
+ * @param timestamp the timestamp (!= null required)
* @param coords the coordinates
* @throws IllegalArgumentException if preconditions are violated
@@ -39,10 +39,10 @@
* 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)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the node is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
- * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
+ * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
* @param coords the coordinates
* @param checkHistoricParams if true, checks values of {@code changesetId} and {@code timestamp}
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 6830)
@@ -47,10 +47,10 @@
* Constructs a new {@code HistoryOsmPrimitive}.
*
- * @param id the id (> 0 required)
- * @param version the version (> 0 required)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the primitive is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required)
- * @param timestamp the timestamp (! null required)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required)
+ * @param timestamp the timestamp (!= null required)
*
* @throws IllegalArgumentException if preconditions are violated
@@ -64,10 +64,10 @@
* This is needed to build virtual HistoryOsmPrimitives for modified primitives, which do not have a timestamp and a changeset id.
*
- * @param id the id (> 0 required)
- * @param version the version (> 0 required)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the primitive is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
- * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
+ * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
* @param checkHistoricParams if true, checks values of {@code changesetId} and {@code timestamp}
*
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 6830)
@@ -26,10 +26,10 @@
* constructor
*
- * @param id the id (>0 required)
- * @param version the version (> 0 required)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the primitive is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required)
- * @param timestamp the timestamp (! null required)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required)
+ * @param timestamp the timestamp (!= null required)
*
* @throws IllegalArgumentException if preconditions are violated
@@ -42,10 +42,10 @@
* constructor
*
- * @param id the id (>0 required)
- * @param version the version (> 0 required)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the primitive is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
- * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
+ * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
* @param checkHistoricParams If true, checks values of {@code changesetId} and {@code timestamp}
*
@@ -60,10 +60,10 @@
* constructor
*
- * @param id the id (>0 required)
- * @param version the version (> 0 required)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the primitive is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required)
- * @param timestamp the timestamp (! null required)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required)
+ * @param timestamp the timestamp (!= null required)
* @param members list of members for this relation
*
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 6830)
@@ -26,10 +26,10 @@
* Constructs a new {@code HistoryWay}.
*
- * @param id the id (> 0 required)
- * @param version the version (> 0 required)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the node is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
- * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
+ * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
* @throws IllegalArgumentException if preconditions are violated
*/
@@ -42,10 +42,10 @@
* 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)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the node is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
- * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
+ * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
* @param checkHistoricParams if true, checks values of {@code changesetId} and {@code timestamp}
* @throws IllegalArgumentException if preconditions are violated
@@ -59,11 +59,11 @@
* Constructs a new {@code HistoryWay} with a given list of node ids.
*
- * @param id the id (> 0 required)
- * @param version the version (> 0 required)
+ * @param id the id (> 0 required)
+ * @param version the version (> 0 required)
* @param visible whether the node is still visible
- * @param user the user (! null required)
- * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
- * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
- * @param nodeIdList the node ids (! null required)
+ * @param user the user (!= null required)
+ * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
+ * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
+ * @param nodeIdList the node ids (!= null required)
* @throws IllegalArgumentException if preconditions are violated
*/
@@ -95,5 +95,5 @@
* @param idx the index
* @return the idx-th node id
- * @exception IndexOutOfBoundsException thrown, if idx <0 || idx >= {#see {@link #getNumNodes()}
+ * @exception IndexOutOfBoundsException thrown, if idx < 0 || idx >= {#see {@link #getNumNodes()}
*/
public long getNodeId(int idx) throws IndexOutOfBoundsException {
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 6830)
@@ -281,6 +281,6 @@
* With this bug, gv.setGlyphTransform(i, trfm) has a different
* effect than on most other systems, namely the translation components
- * ("m02" & "m12", {@link AffineTransform}) appear to be twice as large, as
- * they actually are. The rotation is unaffected (scale & shear not tested
+ * ("m02" & "m12", {@link AffineTransform}) appear to be twice as large, as
+ * they actually are. The rotation is unaffected (scale & shear not tested
* so far).
*
@@ -445,5 +445,5 @@
/**
* Displays text at specified position including its halo, if applicable.
- *
+ *
* @param gv Text's glyphs to display. If {@code null}, use text from {@code s} instead.
* @param s text to display if {@code gv} is {@code null}
@@ -484,5 +484,5 @@
}
}
-
+
protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, TextElement text) {
Index: trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java (revision 6830)
@@ -184,5 +184,5 @@
/**
- * Returns the radius of curvature in the meridian
+ * Returns the radius of curvature in the meridian
* for this reference ellipsoid at the specified latitude.
*
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6830)
@@ -200,5 +200,4 @@
* @param gs A GridShift object containing the coordinate to shift
* @return True if the coordinate is within a Sub Grid, false if not
- * @throws IOException
*/
public boolean gridShiftForward(NTV2GridShift gs) {
@@ -223,5 +222,4 @@
* @param gs A GridShift object containing the coordinate to shift
* @return True if the coordinate is within a Sub Grid, false if not
- * @throws IOException
*/
public boolean gridShiftReverse(NTV2GridShift gs) {
Index: trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (revision 6830)
@@ -63,5 +63,5 @@
* A OSM data validator.
*
- * @author Francisco R. Santos
+ * @author Francisco R. Santos <frsantos@gmail.com>
*/
public class OsmValidator implements LayerChangeListener {
@@ -119,5 +119,5 @@
ConditionalKeys.class, // 3200 .. 3299
};
-
+
private static Map allTestsMap;
static {
@@ -226,5 +226,5 @@
return new TreeMap(allTestsMap);
}
-
+
/**
* Returns the instance of the given test class.
@@ -281,5 +281,5 @@
/**
* Initialize grid details based on current projection system. Values based on
- * the original value fixed for EPSG:4326 (10000) using heuristics (that is, test&error
+ * the original value fixed for EPSG:4326 (10000) using heuristics (that is, test&error
* until most bugs were discovered while keeping the processing time reasonable)
*/
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 6830)
@@ -101,7 +101,7 @@
/** The map of potential duplicates.
*
- * If there is exactly one node for a given pos, the map includes a pair .
+ * If there is exactly one node for a given pos, the map includes a pair <pos, Node>.
* If there are multiple nodes for a given pos, the map includes a pair
- *
+ * <pos, NodesByEqualTagsMap>
*/
private Storage
+ *
* You can specify the border that will appear when files are being dragged by
* calling the constructor with a {@link javax.swing.border.Border}. Only
* JComponents will show any indication with a border.
- *
+ *
* You can turn on some debugging features by passing a PrintStream
* object (such as System.out) into the full constructor. A null
* value will result in no extra debugging information being output.
- *
+ *
*
*
I'm releasing this code into the Public Domain. Enjoy.
@@ -449,5 +449,5 @@
* Implement this inner interface to listen for when files are dropped. For example
* your class declaration may begin like this:
- *
+ *
* public class MyClass implements FileDrop.Listener
* ...
@@ -457,5 +457,5 @@
* } // end filesDropped
* ...
- *
Set the language */
+ /** --language=<language> Set the language */
LANGUAGE(true),
/** --reset-preferences Reset the preferences to default */
RESET_PREFERENCES(false),
- /** --load-preferences= Changes preferences according to the XML file */
+ /** --load-preferences=<url-to-xml> Changes preferences according to the XML file */
LOAD_PREFERENCES(true),
- /** --set== Set preference key to value */
+ /** --set=<key>=<value> Set preference key to value */
SET(true),
/** --geometry=widthxheight(+|-)x(+|-)y Standard unix geometry argument */
@@ -167,11 +167,11 @@
MAXIMIZE(false),
/** --download=minlat,minlon,maxlat,maxlon Download the bounding box
- * --download= Download the location at the URL (with lat=x&lon=y&zoom=z)
- * --download= Open a file (any file type that can be opened with File/Open) */
+ * --download=<URL> Download the location at the URL (with lat=x&lon=y&zoom=z)
+ * --download=<filename> Open a file (any file type that can be opened with File/Open) */
DOWNLOAD(true),
/** --downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as raw GPS
- * --downloadgps= Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS */
+ * --downloadgps=<URL> Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS */
DOWNLOADGPS(true),
- /** --selection= Select with the given search */
+ /** --selection=<searchstring> Select with the given search */
SELECTION(true);
@@ -275,5 +275,5 @@
System.exit(1);
}
-
+
final boolean languageGiven = args.containsKey(Option.LANGUAGE);
@@ -313,5 +313,5 @@
Main.commandLineArgs = Utils.copyArray(argArray);
-
+
if (args.containsKey(Option.VERSION)) {
System.out.println(Version.getInstance().getAgentString());
@@ -428,5 +428,5 @@
RemoteControl.start();
}
-
+
if (MessageNotifier.PROP_NOTIFIER_ENABLED.get()) {
MessageNotifier.start();
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 6830)
@@ -129,168 +129,168 @@
/* File menu */
- /** File -> New Layer **/
+ /** File / New Layer **/
public final NewAction newAction = new NewAction();
- /** File -> Open... **/
+ /** File / Open... **/
public final OpenFileAction openFile = new OpenFileAction();
- /** File -> Open Recent > **/
+ /** File / Open Recent > **/
public final RecentlyOpenedFilesMenu recentlyOpened = new RecentlyOpenedFilesMenu();
- /** File -> Open Location... **/
+ /** File / Open Location... **/
public final OpenLocationAction openLocation = new OpenLocationAction();
- /** File -> Save **/
+ /** File / Save **/
public final SaveAction save = SaveAction.getInstance();
- /** File -> Save As... **/
+ /** File / Save As... **/
public final SaveAsAction saveAs = SaveAsAction.getInstance();
- /** File -> Session > Load Session **/
+ /** File / Session > Load Session **/
public SessionLoadAction sessionLoad;
- /** File -> Session > Save Session As... **/
+ /** File / Session > Save Session As... **/
public SessionSaveAsAction sessionSaveAs;
- /** File -> Export to GPX... **/
+ /** File / Export to GPX... **/
public final GpxExportAction gpxExport = new GpxExportAction();
- /** File -> Download from OSM... **/
+ /** File / Download from OSM... **/
public final DownloadAction download = new DownloadAction();
- /** File -> Download object... **/
+ /** File / Download object... **/
public final DownloadPrimitiveAction downloadPrimitive = new DownloadPrimitiveAction();
- /** File -> Download parent ways/relations... **/
+ /** File / Download parent ways/relations... **/
public final DownloadReferrersAction downloadReferrers = new DownloadReferrersAction();
- /** File -> Close open changesets... **/
+ /** File / Close open changesets... **/
public final CloseChangesetAction closeChangesetAction = new CloseChangesetAction();
- /** File -> Update data **/
+ /** File / Update data **/
public final JosmAction update = new UpdateDataAction();
- /** File -> Update selection **/
+ /** File / Update selection **/
public final JosmAction updateSelection = new UpdateSelectionAction();
- /** File -> Update modified **/
+ /** File / Update modified **/
public final JosmAction updateModified = new UpdateModifiedAction();
- /** File -> Upload data **/
+ /** File / Upload data **/
public final JosmAction upload = new UploadAction();
- /** File -> Upload selection **/
+ /** File / Upload selection **/
public final JosmAction uploadSelection = new UploadSelectionAction();
- /** File -> Restart **/
+ /** File / Restart **/
public final RestartAction restart = new RestartAction();
- /** File -> Exit **/
+ /** File / Exit **/
public final ExitAction exit = new ExitAction();
/* Edit menu */
- /** Edit -> Undo... */
+ /** Edit / Undo... */
public final UndoAction undo = new UndoAction();
- /** Edit -> Redo */
+ /** Edit / Redo */
public final RedoAction redo = new RedoAction();
- /** Edit -> Copy */
+ /** Edit / Copy */
public final CopyAction copy = new CopyAction();
- /** Edit -> Copy Coordinates */
+ /** Edit / Copy Coordinates */
public final JosmAction copyCoordinates = new CopyCoordinatesAction();
- /** Edit -> Paste */
+ /** Edit / Paste */
public final PasteAction paste = new PasteAction();
- /** Edit -> Paste Tags */
+ /** Edit / Paste Tags */
public final PasteTagsAction pasteTags = new PasteTagsAction();
- /** Edit -> Duplicate */
+ /** Edit / Duplicate */
public final DuplicateAction duplicate = new DuplicateAction();
- /** Edit -> Delete */
+ /** Edit / Delete */
public final DeleteAction delete = new DeleteAction();
- /** Edit -> Purge... */
+ /** Edit / Purge... */
public final JosmAction purge = new PurgeAction();
- /** Edit -> Merge layer */
+ /** Edit / Merge layer */
public final MergeLayerAction merge = new MergeLayerAction();
- /** Edit -> Merge selection */
+ /** Edit / Merge selection */
public final MergeSelectionAction mergeSelected = new MergeSelectionAction();
- /** Edit -> Search... */
+ /** Edit / Search... */
public final SearchAction search = new SearchAction();
- /** Edit -> Preferences */
+ /** Edit / Preferences */
public final PreferencesAction preferences = new PreferencesAction();
/* View menu */
- /** View -> Wireframe View */
+ /** View / Wireframe View */
public final WireframeToggleAction wireFrameToggleAction = new WireframeToggleAction();
public final JosmAction toggleGPXLines = new ToggleGPXLinesAction();
- /** View -> Advanced info */
+ /** View / Advanced info */
public final InfoAction info = new InfoAction();
- /** View -> Advanced info (web) */
+ /** View / Advanced info (web) */
public final InfoWebAction infoweb = new InfoWebAction();
- /** View -> History */
+ /** View / History */
public final HistoryInfoAction historyinfo = new HistoryInfoAction();
- /** View -> History (web) */
+ /** View / History (web) */
public final HistoryInfoWebAction historyinfoweb = new HistoryInfoWebAction();
- /** View -> "Zoom to"... actions */
+ /** View / "Zoom to"... actions */
public final Map autoScaleActions = new HashMap();
- /** View -> Jump to position */
+ /** View / Jump to position */
public final JumpToAction jumpToAct = new JumpToAction();
/* Tools menu */
- /** Tools -> Split Way */
+ /** Tools / Split Way */
public final SplitWayAction splitWay = new SplitWayAction();
- /** Tools -> Combine Way */
+ /** Tools / Combine Way */
public final CombineWayAction combineWay = new CombineWayAction();
- /** Tools -> Reverse Ways */
+ /** Tools / Reverse Ways */
public final ReverseWayAction reverseWay = new ReverseWayAction();
- /** Tools -> Simplify Way */
+ /** Tools / Simplify Way */
public final SimplifyWayAction simplifyWay = new SimplifyWayAction();
- /** Tools -> Align Nodes in Circle */
+ /** Tools / Align Nodes in Circle */
public final AlignInCircleAction alignInCircle = new AlignInCircleAction();
- /** Tools -> Align Nodes in Line */
+ /** Tools / Align Nodes in Line */
public final AlignInLineAction alignInLine = new AlignInLineAction();
- /** Tools -> Distribute Nodes */
+ /** Tools / Distribute Nodes */
public final DistributeAction distribute = new DistributeAction();
- /** Tools -> Orthogonalize Shape */
+ /** Tools / Orthogonalize Shape */
public final OrthogonalizeAction ortho = new OrthogonalizeAction();
/** Orthogonalize undo. Action is not shown in the menu. Only triggered by shortcut */
public final Undo orthoUndo = new Undo();
- /** Tools -> Mirror */
+ /** Tools / Mirror */
public final MirrorAction mirror = new MirrorAction();
- /** Tools -> Follow line */
+ /** Tools / Follow line */
public final FollowLineAction followLine = new FollowLineAction();
- /** Tools -> Add Node... */
+ /** Tools / Add Node... */
public final AddNodeAction addNode = new AddNodeAction();
- /** Tools -> Move Node... */
+ /** Tools / Move Node... */
public final MoveNodeAction moveNode = new MoveNodeAction();
- /** Tools -> Create Circle */
+ /** Tools / Create Circle */
public final CreateCircleAction createCircle = new CreateCircleAction();
- /** Tools -> Merge Nodes */
+ /** Tools / Merge Nodes */
public final MergeNodesAction mergeNodes = new MergeNodesAction();
- /** Tools -> Join Node to Way */
+ /** Tools / Join Node to Way */
public final JoinNodeWayAction joinNodeWay = new JoinNodeWayAction();
- /** Tools -> Disconnect Node from Way */
+ /** Tools / Disconnect Node from Way */
public final UnJoinNodeWayAction unJoinNodeWay = new UnJoinNodeWayAction();
- /** Tools -> Unglue Ways */
+ /** Tools / Unglue Ways */
public final UnGlueAction unglueNodes = new UnGlueAction();
- /** Tools -> Join overlapping Areas */
+ /** Tools / Join overlapping Areas */
public final JoinAreasAction joinAreas = new JoinAreasAction();
- /** Tools -> Create multipolygon */
+ /** Tools / Create multipolygon */
public final CreateMultipolygonAction createMultipolygon = new CreateMultipolygonAction(false);
- /** Tools -> Update multipolygon */
+ /** Tools / Update multipolygon */
public final CreateMultipolygonAction updateMultipolygon = new CreateMultipolygonAction(true);
/* Selection menu */
- /** Selection -> Select All */
+ /** Selection / Select All */
public final SelectAllAction selectAll = new SelectAllAction();
- /** Selection -> Unselect All */
+ /** Selection / Unselect All */
public final UnselectAllAction unselectAll = new UnselectAllAction();
- /** Selection -> Non-branching way sequences */
+ /** Selection / Non-branching way sequences */
public final SelectNonBranchingWaySequencesAction nonBranchingWaySequences = new SelectNonBranchingWaySequencesAction();
/* Audio menu */
- /** Audio -> Play/Pause */
+ /** Audio / Play/Pause */
public final JosmAction audioPlayPause = new AudioPlayPauseAction();
- /** Audio -> Next marker */
+ /** Audio / Next marker */
public final JosmAction audioNext = new AudioNextAction();
- /** Audio -> Previous Marker */
+ /** Audio / Previous Marker */
public final JosmAction audioPrev = new AudioPrevAction();
- /** Audio -> Forward */
+ /** Audio / Forward */
public final JosmAction audioFwd = new AudioFwdAction();
- /** Audio -> Back */
+ /** Audio / Back */
public final JosmAction audioBack = new AudioBackAction();
- /** Audio -> Faster */
+ /** Audio / Faster */
public final JosmAction audioFaster = new AudioFasterAction();
- /** Audio -> Slower */
+ /** Audio / Slower */
public final JosmAction audioSlower = new AudioSlowerAction();
/* Windows Menu */
- /** Windows -> Changeset Manager */
+ /** Windows / Changeset Manager */
public final ChangesetManagerToggleAction changesetManager = new ChangesetManagerToggleAction();
-
+
/* Help menu */
- /** Help -> Help */
+ /** Help / Help */
public final HelpAction help = new HelpAction();
- /** Help -> About */
+ /** Help / About */
public final AboutAction about = new AboutAction();
- /** Help -> Show Status Report */
+ /** Help / Show Status Report */
public final ShowStatusReportAction statusreport = new ShowStatusReportAction();
@@ -324,6 +324,6 @@
* dataMenu contains plugin actions that are related to certain tagging schemes (addressing opening hours),
* importing external data and using external web APIs
- * @since 6082
- */
+ * @since 6082
+ */
public final JMenu dataMenu = addMenu(marktr("Data"), KeyEvent.VK_D, 5, ht("/Menu/Data"));
/**
@@ -337,5 +337,5 @@
public final JMenu presetsMenu = addMenu(marktr("Presets"), KeyEvent.VK_P, 7, ht("/Menu/Presets"));
/**
- * submenu in Imagery menu that contains plugin-managed additional imagery layers
+ * submenu in Imagery menu that contains plugin-managed additional imagery layers
* @since 6097
*/
@@ -348,5 +348,5 @@
* gpsMenu contains all plugin actions that are related
* to using GPS data, including opening, uploading and real-time tracking
- * @since 6082
+ * @since 6082
*/
public final JMenu gpsMenu = addMenu(marktr("GPS"), KeyEvent.VK_G, 9, ht("/Menu/GPS"));
@@ -408,11 +408,11 @@
}
};
-
+
/**
* @since 6088
* @return the default position of tnew top-level menus
*/
- public int getDefaultMenuPos() {
- return defaultMenuPos;
+ public int getDefaultMenuPos() {
+ return defaultMenuPos;
}
@@ -586,9 +586,9 @@
public MainMenu() {
JMenuItem current;
-
+
moreToolsMenu.setVisible(false);
dataMenu.setVisible(false);
gpsMenu.setVisible(false);
-
+
add(fileMenu, newAction);
add(fileMenu, openFile);
@@ -710,5 +710,5 @@
add(imageryMenu, PreferencesAction.forPreferenceTab(tr("Imagery preferences"),
tr("Click to open the imagery tab in the preferences"), ImageryPreference.class));
-
+
add(selectionMenu, selectAll);
add(selectionMenu, unselectAll);
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 6830)
@@ -68,9 +68,9 @@
/**
* This is a component used in the {@link MapFrame} for browsing the map. It use is to
- * provide the MapMode's enough capabilities to operate.
+ * provide the MapMode's enough capabilities to operate.
*
* {@code MapView} holds meta-data about the data set currently displayed, as scale level,
* center point viewed, what scrolling mode or editing mode is selected or with
- * what projection the map is viewed etc..
+ * what projection the map is viewed etc..
*
* {@code MapView} is able to administrate several layers.
@@ -732,5 +732,5 @@
* Example:
*
- * List wmsLayers = getLayersOfType(WMSLayer.class);
+ * List<WMSLayer> wmsLayers = getLayersOfType(WMSLayer.class);
*
*
Index: trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 6830)
@@ -24,5 +24,5 @@
*
* @author imi
- * @author Frederik Ramm
+ * @author Frederik Ramm
*/
public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer {
Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 6830)
@@ -180,7 +180,7 @@
/**
- * Task can run in background if returned value <> null. Note that it's tasks responsibility
+ * Task can run in background if returned value != null. Note that it's tasks responsibility
* to ensure proper synchronization, PleaseWaitRunnable doesn't with it.
- * @return If returned value is <> null then task can run in background. TaskId could be used in future for "Always run in background" checkbox
+ * @return If returned value is != null then task can run in background. TaskId could be used in future for "Always run in background" checkbox
*/
public ProgressTaskId canRunInBackground() {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 6830)
@@ -50,5 +50,5 @@
*
* - the table model and the list selection for for a {@link JTable} which shows my entries.
- * See {@link #getMyTableModel()}
and {@link ListMergeModel#getMySelectionModel()}
+ * See {@link #getMyTableModel()} and {@link ListMergeModel#getMySelectionModel()}
* - dito for their entries and merged entries
*
@@ -410,5 +410,5 @@
* @param rows the indices
* @param current the row index before which the nodes are inserted
- * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
+ * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
*
*/
@@ -424,5 +424,5 @@
* @param rows the indices
* @param current the row index before which the nodes are inserted
- * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
+ * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
*
*/
@@ -437,5 +437,5 @@
* @param rows the indices
* @param current the row index before which the nodes are inserted
- * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
+ * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
*
*/
@@ -451,5 +451,5 @@
* @param rows the indices
* @param current the row index after which the nodes are inserted
- * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
+ * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
*
*/
@@ -466,5 +466,5 @@
* @param rows the indices
* @param current the row index after which the nodes are inserted
- * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
+ * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
*
*/
@@ -479,5 +479,5 @@
* @param rows the indices
* @param current the row index after which the nodes are inserted
- * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
+ * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
*
*/
@@ -633,5 +633,5 @@
* participates in the current {@link ComparePairType}
*
- * @see ComparePairListModel#getSelectedComparePair()
+ * @see ListMergeModel.ComparePairListModel#getSelectedComparePair()
*/
public boolean isParticipatingInCurrentComparePair() {
@@ -831,4 +831,7 @@
private final List compareModes;
+ /**
+ * Constructs a new {@code ComparePairListModel}.
+ */
public ComparePairListModel() {
this.compareModes = new ArrayList();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 6830)
@@ -63,6 +63,6 @@
* Creates a download task for a single changeset
*
- * @param changesetId the changeset id. >0 required.
- * @throws IllegalArgumentException thrown if changesetId <= 0
+ * @param changesetId the changeset id. > 0 required.
+ * @throws IllegalArgumentException thrown if changesetId <= 0
*/
public ChangesetContentDownloadTask(int changesetId) throws IllegalArgumentException{
@@ -74,5 +74,5 @@
/**
- * Creates a download task for a collection of changesets. null values and id <=0 in
+ * Creates a download task for a collection of changesets. null values and id <=0 in
* the collection are sillently discarded.
*
@@ -100,5 +100,5 @@
/**
- * Creates a download task for a collection of changesets. null values and id <=0 in
+ * Creates a download task for a collection of changesets. null values and id <=0 in
* the collection are sillently discarded.
*
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 6830)
@@ -104,5 +104,5 @@
* whose parent is {@link Main#parent}.
*
- * Null ids or or ids <= 0 in the id collection are ignored.
+ * Null ids or or ids <= 0 in the id collection are ignored.
*
* @param ids the collection of ids. Empty collection assumed if null.
@@ -118,5 +118,5 @@
* whose parent is the parent window of dialogParent.
*
- * Null ids or or ids <= 0 in the id collection are ignored.
+ * Null ids or or ids <= 0 in the id collection are ignored.
*
* @param dialogParent the parent reference component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be null.
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6830)
@@ -41,5 +41,5 @@
* if (task.isCanceled() || task.hasError())
* return;
- * List parents = task.getParents();
+ * List<Relation> parents = task.getParents();
* // do something with the parent relations
* }
@@ -64,5 +64,5 @@
* Creates a new task for asynchronously downloading the parents of a child relation.
*
- * @param child the child relation. Must not be null. Must have an id > 0.
+ * @param child the child relation. Must not be null. Must have an id > 0.
* @param layer the OSM data layer. Must not be null.
* @param full if true, parent relations are fully downloaded (i.e. with their members)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 6830)
@@ -15,5 +15,5 @@
/**
* This is a {@link TreeModel} which provides the hierarchical structure of {@link Relation}s
- * to a {@link javax.swing.tree.JTree}.
+ * to a {@link javax.swing.JTree}.
*
* The model is initialized with a root relation or with a list of {@link RelationMember}s, see
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 6830)
@@ -26,5 +26,5 @@
* (that are shared by other members).
*
- * @author Christiaan Welvaart
+ * @author Christiaan Welvaart <cjw@time4t.net>
*
*/
Index: trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 6830)
@@ -37,5 +37,5 @@
* Provides max/min lat/lon input fields as well as the "URL from www.openstreetmap.org" text field.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*
*/
Index: trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java (revision 6830)
@@ -15,5 +15,5 @@
* Provides a tile coordinate input field.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*
*/
@@ -27,4 +27,7 @@
}
+ /**
+ * Constructs a new {@code TileSelection}.
+ */
public TileSelection() {
build();
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 6830)
@@ -10,5 +10,4 @@
import java.util.Collection;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
@@ -57,4 +56,7 @@
private OsmServerHistoryReader reader = null;
+ /**
+ * Constructs a new {@code HistoryLoadTask}.
+ */
public HistoryLoadTask() {
super(tr("Load history"), true);
@@ -63,5 +65,5 @@
/**
- * Creates a new task
+ * Constructs a new {@code HistoryLoadTask}.
*
* @param parent the component to be used as reference to find the
@@ -95,5 +97,5 @@
* Adds an object whose history is to be loaded.
*
- * @param pid the primitive id. Must not be null. Id > 0 required.
+ * @param pid the primitive id. Must not be null. Id > 0 required.
* @return this task
*/
@@ -133,8 +135,8 @@
* Adds an object to be loaded, the object is specified by an OSM primitive.
*
- * @param primitive the OSM primitive. Must not be null. primitive.getId() > 0 required.
+ * @param primitive the OSM primitive. Must not be null. primitive.getId() > 0 required.
* @return this task
* @throws IllegalArgumentException thrown if the primitive is null
- * @throws IllegalArgumentException thrown if primitive.getId() <= 0
+ * @throws IllegalArgumentException thrown if primitive.getId() <= 0
*/
public HistoryLoadTask add(OsmPrimitive primitive) {
@@ -148,5 +150,5 @@
*
* @param primitives the OSM primitives. Must not be null.
- * primitive.getId() > 0 required.
+ * primitive.getId() > 0 required.
* @return this task
* @throws IllegalArgumentException thrown if primitives is null
Index: trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 6830)
@@ -31,5 +31,5 @@
/**
* Closes all changesets in changesets if they are not null, if they
- * are still open and if they have an id > 0. Other changesets in the collection
+ * are still open and if they have an id > 0. Other changesets in the collection
* are ignored.
*
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 6830)
@@ -17,5 +17,5 @@
* ExecutorService executorService = ...
* SaveLayerTask task = new SaveLayerTask(layer, monitor);
- * Future taskFuture = executorServce.submit(task)
+ * Future<?> taskFuture = executorServce.submit(task)
* try {
* // wait for the task to complete
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 6830)
@@ -31,5 +31,5 @@
* ExecutorService executorService = ...
* UploadLayerTask task = new UploadLayerTask(layer, monitor);
- * Future taskFuture = executorServce.submit(task)
+ * Future<?> taskFuture = executorServce.submit(task)
* try {
* // wait for the task to complete
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6830)
@@ -231,5 +231,5 @@
return sp;
}
-
+
@Override
public boolean isInfoResizable() {
@@ -393,6 +393,6 @@
/**
* transition function:
- * w(0)=1, w(1)=0, 0<=w(x)<=1
- * @param x number: 0<=x<=1
+ * w(0)=1, w(1)=0, 0<=w(x)<=1
+ * @param x number: 0<=x<=1
* @return the weighted value
*/
Index: trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6830)
@@ -450,5 +450,5 @@
/**
- * Replies the savable state of this layer (i.e if it can be saved through a "File->Save" dialog).
+ * Replies the savable state of this layer (i.e if it can be saved through a "File->Save" dialog).
* @return true if this layer can be saved to a file
* @since 5459
@@ -468,5 +468,5 @@
/**
- * Creates a new "Save" dialog for this layer and makes it visible.
+ * Creates a new "Save" dialog for this layer and makes it visible.
* When the user has chosen a file, checks the file extension, and confirms overwrite if needed.
* @return The output {@code File}
Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6830)
@@ -87,8 +87,8 @@
* Class that displays a slippy map layer.
*
- * @author Frederik Ramm
- * @author LuVar
- * @author Dave Hansen
- * @author Upliner
+ * @author Frederik Ramm
+ * @author LuVar <lubomir.varga@freemap.sk>
+ * @author Dave Hansen <dave@sr71.net>
+ * @author Upliner <upliner@gmail.com>
*
*/
@@ -736,5 +736,5 @@
* Check if zooming out is allowed
*
- * @return true, if zooming out is allowed (currentZoomLevel > minZoomLevel)
+ * @return true, if zooming out is allowed (currentZoomLevel > minZoomLevel)
*/
public boolean zoomDecreaseAllowed() {
Index: trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 6830)
@@ -514,5 +514,5 @@
*
* @param request
- * @return -1 if request is no longer needed, otherwise priority of request (lower number <=> more important request)
+ * @return -1 if request is no longer needed, otherwise priority of request (lower number <=> more important request)
*/
private int getRequestPriority(WMSRequest request) {
@@ -738,5 +738,5 @@
public static class ChangeResolutionAction extends AbstractAction implements LayerAction {
-
+
/**
* Constructs a new {@code ChangeResolutionAction}
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (revision 6830)
@@ -17,5 +17,5 @@
* Marker class with audio playback capability.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*
*/
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 6830)
@@ -19,5 +19,5 @@
* Marker class with button look-and-feel.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*
*/
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (revision 6830)
@@ -31,5 +31,5 @@
* displays an image view dialog. Re-uses some code from GeoImageLayer.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*
*/
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6830)
@@ -60,9 +60,9 @@
* will create AudioMarkers for .wav files, ImageMarkers for .png/.jpg/.jpeg
* files, and WebMarkers for everything else. (The creation of a WebMarker will
- * fail if there's no valid URL in the tag, so it might still make sense
+ * fail if there's no valid URL in the <link> tag, so it might still make sense
* to add Makers for such waypoints at the end of the list.)
*
- * The default implementation only looks at the value of the tag inside
- * the tag of the GPX file.
+ * The default implementation only looks at the value of the <link> tag inside
+ * the <wpt> tag of the GPX file.
*
* HowTo implement a new Marker
@@ -78,5 +78,5 @@
*
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*/
public class Marker implements TemplateEngineDataProvider {
@@ -288,10 +288,10 @@
public double time;
/** Time offset in seconds from the gpx point from which it was derived, may be adjusted later to sync with other data, so not final */
- public double offset;
+ public double offset;
private String cachedText;
private int textVersion = -1;
private CachedLatLon coor;
-
+
private boolean erroneous = false;
@@ -416,5 +416,5 @@
}
}
-
+
protected void paintIcon(MapView mv, Graphics g, int x, int y) {
if (!erroneous) {
@@ -424,5 +424,5 @@
int width = symbol.getIconWidth();
int height = symbol.getIconHeight();
-
+
redSymbol = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
Graphics2D gbi = redSymbol.createGraphics();
@@ -501,5 +501,5 @@
throw new UnsupportedOperationException();
}
-
+
/**
* Determines if this marker is erroneous.
@@ -510,5 +510,5 @@
return erroneous;
}
-
+
/**
* Sets this marker erroneous or not.
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (revision 6830)
@@ -12,5 +12,5 @@
* the Marker are consecutively called until one returns a Marker object.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*/
public interface MarkerProducers {
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6830)
@@ -31,5 +31,5 @@
* Singleton marker class to track position of audio.
*
- * @author David Earl
+ * @author David Earl <david@frankieandshadow.com>
* @since 572
*/
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (revision 6830)
@@ -23,5 +23,5 @@
* Marker class with Web URL activation.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm
*
*/
@@ -41,5 +41,5 @@
setErroneous(true);
new Notification(
- "" + tr("There was an error while trying to display the URL for this marker") + "
" +
+ "" + tr("There was an error while trying to display the URL for this marker") + "
" +
tr("(URL was: ") + webUrl.toString() + ")" + "
" + error)
.setIcon(JOptionPane.ERROR_MESSAGE)
@@ -59,5 +59,5 @@
return wpt;
}
-
+
private final void updateErroneous() {
if ("file".equals(webUrl.getProtocol())) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 6830)
@@ -294,5 +294,5 @@
*
* @param osm the primitive to create styles for
- * @param scale the scale (in meters per 100 px), must be > 0
+ * @param scale the scale (in meters per 100 px), must be > 0
* @param multipolyOuterWay support for a very old multipolygon tagging style
* where you add the tags both to the outer and the inner way.
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 6830)
@@ -31,5 +31,4 @@
* options mappaint.nameOrder and mappaint.nameComplementOrder.
*
- *
*
*/
@@ -202,5 +201,5 @@
return result;
}
-
+
/**
* Sets the name tags to be looked up in order to build up the label.
@@ -221,5 +220,5 @@
this.nameComplementTags = buildNameTags(nameComplementTags);
}
-
+
/**
* Replies an unmodifiable list of the name tags used to compose the label.
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java (revision 6830)
@@ -22,5 +22,5 @@
/**
- * The View -> Map Paint Styles menu
+ * The View -> Map Paint Styles menu
* @since 5086
*/
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 6830)
@@ -49,5 +49,5 @@
return styles;
}
-
+
private MapPaintStyles() {
// Hide default constructor for utils classes
@@ -388,5 +388,5 @@
/***********************************
- * MapPaintSylesUpdateListener & related code
+ * MapPaintSylesUpdateListener & related code
* (get informed when the list of MapPaint StyleSources changes)
*/
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java (revision 6830)
@@ -3,5 +3,5 @@
/**
- * An interval of the form "lower < x <= upper" where 0 <= lower < upper.
+ * An interval of the form "lower < x <= upper" where 0 <= lower < upper.
* (upper can be Double.POSITIVE_INFINITY)
* immutable class
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6830)
@@ -16,5 +16,5 @@
* Splits the range of possible scale values (0 < scale < +Infinity) into multiple
* subranges, for each scale range it keeps a list of styles.
- * Immutable class, equals & hashCode is required (the same for StyleList, ElemStyle
+ * Immutable class, equals & hashCode is required (the same for StyleList, ElemStyle
* and its subclasses).
*/
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 6830)
@@ -138,5 +138,5 @@
/**
- * link between primitives, e.g. relation >[role=outer] way
+ * link between primitives, e.g. relation >[role=outer] way
*/
LINK
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 6830)
@@ -88,5 +88,5 @@
}
}
-
+
private ExpressionFactory() {
// Hide default constructor for utils classes
@@ -531,5 +531,5 @@
* Percent-encode a string. (See https://en.wikipedia.org/wiki/Percent-encoding)
* This is especially useful for data urls, e.g.
- * icon-image: concat("data:image/svg+xml,", URL_encode(""));
+ * icon-image: concat("data:image/svg+xml,", URL_encode("<svg>...</svg>"));
* @param s arbitrary string
* @return the encoded string
@@ -546,6 +546,5 @@
* XML-encode a string.
*
- * Escapes special characters in xml. Alternative to using
- * blocks.
+ * Escapes special characters in xml. Alternative to using <![CDATA[ ... ]]> blocks.
* @param s arbitrary string
* @return the encoded string
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (revision 6830)
@@ -205,5 +205,5 @@
/**
- * comma delimited list of floats (at least 2, all >= 0)
+ * comma delimited list of floats (at least 2, all >= 0)
*/
List float_array() :
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6830)
@@ -48,9 +48,9 @@
* an "inverse" notation:
*
- * selector_a > selector_b { ... } // the standard notation (child selector)
- * relation[type=route] > way { ... } // example (all ways of a route)
+ * selector_a > selector_b { ... } // the standard notation (child selector)
+ * relation[type=route] > way { ... } // example (all ways of a route)
*
- * selector_a < selector_b { ... } // the inverse notation (parent selector)
- * node[traffic_calming] < way { ... } // example (way that has a traffic calming node)
+ * selector_a < selector_b { ... } // the inverse notation (parent selector)
+ * node[traffic_calming] < way { ... } // example (way that has a traffic calming node)
*
*
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6830)
@@ -21,12 +21,13 @@
import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
/**
* Panel allowing the user to setup advanced OAuth parameters:
+ *
* - Consumer key
* - Consumer secret
@@ -34,4 +35,5 @@
* - Access token URL
* - Authorize URL
+ *
*
* @see OAuthParameters
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEntry.java (revision 6830)
@@ -120,5 +120,5 @@
/**
* extract file part from url, e.g.:
- * http://www.test.com/file.xml?format=text --> file.xml
+ * http://www.test.com/file.xml?format=text --> file.xml
*/
public String getFileNamePart() {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 6830)
@@ -194,8 +194,8 @@
* adds a tag given by a name/value pair to the tag editor model.
*
- * If there is no tag with name name yet, a new {@link TagModel} is created
+ * If there is no tag with name name yet, a new {@link TagModel} is created
* and append to this model.
*
- * If there is a tag with name name, value is merged to the list
+ * If there is a tag with name name, value is merged to the list
* of values for this tag.
*
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6830)
@@ -240,5 +240,5 @@
/**
- * Enum denoting how a match (see {@link Item#matches}) is performed.
+ * Enum denoting how a match (see {@link TaggingPresetItem#matches}) is performed.
*/
public static enum MatchType {
@@ -1379,5 +1379,5 @@
/**
* allow escaped comma in comma separated list:
- * "A\, B\, C,one\, two" --> ["A, B, C", "one, two"]
+ * "A\, B\, C,one\, two" --> ["A, B, C", "one, two"]
* @param delimiter the delimiter, e.g. a comma. separates the entries and
* must be escaped within one entry
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java (revision 6830)
@@ -79,5 +79,5 @@
/**
* Merges two priorities.
- * The resulting priority is always >= the original ones.
+ * The resulting priority is always >= the original ones.
*/
public AutoCompletionItemPriority mergeWith(AutoCompletionItemPriority other) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 6830)
@@ -247,5 +247,5 @@
/**
* replies the idx-th item from the list of filtered items
- * @param idx the index; must be in the range 0<= idx < {@link #getFilteredSize()}
+ * @param idx the index; must be in the range 0 <= idx < {@link #getFilteredSize()}
* @return the item
*
Index: trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 6830)
@@ -21,6 +21,6 @@
/**
- * Synchronizes scrollbar adjustments between a set of {@link Adjustable}s.
- * Whenever the adjustment of one of the registered Adjustables is updated
+ * Synchronizes scrollbar adjustments between a set of {@link Adjustable}s.
+ * Whenever the adjustment of one of the registered Adjustables is updated
* the adjustment of the other registered Adjustables is adjusted too.
* @since 6147
@@ -101,10 +101,10 @@
/**
* Wires a {@link JCheckBox} to the adjustment synchronizer, in such a way that:
- *
- * state changes in the checkbox control whether the adjustable participates
- * in synchronized adjustment
- * state changes in this {@link AdjustmentSynchronizer} are reflected in the
- * {@link JCheckBox}
- *
+ *
+ * - state changes in the checkbox control whether the adjustable participates
+ * in synchronized adjustment
+ * - state changes in this {@link AdjustmentSynchronizer} are reflected in the
+ * {@link JCheckBox}
+ *
*
* @param view the checkbox to control whether an adjustable participates in synchronized adjustment
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 6830)
@@ -39,9 +39,9 @@
*/
public final class GuiHelper {
-
+
private GuiHelper() {
// Hide default constructor for utils classes
}
-
+
/**
* disable / enable a component and all its child components
@@ -180,5 +180,5 @@
/**
* Return s new BasicStroke object with given thickness and style
- * @param code = 3.5 -> thickness=3.5px; 3.5 10 5 -> thickness=3.5px, dashed: 10px filled + 5px empty
+ * @param code = 3.5 -> thickness=3.5px; 3.5 10 5 -> thickness=3.5px, dashed: 10px filled + 5px empty
* @return stroke for drawing
*/
Index: trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java (revision 6830)
@@ -71,5 +71,5 @@
/**
* Highlight and remember given primitive
- * @param prims - primitives to highlight/unhighlight
+ * @param p - primitive to highlight/unhighlight
* @param flag - true to highlight
*/
Index: trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java (revision 6830)
@@ -56,9 +56,9 @@
* null.
*
- * @param columns the number of columns to use to calculate
+ * @param columns the number of columns to use to calculate
* the preferred width; if columns is set to zero, the
* preferred width will be whatever naturally results from
* the component implementation
- */
+ */
public DisableShortcutsOnFocusGainedTextField(int columns) {
super(columns);
@@ -71,5 +71,5 @@
*
* @param text the text to be displayed, or null
- * @param columns the number of columns to use to calculate
+ * @param columns the number of columns to use to calculate
* the preferred width; if columns is set to zero, the
* preferred width will be whatever naturally results from
@@ -91,9 +91,9 @@
* createDefaultModel method
* @param text the initial string to display, or null
- * @param columns the number of columns to use to calculate
- * the preferred width >= 0; if columns
+ * @param columns the number of columns to use to calculate
+ * the preferred width >= 0; if columns
* is set to zero, the preferred width will be whatever
* naturally results from the component implementation
- * @exception IllegalArgumentException if columns < 0
+ * @exception IllegalArgumentException if columns < 0
*/
public DisableShortcutsOnFocusGainedTextField(Document doc, String text, int columns) {
@@ -108,5 +108,5 @@
addFocusListener(this);
}
-
+
@Override
public void focusGained(FocusEvent e) {
@@ -120,5 +120,5 @@
restoreMenuActions();
}
-
+
/**
* Disables all relevant menu actions.
@@ -149,5 +149,5 @@
}
}
-
+
/**
* Unregisters all relevant action shortcuts.
@@ -156,5 +156,5 @@
protected void unregisterActionShortcuts() {
unregisteredActionShortcuts.clear();
- // Unregister all actions without modifiers to avoid them to be triggered by typing in this text field
+ // Unregister all actions without modifiers to avoid them to be triggered by typing in this text field
for (Shortcut shortcut : Shortcut.listAll()) {
KeyStroke ks = shortcut.getKeyStroke();
@@ -168,5 +168,5 @@
}
}
-
+
/**
* Returns true if the given shortcut has no modifier and is not an actions key.
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JFileChooserManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JFileChooserManager.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JFileChooserManager.java (revision 6830)
@@ -16,9 +16,9 @@
/**
- * A chained utility class used to create and open {@link JFileChooser} dialogs.
- * Use only this class if you need to control specifically your JFileChooser dialog.
+ * A chained utility class used to create and open {@link JFileChooser} dialogs.
+ * Use only this class if you need to control specifically your JFileChooser dialog.
*
* A simpler usage is to call the {@link DiskAccessAction#createAndOpenFileChooser} methods.
- *
+ *
* @since 5438
*/
@@ -27,5 +27,5 @@
private final String lastDirProperty;
private final String curDir;
-
+
private JFileChooser fc;
@@ -38,9 +38,9 @@
this(open, null);
}
-
+
/**
* Creates a new {@code JFileChooserManager}.
* @param open If true, "Open File" dialogs will be created. If false, "Save File" dialogs will be created.
- * @param lastDirProperty The name of the property used to get the last directory. This directory is used to initialize the JFileChooser.
+ * @param lastDirProperty The name of the property used to get the last directory. This directory is used to initialize the JFileChooser.
* Then, if the user effectively chooses a file or a directory, this property will be updated to the directory path.
* @see #createFileChooser
@@ -53,7 +53,7 @@
* Creates a new {@code JFileChooserManager}.
* @param open If true, "Open File" dialogs will be created. If false, "Save File" dialogs will be created.
- * @param lastDirProperty The name of the property used to get the last directory. This directory is used to initialize the JFileChooser.
+ * @param lastDirProperty The name of the property used to get the last directory. This directory is used to initialize the JFileChooser.
* Then, if the user effectively chooses a file or a directory, this property will be updated to the directory path.
- * @param defaultDir The default directory used to initialize the JFileChooser if the {@code lastDirProperty} property value is missing.
+ * @param defaultDir The default directory used to initialize the JFileChooser if the {@code lastDirProperty} property value is missing.
* @see #createFileChooser
*/
@@ -61,6 +61,6 @@
this.open = open;
this.lastDirProperty = lastDirProperty == null || lastDirProperty.isEmpty() ? "lastDirectory" : lastDirProperty;
- this.curDir = Main.pref.get(this.lastDirProperty).isEmpty() ?
- (defaultDir == null || defaultDir.isEmpty() ? "." : defaultDir)
+ this.curDir = Main.pref.get(this.lastDirProperty).isEmpty() ?
+ (defaultDir == null || defaultDir.isEmpty() ? "." : defaultDir)
: Main.pref.get(this.lastDirProperty);
}
@@ -68,5 +68,5 @@
/**
* Replies the {@code JFileChooser} that has been previously created.
- * @return The {@code JFileChooser} that has been previously created, or {@code null} if it has not been created yet.
+ * @return The {@code JFileChooser} that has been previously created, or {@code null} if it has not been created yet.
* @see #createFileChooser
*/
@@ -90,15 +90,15 @@
return doCreateFileChooser(false, null, null, null, null, JFileChooser.FILES_ONLY, false);
}
-
+
/**
* Creates a new {@link JFileChooser} with given settings for a single {@code FileFilter}.
- *
+ *
* @param multiple If true, makes the dialog allow multiple file selections
* @param title The string that goes in the dialog window's title bar
* @param filter The only file filter that will be proposed by the dialog
- * @param selectionMode The selection mode that allows the user to:
- *
just select files ({@code JFileChooser.FILES_ONLY})
- * just select directories ({@code JFileChooser.DIRECTORIES_ONLY})
- * select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})
+ * @param selectionMode The selection mode that allows the user to:
+ * - just select files ({@code JFileChooser.FILES_ONLY})
+ * - just select directories ({@code JFileChooser.DIRECTORIES_ONLY})
+ * - select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})
* @return this
* @see DiskAccessAction#createAndOpenFileChooser(boolean, boolean, String, FileFilter, int, String)
@@ -109,16 +109,16 @@
return this;
}
-
+
/**
* Creates a new {@link JFileChooser} with given settings for a collection of {@code FileFilter}s.
- *
+ *
* @param multiple If true, makes the dialog allow multiple file selections
* @param title The string that goes in the dialog window's title bar
* @param filters The file filters that will be proposed by the dialog
* @param defaultFilter The file filter that will be selected by default
- * @param selectionMode The selection mode that allows the user to:
- * just select files ({@code JFileChooser.FILES_ONLY})
- * just select directories ({@code JFileChooser.DIRECTORIES_ONLY})
- * select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})
+ * @param selectionMode The selection mode that allows the user to:
+ * - just select files ({@code JFileChooser.FILES_ONLY})
+ * - just select directories ({@code JFileChooser.DIRECTORIES_ONLY})
+ * - select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})
* @return this
* @see DiskAccessAction#createAndOpenFileChooser(boolean, boolean, String, Collection, FileFilter, int, String)
@@ -130,14 +130,14 @@
/**
* Creates a new {@link JFileChooser} with given settings for a file extension.
- *
+ *
* @param multiple If true, makes the dialog allow multiple file selections
* @param title The string that goes in the dialog window's title bar
* @param extension The file extension that will be selected as the default file filter
- * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
+ * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
* If false, only the file filters that include {@code extension} will be proposed
- * @param selectionMode The selection mode that allows the user to:
- * just select files ({@code JFileChooser.FILES_ONLY})
- * just select directories ({@code JFileChooser.DIRECTORIES_ONLY})
- * select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})
+ * @param selectionMode The selection mode that allows the user to:
+ * - just select files ({@code JFileChooser.FILES_ONLY})
+ * - just select directories ({@code JFileChooser.DIRECTORIES_ONLY})
+ * - select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})
* @return this
* @see DiskAccessAction#createAndOpenFileChooser(boolean, boolean, String, FileFilter, int, String)
@@ -156,5 +156,5 @@
fc.setMultiSelectionEnabled(multiple);
fc.setAcceptAllFileFilterUsed(false);
-
+
if (filters != null) {
for (FileFilter filter : filters) {
@@ -174,5 +174,5 @@
/**
* Opens the {@code JFileChooser} that has been created. Nothing happens if it has not been created yet.
- * @return the {@code JFileChooser} if the user effectively choses a file or directory. {@code null} if the user cancelled the dialog.
+ * @return the {@code JFileChooser} if the user effectively choses a file or directory. {@code null} if the user cancelled the dialog.
*/
public final JFileChooser openFileChooser() {
@@ -181,10 +181,10 @@
/**
- * Opens the {@code JFileChooser} that has been created and waits for the user to choose a file/directory, or cancel the dialog.
- * Nothing happens if the dialog has not been created yet.
+ * Opens the {@code JFileChooser} that has been created and waits for the user to choose a file/directory, or cancel the dialog.
+ * Nothing happens if the dialog has not been created yet.
* When the user choses a file or directory, the {@code lastDirProperty} is updated to the chosen directory path.
- *
+ *
* @param parent The Component used as the parent of the JFileChooser. If null, uses {@code Main.parent}.
- * @return the {@code JFileChooser} if the user effectively choses a file or directory. {@code null} if the user cancelled the dialog.
+ * @return the {@code JFileChooser} if the user effectively choses a file or directory. {@code null} if the user cancelled the dialog.
*/
public JFileChooser openFileChooser(Component parent) {
@@ -193,5 +193,5 @@
parent = Main.parent;
}
-
+
int answer = open ? fc.showOpenDialog(parent) : fc.showSaveDialog(parent);
if (answer != JFileChooser.APPROVE_OPTION) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java (revision 6830)
@@ -24,7 +24,7 @@
/**
- * Class overriding each {@link JComboBox} in JOSM to control consistently the number of displayed items at once.
+ * Class overriding each {@link JComboBox} in JOSM to control consistently the number of displayed items at once.
* This is needed because of the default Java behaviour that may display the top-down list off the screen (see #7917).
- *
+ *
* @since 5429
*/
@@ -32,9 +32,9 @@
/**
- * The default prototype value used to compute the maximum number of elements to be displayed at once before
+ * The default prototype value used to compute the maximum number of elements to be displayed at once before
* displaying a scroll bar
*/
public static final String DEFAULT_PROTOTYPE_DISPLAY_VALUE = "Prototype display value";
-
+
/**
* Creates a JosmComboBox with a default data model.
@@ -55,7 +55,7 @@
* Use addItem to add items. By default the first item
* in the data model becomes selected.
- *
- * @param prototypeDisplayValue the Object used to compute
- * the maximum number of elements to be displayed at once before
+ *
+ * @param prototypeDisplayValue the Object used to compute
+ * the maximum number of elements to be displayed at once before
* displaying a scroll bar
*
@@ -75,5 +75,5 @@
* may impact how the insert, remove and add methods behave.
*
- * @param aModel the ComboBoxModel that provides the
+ * @param aModel the ComboBoxModel that provides the
* displayed list of items
* @see DefaultComboBoxModel
@@ -88,5 +88,5 @@
}
- /**
+ /**
* Creates a JosmComboBox that contains the elements
* in the specified array. By default the first item in the array
@@ -100,5 +100,5 @@
init(findPrototypeDisplayValue(Arrays.asList(items)));
}
-
+
/**
* Finds the prototype display value to use among the given possible candidates.
@@ -113,5 +113,5 @@
// Remind old prototype to restore it later
Object oldPrototype = getPrototypeDisplayValue();
- // Get internal JList to directly call the renderer
+ // Get internal JList to directly call the renderer
JList list = getList();
try {
@@ -120,5 +120,5 @@
for (Object value : possibleValues) {
if (value != null) {
- // With a "classic" renderer, we could call setPrototypeDisplayValue(value) + getPreferredSize()
+ // With a "classic" renderer, we could call setPrototypeDisplayValue(value) + getPreferredSize()
// but not with TaggingPreset custom renderer that return a dummy height if index is equal to -1
// So we explicitely call the renderer by simulating a correct index for the current value
@@ -143,5 +143,5 @@
return result;
}
-
+
protected final JList getList() {
for (int i = 0; i < getUI().getAccessibleChildrenCount(this); i++) {
@@ -153,10 +153,10 @@
return null;
}
-
+
protected void init(Object prototype) {
if (prototype != null) {
setPrototypeDisplayValue(prototype);
int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
- // Compute maximum number of visible items based on the preferred size of the combo box.
+ // Compute maximum number of visible items based on the preferred size of the combo box.
// This assumes that items have the same height as the combo box, which is not granted by the look and feel
int maxsize = (screenHeight/getPreferredSize().height) / 2;
@@ -180,10 +180,10 @@
addPropertyChangeListener("editor", handler);
}
-
+
protected class ContextMenuHandler extends MouseAdapter implements PropertyChangeListener {
private JTextComponent component;
private PopupMenuLauncher launcher;
-
+
@Override public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals("editable")) {
@@ -200,5 +200,5 @@
}
}
-
+
private void enableMenu() {
if (launcher == null) {
@@ -223,9 +223,9 @@
}
}
-
+
@Override public void mousePressed(MouseEvent e) { processEvent(e); }
@Override public void mouseClicked(MouseEvent e) { processEvent(e); }
@Override public void mouseReleased(MouseEvent e) { processEvent(e); }
-
+
private void processEvent(MouseEvent e) {
if (launcher != null && !e.isPopupTrigger()) {
@@ -236,5 +236,5 @@
}
}
-
+
/**
* Reinitializes this {@link JosmComboBox} to the specified values. This may needed if a custom renderer is used.
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java (revision 6830)
@@ -14,8 +14,8 @@
/**
- * A subclass of {@link JPasswordField} to implement a workaround to
+ * A subclass of {@link JPasswordField} to implement a workaround to
* JDK bug 6322854.
* This class can be deleted after Oracle decides to fix this bug...
- *
+ *
* @since 5752
* @see http://josm.openstreetmap.de/ticket/8404
@@ -35,5 +35,5 @@
/**
* Constructs a new JosmPasswordField that uses the
- * given text storage model and the given number of columns.
+ * given text storage model and the given number of columns.
* This is the constructor through which the other constructors feed.
* The echo character is set to '*', but may be changed by the current
@@ -43,6 +43,6 @@
* @param doc the text storage to use
* @param txt the text to be displayed, null if none
- * @param columns the number of columns to use to calculate
- * the preferred width >= 0; if columns is set to zero, the
+ * @param columns the number of columns to use to calculate
+ * the preferred width >= 0; if columns is set to zero, the
* preferred width will be whatever naturally results from
* the component implementation
@@ -58,6 +58,6 @@
* is set to null.
*
- * @param columns the number of columns >= 0
- */
+ * @param columns the number of columns >= 0
+ */
public JosmPasswordField(int columns) {
super(columns);
@@ -71,5 +71,5 @@
*
* @param text the text to be displayed, null if none
- * @param columns the number of columns >= 0
+ * @param columns the number of columns >= 0
*/
public JosmPasswordField(String text, int columns) {
@@ -89,5 +89,5 @@
workaroundJdkBug6322854(this);
}
-
+
/**
* Implements a workaround to JDK bug 6322854.
@@ -97,7 +97,7 @@
if (text != null) {
text.getActionMap().put("paste", new Action() {
-
+
private final Action pasteAction = TransferHandler.getPasteAction();
-
+
@Override
public void actionPerformed(ActionEvent e) {
@@ -110,30 +110,30 @@
}
}
-
+
@Override
public void setEnabled(boolean b) {
pasteAction.setEnabled(b);
}
-
+
@Override
public void removePropertyChangeListener(PropertyChangeListener listener) {
pasteAction.removePropertyChangeListener(listener);
}
-
+
@Override
public void putValue(String key, Object value) {
pasteAction.putValue(key, value);
}
-
+
@Override
public boolean isEnabled() {
return pasteAction.isEnabled();
}
-
+
@Override
public Object getValue(String key) {
return pasteAction.getValue(key);
}
-
+
@Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java (revision 6830)
@@ -44,6 +44,6 @@
* string is null.
*
- * @param rows the number of rows >= 0
- * @param columns the number of columns >= 0
+ * @param rows the number of rows >= 0
+ * @param columns the number of columns >= 0
* @exception IllegalArgumentException if the rows or columns
* arguments are negative.
@@ -58,6 +58,6 @@
*
* @param text the text to be displayed, or null
- * @param rows the number of rows >= 0
- * @param columns the number of columns >= 0
+ * @param rows the number of rows >= 0
+ * @param columns the number of columns >= 0
* @exception IllegalArgumentException if the rows or columns
* arguments are negative.
@@ -74,6 +74,6 @@
* @param doc the model to use, or create a default one if null
* @param text the text to be displayed, null if none
- * @param rows the number of rows >= 0
- * @param columns the number of columns >= 0
+ * @param rows the number of rows >= 0
+ * @param columns the number of columns >= 0
* @exception IllegalArgumentException if the rows or columns
* arguments are negative.
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (revision 6830)
@@ -22,8 +22,8 @@
* @param text the initial string to display, or null
* @param columns the number of columns to use to calculate
- * the preferred width >= 0; if columns
+ * the preferred width >= 0; if columns
* is set to zero, the preferred width will be whatever
* naturally results from the component implementation
- * @exception IllegalArgumentException if columns < 0
+ * @exception IllegalArgumentException if columns < 0
*/
public JosmTextField(Document doc, String text, int columns) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 6830)
@@ -163,5 +163,5 @@
*
* @param dividerSize the size of dividers (pixels)
- * @throws IllegalArgumentException if dividerSize < 0
+ * @throws IllegalArgumentException if dividerSize < 0
* @see #getDividerSize
*/
@@ -1029,7 +1029,7 @@
/**
* Convenience method that returns the last child whose weight
- * is > 0.0.
- *
- * @return the last child whose weight is > 0.0.
+ * is > 0.0.
+ *
+ * @return the last child whose weight is > 0.0.
* @see #getChildren
* @see Node#getWeight
Index: trunk/src/org/openstreetmap/josm/io/Capabilities.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/Capabilities.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/Capabilities.java (revision 6830)
@@ -16,24 +16,24 @@
*
* Example capabilites document:
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
+ *
+ * <osm version="0.6" generator="OpenStreetMap server">
+ * <api>
+ * <version minimum="0.6" maximum="0.6"/>
+ * <area maximum="0.25"/>
+ * <tracepoints per_page="5000"/>
+ * <waynodes maximum="2000"/>
+ * <changesets maximum_elements="50000"/>
+ * <timeout seconds="300"/>
+ * </api>
+ * <policy>
+ * <imagery>
+ * <blacklist regex=".*\.google\.com/.*"/>
+ * <blacklist regex=".*209\.85\.2\d\d.*"/>
+ * <blacklist regex=".*209\.85\.1[3-9]\d.*"/>
+ * <blacklist regex=".*209\.85\.12[89].*"/>
+ * </imagery>
+ * </policy>
+ * </osm>
+ *
* This class is used in conjunction with a very primitive parser
* and simply stuffs the each tag and its attributes into a hash
Index: trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 6830)
@@ -56,12 +56,17 @@
private Collection changesetIds = null;
- public ChangesetQuery() {}
+ /**
+ * Constructs a new {@code ChangesetQuery}.
+ */
+ public ChangesetQuery() {
+
+ }
/**
* Restricts the query to changesets owned by the user with id uid.
*
- * @param uid the uid of the user. >0 expected.
+ * @param uid the uid of the user. > 0 expected.
* @return the query object with the applied restriction
- * @throws IllegalArgumentException thrown if uid <= 0
+ * @throws IllegalArgumentException thrown if uid <= 0
* @see #forUser(String)
*/
@@ -462,6 +467,5 @@
/**
- * Parses the changeset query given as URL query parameters and replies a
- * {@link ChangesetQuery}
+ * Parses the changeset query given as URL query parameters and replies a {@link ChangesetQuery}.
*
* query is the query part of a API url for querying changesets,
@@ -470,5 +474,5 @@
* Example for an query string:
*
- * uid=1234&open=true
+ * uid=1234&open=true
*
*
Index: trunk/src/org/openstreetmap/josm/io/FileExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/FileExporter.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/FileExporter.java (revision 6830)
@@ -36,5 +36,5 @@
/**
- * Returns the enabled state of this {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
+ * Returns the enabled state of this {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
* @return true if this {@code FileExporter} is enabled
* @since 5459
@@ -45,5 +45,5 @@
/**
- * Sets the enabled state of the {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
+ * Sets the enabled state of the {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
* @param enabled true to enable this {@code FileExporter}, false to disable it
* @since 5459
Index: trunk/src/org/openstreetmap/josm/io/FileImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/FileImporter.java (revision 6830)
@@ -81,5 +81,5 @@
}
}
-
+
private static void displayError(File f, Exception e) {
Main.error(e);
@@ -91,5 +91,5 @@
);
}
-
+
private static void displayCancel(final Throwable t) {
GuiHelper.runInEDTAndWait(new Runnable() {
@@ -103,5 +103,5 @@
});
}
-
+
public boolean importDataHandleExceptions(List files, ProgressMonitor progressMonitor) {
try {
@@ -157,5 +157,5 @@
/**
- * Returns the enabled state of this {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
+ * Returns the enabled state of this {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
* @return true if this {@code FileImporter} is enabled
* @since 5459
@@ -166,5 +166,5 @@
/**
- * Sets the enabled state of the {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
+ * Sets the enabled state of the {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
* @param enabled true to enable this {@code FileImporter}, false to disable it
* @since 5459
Index: trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 6830)
@@ -397,5 +397,5 @@
/**
- * convert url/urlname to link element (GPX 1.0 -> GPX 1.1).
+ * convert url/urlname to link element (GPX 1.0 -> GPX 1.1).
*/
private void convertUrlToLink(Map attr) {
Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 6830)
@@ -104,5 +104,5 @@
* later we fetched as part of a Multi Get request.
*
- * Ignore the id if it id <= 0.
+ * Ignore the id if it id <= 0.
*
* @param ds the dataset (must not be null)
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6830)
@@ -46,7 +46,7 @@
/**
- * Class that encapsulates the communications with the OSM API.
+ * Class that encapsulates the communications with the OSM API.
*
- * All interaction with the server-side OSM API should go through this class.
+ * All interaction with the server-side OSM API should go through this class.
*
* It is conceivable to extract this into an interface later and create various
@@ -426,5 +426,5 @@
/**
* Updates a changeset with the keys in changesetUpdate. The changeset must not
- * be null and id > 0 must be true.
+ * be null and id > 0 must be true.
*
* @param changeset the changeset to update. Must not be null.
@@ -433,5 +433,5 @@
* @throws OsmTransferException if something goes wrong.
* @throws IllegalArgumentException if changeset is null
- * @throws IllegalArgumentException if changeset.getId() <= 0
+ * @throws IllegalArgumentException if changeset.getId() <= 0
*
*/
@@ -466,13 +466,12 @@
/**
- * Closes a changeset on the server. Sets changeset.setOpen(false) if this operation
- * succeeds.
- *
- * @param changeset the changeset to be closed. Must not be null. changeset.getId() > 0 required.
+ * Closes a changeset on the server. Sets changeset.setOpen(false) if this operation succeeds.
+ *
+ * @param changeset the changeset to be closed. Must not be null. changeset.getId() > 0 required.
* @param monitor the progress monitor. If null, uses {@link NullProgressMonitor#INSTANCE}
*
* @throws OsmTransferException if something goes wrong.
* @throws IllegalArgumentException thrown if changeset is null
- * @throws IllegalArgumentException thrown if changeset.getId() <= 0
+ * @throws IllegalArgumentException thrown if changeset.getId() <= 0
*/
public void closeChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
@@ -767,9 +766,9 @@
/**
* Sets the changesets to which further data uploads are directed. The changeset
- * can be null. If it isn't null it must have been created, i.e. id > 0 is required. Furthermore,
+ * can be null. If it isn't null it must have been created, i.e. id > 0 is required. Furthermore,
* it must be open.
*
* @param changeset the changeset
- * @throws IllegalArgumentException thrown if changeset.getId() <= 0
+ * @throws IllegalArgumentException thrown if changeset.getId() <= 0
* @throws IllegalArgumentException thrown if !changeset.isOpen()
*/
Index: trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 6830)
@@ -47,8 +47,8 @@
* constructor
*
- * @param primitive the primitive to be read. Must not be null. primitive.id > 0 expected
+ * @param primitive the primitive to be read. Must not be null. primitive.id > 0 expected
*
* @exception IllegalArgumentException thrown if primitive is null
- * @exception IllegalArgumentException thrown if primitive.id <= 0
+ * @exception IllegalArgumentException thrown if primitive.id <= 0
*/
public OsmServerBackreferenceReader(OsmPrimitive primitive) throws IllegalArgumentException {
@@ -62,8 +62,8 @@
* constructor
*
- * @param id the id of the primitive. > 0 expected
+ * @param id the id of the primitive. > 0 expected
* @param type the type of the primitive. Must not be null.
*
- * @exception IllegalArgumentException thrown if id <= 0
+ * @exception IllegalArgumentException thrown if id <= 0
* @exception IllegalArgumentException thrown if type is null
*
@@ -97,5 +97,5 @@
* @param readFull true, if referers should be read fully (i.e. including their immediate children)
*
- * @exception IllegalArgumentException thrown if id <= 0
+ * @exception IllegalArgumentException thrown if id <= 0
* @exception IllegalArgumentException thrown if type is null
*
Index: trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 6830)
@@ -76,9 +76,9 @@
* Reads the changeset with id id from the server
*
- * @param id the changeset id. id > 0 required.
+ * @param id the changeset id. id > 0 required.
* @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
* @return the changeset read
* @throws OsmTransferException thrown if something goes wrong
- * @throws IllegalArgumentException if id <= 0
+ * @throws IllegalArgumentException if id <= 0
*/
public Changeset readChangeset(long id, ProgressMonitor monitor) throws OsmTransferException {
@@ -112,9 +112,9 @@
* Reads the changeset with id id from the server
*
- * @param ids the list of ids. Ignored if null. Only load changesets for ids > 0.
+ * @param ids the list of ids. Ignored if null. Only load changesets for ids > 0.
* @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
* @return the changeset read
* @throws OsmTransferException thrown if something goes wrong
- * @throws IllegalArgumentException if id <= 0
+ * @throws IllegalArgumentException if id <= 0
*/
public List readChangesets(Collection ids, ProgressMonitor monitor) throws OsmTransferException {
@@ -160,8 +160,8 @@
* Downloads the content of a changeset
*
- * @param id the changeset id. >0 required.
+ * @param id the changeset id. > 0 required.
* @param monitor the progress monitor. {@link NullProgressMonitor#INSTANCE} assumed if null.
* @return the changeset content
- * @throws IllegalArgumentException thrown if id <= 0
+ * @throws IllegalArgumentException thrown if id <= 0
* @throws OsmTransferException thrown if something went wrong
*/
Index: trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 6830)
@@ -37,9 +37,9 @@
* Creates a new server object reader for a given id and a primitive type.
*
- * @param id the object id. > 0 required.
+ * @param id the object id. > 0 required.
* @param type the type. Must not be null.
* @param full true, if a full download is requested (i.e. a download including
* immediate children); false, otherwise
- * @throws IllegalArgumentException thrown if id <= 0
+ * @throws IllegalArgumentException thrown if id <= 0
* @throws IllegalArgumentException thrown if type is null
*/
@@ -51,8 +51,8 @@
* Creates a new server object reader for a given id and a primitive type.
*
- * @param id the object id. > 0 required.
+ * @param id the object id. > 0 required.
* @param type the type. Must not be null.
* @param version the specific version number, if required; -1, otherwise
- * @throws IllegalArgumentException thrown if id <= 0
+ * @throws IllegalArgumentException thrown if id <= 0
* @throws IllegalArgumentException thrown if type is null
*/
@@ -73,9 +73,9 @@
* Creates a new server object reader for an object with the given id
*
- * @param id the object id. Must not be null. Unique id > 0 required.
+ * @param id the object id. Must not be null. Unique id > 0 required.
* @param full true, if a full download is requested (i.e. a download including
* immediate children); false, otherwise
* @throws IllegalArgumentException thrown if id is null
- * @throws IllegalArgumentException thrown if id.getUniqueId() <= 0
+ * @throws IllegalArgumentException thrown if id.getUniqueId() <= 0
*/
public OsmServerObjectReader(PrimitiveId id, boolean full) {
@@ -86,8 +86,8 @@
* Creates a new server object reader for an object with the given id
*
- * @param id the object id. Must not be null. Unique id > 0 required.
+ * @param id the object id. Must not be null. Unique id > 0 required.
* @param version the specific version number, if required; -1, otherwise
* @throws IllegalArgumentException thrown if id is null
- * @throws IllegalArgumentException thrown if id.getUniqueId() <= 0
+ * @throws IllegalArgumentException thrown if id.getUniqueId() <= 0
*/
public OsmServerObjectReader(PrimitiveId id, int version) {
Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 6830)
@@ -143,6 +143,6 @@
* @param primitives the collection of primitives to upload
* @param progressMonitor the progress monitor
- * @param chunkSize the size of the individual upload chunks. > 0 required.
- * @throws IllegalArgumentException thrown if chunkSize <= 0
+ * @param chunkSize the size of the individual upload chunks. > 0 required.
+ * @throws IllegalArgumentException thrown if chunkSize <= 0
* @throws OsmTransferException thrown if an exception occurs
*/
Index: trunk/src/org/openstreetmap/josm/io/XmlWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/XmlWriter.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/XmlWriter.java (revision 6830)
@@ -41,5 +41,5 @@
* @param keepApos true if apostrophe sign should stay as it is (in order to work around
* a Java bug that renders
- * new JLabel("'")
+ * new JLabel("<html>'</html>")
* literally as 6 character string, see #7558)
*/
Index: trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java (revision 6830)
@@ -3,6 +3,6 @@
import java.awt.Component;
+import java.net.Authenticator.RequestorType;
import java.net.PasswordAuthentication;
-import java.net.Authenticator.RequestorType;
import org.openstreetmap.josm.data.oauth.OAuthToken;
@@ -39,5 +39,5 @@
* @param host the hostname for these credentials
* @param credentials the credentials
- * @throws CredentialsManagerException thrown if a problem occurs in a implementation of this interface
+ * @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface
*/
void store(RequestorType requestorType, String host, PasswordAuthentication credentials) throws CredentialsAgentException;
Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 6830)
@@ -331,27 +331,25 @@
}
-
-
/**
* Try to find a plugin after some criterias. Extract the plugin-information
* from the plugin and return it. The plugin is searched in the following way:
- *
- *first look after an MANIFEST.MF in the package org.openstreetmap.josm.plugins.
+ *
+ *- first look after an MANIFEST.MF in the package org.openstreetmap.josm.plugins.<plugin name>
* (After removing all fancy characters from the plugin name).
- * If found, the plugin is loaded using the bootstrap classloader.
+ * If found, the plugin is loaded using the bootstrap classloader.
*- If not found, look for a jar file in the user specific plugin directory
- * (~/.josm/plugins/
.jar)
- *- If not found and the environment variable JOSM_RESOURCES + "/plugins/" exist, look there.
- *
- Try for the java property josm.resources + "/plugins/" (set via java -Djosm.plugins.path=...)
+ * (~/.josm/plugins/<plugin name>.jar)
+ *- If not found and the environment variable JOSM_RESOURCES + "/plugins/" exist, look there.
+ *- Try for the java property josm.resources + "/plugins/" (set via java -Djosm.plugins.path=...)
*- If the environment variable ALLUSERSPROFILE and APPDATA exist, look in
- * ALLUSERSPROFILE/
/JOSM/plugins.
+ * ALLUSERSPROFILE/<the last stuff from APPDATA>/JOSM/plugins.
* (*sic* There is no easy way under Windows to get the All User's application
- * directory)
+ * directory)
*- Finally, look in some typical unix paths:
- * - /usr/local/share/josm/plugins/
- *
- /usr/local/lib/josm/plugins/
- *
- /usr/share/josm/plugins/
- *
- /usr/lib/josm/plugins/
- *
+ *
- /usr/local/share/josm/plugins/
+ * - /usr/local/lib/josm/plugins/
+ * - /usr/share/josm/plugins/
+ * - /usr/lib/josm/plugins/
+ *
* If a plugin class or jar file is found earlier in the list but seem not to
* be working, an PluginException is thrown rather than continuing the search.
Index: trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 6830)
@@ -19,5 +19,5 @@
* Creates and controls a separate audio player thread.
*
- * @author David Earl
+ * @author David Earl <david@frankieandshadow.com>
* @since 547
*/
@@ -124,5 +124,5 @@
* @param url The resource to play, which must be a WAV file or stream
* @param seconds The number of seconds into the audio to start playing
- * @param speed Rate at which audio playes (1.0 = real time, > 1 is faster)
+ * @param speed Rate at which audio playes (1.0 = real time, > 1 is faster)
* @throws Exception audio fault exception, e.g. can't open stream, unhandleable audio format
*/
Index: trunk/src/org/openstreetmap/josm/tools/AudioUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (revision 6830)
@@ -14,5 +14,5 @@
* Utils functions for audio.
*
- * @author David Earl
+ * @author David Earl <david@frankieandshadow.com>
* @since 1462
*/
@@ -22,5 +22,5 @@
// Hide default constructor for utils classes
}
-
+
/**
* Returns calibrated length of recording in seconds.
Index: trunk/src/org/openstreetmap/josm/tools/ColorHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (revision 6830)
@@ -5,5 +5,5 @@
/**
- * Helper to convert from color to html string and back
+ * Helper to convert from color to HTML string and back.
*/
public final class ColorHelper {
@@ -12,5 +12,5 @@
// Hide default constructor for utils classes
}
-
+
/**
* Returns the {@code Color} for the given HTML code.
@@ -55,5 +55,5 @@
* Returns the HTML color code (6 or 8 digit).
* @param col The color to convert
- * @param withAlpha if {@code true} and alpha value < 255, return 8-digit color code, else always 6-digit
+ * @param withAlpha if {@code true} and alpha value < 255, return 8-digit color code, else always 6-digit
* @return the HTML color code (6 or 8 digit)
* @since 6655
Index: trunk/src/org/openstreetmap/josm/tools/Diff.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 6830)
@@ -57,5 +57,5 @@
and hashcode methods for the objects compared.
- The basic algorithm is described in:
+ The basic algorithm is described in:
"An O(ND) Difference Algorithm and its Variations", Eugene Myers,
Algorithmica Vol. 1 No. 2, 1986, p 251.
@@ -589,4 +589,5 @@
}
+ @Override
public String toString() {
String s = String.format("%d -%d +%d %d",line0,deleted,inserted,line1);
@@ -830,5 +831,5 @@
realindexes = new int[buffered_lines];
}
-
+
FileData(Object[] data, Map h) {
this(data.length);
Index: trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 6830)
@@ -38,5 +38,5 @@
@SuppressWarnings("CallToThreadDumpStack")
public final class ExceptionUtil {
-
+
private ExceptionUtil() {
// Hide default constructor for utils classes
@@ -697,5 +697,5 @@
/**
- * Replaces some HTML reserved characters (<, > and &) by their equivalent entity (<, > and &);
+ * Replaces some HTML reserved characters (<, > and &) by their equivalent entity (<, > and &);
* @param s The unescaped string
* @return The escaped string
Index: trunk/src/org/openstreetmap/josm/tools/ExifReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 6830)
@@ -31,5 +31,5 @@
// Hide default constructor for utils classes
}
-
+
/**
* Returns the date/time from the given JPEG file.
@@ -70,13 +70,13 @@
* Returns the image orientation of the given JPEG file.
* @param filename The JPEG file to read
- * @return The image orientation as an {@code int}. Default value is 1. Possible values are listed in EXIF spec as follows:
- * 1. The 0th row is at the visual top of the image, and the 0th column is the visual left-hand side.
- * 2. The 0th row is at the visual top of the image, and the 0th column is the visual right-hand side.
- * 3. The 0th row is at the visual bottom of the image, and the 0th column is the visual right-hand side.
- * 4. The 0th row is at the visual bottom of the image, and the 0th column is the visual left-hand side.
- * 5. The 0th row is the visual left-hand side of the image, and the 0th column is the visual top.
- * 6. The 0th row is the visual right-hand side of the image, and the 0th column is the visual top.
- * 7. The 0th row is the visual right-hand side of the image, and the 0th column is the visual bottom.
- * 8. The 0th row is the visual left-hand side of the image, and the 0th column is the visual bottom.
+ * @return The image orientation as an {@code int}. Default value is 1. Possible values are listed in EXIF spec as follows:
+ * - The 0th row is at the visual top of the image, and the 0th column is the visual left-hand side.
+ * - The 0th row is at the visual top of the image, and the 0th column is the visual right-hand side.
+ * - The 0th row is at the visual bottom of the image, and the 0th column is the visual right-hand side.
+ * - The 0th row is at the visual bottom of the image, and the 0th column is the visual left-hand side.
+ * - The 0th row is the visual left-hand side of the image, and the 0th column is the visual top.
+ * - The 0th row is the visual right-hand side of the image, and the 0th column is the visual top.
+ * - The 0th row is the visual right-hand side of the image, and the 0th column is the visual bottom.
+ * - The 0th row is the visual left-hand side of the image, and the 0th column is the visual bottom.
* @see http://www.impulseadventure.com/photo/exif-orientation.html
* @see http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto
@@ -133,5 +133,5 @@
return null;
}
-
+
/**
* Returns the direction of the given JPEG file.
@@ -152,5 +152,5 @@
return null;
}
-
+
/**
* Returns the direction of the given EXIF GPS directory.
@@ -176,10 +176,10 @@
double min = components[1].doubleValue();
double sec = components[2].doubleValue();
-
+
if (Double.isNaN(deg) && Double.isNaN(min) && Double.isNaN(sec))
throw new IllegalArgumentException();
-
+
value = (Double.isNaN(deg) ? 0 : deg + (Double.isNaN(min) ? 0 : (min / 60)) + (Double.isNaN(sec) ? 0 : (sec / 3600)));
-
+
if (dirGps.getString(gpsTagRef).charAt(0) == cRef) {
value = -value;
Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 6830)
@@ -37,9 +37,9 @@
*/
public final class Geometry {
-
+
private Geometry() {
// Hide default constructor for utils classes
}
-
+
public enum PolygonIntersection {FIRST_INSIDE_SECOND, SECOND_INSIDE_FIRST, OUTSIDE, CROSSING}
@@ -771,5 +771,5 @@
* Tests if the polygon formed by {@code nodes} is inside the multipolygon {@code multiPolygon}. The nullable argument
* {@code isOuterWayAMatch} allows to decide if the immediate {@code outer} way of the multipolygon is a match.
- *
+ *
* If {@code nodes} contains exactly one element, then it is checked whether that one node is inside the multipolygon.
*/
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 6830)
@@ -32,9 +32,9 @@
*/
public final class I18n {
-
+
private I18n() {
// Hide default constructor for utils classes
}
-
+
private enum PluralMode { MODE_NOTONE, MODE_NONE, MODE_GREATERONE,
MODE_CS/*, MODE_AR*/, MODE_PL/*, MODE_RO*/, MODE_RU, MODE_SK/*, MODE_SL*/}
@@ -135,7 +135,7 @@
* These strings are collected by a script that runs on the source code files.
* After translation, the localizations are distributed with the main program.
- *
+ *
* For example, {@code tr("JOSM''s default value is ''{0}''.", val)}.
- *
+ *
* Use {@link #trn} for distinguishing singular from plural text, i.e.,
* do not use {@code tr(size == 1 ? "singular" : "plural")} nor
@@ -207,5 +207,5 @@
* Translates some text for the current locale and distinguishes between
* {@code singularText} and {@code pluralText} depending on {@code n}.
- *
+ *
* For instance, {@code trn("There was an error!", "There were errors!", i)} or
* {@code trn("Found {0} error in {1}!", "Found {0} errors in {1}!", i, Integer.toString(i), url)}.
Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6830)
@@ -85,5 +85,5 @@
* Openstreetmap.org changed it's URL scheme in August 2013, which breaks the URL parsing.
* The following function, called by the old parse function if necessary, provides parsing new URLs
- * the new URLs follow the scheme http://www.openstreetmap.org/#map=18/51.71873/8.76164&layers=CN
+ * the new URLs follow the scheme http://www.openstreetmap.org/#map=18/51.71873/8.76164&layers=CN
* @param url string for parsing
* @return Bounds if hashurl, {@code null} otherwise
@@ -294,5 +294,5 @@
* @param zoom zoom depth of display
* @return link to display that area in OSM map
- *
+ *
* @since 6453
*/
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 6830)
@@ -11,5 +11,5 @@
*/
public interface PlatformHook {
-
+
/**
* The preStartupHook will be called extremly early. It is
@@ -47,5 +47,5 @@
* shortuts from this hook, but only "systemCuts"!
*
- * BTW: SystemCuts should be named "system:",
+ * BTW: SystemCuts should be named "system:<whatever>",
* and it'd be best if sou'd recycle the names already used
* by the Windows and OSX hooks. Especially the later has
@@ -69,6 +69,6 @@
* Another reason not to use the implementation in the *nix
* hook are LAFs that don't understand HTML, such as the OSX LAFs.
- *
- * @param name Tooltip text to display
+ *
+ * @param name Tooltip text to display
* @param sc Shortcut associated (to display accelerator between parenthesis)
* @return Full tooltip text (name + accelerator)
Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 6830)
@@ -28,5 +28,5 @@
*/
public final class TextTagParser {
-
+
// properties need JOSM restart to apply, modified rarely enough
protected static final int MAX_KEY_LENGTH = Main.pref.getInteger("tags.paste.max-key-length", 50);
@@ -34,9 +34,9 @@
protected static final String KEY_PATTERN = Main.pref.get("tags.paste.tag-pattern", "[0-9a-zA-Z:_]*");
protected static final int MAX_VALUE_LENGTH = 255;
-
+
private TextTagParser() {
// Hide default constructor for utils classes
}
-
+
public static class TextAnalyzer {
boolean quotesStarted = false;
@@ -52,5 +52,5 @@
n = data.length();
}
-
+
/**
* Read tags from "Free format"
@@ -72,5 +72,5 @@
return tags;
}
-
+
private String parseString(String stopChars) {
char[] stop = stopChars.toCharArray();
@@ -95,5 +95,5 @@
pos++;
break;
- } else if (!quotesStarted && (Arrays.binarySearch(stop, c)>=0)) {
+ } else if (!quotesStarted && (Arrays.binarySearch(stop, c)>=0)) {
// stop-symbol found
pos++;
@@ -110,5 +110,5 @@
return res.trim();
}
-
+
private void skipSign() {
char c;
@@ -155,5 +155,5 @@
/**
- * Try to find tag-value pairs in given text
+ * Try to find tag-value pairs in given text
* @param text - text in which tags are looked for
* @param splitRegex - text is splitted into parts with this delimiter
@@ -175,5 +175,5 @@
v = unescape(v);
if (k==null || v==null) return null;
- }
+ }
tags.put(k,v);
} else {
@@ -185,12 +185,12 @@
} else {
return null;
- }
- }
-
+ }
+ }
+
public static Map getValidatedTagsFromText(String buf) {
Map tags = readTagsFromText(buf);
return validateTags(tags) ? tags : null;
}
-
+
/**
* Apply different methods to extract tag-value pairs from arbitrary text
@@ -198,8 +198,8 @@
* @return null if no format is suitable
*/
-
+
public static Map readTagsFromText(String buf) {
Map tags;
-
+
// Format
// tag1\tval1\ntag2\tval2\n
@@ -209,5 +209,5 @@
// Format
- // a=b \n c=d \n "a b"=hello
+ // a=b \n c=d \n "a b"=hello
// SORRY: "a=b" = c is not supported fror now, only first = will be considered
// a = "b=c" is OK
@@ -216,14 +216,14 @@
// try format t1=v1\n t2=v2\n ...
if (tags!=null) return tags;
-
+
// JSON-format
String bufJson = buf.trim();
// trim { }, if there are any
if (bufJson.startsWith("{") && bufJson.endsWith("}") ) bufJson = bufJson.substring(1,bufJson.length()-1);
- tags = readTagsByRegexp(bufJson, "[\\s]*,[\\s]*",
+ tags = readTagsByRegexp(bufJson, "[\\s]*,[\\s]*",
"[\\s]*(\\\".*?[^\\\\]\\\")"+"[\\s]*:[\\s]*"+"(\\\".*?[^\\\\]\\\")[\\s]*", true);
if (tags!=null) return tags;
- // Free format
+ // Free format
// a 1 "b" 2 c=3 d 4 e "5"
TextAnalyzer parser = new TextAnalyzer(buf);
@@ -234,5 +234,5 @@
/**
* Check tags for correctness and display warnings if needed
- * @param tags - map key->value to check
+ * @param tags - map key->value to check
* @return true if the tags should be pasted
*/
@@ -265,5 +265,5 @@
return true;
}
-
+
private static int warning(String text, String data, String code) {
ExtendedDialog ed = new ExtendedDialog(
@@ -304,7 +304,7 @@
tr("Warning"),
new String[]{tr("Ok"), tr("Clear buffer")});
-
+
ed.setButtonIcons(new String[]{"ok.png", "dialogs/delete.png"});
-
+
ed.setContent(p);
ed.setDefaultButton(1);
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6829)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6830)
@@ -261,5 +261,5 @@
/**
- * convert float range 0 <= x <= 1 to integer range 0..255
+ * convert float range 0 <= x <= 1 to integer range 0..255
* when dealing with colors and color alpha value
* @return null if val is null, the corresponding int if val is in the
@@ -275,5 +275,5 @@
/**
- * convert integer range 0..255 to float range 0 <= x <= 1
+ * convert integer range 0..255 to float range 0 <= x <= 1
* when dealing with colors and color alpha value
*/
@@ -317,5 +317,5 @@
/**
- * Simple file copy function that will overwrite the target file.
+ * Simple file copy function that will overwrite the target file.
* Taken from this article (CC-NC-BY-SA)
* @param in The source file
@@ -526,5 +526,5 @@
* Topological sort.
*
- * @param dependencies contains mappings (key -> value). In the final list of sorted objects, the key will come
+ * @param dependencies contains mappings (key -> value). In the final list of sorted objects, the key will come
* after the value. (In other words, the key depends on the value(s).)
* There must not be cyclic dependencies.
@@ -836,5 +836,5 @@
* @param elapsedTime The duration in milliseconds
* @return A human readable string for the given duration
- * @throws IllegalArgumentException if elapsedTime is < 0
+ * @throws IllegalArgumentException if elapsedTime is < 0
* @since 6354
*/
@@ -867,5 +867,5 @@
/**
* Returns a human readable representation of a list of positions.
- *
+ *
* For instance, {@code [1,5,2,6,7} yields "1-2,5-7
* @param positionList a list of positions
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java (revision 6829)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandling.java (revision 6830)
@@ -7,10 +7,9 @@
import org.junit.Test;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
import org.openstreetmap.josm.data.coor.LatLon;
/**
- * Some unit test cases for basic tag management on {@see OsmPrimitive}. Uses
- * {@see Node} for the tests, {@see OsmPrimitive} is abstract.
+ * Some unit test cases for basic tag management on {@link OsmPrimitive}. Uses
+ * {@link Node} for the tests, {@link OsmPrimitive} is abstract.
*
*/