Context Navigation

Changeset 5816 in josm for trunk/src

Timestamp:

2013-03-31T15:09:56+02:00 (12 years ago)

Author:

stoecker

Message:

javadoc fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

r5266	r5816
11	11	/**
12	12	* This is the common base class for {@link Command}s which manipulate {@link Conflict}s in
13		* addition to {@link OsmPrimitive}s.
	13	* addition to {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
14	14	*
15	15	* A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing

-              r5266
+              r5816
     /**
      * constructor
+     * constructor for coordinate conflict
+     *
+     * @param my  my node
+     * @param their  their node
+     * @param conflict the conflict data set
      * @param decision the merge decision
      */

-              r5266
+              r5816
      * constructor
+     *
+     * @param my  my node
+     * @param their  their node
+     * @param conflict the conflict data set
      * @param decision the merge decision
      */

-              r5266
+              r5816
     /**
      * 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) {

-              r5266
+              r5816
      * 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
      */

-              r5266
+              r5816
     /**
      * 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) {

r5266	r5816
12	12
13	13	/**
14		* A BBoxChooser emits {@link ~~Proper~~yChangeEvent}s for this property
	14	* A BBoxChooser emits {@link java.beans.PropertyChangeEvent}s for this property
15	15	* if the current bounding box changes.
16	16	*/

r5266	r5816
16	16	/**
17	17	* The table cell renderer used in the changeset content table, except for the "name"
18		* column in which we use a {@link OsmPrimitivRenderer}.
	18	* column in which we use a {@link org.openstreetmap.josm.gui.OsmPrimitivRenderer}.
19	19	*
20	20	*/

-              r4590
+              r5816
      * @return the current URL
      */
     public String getUrl() {
         return url;
 …
         /**
          * Checks whether the hyperlink event originated on a <a ...> element with
+         * Checks whether the hyperlink event originated on a &lt;a ...&gt; element with
          * a relative href consisting of a URL fragment only, i.e.
          * <a href="#thisIsALocalFragment">. If so, replies the fragment, i.e.
+         * &lt;a href="#thisIsALocalFragment"&gt;. If so, replies the fragment, i.e.
          * "thisIsALocalFragment".
+         *
          * Otherwise, replies null
+         * Otherwise, replies <code>null</code>
+         *
          * @param e the hyperlink event
          * @return the local fragment
+         * @return the local fragment or <code>null</code>
          */
         protected String getUrlFragment(HyperlinkEvent e) {

Note: See TracChangeset for help on using the changeset viewer.