Changeset 5832 in josm for trunk


Ignore:
Timestamp:
2013-04-07T17:00:16+02:00 (7 years ago)
Author:
stoecker
Message:

i18n update and javadoc fixes

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

    r5266 r5832  
    1717
    1818/**
    19  * This is the {@link TableModel} used in the tables of the {@link TagMerger}.
     19 * This is the {@link javax.swing.table.TableModel} used in the tables of the {@link TagMerger}.
    2020 *
    2121 * The model can {@link #populate(OsmPrimitive, OsmPrimitive)} itself from the conflicts
     
    142142     * to <code>decision</code>.
    143143     *
    144      * @param row  the row
     144     * @param row the row
    145145     * @param decision the decision
    146146     */
     
    155155     * to <code>decision</code>.
    156156     *
    157      * @param row  the array of row indices
     157     * @param rows the array of row indices
    158158     * @param decision the decision
    159159     */
    160 
    161160    public void decide(int [] rows, MergeDecisionType decision) {
    162161        if (rows == null || rows.length == 0)
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

    r5266 r5832  
    2323 * This model manages a list of conflicting relation members.
    2424 *
    25  * It can be used as {@link TableModel}.
    26  *
    27  *
     25 * It can be used as {@link javax.swing.table.TableModel}.
    2826 */
    2927public class RelationMemberConflictResolverModel extends DefaultTableModel {
     
    251249     * Builds a collection of commands executing the decisions made in this model.
    252250     *
    253      * @param newPrimitive the primitive which members shall refer to if the
    254      * decision is {@link RelationMemberConflictDecisionType#REPLACE}
     251     * @param newPrimitive the primitive which members shall refer to
    255252     * @return a list of commands
    256253     */
     
    290287     * to the decisions managed by this model.
    291288     *
    292      * @param newPrimitive the primitive which members shall refer to if the
    293      * decision is {@link RelationMemberConflictDecisionType#REPLACE}
     289     * @param newPrimitive the primitive which members shall refer to
    294290     *
    295291     * @return the set of relations which have to be modified according
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java

    r5266 r5832  
    2020/**
    2121 * This is a UI widget for resolving tag conflicts, i.e. differences of the tag values
    22  * of multiple {@link OsmPrimitive}s.
     22 * of multiple {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
    2323 *
    2424 *
  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

    r5266 r5832  
    3232/**
    3333 * This is non-modal dialog, always showing on top, which displays history information
    34  * about a given {@link OsmPrimitive}.
     34 * about a given {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
    3535 *
    3636 */
  • trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java

    r5627 r5832  
    1717/**
    1818 * RelationMemberListViewer is a UI component which displays the  list of relation members of two
    19  * version of a {@link Relation} in a {@link History}.
     19 * version of a {@link org.openstreetmap.josm.data.osm.Relation} in a {@link org.openstreetmap.josm.data.osm.history.History}.
    2020 *
    2121 * <ul>
  • trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java

    r5266 r5832  
    1313/**
    1414 * TagInfoViewer is a UI component which displays the list of tags of two
    15  * version of a {@link OsmPrimitive} in a {@link History}.
     15 * version of a {@link org.openstreetmap.josm.data.osm.OsmPrimitive} in a {@link org.openstreetmap.josm.data.osm.history.History}.
    1616 *
    1717 * <ul>
  • trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

    r5266 r5832  
    1414
    1515/**
    16  * The {@link TableCellRenderer} for a list of tagsin {@link HistoryBrower}
     16 * The {@link TableCellRenderer} for a list of tags in {@link HistoryBrowser}
    1717 *
    1818 */
  • trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java

    r5266 r5832  
    88
    99/**
    10  * The {@link TableColumnModel} for the table with the list of tags
     10 * The {@link javax.swing.table.TableColumnModel} for the table with the list of tags
    1111 *
    1212 */
  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java

    r5266 r5832  
    44/**
    55 * An UploadStrategySpecification consists of the parameter describing the strategy
    6  * for uploading a collection of {@link OsmPrimitive}.
     6 * for uploading a collection of {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
    77 *
    88 * This includes:
     
    1212 * <li>whether to close the changeset used after the upload</li>
    1313 * </ul>
    14  *
    15  *
    1614 */
    1715public class UploadStrategySpecification  {
     
    5048    /**
    5149     * Replies the upload strategy
    52      * @return
     50     * @return the upload strategy
    5351     */
    5452    public UploadStrategy getStrategy() {
  • trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java

    r5266 r5832  
    2222
    2323/**
    24  * Reads the history of an {@link OsmPrimitive} from the OSM API server.
     24 * Reads the history of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} from the OSM API server.
    2525 *
    2626 */
Note: See TracChangeset for help on using the changeset viewer.