Ignore:
Timestamp:
2009-11-24T10:45:04+01:00 (14 years ago)
Author:
stoecker
Message:

i18n updated, fixed files to reduce problems when applying patches, fix #4017

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r1954 r2512  
    1717/**
    1818 * This is the {@see TableModel} used in the tables of the {@see TagMerger}.
    19  * 
     19 *
    2020 * The model can {@see #populate(OsmPrimitive, OsmPrimitive)} itself from the conflicts
    2121 * in the tag sets of two {@see OsmPrimitive}s. Internally, it keeps a list of {@see TagMergeItem}s.
    22  * 
     22 *
    2323 *  {@see #decide(int, MergeDecisionType)} and {@see #decide(int[], MergeDecisionType)} can be used
    2424 *  to remember a merge decision for a specific row in the model.
    25  * 
     25 *
    2626 *  The model notifies {@see PropertyChangeListener}s about updates of the number of
    2727 *  undecided tags (see {@see #PROP_NUM_UNDECIDED_TAGS}).
    28  * 
     28 *
    2929 */
    3030public class TagMergeModel extends DefaultTableModel {
    … …  
    4040
    4141    private int numUndecidedTags = 0;
    42 
    4342
    4443    public TagMergeModel() {
    … …  
    8180     * refreshes the number of undecided tag conflicts after an update in the list of
    8281     * {@see TagMergeItem}s. Notifies {@see PropertyChangeListener} if necessary.
    83      * 
     82     *
    8483     */
    8584    protected void refreshNumUndecidedTags() {
    … …  
    9998     * Populate the model with conflicts between the tag sets of the two
    10099     * {@see OsmPrimitive} <code>my</code> and <code>their</code>.
    101      * 
     100     *
    102101     * @param my  my primitive (i.e. the primitive from the local dataset)
    103102     * @param their their primitive (i.e. the primitive from the server dataset)
    104      * 
     103     *
    105104     */
    106105    public void populate(OsmPrimitive my, OsmPrimitive their) {
    … …  
    124123    /**
    125124     * add a {@see TagMergeItem} to the model
    126      * 
     125     *
    127126     * @param item the item
    128127     */
    … …  
    143142     * set the merge decision of the {@see TagMergeItem} in row <code>row</code>
    144143     * to <code>decision</code>.
    145      * 
     144     *
    146145     * @param row  the row
    147146     * @param decision the decision
    … …  
    156155     * set the merge decision of all {@see TagMergeItem} given by indices in <code>rows</code>
    157156     * to <code>decision</code>.
    158      * 
     157     *
    159158     * @param row  the array of row indices
    160159     * @param decision the decision
    … …  
    175174        return tagMergeItems == null ? 0 : tagMergeItems.size();
    176175    }
    177 
    178176
    179177    @Override
Note: See TracChangeset for help on using the changeset viewer.