Ignore:
Timestamp:
2014-02-10T00:51:53+01:00 (6 years ago)
Author:
Don-vip
Message:

javadoc fixes for jdk8 compatibility

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

    r6814 r6830  
    4040 * @since 996
    4141 *
    42  * @author Henry Loenwind, based on much copy&Paste from other Actions.
     42 * @author Henry Loenwind
    4343 * @author Sebastian Masch
    4444 */
  • trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java

    r6380 r6830  
    7676     * @param title The string that goes in the dialog window's title bar
    7777     * @param extension The file extension that will be selected as the default file filter
    78      * @param selectionMode The selection mode that allows the user to:<br/>
     78     * @param selectionMode The selection mode that allows the user to:<br><ul>
    7979     *                      <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
    8080     *                      <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
    81      *                      <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li>
     81     *                      <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li></ul>
    8282     * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
    8383     *                 If false, only the file filters that include {@code extension} will be proposed
     
    9797     * @param title The string that goes in the dialog window's title bar
    9898     * @param filter The only file filter that will be proposed by the dialog
    99      * @param selectionMode The selection mode that allows the user to:<br/>
     99     * @param selectionMode The selection mode that allows the user to:<br><ul>
    100100     *                      <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
    101101     *                      <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
    102      *                      <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li>
     102     *                      <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li></ul>
    103103     * @param lastDirProperty The name of the property used to setup the JFileChooser initial directory. This property will then be updated to the new "last directory" chosen by the user
    104104     * @return The {@code JFileChooser}.
     
    116116     * @param filters The file filters that will be proposed by the dialog
    117117     * @param defaultFilter The file filter that will be selected by default
    118      * @param selectionMode The selection mode that allows the user to:<br/>
     118     * @param selectionMode The selection mode that allows the user to:<br><ul>
    119119     *                      <li>just select files ({@code JFileChooser.FILES_ONLY})</li>
    120120     *                      <li>just select directories ({@code JFileChooser.DIRECTORIES_ONLY})</li>
    121      *                      <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li>
     121     *                      <li>select both files and directories ({@code JFileChooser.FILES_AND_DIRECTORIES})</li></ul>
    122122     * @param lastDirProperty The name of the property used to setup the JFileChooser initial directory. This property will then be updated to the new "last directory" chosen by the user
    123123     * @return The {@code JFileChooser}.
  • trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java

    r6814 r6830  
    7070     *
    7171     * @param targetLayer  the target layer. Must not be null.
    72      * @param id the primitive id. id > 0 required.
     72     * @param id the primitive id. id &gt; 0 required.
    7373     * @param type the primitive type. type != null required
    7474     * @exception IllegalArgumentException thrown if targetLayer is null
    75      * @exception IllegalArgumentException thrown if id <= 0
     75     * @exception IllegalArgumentException thrown if id &lt;= 0
    7676     * @exception IllegalArgumentException thrown if type == null
    7777     */
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r6639 r6830  
    300300    }
    301301
    302     // Adds the menu entry, Shortcuts, etc.
     302    /**
     303     * Constructs a new {@code JoinAreasAction}.
     304     */
    303305    public JoinAreasAction() {
    304306        super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"),
     
    399401     * Tests if the areas have some intersections to join.
    400402     * @param areas Areas to test
    401      * @return @{code true} if areas are joinable
     403     * @return {@code true} if areas are joinable
    402404     */
    403405    private boolean testJoin(List<Multipolygon> areas) {
  • trunk/src/org/openstreetmap/josm/actions/MirrorAction.java

    r6380 r6830  
    2828 * Note: If a ways are selected, their nodes are mirrored
    2929 *
    30  * @author Teemu Koskinen, based on much copy&Paste from other Actions.
     30 * @author Teemu Koskinen
    3131 */
    3232public final class MirrorAction extends JosmAction {
    3333
     34    /**
     35     * Constructs a new {@code MirrorAction}.
     36     */
    3437    public MirrorAction() {
    3538        super(tr("Mirror"), "mirror", tr("Mirror selected nodes and ways."),
  • trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java

    r6431 r6830  
    4444
    4545    /**
    46      * Create the preference action with "&Preferences" as label.
     46     * Create the preference action with "Preferences" as label.
    4747     */
    4848    public PreferencesAction() {
  • trunk/src/org/openstreetmap/josm/actions/RestartAction.java

    r6643 r6830  
    2323/**
    2424 * Restarts JOSM as it was launched. Comes from "restart" plugin, originally written by Upliner.
    25  * <br/><br/>
     25 * <br><br>
    2626 * Mechanisms have been improved based on #8561 discussions and <a href="http://lewisleo.blogspot.jp/2012/08/programmatically-restart-java.html">this article</a>.
    2727 * @since 5857
     
    5050            Main.exitJosm(true, 9);
    5151        }
    52        
     52
    5353        try {
    5454            restartJOSM();
  • trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

    r6815 r6830  
    120120
    121121    /**
    122      * Creates a new "Save" dialog for a single {@link ExtensionFileFilter} and makes it visible.<br/>
     122     * Creates a new "Save" dialog for a single {@link ExtensionFileFilter} and makes it visible.<br>
    123123     * When the user has chosen a file, checks the file extension, and confirms overwrite if needed.
    124124     *
     
    135135
    136136    /**
    137      * Creates a new "Save" dialog for a given file extension and makes it visible.<br/>
     137     * Creates a new "Save" dialog for a given file extension and makes it visible.<br>
    138138     * When the user has chosen a file, checks the file extension, and confirms overwrite if needed.
    139139     *
  • trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java

    r6623 r6830  
    111111    /**
    112112     * Finds out if the current selection can be extended.
    113      * <p/>
     113     * <p>
    114114     * The members outerNodes, nodes must have been initialized.
    115115     * How to update these members when extending the selection, @see extend().
    116      *
     116     * </p>
    117117     * @param selection current selection
    118118     * @return a way by which to extend the selection, or null
  • trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

    r6679 r6830  
    286286     *
    287287     * assume that OrginalNode is in the way
    288      *
    289      * -> the new node will be put into the parameter newNodes.
    290      * -> the add-node command will be put into the parameter cmds.
    291      * -> the changed way will be returned and must be put into cmds by the caller!
     288     * <ul>
     289     * <li>the new node will be put into the parameter newNodes.</li>
     290     * <li>the add-node command will be put into the parameter cmds.</li>
     291     * <li>the changed way will be returned and must be put into cmds by the caller!</li>
     292     * </ul>
    292293     */
    293294    private Way modifyWay(Node originalNode, Way w, List<Command> cmds, List<Node> newNodes) {
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java

    r6380 r6830  
    1313
    1414/**
    15  * Play the sound track from the Audio Marker after the one most recently played.<br/>
     15 * Play the sound track from the Audio Marker after the one most recently played.<br>
    1616 * Play from the first such Marker if none has been played, or repeat the last marker if at the end.
    1717 * @since 547
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java

    r6380 r6830  
    1616
    1717/**
    18  * If not playing, play the sound track from the first Audio Marker, or from the point at which it was paused.<br/>
    19  * If playing, pause the sound.<br/>
     18 * If not playing, play the sound track from the first Audio Marker, or from the point at which it was paused.<br>
     19 * If playing, pause the sound.<br>
    2020 * If fast forwarding or slow forwarding, resume normal speed.
    2121 * @since 547
  • trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java

    r6380 r6830  
    1313
    1414/**
    15  * Play the sound track from the Audio Marker before the one most recently played.<br/>
     15 * Play the sound track from the Audio Marker before the one most recently played.<br>
    1616 * Play from the first such Marker if none has been played or already at the first marker.
    1717 * @since 547
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

    r6589 r6830  
    9696     * {@link Future}, but make sure not to freeze up JOSM. Example:
    9797     * <pre>
    98      *    Future<?> future = task.download(...);
     98     *    Future&lt;?&gt; future = task.download(...);
    9999     *    // DON'T run this on the Swing EDT or JOSM will freeze
    100100     *    future.get(); // waits for the dowload task to complete
     
    104104     * the Swing EDT:
    105105     * <pre>
    106      *    final Future<?> future = task.download(...);
     106     *    final Future&lt;?&gt; future = task.download(...);
    107107     *    Runnable runAfterTask = new Runnable() {
    108108     *       public void run() {
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

    r6084 r6830  
    88import java.text.MessageFormat;
    99import java.util.Collection;
    10 import java.util.Set;
     10import java.util.HashMap;
    1111import java.util.HashSet;
    12 import java.util.HashMap;
    1312import java.util.Map;
    1413import java.util.Map.Entry;
     14import java.util.Set;
    1515
    1616import javax.swing.JOptionPane;
     
    101101     *
    102102     * @param targetLayer  the target layer. Must not be null.
    103      * @param id the primitive id. id > 0 required.
     103     * @param id the primitive id. id &gt; 0 required.
    104104     * @param type the primitive type. type != null required
    105      * @exception IllegalArgumentException thrown if id <= 0
     105     * @exception IllegalArgumentException thrown if id &lt;= 0
    106106     * @exception IllegalArgumentException thrown if type == null
    107107     * @exception IllegalArgumentException thrown if targetLayer == null
     
    124124     * constructor
    125125     *
    126      * @param targetLayer  the target layer. Must not be null.
     126     * @param targetLayer the target layer. Must not be null.
    127127     * @param primitiveId a PrimitiveId object.
    128      * @exception IllegalArgumentException thrown if id <= 0
     128     * @exception IllegalArgumentException thrown if id &lt;= 0
    129129     * @exception IllegalArgumentException thrown if targetLayer == null
    130130     *
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java

    r6069 r6830  
    2525     * {@link Future}, but make sure not to freeze up JOSM. Example:
    2626     * <pre>
    27      *    Future<?> future = task.download(...);
     27     *    Future&lt;?&gt; future = task.download(...);
    2828     *    // DON'T run this on the Swing EDT or JOSM will freeze
    2929     *    future.get(); // waits for the dowload task to complete
     
    3333     * the Swing EDT:
    3434     * <pre>
    35      *    final Future<?> future = task.download(...);
     35     *    final Future&lt;?&gt; future = task.download(...);
    3636     *    Runnable runAfterTask = new Runnable() {
    3737     *       public void run() {
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

    r6388 r6830  
    5252
    5353/**
    54  * @author Alexander Kachkaev <alexander@kachkaev.ru>, 2011
     54 * @author Alexander Kachkaev &lt;alexander@kachkaev.ru&gt;, 2011
    5555 */
    5656public class ImproveWayAccuracyAction extends MapMode implements MapViewPaintable,
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java

    r6362 r6830  
    2020 * segment to divide.
    2121 *
    22  * @author Alexander Kachkaev <alexander@kachkaev.ru>, 2011
     22 * @author Alexander Kachkaev &lt;alexander@kachkaev.ru&gt;, 2011
    2323 */
    2424final class ImproveWayAccuracyHelper {
     
    2727        // Hide default constructor for utils classes
    2828    }
    29    
     29
    3030    /**
    3131     * Finds the way to work on. If the mouse is on the node, extracts one of
Note: See TracChangeset for help on using the changeset viewer.