Changeset 11615 in josm for trunk/src


Ignore:
Timestamp:
2017-02-25T14:46:22+01:00 (7 years ago)
Author:
Don-vip
Message:

add javadoc

Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

    r11589 r11615  
    140140        Command createCommand(OsmPrimitive p, Selector matchingSelector);
    141141
     142        /**
     143         * Checks that object is either an {@link Expression} or a {@link String}.
     144         * @param obj object to check
     145         * @throws IllegalArgumentException if object is not an {@code Expression} or a {@code String}
     146         */
    142147        static void checkObject(final Object obj) {
    143148            CheckParameterUtil.ensureThat(obj instanceof Expression || obj instanceof String,
    … …  
    252257    }
    253258
     259    /**
     260     * Tag check.
     261     */
    254262    public static class TagCheck implements Predicate<OsmPrimitive> {
    255263        /** The selector of this {@code TagCheck} */

  • trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

    r11553 r11615  
    2828 *
    2929 *   <li>{@link DeriveLabelFromNameTagsCompositionStrategy} - the label is given by the value
    30  *   of one
    31  *   of the configured "name tags". The list of relevant name tags can be configured
     30 *   of one of the configured "name tags". The list of relevant name tags can be configured
    3231 *   in the JOSM preferences
    33  *   content of a tag whose name specified in the MapCSS style file, see the preference
    34  *   options <tt>mappaint.nameOrder</tt> and <tt>mappaint.nameComplementOrder</tt>.</li>
     32 *   see the preference options <tt>mappaint.nameOrder</tt> and <tt>mappaint.nameComplementOrder</tt>.</li>
    3533 * </ul>
    3634 * @since  3987 (creation)
    … …  
    5048    String compose(OsmPrimitive primitive);
    5149
     50    /**
     51     * Strategy where the label is given by a static text specified in the MapCSS style file.
     52     */
    5253    class StaticLabelCompositionStrategy implements LabelCompositionStrategy {
    5354        private final String defaultLabel;
    … …  
    8586    }
    8687
     88    /**
     89     * Strategy where the label is given by the content of a tag whose name specified in the MapCSS style file.
     90     */
    8791    class TagLookupCompositionStrategy implements LabelCompositionStrategy {
    8892
    … …  
    129133    }
    130134
     135    /**
     136     * Strategy where the label is given by the value of one of the configured "name tags".
     137     * The list of relevant name tags can be configured in the JOSM preferences
     138     * see the preference options <tt>mappaint.nameOrder</tt> and <tt>mappaint.nameComplementOrder</tt>
     139     */
    131140    class DeriveLabelFromNameTagsCompositionStrategy implements LabelCompositionStrategy, PreferenceChangedListener {
    132141

  • trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java

    r10755 r11615  
    11// License: GPL. For details, see LICENSE file.
    2 
    32package org.openstreetmap.josm.gui.widgets;
    43
    … …  
    1918
    2019/**
    21  *
    2220 * Class based on:  http://www.camick.com/java/source/ButtonColumn.java
    2321 * https://tips4java.wordpress.com/2009/07/12/table-button-column/
    24  *
     22 * @since 10536
    2523 */
    2624public class ButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener {
    … …  
    3836    }
    3937
     38    /**
     39     * Constructs a new {@code ButtonColumn}.
     40     * @param action action
     41     * @param buttonName button name
     42     */
    4043    public ButtonColumn(Action action, String buttonName) {
    4144        this(action);
    4245        this.buttonName = buttonName;
    4346    }
    44 
    4547
    4648    /**
    … …  
    116118        return renderButton;
    117119    }
    118 
    119120}
Note: See TracChangeset for help on using the changeset viewer.