Changeset 8470 in josm


Ignore:
Timestamp:
2015-06-06T04:32:00+02:00 (4 years ago)
Author:
Don-vip
Message:

javadoc fixes. Removed one duplicated method in exception handling

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

Legend:

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

    r8443 r8470  
    7878         * Replies all primitives of type <code>type</code> in the current selection.
    7979         *
    80          * @param <T>
    8180         * @param type  the type
    8281         * @return all primitives of type <code>type</code> in the current selection.
    8382         */
    84         protected <T extends PrimitiveData> Collection<? extends PrimitiveData> getSourcePrimitivesByType(OsmPrimitiveType type) {
     83        protected Collection<? extends PrimitiveData> getSourcePrimitivesByType(OsmPrimitiveType type) {
    8584            return PrimitiveData.getFilteredList(source, type);
    8685        }
     
    9089         * selection
    9190         *
    92          * @param <T>
    9391         * @param type  the type
    9492         * @return the collection of tags for all primitives of type <code>type</code> in the current
    9593         * selection
    9694         */
    97         protected <T extends OsmPrimitive> TagCollection getSourceTagsByType(OsmPrimitiveType type) {
     95        protected TagCollection getSourceTagsByType(OsmPrimitiveType type) {
    9896            return TagCollection.unionOfAllPrimitives(getSourcePrimitivesByType(type));
    9997        }
     
    103101         * type <code>type</code>
    104102         *
    105          * @param <T>
    106103         * @param type the type
    107104         * @return true if there is at least one tag in the current selection for primitives of
    108105         * type <code>type</code>
    109106         */
    110         protected <T extends OsmPrimitive> boolean hasSourceTagsByType(OsmPrimitiveType type) {
     107        protected boolean hasSourceTagsByType(OsmPrimitiveType type) {
    111108            return !getSourceTagsByType(type).isEmpty();
    112109        }
     
    177174         * is in the target collection
    178175         *
    179          * @param <T>
    180176         * @param type  the type to look for
    181177         * @return true if there is at least one primitive of type <code>type</code> in the collection
    182178         * <code>selection</code>
    183179         */
    184         protected <T extends OsmPrimitive> boolean hasTargetPrimitives(Class<T> type) {
     180        protected boolean hasTargetPrimitives(Class<? extends OsmPrimitive> type) {
    185181            return !OsmPrimitive.getFilteredList(target, type).isEmpty();
    186182        }
     
    301297    /**
    302298     * Create and execute SequenceCommand with descriptive title
    303      * @param commands
     299     * @param commands the commands to perform in a sequential command
    304300     */
    305301    private static void commitCommands(Collection<OsmPrimitive> selection, List<Command> commands) {
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r8308 r8470  
    3535 *
    3636 * The user can click on an object, which gets deleted if possible. When Ctrl is
    37  * pressed when releasing the button, the objects and all its references are
    38  * deleted.
     37 * pressed when releasing the button, the objects and all its references are deleted.
    3938 *
    4039 * If the user did not press Ctrl and the object has any references, the user
     
    4746 */
    4847public class DeleteAction extends MapMode implements ModifierListener {
    49     // Cache previous mouse event (needed when only the modifier keys are
    50     // pressed but the mouse isn't moved)
     48    // Cache previous mouse event (needed when only the modifier keys are pressed but the mouse isn't moved)
    5149    private MouseEvent oldEvent = null;
    5250
     
    181179    /**
    182180     * handles everything related to highlighting primitives and way
    183      * segments for the given pointer position (via MouseEvent) and
    184      * modifiers.
    185      * @param e
    186      * @param modifiers
     181     * segments for the given pointer position (via MouseEvent) and modifiers.
     182     * @param e current mouse event
     183     * @param modifiers mouse modifiers, not necessarly taken from the given mouse event
    187184     */
    188185    private void addHighlighting(MouseEvent e, int modifiers) {
     
    202199            Command delCmd = buildDeleteCommands(e, modifiers, true);
    203200            if(delCmd != null) {
    204                 // all other cases delete OsmPrimitives directly, so we can
    205                 // safely do the following
     201                // all other cases delete OsmPrimitives directly, so we can safely do the following
    206202                for(OsmPrimitive osm : delCmd.getParticipatingPrimitives()) {
    207203                    newHighlights.add(osm);
     
    236232
    237233    /**
    238      * This function handles all work related to updating the cursor and
    239      * highlights
     234     * This function handles all work related to updating the cursor and highlights
    240235     *
    241      * @param e
    242      * @param modifiers
     236     * @param e current mouse event
     237     * @param modifiers mouse modifiers, not necessarly taken from the given mouse event
    243238     */
    244239    private void updateCursor(MouseEvent e, int modifiers) {
     
    260255     * mouse is not moved and only modifier keys are pressed, no mouse event
    261256     * occurs. We can use AWTEvent to catch those but still lack a proper
    262      * mouseevent. Instead we copy the previous event and only update the
    263      * modifiers.
     257     * mouseevent. Instead we copy the previous event and only update the modifiers.
    264258     */
    265259    private void giveUserFeedback(MouseEvent e, int modifiers) {
     
    279273    /**
    280274     * If user clicked with the left button, delete the nearest object.
    281      * position.
    282275     */
    283276    @Override
     
    372365     * @param e MouseEvent from which modifiers and position are taken
    373366     * @param modifiers For explanation, see {@link #updateCursor}
    374      * @param silent Set to true if the user should not be bugged with additional
    375      *        dialogs
     367     * @param silent Set to true if the user should not be bugged with additional dialogs
    376368     * @return delete command
    377369     */
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r8465 r8470  
    369369     * to appropriate {@link #mode}, depending on Ctrl/Alt/Shift modifiers and
    370370     * {@link #dualAlignEnabled}.
    371      * @param e
     371     * @param e current mouse event
    372372     */
    373373    @Override
     
    448448    /**
    449449     * Performs action depending on what {@link #mode} we're in.
    450      * @param e
     450     * @param e current mouse event
    451451     */
    452452    @Override
     
    510510    /**
    511511     * Does anything that needs to be done, then switches back to select mode.
    512      * @param e
     512     * @param e current mouse event
    513513     */
    514514    @Override
     
    711711    /**
    712712     * This method tests if {@code node} has other ways apart from the given one.
    713      * @param node
    714      * @param myWay
     713     * @param node node to test
     714     * @param myWay way known to contain this node
    715715     * @return {@code true} if {@code node} belongs only to {@code myWay}, false if there are more ways.
    716716     */
     
    11411141     * Draws given reference segment.
    11421142     * @param g2 the Graphics2D object used to draw on
    1143      * @param mv
     1143     * @param mv map view
    11441144     * @param seg the reference segment
    11451145     */
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java

    r8378 r8470  
    1717     *  Lowercase signifies off and '?' means unknown/optional.
    1818     *  Order is Alt, Shift, Ctrl
    19      * @param str
     19     * @param str 3 letters string defining modifiers
    2020     */
    2121    public ModifiersSpec(String str) {
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r8444 r8470  
    666666     * selectables nearby. Everything has to be pre-determined for this
    667667     * function; its main purpose is to centralize what the modifiers do.
    668      * @param hasSelectionNearby
     668     * @param hasSelectionNearby {@code true} if some primitves are selectable nearby
    669669     */
    670670    private void determineMapMode(boolean hasSelectionNearby) {
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r8426 r8470  
    410410
    411411    /**
    412      * Launches the dialog for specifying search criteria and runs
    413      * a search
     412     * Launches the dialog for specifying search criteria and runs a search
    414413     */
    415414    public static void search() {
     
    424423     * search history and performs the search.
    425424     *
    426      * @param s
     425     * @param s search settings
    427426     */
    428427    public static void searchWithHistory(SearchSetting s) {
     
    432431    }
    433432
     433    /**
     434     * Performs the search specified by the settings in <code>s</code> without saving it to search history.
     435     *
     436     * @param s search settings
     437     */
    434438    public static void searchWithoutHistory(SearchSetting s) {
    435439        lastSearch = new SearchSetting(s);
     
    486490
    487491    /**
    488      * Version of getSelection that is customized for filter, but should
    489      * also work in other context.
     492     * Version of getSelection that is customized for filter, but should also work in other context.
    490493     *
    491494     * @param s the search settings
  • trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

    r8466 r8470  
    8383    /**
    8484     * Add (register) MatchFactory with SearchCompiler
    85      * @param factory
     85     * @param factory match factory
    8686     */
    8787    public static void addMatchFactory(MatchFactory factory) {
     
    13551355     *
    13561356     * @return match determined by search string
    1357      * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError
     1357     * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed
    13581358     */
    13591359    public Match parse() throws ParseError {
     
    13701370     *
    13711371     * @return match determined by parsing expression
    1372      * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError
     1372     * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed
    13731373     */
    13741374    private Match parseExpression() throws ParseError {
     
    13971397     * @param errorMessage to display if parsing error occurs
    13981398     * @return match determined by parsing expression
    1399      * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError
     1399     * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed
    14001400     * @see #parseExpression()
    14011401     */
     
    14121412     *
    14131413     * @return match determined by parsing factor string
    1414      * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError
     1414     * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed
    14151415     */
    14161416    private Match parseFactor() throws ParseError {
  • trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

    r8443 r8470  
    169169     * Tests whether way can be reversed without semantic change, i.e., whether tags have to be changed.
    170170     * Looks for keys like oneway, oneway:bicycle, cycleway:right:oneway, left/right.
    171      * @param way
     171     * @param way way to test
    172172     * @return false if tags should be changed to keep semantic, true otherwise.
    173173     */
  • trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

    r8461 r8470  
    955955     * @param tmpPref - preferences to fill from JS
    956956     * @param varInJS - JS variable name, where preferences are stored
    957      * @throws ScriptException
     957     * @throws ScriptException if the evaluation fails
    958958     */
    959959    public static void readPrefsFromJS(ScriptEngine engine, Preferences tmpPref, String varInJS) throws ScriptException {
     
    10401040     * @param whereToPutInJS - variable name to store preferences in JS
    10411041     * @param includeDefaults - include known default values to JS objects
    1042      * @throws ScriptException
     1042     * @throws ScriptException if the evaluation fails
    10431043     */
    10441044    public static void loadPrefsToJS(ScriptEngine engine, Preferences tmpPref, String whereToPutInJS, boolean includeDefaults) throws ScriptException {
  • trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java

    r8344 r8470  
    3434     *
    3535     * @return BufferedImage of cache entry content
    36      * @throws IOException
     36     * @throws IOException if an error occurs during reading.
    3737     */
    3838    public BufferedImage getImage() throws IOException {
  • trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java

    r8440 r8470  
    3737
    3838    /**
    39      * Submit job for background fetch, and listener will be
    40      * fed with value object
     39     * Submit job for background fetch, and listener will be fed with value object
    4140     *
    42      * @param listener
     41     * @param listener cache loader listener
    4342     * @param force true if the load should skip all the caches (local & remote)
    4443     */
  • trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java

    r8403 r8470  
    66    /**
    77     * Result of download
    8      *
    98     */
    109    enum LoadResult {
     
    1312        CANCELED
    1413    }
     14
    1515    /**
    1616     * Will be called when K object processed. The result might be:
     
    1919     * LoadResult.REJECTED when job was rejected because of full queue
    2020     *
    21      * @param data
    22      * @param attributes
    23      * @param result
     21     * @param data cache entry contents
     22     * @param attributes cache entry attributes
     23     * @param result load result (success, failure, canceled)
    2424     */
    2525    public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result);
    26 
    2726}
  • trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

    r8384 r8470  
    504504     *
    505505     * @param img Used only when overlapping is used, when not used, used raw from imageData
    506      * @param imageData
    507      * @param projection
    508      * @param pixelPerDegree
    509      * @param east
    510      * @param north
    511      * @throws IOException
     506     * @param imageData input stream to raw image data
     507     * @param projection current projection
     508     * @param pixelPerDegree number of pixels per degree
     509     * @param east easting
     510     * @param north northing
     511     * @throws IOException if any I/O error occurs
    512512     */
    513     public synchronized void saveToCache(BufferedImage img, InputStream imageData, Projection projection, double pixelPerDegree, double east, double north) throws IOException {
     513    public synchronized void saveToCache(BufferedImage img, InputStream imageData, Projection projection, double pixelPerDegree, double east, double north)
     514            throws IOException {
    514515        ProjectionEntries projectionEntries = getProjectionEntries(projection);
    515516        CacheEntry entry = findEntry(projectionEntries, pixelPerDegree, east, north);
     
    523524                mimeType = URLConnection.guessContentTypeFromStream(imageData);
    524525            }
    525             entry = new CacheEntry(pixelPerDegree, east, north, tileSize,generateFileName(projectionEntries, pixelPerDegree, projection, east, north, mimeType));
     526            entry = new CacheEntry(pixelPerDegree, east, north,
     527                    tileSize,generateFileName(projectionEntries, pixelPerDegree, projection, east, north, mimeType));
    526528            entry.lastUsed = System.currentTimeMillis();
    527529            entry.lastModified = entry.lastUsed;
  • trunk/src/org/openstreetmap/josm/data/osm/BBox.java

    r8393 r8470  
    3333     * Result is minimal BBox containing both points.
    3434     *
    35      * @param a
    36      * @param b
     35     * @param a first point
     36     * @param b second point
    3737     */
    3838    public BBox(LatLon a, LatLon b) {
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r8338 r8470  
    954954    /**
    955955     * Show message and stack trace in log in case primitive is not found
    956      * @param primitiveId
     956     * @param primitiveId primitive id to look for
    957957     * @return Primitive by id.
    958958     */
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r8444 r8470  
    4545    private static final String SPECIAL_VALUE_LOCAL_NAME = "localname";
    4646
    47 
    4847    /**
    4948     * An object can be disabled by the filter mechanism.
     
    115114     * If <code>list</code> is null, replies an empty list.
    116115     *
    117      * @param <T>
     116     * @param <T> type of data (must be one of the {@link OsmPrimitive} types
    118117     * @param list  the original list
    119118     * @param type the type to filter for
    120119     * @return the sub-list of OSM primitives of type <code>type</code>
    121120     */
    122     public static <T extends OsmPrimitive>  List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
     121    public static <T extends OsmPrimitive> List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
    123122        if (list == null) return Collections.emptyList();
    124123        List<T> ret = new LinkedList<>();
     
    249248     *
    250249     * @param id the id
    251      * @param allowNegativeId
     250     * @param allowNegativeId {@code true} to allow negative id
    252251     * @throws IllegalArgumentException if id &lt; 0 and allowNegativeId is false
    253252     */
     
    278277     * If id is not &gt; 0 version is ignored and set to 0.
    279278     *
    280      * @param id
    281      * @param version
    282      * @param allowNegativeId
     279     * @param id the id
     280     * @param version the version (positive integer)
     281     * @param allowNegativeId {@code true} to allow negative id
    283282     * @throws IllegalArgumentException if id &lt; 0 and allowNegativeId is false
    284283     */
     
    288287        setIncomplete(id > 0 && version == 0);
    289288    }
    290 
    291289
    292290    /*----------
     
    313311    /**
    314312     * This method should never ever by called from somewhere else than Dataset.addPrimitive or removePrimitive methods
    315      * @param dataSet
     313     * @param dataSet the parent dataset
    316314     */
    317315    void setDataset(DataSet dataSet) {
     
    11751173
    11761174    /**
    1177      * Replies true if this primitive and other are equal with respect to their
    1178      * semantic attributes.
     1175     * Replies true if this primitive and other are equal with respect to their semantic attributes.
    11791176     * <ol>
    11801177     *   <li>equal id</li>
     
    11821179     *   <li>both have the same tags</li>
    11831180     * </ol>
    1184      * @param other
    1185      * @return true if this primitive and other are equal with respect to their
    1186      * semantic attributes.
     1181     * @param other other primitive to compare
     1182     * @return true if this primitive and other are equal with respect to their semantic attributes.
    11871183     */
    11881184    public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
     
    11971193
    11981194    /**
    1199      * Replies true if this primitive and other are equal with respect to their
    1200      * technical attributes. The attributes:
     1195     * Replies true if this primitive and other are equal with respect to their technical attributes.
     1196     * The attributes:
    12011197     * <ol>
    12021198     *   <li>deleted</li>
     
    12091205     * have to be equal
    12101206     * @param other the other primitive
    1211      * @return true if this primitive and other are equal with respect to their
    1212      * technical attributes
     1207     * @return true if this primitive and other are equal with respect to their technical attributes
    12131208     */
    12141209    public boolean hasEqualTechnicalAttributes(OsmPrimitive other) {
    12151210        if (other == null) return false;
    12161211
    1217         return
    1218                 isDeleted() == other.isDeleted()
     1212        return  isDeleted() == other.isDeleted()
    12191213                && isModified() == other.isModified()
    12201214                && timestamp == other.timestamp
  • trunk/src/org/openstreetmap/josm/data/osm/Relation.java

    r8444 r8470  
    109109    /**
    110110     * Replace member at position specified by index.
    111      * @param index
    112      * @param member
     111     * @param index index (positive integer)
     112     * @param member relation member to set
    113113     * @return Member that was at the position
    114114     */
     
    133133    /**
    134134     * Removes member at specified position.
    135      * @param index
     135     * @param index index (positive integer)
    136136     * @return Member that was at the position
    137137     */
     
    218218    /**
    219219     * Creates new relation
    220      * @param id
    221      * @param version
     220     * @param id the id
     221     * @param version version number (positive integer)
    222222     */
    223223    public Relation(long id, int version) {
  • trunk/src/org/openstreetmap/josm/data/osm/Storage.java

    r8384 r8470  
    130130    /**
    131131     * constructor
    132      * @param ha
    133      * @param capacity
     132     * @param ha hash
     133     * @param capacity capacity
    134134     * @param safeIterator If set to false, you must not modify the Storage
    135135     *          while iterating over it. If set to true, you can safely
  • trunk/src/org/openstreetmap/josm/data/osm/User.java

    r8444 r8470  
    148148     * Adds a user name to the list if it is not there, yet.
    149149     *
    150      * @param name
     150     * @param name User name
    151151     */
    152152    public void addName(String name) {
     
    157157     * Returns true if the name is in the names list
    158158     *
    159      * @param name
     159     * @param name User name
    160160     * @return <code>true</code> if the name is in the names list
    161161     */
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

    r8395 r8470  
    107107     * equal <code>null</code>) this method does not do anything.
    108108     *
    109      * @param enlargeDegree
     109     * @param enlargeDegree number of degrees to enlarge on each side
    110110     */
    111111    public void enlargeBoundingBox(double enlargeDegree) {
     
    141141     * equal <code>null</code>) this method does not do anything.
    142142     *
    143      * @param maxEnlargePercent
     143     * @param maxEnlargePercent maximum enlargement in percentage (100.0 for 100%)
    144144     */
    145145    public void enlargeBoundingBoxLogarithmically(double maxEnlargePercent) {
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r8444 r8470  
    857857     * highlights a given GeneralPath using the settings from BasicStroke to match the line's
    858858     * style. Width of the highlight is hard coded.
    859      * @param path
    860      * @param line
     859     * @param path path to draw
     860     * @param line line style
    861861     */
    862862    private void drawPathHighlight(GeneralPath path, BasicStroke line) {
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

    r8415 r8470  
    9999     * @param in Grid Shift File InputStream
    100100     * @param loadAccuracy is Accuracy data to be loaded as well as shift data?
    101      * @throws IOException
     101     * @throws IOException if any I/O error occurs
    102102     */
    103103    public void loadGridShiftFile(InputStream in, boolean loadAccuracy) throws IOException {
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

    r8406 r8470  
    6969     * @param bigEndian is the file bigEndian?
    7070     * @param loadAccuracy is the node Accuracy data to be loaded?
    71      * @throws IOException
     71     * @throws IOException if any I/O error occurs
    7272     */
    7373    public NTV2SubGrid(InputStream in, boolean bigEndian, boolean loadAccuracy) throws IOException {
     
    283283    /**
    284284     * Set an array of Sub Grids of this sub grid
    285      * @param subGrid
     285     * @param subGrid subgrids
    286286     */
    287287    public void setSubGridArray(NTV2SubGrid[] subGrid) {
  • trunk/src/org/openstreetmap/josm/data/validation/Test.java

    r8378 r8470  
    251251     * Fixes the error with the appropriate command
    252252     *
    253      * @param testError
     253     * @param testError error to fix
    254254     * @return The command to fix the error
    255255     */
  • trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

    r8461 r8470  
    99import java.awt.event.ActionListener;
    1010import java.io.BufferedReader;
    11 import java.io.FileNotFoundException;
    1211import java.io.IOException;
    1312import java.io.InputStream;
     
    154153     * by the nearest + word before this.
    155154     *
    156      * @throws FileNotFoundException
    157      * @throws IOException
     155     * @throws IOException if any I/O error occurs
    158156     */
    159157    private static void initializeData() throws IOException {
  • trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

    r7434 r8470  
    188188     */
    189189    public static void explainNestedInvocationTargetException(Exception e) {
    190         InvocationTargetException ex = getNestedException(e, InvocationTargetException.class);
     190        InvocationTargetException ex = ExceptionUtil.getNestedException(e, InvocationTargetException.class);
    191191        if (ex != null) {
    192192            // Users should be able to submit a bug report for an invocation target exception
     
    404404
    405405    /**
    406      * Replies the first nested exception of type <code>nestedClass</code> (including
    407      * the root exception <code>e</code>) or null, if no such exception is found.
    408      *
    409      * @param <T>
    410      * @param e the root exception
    411      * @param nestedClass the type of the nested exception
    412      * @return the first nested exception of type <code>nestedClass</code> (including
    413      * the root exception <code>e</code>) or null, if no such exception is found.
    414      */
    415     protected static <T> T getNestedException(Exception e, Class<T> nestedClass) {
    416         Throwable t = e;
    417         while (t != null && !(nestedClass.isInstance(t))) {
    418             t = t.getCause();
    419         }
    420         if (t == null)
    421             return null;
    422         else if (nestedClass.isInstance(t))
    423             return nestedClass.cast(t);
    424         return null;
    425     }
    426 
    427     /**
    428406     * Explains an {@link OsmTransferException} to the user.
    429407     *
     
    431409     */
    432410    public static void explainOsmTransferException(OsmTransferException e) {
    433         if (getNestedException(e, SecurityException.class) != null) {
     411        if (ExceptionUtil.getNestedException(e, SecurityException.class) != null) {
    434412            explainSecurityException(e);
    435413            return;
    436414        }
    437         if (getNestedException(e, SocketException.class) != null) {
     415        if (ExceptionUtil.getNestedException(e, SocketException.class) != null) {
    438416            explainNestedSocketException(e);
    439417            return;
    440418        }
    441         if (getNestedException(e, UnknownHostException.class) != null) {
     419        if (ExceptionUtil.getNestedException(e, UnknownHostException.class) != null) {
    442420            explainNestedUnkonwnHostException(e);
    443421            return;
    444422        }
    445         if (getNestedException(e, IOException.class) != null) {
     423        if (ExceptionUtil.getNestedException(e, IOException.class) != null) {
    446424            explainNestedIOException(e);
    447425            return;
    448426        }
    449         if (getNestedException(e, IllegalDataException.class) != null) {
     427        if (ExceptionUtil.getNestedException(e, IllegalDataException.class) != null) {
    450428            explainNestedIllegalDataException(e);
    451429            return;
    452430        }
    453         if (getNestedException(e, OfflineAccessException.class) != null) {
     431        if (ExceptionUtil.getNestedException(e, OfflineAccessException.class) != null) {
    454432            explainNestedOfflineAccessException(e);
    455433            return;
     
    534512     */
    535513    public static void explainException(Exception e) {
    536         if (getNestedException(e, InvocationTargetException.class) != null) {
     514        if (ExceptionUtil.getNestedException(e, InvocationTargetException.class) != null) {
    537515            explainNestedInvocationTargetException(e);
    538516            return;
  • trunk/src/org/openstreetmap/josm/gui/MapFrame.java

    r8399 r8470  
    592592
    593593    /**
    594      * Replies the instance of a toggle dialog of type <code>type</code> managed by this
    595      * map frame
     594     * Replies the instance of a toggle dialog of type <code>type</code> managed by this map frame
    596595     *
    597      * @param <T>
     596     * @param <T> toggle dialog type
    598597     * @param type the class of the toggle dialog, i.e. UserListDialog.class
    599598     * @return the instance of a toggle dialog of type <code>type</code> managed by this
     
    618617        if (dialogsPanel.isVisible()) {
    619618            Main.pref.putInteger("toggleDialogs.width", splitPane.getWidth()-splitPane.getDividerLocation());
    620     }
     619        }
    621620    }
    622621
  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r8426 r8470  
    396396         * keep the popup on screen and shows a vertical scrollbar, if the
    397397         * screen is too small.
    398          * @param content
    399          * @param ms
     398         * @param content popup content
     399         * @param ms mouse state
    400400         * @return popup
    401401         */
     
    432432        /**
    433433         * Calls this to update the element that is shown in the statusbar
    434          * @param ms
     434         * @param ms mouse state
    435435         */
    436436        private void statusBarElementUpdate(MouseState ms) {
  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r8459 r8470  
    329329
    330330    /**
    331      * @param r
     331     * @param r rectangle
    332332     * @return Minimum bounds that will cover rectangle
    333333     */
  • trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

    r8426 r8470  
    107107    /**
    108108     * Sets a custom text line below currentAction. Can be used to display additional information
    109      * @param text
     109     * @param text custom text
    110110     */
    111111    @Override
  • trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

    r8393 r8470  
    9292    /**
    9393     * Plugins that wish to add custom tile sources to slippy map choose should call this method
    94      * @param tileSourceProvider
     94     * @param tileSourceProvider new tile source provider
    9595     */
    9696    public static void addTileSourceProvider(TileSourceProvider tileSourceProvider) {
     
    237237
    238238    /**
    239      * Callback for the OsmMapControl. (Re-)Sets the start and end point of the
    240      * selection rectangle.
     239     * Callback for the OsmMapControl. (Re-)Sets the start and end point of the selection rectangle.
    241240     *
    242      * @param aStart
    243      * @param aEnd
     241     * @param aStart selection start
     242     * @param aEnd selection end
    244243     */
    245244    public void setSelection(Point aStart, Point aEnd) {
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

    r8444 r8470  
    126126
    127127    /**
    128      *
    129      * @param entry
     128     * Replies primitive from my dataset referenced by entry
     129     * @param entry entry
    130130     * @return Primitive from my dataset referenced by entry
    131131     */
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

    r8444 r8470  
    401401    /**
    402402     * Constructs a new {@code ListMerger}.
    403      * @param model
     403     * @param model list merger model
    404404     */
    405405    public ListMerger(ListMergeModel<T> model) {
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

    r8444 r8470  
    182182     * Replies the decision at position <code>row</code>
    183183     *
    184      * @param row
     184     * @param row position
    185185     * @return the decision at position <code>row</code>
    186186     */
  • trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

    r8449 r8470  
    301301     * map frame
    302302     *
    303      * @param <T>
     303     * @param <T> toggle dialog type
    304304     * @param type the class of the toggle dialog, i.e. UserListDialog.class
    305305     * @return the instance of a toggle dialog of type <code>type</code> managed by this
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r8390 r8470  
    501501     * is the editor's business.
    502502     *
    503      * @param row
     503     * @param row position
    504504     */
    505505    private void editMembership(int row) {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

    r8345 r8470  
    6161    private final List<Integer> notSortable = new ArrayList<>();
    6262
    63     public static Node firstOnewayNode(RelationMember m){
     63    public static Node firstOnewayNode(RelationMember m) {
    6464        if(!m.isWay()) return null;
    6565        if("backward".equals(m.getRole())) {
     
    6969    }
    7070
    71     public static Node lastOnewayNode(RelationMember m){
     71    public static Node lastOnewayNode(RelationMember m) {
    7272        if(!m.isWay()) return null;
    7373        if("backward".equals(m.getRole())) {
     
    267267    /**
    268268     * find next node in nw NodeWays structure, if the node is found delete and return it
    269      * @param nw
    270      * @param n
     269     * @param nw nodes and ways
     270     * @param n node
    271271     * @return node next to n
    272272     */
    273     private Integer deleteAndGetAdjacentNode(NodesWays nw, Node n){
     273    private Integer deleteAndGetAdjacentNode(NodesWays nw, Node n) {
    274274        Integer j = findAdjacentWay(nw, n);
    275275        if(j == null) return null;
     
    284284    }
    285285
    286     private void deleteWayNode(NodesWays nw, Integer way, Node n){
     286    private void deleteWayNode(NodesWays nw, Integer way, Node n) {
    287287        if(nw.oneWay) {
    288288            doneOneway(way);
  • trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

    r8444 r8470  
    281281
    282282    /**
    283      * Invoked by
    284      * @param b
     283     * Starts download for the given bounding box
     284     * @param b bounding box to download
    285285     */
    286286    public void startDownload(Bounds b) {
  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

    r7528 r8470  
    125125    /**
    126126     * Sets the current history.
    127      * @param history
     127     * @param history current history
    128128     */
    129129    protected void setHistory(History history) {
  • trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

    r8394 r8470  
    173173     * Recursive unzipping function
    174174     * TODO: May be placed somewhere else - Tools.Utils?
    175      * @param file
    176      * @param dir
    177      * @throws IOException
     175     * @param file zip file
     176     * @param dir output directory
     177     * @throws IOException if any I/O error occurs
    178178     */
    179179    public static void unzipFileRecursively(File file, String dir) throws IOException {
  • trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

    r8464 r8470  
    353353     * {@link ImageryType#BING}, {@link ImageryType#SCANEX}.
    354354     *
    355      * @param info
     355     * @param info imagery info
    356356     * @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found.
    357      * @throws IllegalArgumentException
     357     * @throws IllegalArgumentException if url from imagery info is null or invalid
    358358     */
    359359    public static TileSource getTileSource(ImageryInfo info) {
  • trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

    r8444 r8470  
    433433
    434434    /**
    435      *
    436      * @param xIndex
    437      * @param yIndex
     435     * Returns east/north for a x/y couple.
     436     * @param xIndex x index
     437     * @param yIndex y index
    438438     * @return Real EastNorth of given tile. dx/dy is not counted in
    439439     */
     
    531531
    532532    /**
    533      *
    534      * @param request
     533     * Replies request priority.
     534     * @param request WMS request
    535535     * @return -1 if request is no longer needed, otherwise priority of request (lower number &lt;=&gt; more important request)
    536536     */
     
    719719     * not update existing tiles, only new ones will be subject to the new settings.
    720720     *
    721      * @param layer
     721     * @param layer WMS layer
    722722     * @param snap  Set to true if the resolution should snap to certain values instead of
    723723     *              matching the current zoom level perfectly
     
    739739     * false they will be removed instantly (and redrawn only after the new resolution
    740740     * image has been loaded).
    741      * @param layer
     741     * @param layer WMS layer
    742742     * @param snap  Set to true if the resolution should snap to certain values instead of
    743743     *              matching the current zoom level perfectly
  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

    r8393 r8470  
    4545    /**
    4646     * draws a primitive
    47      * @param primitive
    48      * @param paintSettings
    49      * @param painter
     47     * @param primitive primitive to draw
     48     * @param paintSettings paint settings
     49     * @param painter painter
    5050     * @param selected true, if primitive is selected
    5151     * @param outermember true, if primitive is not selected and outer member of a selected multipolygon relation
  • trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java

    r8444 r8470  
    3939     * If null, no label is rendered.
    4040     * @param font the font to be used. Must not be null.
    41      * @param xOffset
    42      * @param yOffset
     41     * @param xOffset x offset
     42     * @param yOffset y offset
    4343     * @param color the color to be used. Must not be null
    44      * @param haloRadius
    45      * @param haloColor
     44     * @param haloRadius halo radius
     45     * @param haloColor halo color
    4646     */
    4747    public TextElement(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) {
  • trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

    r8461 r8470  
    158158     * Add validation listener to currently open preferences dialog. Calling to removeValidationListener is not necessary, all listeners will
    159159     * be automatically removed when dialog is closed
    160      * @param validationListener
     160     * @param validationListener validation listener to add
    161161     */
    162162    public void addValidationListener(ValidationListener validationListener) {
  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java

    r8291 r8470  
    5151     * next time JOSM is used.
    5252     *
    53      * @param saveToPreferences
     53     * @param saveToPreferences {@code true} to save to preferences file
    5454     */
    5555    public void setSaveToPreferences(boolean saveToPreferences) {
     
    8787     * Sets the access token secret. Pass in null to remove the current access token secret.
    8888     *
    89      * @param accessTokenSecret
     89     * @param accessTokenSecret access token secret, or null
    9090     */
    9191    public void setAccessTokenSecret(String accessTokenSecret) {
  • trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java

    r5891 r8470  
    116116     * @param title Can be {@code null}, in that case task title is not changed
    117117     */
     118    void subTask(String title);
    118119
    119     void subTask(String title);
    120120    /**
    121121     * Shows additional text
     122     * @param text custom text
    122123     */
     124    void setCustomText(String text);
    123125
    124     void setCustomText(String text);
    125126    /**
    126      * Show extra text after normal task title. Hack for ProgressInputStream to show number of kB
    127      * already downloaded
    128      * @param text
     127     * Show extra text after normal task title. Hack for ProgressInputStream to show number of kB already downloaded
     128     * @param text extra text
    129129     */
    130130    void setExtraText(String text);
  • trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

    r8444 r8470  
    474474
    475475    /**
    476      * @param autoCompletionList
     476     * Sets the editor autocompletion list
     477     * @param autoCompletionList autocompletion list
    477478     */
    478479    public void setAutoCompletionList(AutoCompletionList autoCompletionList) {
     
    520521     * Inject a tag cell editor in the tag table
    521522     *
    522      * @param editor
     523     * @param editor tag cell editor
    523524     */
    524525    public void setTagCellEditor(TagCellEditor editor) {
  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

    r7748 r8470  
    271271     * an empty list if key is null or if key is not in {@link #getKeys()}.
    272272     *
    273      * @param key
     273     * @param key OSM key
    274274     * @return the list of auto completion values
    275275     */
  • trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

    r8465 r8470  
    11161116        /**
    11171117         * Dividers can't have a weight, they don't grow or shrink.
    1118          * @throws UnsupportedOperationException
     1118         * @throws UnsupportedOperationException always
    11191119         */
    11201120        @Override
  • trunk/src/org/openstreetmap/josm/io/CachedFile.java

    r8443 r8470  
    136136    /**
    137137     * Set the caching strategy. Only applies to URLs.
    138      * @param cachingStrategy
     138     * @param cachingStrategy caching strategy
    139139     * @return this object
    140140     */
  • trunk/src/org/openstreetmap/josm/io/Compression.java

    r7937 r8470  
    5555     * Returns an un-compressing {@link InputStream} for {@code in}.
    5656     *
    57      * @throws IOException
     57     * @throws IOException if any I/O error occurs
    5858     */
    5959    public InputStream getUncompressedInputStream(InputStream in) throws IOException {
     
    7474     * Returns an un-compressing {@link InputStream} for the {@link File} {@code file}.
    7575     *
    76      * @throws IOException
     76     * @throws IOException if any I/O error occurs
    7777     */
    7878    @SuppressWarnings("resource")
     
    8484     * Returns an un-compressing {@link InputStream} for the {@link URL} {@code url}.
    8585     *
    86      * @throws IOException
     86     * @throws IOException if any I/O error occurs
    8787     */
    8888    public static InputStream getUncompressedURLInputStream(URL url) throws IOException {
     
    9393     * Returns a compressing {@link OutputStream} for {@code out}.
    9494     *
    95      * @throws IOException
     95     * @throws IOException if any I/O error occurs
    9696     */
    9797    public OutputStream getCompressedOutputStream(OutputStream out) throws IOException {
     
    112112     * Returns a compressing {@link OutputStream} for the {@link File} {@code file}.
    113113     *
    114      * @throws IOException
     114     * @throws IOException if any I/O error occurs
    115115     */
    116116    @SuppressWarnings("resource")
  • trunk/src/org/openstreetmap/josm/io/GpxReader.java

    r8461 r8470  
    534534     * @return true if file was properly parsed, false if there was error during
    535535     * parsing but some data were parsed anyway
    536      * @throws SAXException
    537      * @throws IOException
     536     * @throws SAXException if any SAX parsing error occurs
     537     * @throws IOException if any I/O error occurs
    538538     */
    539539    public boolean parse(boolean tryToFinish) throws SAXException, IOException {
  • trunk/src/org/openstreetmap/josm/io/NoteReader.java

    r8377 r8470  
    197197     * Initializes the reader with a given InputStream
    198198     * @param source - InputStream containing Notes XML
    199      * @throws IOException
     199     * @throws IOException if any I/O error occurs
    200200     */
    201201    public NoteReader(InputStream source) throws IOException {
     
    206206     * Initializes the reader with a string as a source
    207207     * @param source UTF-8 string containing Notes XML to parse
    208      * @throws IOException
     208     * @throws IOException if any I/O error occurs
    209209     */
    210210    public NoteReader(String source) throws IOException {
     
    216216     * the resulting Note objects
    217217     * @return List of Notes parsed from the input data
    218      * @throws SAXException
    219      * @throws IOException
     218     * @throws SAXException if any SAX parsing error occurs
     219     * @throws IOException if any I/O error occurs
    220220     */
    221221    public List<Note> parse() throws SAXException, IOException {
  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r8415 r8470  
    802802     * @param monitor Progress monitor
    803803     * @return Note as it exists on the server after creation (ID assigned)
    804      * @throws OsmTransferException
     804     * @throws OsmTransferException if any error occurs during dialog with OSM API
    805805     */
    806806    public Note createNote(LatLon latlon, String text, ProgressMonitor monitor) throws OsmTransferException {
     
    824824     * @param monitor Progress monitor
    825825     * @return Note returned by the API after the comment was added
    826      * @throws OsmTransferException
     826     * @throws OsmTransferException if any error occurs during dialog with OSM API
    827827     */
    828828    public Note addCommentToNote(Note note, String comment, ProgressMonitor monitor) throws OsmTransferException {
     
    842842     * @param monitor Progress monitor
    843843     * @return Note returned by the API after the close operation
    844      * @throws OsmTransferException
     844     * @throws OsmTransferException if any error occurs during dialog with OSM API
    845845     */
    846846    public Note closeNote(Note note, String closeMessage, ProgressMonitor monitor) throws OsmTransferException {
     
    864864     * @param monitor Progress monitor
    865865     * @return Note returned by the API after the reopen operation
    866      * @throws OsmTransferException
     866     * @throws OsmTransferException if any error occurs during dialog with OSM API
    867867     */
    868868    public Note reopenNote(Note note, String reactivateMessage, ProgressMonitor monitor) throws OsmTransferException {
  • trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

    r8390 r8470  
    149149     *
    150150     * @return the data set
    151      * @throws OsmTransferException
     151     * @throws OsmTransferException if any error occurs during dialog with OSM API
    152152     */
    153153    protected DataSet getReferringWays(ProgressMonitor progressMonitor) throws OsmTransferException {
     
    160160     * @param progressMonitor the progress monitor
    161161     * @return the data set
    162      * @throws OsmTransferException
     162     * @throws OsmTransferException if any error occurs during dialog with OSM API
    163163     */
    164164    protected DataSet getReferringRelations(ProgressMonitor progressMonitor) throws OsmTransferException {
  • trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

    r8443 r8470  
    106106     * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
    107107     * @return the downloaded data
    108      * @throws OsmTransferException
     108     * @throws OsmTransferException if any error occurs during dialog with OSM API
    109109     */
    110110    @Override
  • trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

    r8415 r8470  
    366366     * Downloads notes from a given raw URL. The URL is assumed to be complete and no API limits are added
    367367     *
    368      * @param progressMonitor
     368     * @param progressMonitor progress monitor
    369369     * @return A list of notes parsed from the URL
    370      * @throws OsmTransferException
     370     * @throws OsmTransferException if any error occurs during dialog with OSM API
    371371     */
    372372    public List<Note> parseRawNotes(final ProgressMonitor progressMonitor) throws OsmTransferException {
     
    376376    /**
    377377     * Download notes from a URL that contains a bzip2 compressed notes dump file
    378      * @param progressMonitor
     378     * @param progressMonitor progress monitor
    379379     * @return A list of notes parsed from the URL
    380      * @throws OsmTransferException
     380     * @throws OsmTransferException if any error occurs during dialog with OSM API
    381381     */
    382382    public List<Note> parseRawNotesBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
  • trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java

    r8394 r8470  
    7878    /**
    7979     * Increase ticker (progress counter and displayed text) by the given amount.
    80      * @param amount
     80     * @param amount number of ticks
    8181     */
    8282    private void advanceTicker(int amount) {
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java

    r8342 r8470  
    113113     * Stops the HTTP server
    114114     *
    115      * @throws IOException
     115     * @throws IOException if any I/O error occurs
    116116     */
    117117    public void stopServer() throws IOException {
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

    r8404 r8470  
    114114     * @param v value
    115115     * @return which one
    116      * @throws IOException
     116     * @throws IOException if any I/O error occurs
    117117     */
    118118    private static GeneralName createGeneralName(String t, String v) throws IOException {
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

    r8464 r8470  
    7676    /**
    7777     * Adds a node, implements the GET /add_node?lon=...&amp;lat=... request.
    78      * @param args
     78     * @param args request arguments
    7979     */
    8080    private void addNode(Map<String, String> args){
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

    r8415 r8470  
    5757     * Check permission and parameters and handle request.
    5858     *
    59      * @throws RequestHandlerForbiddenException
    60      * @throws RequestHandlerBadRequestException
    61      * @throws RequestHandlerErrorException
     59     * @throws RequestHandlerForbiddenException if request is forbidden by preferences
     60     * @throws RequestHandlerBadRequestException if request is invalid
     61     * @throws RequestHandlerErrorException if an error occurs while processing request
    6262     */
    6363    public final void handle() throws RequestHandlerForbiddenException, RequestHandlerBadRequestException, RequestHandlerErrorException {
     
    7070    /**
    7171     * Validates the request before attempting to perform it.
    72      * @throws RequestHandlerBadRequestException
     72     * @throws RequestHandlerBadRequestException if request is invalid
    7373     * @since 5678
    7474     */
     
    8080     * This method of the subclass will do the real work.
    8181     *
    82      * @throws RequestHandlerErrorException
    83      * @throws RequestHandlerBadRequestException
     82     * @throws RequestHandlerErrorException if an error occurs while processing request
     83     * @throws RequestHandlerBadRequestException if request is invalid
    8484     */
    8585    protected abstract void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException;
     
    133133
    134134    /**
    135      * Check permissions in preferences and display error message
    136      * or ask for permission.
    137      *
    138      * @throws RequestHandlerForbiddenException
     135     * Check permissions in preferences and display error message or ask for permission.
     136     *
     137     * @throws RequestHandlerForbiddenException if request is forbidden by preferences
    139138     */
    140139    public final void checkPermission() throws RequestHandlerForbiddenException {
  • trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

    r8404 r8470  
    492492    /**
    493493     * Sets the name
    494      * @param name
     494     * @param name Plugin name
    495495     */
    496496    public void setName(String name) {
  • trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java

    r8390 r8470  
    3232     * @param manifest the plugin manifest
    3333     * @return a plugin information object
    34      * @throws PluginListParseException
     34     * @throws PluginListParseException if plugin manifest cannot be parsed
    3535     */
    3636    protected static PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException{
  • trunk/src/org/openstreetmap/josm/tools/CompositeList.java

    r8290 r8470  
    99 *
    1010 * Extremely simple single-purpose implementation.
    11  * @param <T>
     11 * @param <T> item type
    1212 * @since 7109
    1313 */
  • trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

    r7596 r8470  
    614614     * the root exception <code>e</code>) or null, if no such exception is found.
    615615     *
    616      * @param <T>
     616     * @param <T> nested exception type
    617617     * @param e the root exception
    618618     * @param nestedClass the type of the nested exception
    619619     * @return the first nested exception of type <code>nestedClass</code> (including
    620620     * the root exception <code>e</code>) or null, if no such exception is found.
    621      */
    622     protected static <T> T getNestedException(Exception e, Class<T> nestedClass) {
     621     * @since 8470
     622     */
     623    public static <T> T getNestedException(Exception e, Class<T> nestedClass) {
    623624        Throwable t = e;
    624625        while (t != null && !(nestedClass.isInstance(t))) {
  • trunk/src/org/openstreetmap/josm/tools/ExifReader.java

    r8364 r8470  
    121121     * @param dirGps The EXIF GPS directory
    122122     * @return The lat/lon read in the EXIF section, or {@code null} if {@code dirGps} is null
    123      * @throws MetadataException
     123     * @throws MetadataException if invalid metadata is given
    124124     * @since 6209
    125125     */
  • trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java

    r8416 r8470  
    5151     * Create new GeoPropertyIndex.
    5252     * @param geoProp the input property that should be made faster by this index
    53      * @param maxLevel
     53     * @param maxLevel max level
    5454     */
    5555    public GeoPropertyIndex(GeoProperty<T> geoProp, int maxLevel) {
  • trunk/src/org/openstreetmap/josm/tools/Geometry.java

    r8459 r8470  
    227227     * @param lineP2 second point in path
    228228     * @param lineP3 third point in path
    229      * @param testPoint
     229     * @param testPoint point to test
    230230     * @return true if to the right side, false otherwise
    231231     */
     
    714714     * Returns angle of a segment defined with 2 point coordinates.
    715715     *
    716      * @param p1
    717      * @param p2
     716     * @param p1 first point
     717     * @param p2 second point
    718718     * @return Angle in radians (-pi, pi]
    719719     */
     
    729729     * Returns angle of a corner defined with 3 point coordinates.
    730730     *
    731      * @param p1
     731     * @param p1 first point
    732732     * @param p2 Common endpoint
    733      * @param p3
     733     * @param p3 third point
    734734     * @return Angle in radians (-pi, pi]
    735735     */
  • trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

    r8468 r8470  
    195195    /**
    196196     * Apply different methods to extract tag-value pairs from arbitrary text
    197      * @param buf
     197     * @param buf buffer
    198198     * @return null if no format is suitable
    199199     */
    200 
    201200    public static Map<String,String> readTagsFromText(String buf) {
    202201        Map<String,String> tags;
Note: See TracChangeset for help on using the changeset viewer.