Index: trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 5816)
@@ -11,5 +11,5 @@
/**
* This is the common base class for {@link Command}s which manipulate {@link Conflict}s in
- * addition to {@link OsmPrimitive}s.
+ * addition to {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
*
* A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing
Index: trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (revision 5816)
@@ -26,8 +26,7 @@
/**
- * constructor
+ * constructor for coordinate conflict
*
- * @param my my node
- * @param their their node
+ * @param conflict the conflict data set
* @param decision the merge decision
*/
Index: trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (revision 5816)
@@ -30,6 +30,5 @@
* constructor
*
- * @param my my node
- * @param their their node
+ * @param conflict the conflict data set
* @param decision the merge decision
*/
Index: trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java (revision 5816)
@@ -27,6 +27,5 @@
/**
* constructor
- * @param my my primitive (i.e. the primitive from the local dataset)
- * @param their their primitive (i.e. the primitive from the server)
+ * @param conflict the conflict data set
*/
public ModifiedConflictResolveCommand(Conflict extends OsmPrimitive> conflict) {
Index: trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (revision 5816)
@@ -46,6 +46,5 @@
* constructor
*
- * @param my my primitive
- * @param their their primitive
+ * @param conflict the conflict data set
* @param mergeItems the list of merge decisions, represented as {@link TagMergeItem}s
*/
Index: trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (revision 5816)
@@ -25,6 +25,5 @@
/**
* constructor
- * @param my my primitive (i.e. the primitive from the local dataset)
- * @param their their primitive (i.e. the primitive from the server)
+ * @param conflict the conflict data set
*/
public VersionConflictResolveCommand(Conflict extends OsmPrimitive> conflict) {
Index: trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java (revision 5816)
@@ -12,5 +12,5 @@
/**
- * A BBoxChooser emits {@link ProperyChangeEvent}s for this property
+ * A BBoxChooser emits {@link java.beans.PropertyChangeEvent}s for this property
* if the current bounding box changes.
*/
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (revision 5816)
@@ -16,5 +16,5 @@
/**
* The table cell renderer used in the changeset content table, except for the "name"
- * column in which we use a {@link OsmPrimitivRenderer}.
+ * column in which we use a {@link org.openstreetmap.josm.gui.OsmPrimitivRenderer}.
*
*/
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 5815)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 5816)
@@ -239,5 +239,4 @@
* @return the current URL
*/
-
public String getUrl() {
return url;
@@ -544,13 +543,13 @@
/**
- * Checks whether the hyperlink event originated on a element with
+ * Checks whether the hyperlink event originated on a <a ...> element with
* a relative href consisting of a URL fragment only, i.e.
- * . If so, replies the fragment, i.e.
+ * <a href="#thisIsALocalFragment">. If so, replies the fragment, i.e.
* "thisIsALocalFragment".
*
- * Otherwise, replies null
+ * Otherwise, replies null
*
* @param e the hyperlink event
- * @return the local fragment
+ * @return the local fragment or null
*/
protected String getUrlFragment(HyperlinkEvent e) {