Changeset 13076 in josm for trunk/src/org/openstreetmap


Ignore:
Timestamp:
2017-11-04T11:19:54+01:00 (6 years ago)
Author:
Don-vip
Message:

see #15560 - fix javadoc warnings with recent JDKs

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

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r12912 r13076  
    671671         * @param foundMatches The number of matches added to the result.
    672672         * @param setting The setting used.
     673         * @param parent parent component
    673674         */
    674675        void receiveSearchResult(DataSet ds, Collection<OsmPrimitive> result, int foundMatches, SearchSetting setting, Component parent);

  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r13023 r13076  
    3939import org.openstreetmap.josm.Main;
    4040import org.openstreetmap.josm.data.preferences.BooleanProperty;
     41import org.openstreetmap.josm.data.preferences.ColorInfo;
    4142import org.openstreetmap.josm.data.preferences.DoubleProperty;
    4243import org.openstreetmap.josm.data.preferences.IntegerProperty;
    43 import org.openstreetmap.josm.data.preferences.ColorInfo;
    4444import org.openstreetmap.josm.data.preferences.LongProperty;
    4545import org.openstreetmap.josm.data.preferences.NamedColorProperty;
    4646import org.openstreetmap.josm.data.preferences.PreferencesReader;
    4747import org.openstreetmap.josm.data.preferences.PreferencesWriter;
     48import org.openstreetmap.josm.io.OfflineAccessException;
     49import org.openstreetmap.josm.io.OnlineResource;
    4850import org.openstreetmap.josm.spi.preferences.AbstractPreferences;
     51import org.openstreetmap.josm.spi.preferences.Config;
    4952import org.openstreetmap.josm.spi.preferences.IBaseDirectories;
    5053import org.openstreetmap.josm.spi.preferences.IPreferences;
    … …  
    5457import org.openstreetmap.josm.spi.preferences.Setting;
    5558import org.openstreetmap.josm.spi.preferences.StringSetting;
    56 import org.openstreetmap.josm.io.OfflineAccessException;
    57 import org.openstreetmap.josm.io.OnlineResource;
    58 import org.openstreetmap.josm.spi.preferences.Config;
    5959import org.openstreetmap.josm.tools.CheckParameterUtil;
    6060import org.openstreetmap.josm.tools.ColorHelper;
    … …  
    336336
    337337    /**
     338     * @param key preference key
     339     * @return listener list for this key
    338340     * @deprecated deprecated private method
    339341     */
    … …  
    383385
    384386    /**
     387     * @param key preference key
     388     * @param oldValue old value
     389     * @param newValue new value
    385390     * @deprecated deprecated private method
    386391     */
    … …  
    431436
    432437    /**
     438     * @param createIfMissing if true, automatically creates this directory,
     439     * in case it is missing
     440     * @return the preferences directory
    433441     * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
    434442     */
    … …  
    451459
    452460    /**
     461     * @param createIfMissing if true, automatically creates this directory,
     462     * in case it is missing
     463     * @return the user data directory
    453464     * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
    454465     */
    … …  
    496507
    497508    /**
     509     * @param createIfMissing if true, automatically creates this directory,
     510     * in case it is missing
     511     * @return the cache directory
    498512     * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
    499513     */
    … …  
    945959    /**
    946960     * only for preferences
     961     * @param o color key
     962     * @return translated color name
    947963     * @deprecated (since 12987) no longer supported
    948964     */

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

    r12955 r13076  
    66import java.awt.Graphics;
    77import java.awt.Graphics2D;
     8import java.awt.event.ActionEvent;
    89import java.awt.event.ActionListener;
    9 import java.awt.event.ActionEvent;
    1010import java.awt.geom.Path2D;
    1111
    … …  
    2323
    2424    /**
     25     * Constructs a new {@code PopupMenuButton}.
    2526     * @see JButton#JButton()
    2627     */
    … …  
    3132
    3233    /**
     34     * Constructs a new {@code PopupMenuButton}.
     35     * @param a the <code>Action</code> used to specify the new button
    3336     * @see JButton#JButton(Action)
    3437     */
    … …  
    3942
    4043    /**
     44     * Constructs a new {@code PopupMenuButton}.
     45     * @param i the Icon image to display on the button
    4146     * @see JButton#JButton(Icon)
    4247     */
    … …  
    4752
    4853    /**
     54     * Constructs a new {@code PopupMenuButton}.
     55     * @param t the text of the button
    4956     * @see JButton#JButton(String)
    5057     */
    … …  
    5562
    5663    /**
     64     * Constructs a new {@code PopupMenuButton}.
     65     * @param t the text of the button
     66     * @param i the Icon image to display on the button
    5767     * @see JButton#JButton(String, Icon)
    5868     */
    … …  
    6474    /**
    6575     * Pass-through to {@link JButton#JButton()} allowing associated popup menu to be set
     76     * @param m the associated popup menu
    6677     */
    6778    public PopupMenuButton(JPopupMenu m) {
    … …  
    7283    /**
    7384     * Pass-through to {@link JButton#JButton(Action)} allowing associated popup menu to be set
     85     * @param a the <code>Action</code> used to specify the new button
     86     * @param m the associated popup menu
    7487     */
    7588    public PopupMenuButton(Action a, JPopupMenu m) {
    … …  
    8093    /**
    8194     * Pass-through to {@link JButton#JButton(Icon)} allowing associated popup menu to be set
     95     * @param i the Icon image to display on the button
     96     * @param m the associated popup menu
    8297     */
    8398    public PopupMenuButton(Icon i, JPopupMenu m) {
    … …  
    88103    /**
    89104     * Pass-through to {@link JButton#JButton(String)} allowing associated popup menu to be set
     105     * @param t the text of the button
     106     * @param m the associated popup menu
    90107     */
    91108    public PopupMenuButton(String t, JPopupMenu m) {
    … …  
    96113    /**
    97114     * Pass-through to {@link JButton#JButton(String, Icon)} allowing associated popup menu to be set
     115     * @param t the text of the button
     116     * @param i the Icon image to display on the button
     117     * @param m the associated popup menu
    98118     */
    99119    public PopupMenuButton(String t, Icon i, JPopupMenu m) {
    … …  
    113133    /**
    114134     * Get the popup menu associated with this button
     135     * @return the popup menu associated with this button
    115136     */
    116137    public JPopupMenu getPopupMenu() {

  • trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java

    r13003 r13076  
    1515    private final List<TemplateEntry> entries;
    1616
     17    /**
     18     * Constructs a new {@code Condition} with predefined template entries.
     19     * @param entries template entries
     20     */
    1721    public Condition(Collection<TemplateEntry> entries) {
    1822        this.entries = new ArrayList<>(entries);
    1923    }
    2024
     25    /**
     26     * Constructs a new {@code Condition}.
     27     */
    2128    public Condition() {
    2229        this.entries = new ArrayList<>();
    … …  
    2431
    2532    /**
     33     * Returns template entries.
     34     * @return template entries
    2635     * @deprecated (since 13003) use constructor {@link #Condition(java.util.Collection)} to set the entries
    2736     */
Note: See TracChangeset for help on using the changeset viewer.