Index: trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 8470) @@ -78,9 +78,8 @@ * Replies all primitives of type type in the current selection. * - * @param * @param type the type * @return all primitives of type type in the current selection. */ - protected Collection getSourcePrimitivesByType(OsmPrimitiveType type) { + protected Collection getSourcePrimitivesByType(OsmPrimitiveType type) { return PrimitiveData.getFilteredList(source, type); } @@ -90,10 +89,9 @@ * selection * - * @param * @param type the type * @return the collection of tags for all primitives of type type in the current * selection */ - protected TagCollection getSourceTagsByType(OsmPrimitiveType type) { + protected TagCollection getSourceTagsByType(OsmPrimitiveType type) { return TagCollection.unionOfAllPrimitives(getSourcePrimitivesByType(type)); } @@ -103,10 +101,9 @@ * type type * - * @param * @param type the type * @return true if there is at least one tag in the current selection for primitives of * type type */ - protected boolean hasSourceTagsByType(OsmPrimitiveType type) { + protected boolean hasSourceTagsByType(OsmPrimitiveType type) { return !getSourceTagsByType(type).isEmpty(); } @@ -177,10 +174,9 @@ * is in the target collection * - * @param * @param type the type to look for * @return true if there is at least one primitive of type type in the collection * selection */ - protected boolean hasTargetPrimitives(Class type) { + protected boolean hasTargetPrimitives(Class type) { return !OsmPrimitive.getFilteredList(target, type).isEmpty(); } @@ -301,5 +297,5 @@ /** * Create and execute SequenceCommand with descriptive title - * @param commands + * @param commands the commands to perform in a sequential command */ private static void commitCommands(Collection selection, List commands) { Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 8470) @@ -35,6 +35,5 @@ * * The user can click on an object, which gets deleted if possible. When Ctrl is - * pressed when releasing the button, the objects and all its references are - * deleted. + * pressed when releasing the button, the objects and all its references are deleted. * * If the user did not press Ctrl and the object has any references, the user @@ -47,6 +46,5 @@ */ public class DeleteAction extends MapMode implements ModifierListener { - // Cache previous mouse event (needed when only the modifier keys are - // pressed but the mouse isn't moved) + // Cache previous mouse event (needed when only the modifier keys are pressed but the mouse isn't moved) private MouseEvent oldEvent = null; @@ -181,8 +179,7 @@ /** * handles everything related to highlighting primitives and way - * segments for the given pointer position (via MouseEvent) and - * modifiers. - * @param e - * @param modifiers + * segments for the given pointer position (via MouseEvent) and modifiers. + * @param e current mouse event + * @param modifiers mouse modifiers, not necessarly taken from the given mouse event */ private void addHighlighting(MouseEvent e, int modifiers) { @@ -202,6 +199,5 @@ Command delCmd = buildDeleteCommands(e, modifiers, true); if(delCmd != null) { - // all other cases delete OsmPrimitives directly, so we can - // safely do the following + // all other cases delete OsmPrimitives directly, so we can safely do the following for(OsmPrimitive osm : delCmd.getParticipatingPrimitives()) { newHighlights.add(osm); @@ -236,9 +232,8 @@ /** - * This function handles all work related to updating the cursor and - * highlights + * This function handles all work related to updating the cursor and highlights * - * @param e - * @param modifiers + * @param e current mouse event + * @param modifiers mouse modifiers, not necessarly taken from the given mouse event */ private void updateCursor(MouseEvent e, int modifiers) { @@ -260,6 +255,5 @@ * mouse is not moved and only modifier keys are pressed, no mouse event * occurs. We can use AWTEvent to catch those but still lack a proper - * mouseevent. Instead we copy the previous event and only update the - * modifiers. + * mouseevent. Instead we copy the previous event and only update the modifiers. */ private void giveUserFeedback(MouseEvent e, int modifiers) { @@ -279,5 +273,4 @@ /** * If user clicked with the left button, delete the nearest object. - * position. */ @Override @@ -372,6 +365,5 @@ * @param e MouseEvent from which modifiers and position are taken * @param modifiers For explanation, see {@link #updateCursor} - * @param silent Set to true if the user should not be bugged with additional - * dialogs + * @param silent Set to true if the user should not be bugged with additional dialogs * @return delete command */ Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8470) @@ -369,5 +369,5 @@ * to appropriate {@link #mode}, depending on Ctrl/Alt/Shift modifiers and * {@link #dualAlignEnabled}. - * @param e + * @param e current mouse event */ @Override @@ -448,5 +448,5 @@ /** * Performs action depending on what {@link #mode} we're in. - * @param e + * @param e current mouse event */ @Override @@ -510,5 +510,5 @@ /** * Does anything that needs to be done, then switches back to select mode. - * @param e + * @param e current mouse event */ @Override @@ -711,6 +711,6 @@ /** * This method tests if {@code node} has other ways apart from the given one. - * @param node - * @param myWay + * @param node node to test + * @param myWay way known to contain this node * @return {@code true} if {@code node} belongs only to {@code myWay}, false if there are more ways. */ @@ -1141,5 +1141,5 @@ * Draws given reference segment. * @param g2 the Graphics2D object used to draw on - * @param mv + * @param mv map view * @param seg the reference segment */ Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 8470) @@ -17,5 +17,5 @@ * Lowercase signifies off and '?' means unknown/optional. * Order is Alt, Shift, Ctrl - * @param str + * @param str 3 letters string defining modifiers */ public ModifiersSpec(String str) { Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8470) @@ -666,5 +666,5 @@ * selectables nearby. Everything has to be pre-determined for this * function; its main purpose is to centralize what the modifiers do. - * @param hasSelectionNearby + * @param hasSelectionNearby {@code true} if some primitves are selectable nearby */ private void determineMapMode(boolean hasSelectionNearby) { Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8470) @@ -410,6 +410,5 @@ /** - * Launches the dialog for specifying search criteria and runs - * a search + * Launches the dialog for specifying search criteria and runs a search */ public static void search() { @@ -424,5 +423,5 @@ * search history and performs the search. * - * @param s + * @param s search settings */ public static void searchWithHistory(SearchSetting s) { @@ -432,4 +431,9 @@ } + /** + * Performs the search specified by the settings in s without saving it to search history. + * + * @param s search settings + */ public static void searchWithoutHistory(SearchSetting s) { lastSearch = new SearchSetting(s); @@ -486,6 +490,5 @@ /** - * Version of getSelection that is customized for filter, but should - * also work in other context. + * Version of getSelection that is customized for filter, but should also work in other context. * * @param s the search settings Index: trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 8470) @@ -83,5 +83,5 @@ /** * Add (register) MatchFactory with SearchCompiler - * @param factory + * @param factory match factory */ public static void addMatchFactory(MatchFactory factory) { @@ -1355,5 +1355,5 @@ * * @return match determined by search string - * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError + * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed */ public Match parse() throws ParseError { @@ -1370,5 +1370,5 @@ * * @return match determined by parsing expression - * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError + * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed */ private Match parseExpression() throws ParseError { @@ -1397,5 +1397,5 @@ * @param errorMessage to display if parsing error occurs * @return match determined by parsing expression - * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError + * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed * @see #parseExpression() */ @@ -1412,5 +1412,5 @@ * * @return match determined by parsing factor string - * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError + * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed */ private Match parseFactor() throws ParseError { Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 8470) @@ -169,5 +169,5 @@ * Tests whether way can be reversed without semantic change, i.e., whether tags have to be changed. * Looks for keys like oneway, oneway:bicycle, cycleway:right:oneway, left/right. - * @param way + * @param way way to test * @return false if tags should be changed to keep semantic, true otherwise. */ Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 8470) @@ -955,5 +955,5 @@ * @param tmpPref - preferences to fill from JS * @param varInJS - JS variable name, where preferences are stored - * @throws ScriptException + * @throws ScriptException if the evaluation fails */ public static void readPrefsFromJS(ScriptEngine engine, Preferences tmpPref, String varInJS) throws ScriptException { @@ -1040,5 +1040,5 @@ * @param whereToPutInJS - variable name to store preferences in JS * @param includeDefaults - include known default values to JS objects - * @throws ScriptException + * @throws ScriptException if the evaluation fails */ public static void loadPrefsToJS(ScriptEngine engine, Preferences tmpPref, String whereToPutInJS, boolean includeDefaults) throws ScriptException { Index: trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java (revision 8470) @@ -34,5 +34,5 @@ * * @return BufferedImage of cache entry content - * @throws IOException + * @throws IOException if an error occurs during reading. */ public BufferedImage getImage() throws IOException { Index: trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java (revision 8470) @@ -37,8 +37,7 @@ /** - * Submit job for background fetch, and listener will be - * fed with value object + * Submit job for background fetch, and listener will be fed with value object * - * @param listener + * @param listener cache loader listener * @param force true if the load should skip all the caches (local & remote) */ Index: trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java (revision 8470) @@ -6,5 +6,4 @@ /** * Result of download - * */ enum LoadResult { @@ -13,4 +12,5 @@ CANCELED } + /** * Will be called when K object processed. The result might be: @@ -19,9 +19,8 @@ * LoadResult.REJECTED when job was rejected because of full queue * - * @param data - * @param attributes - * @param result + * @param data cache entry contents + * @param attributes cache entry attributes + * @param result load result (success, failure, canceled) */ public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result); - } Index: trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (revision 8470) @@ -504,12 +504,13 @@ * * @param img Used only when overlapping is used, when not used, used raw from imageData - * @param imageData - * @param projection - * @param pixelPerDegree - * @param east - * @param north - * @throws IOException + * @param imageData input stream to raw image data + * @param projection current projection + * @param pixelPerDegree number of pixels per degree + * @param east easting + * @param north northing + * @throws IOException if any I/O error occurs */ - public synchronized void saveToCache(BufferedImage img, InputStream imageData, Projection projection, double pixelPerDegree, double east, double north) throws IOException { + public synchronized void saveToCache(BufferedImage img, InputStream imageData, Projection projection, double pixelPerDegree, double east, double north) + throws IOException { ProjectionEntries projectionEntries = getProjectionEntries(projection); CacheEntry entry = findEntry(projectionEntries, pixelPerDegree, east, north); @@ -523,5 +524,6 @@ mimeType = URLConnection.guessContentTypeFromStream(imageData); } - entry = new CacheEntry(pixelPerDegree, east, north, tileSize,generateFileName(projectionEntries, pixelPerDegree, projection, east, north, mimeType)); + entry = new CacheEntry(pixelPerDegree, east, north, + tileSize,generateFileName(projectionEntries, pixelPerDegree, projection, east, north, mimeType)); entry.lastUsed = System.currentTimeMillis(); entry.lastModified = entry.lastUsed; Index: trunk/src/org/openstreetmap/josm/data/osm/BBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/BBox.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/osm/BBox.java (revision 8470) @@ -33,6 +33,6 @@ * Result is minimal BBox containing both points. * - * @param a - * @param b + * @param a first point + * @param b second point */ public BBox(LatLon a, LatLon b) { Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 8470) @@ -954,5 +954,5 @@ /** * Show message and stack trace in log in case primitive is not found - * @param primitiveId + * @param primitiveId primitive id to look for * @return Primitive by id. */ Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8470) @@ -45,5 +45,4 @@ private static final String SPECIAL_VALUE_LOCAL_NAME = "localname"; - /** * An object can be disabled by the filter mechanism. @@ -115,10 +114,10 @@ * If list is null, replies an empty list. * - * @param + * @param type of data (must be one of the {@link OsmPrimitive} types * @param list the original list * @param type the type to filter for * @return the sub-list of OSM primitives of type type */ - public static List getFilteredList(Collection list, Class type) { + public static List getFilteredList(Collection list, Class type) { if (list == null) return Collections.emptyList(); List ret = new LinkedList<>(); @@ -249,5 +248,5 @@ * * @param id the id - * @param allowNegativeId + * @param allowNegativeId {@code true} to allow negative id * @throws IllegalArgumentException if id < 0 and allowNegativeId is false */ @@ -278,7 +277,7 @@ * If id is not > 0 version is ignored and set to 0. * - * @param id - * @param version - * @param allowNegativeId + * @param id the id + * @param version the version (positive integer) + * @param allowNegativeId {@code true} to allow negative id * @throws IllegalArgumentException if id < 0 and allowNegativeId is false */ @@ -288,5 +287,4 @@ setIncomplete(id > 0 && version == 0); } - /*---------- @@ -313,5 +311,5 @@ /** * This method should never ever by called from somewhere else than Dataset.addPrimitive or removePrimitive methods - * @param dataSet + * @param dataSet the parent dataset */ void setDataset(DataSet dataSet) { @@ -1175,6 +1173,5 @@ /** - * Replies true if this primitive and other are equal with respect to their - * semantic attributes. + * Replies true if this primitive and other are equal with respect to their semantic attributes. *
    *
  1. equal id
    2. @@ -1182,7 +1179,6 @@ *
  2. both have the same tags
    3. *
- * @param other - * @return true if this primitive and other are equal with respect to their - * semantic attributes. + * @param other other primitive to compare + * @return true if this primitive and other are equal with respect to their semantic attributes. */ public boolean hasEqualSemanticAttributes(OsmPrimitive other) { @@ -1197,6 +1193,6 @@ /** - * Replies true if this primitive and other are equal with respect to their - * technical attributes. The attributes: + * Replies true if this primitive and other are equal with respect to their technical attributes. + * The attributes: *
    *
  1. deleted
    2. @@ -1209,12 +1205,10 @@ * have to be equal * @param other the other primitive - * @return true if this primitive and other are equal with respect to their - * technical attributes + * @return true if this primitive and other are equal with respect to their technical attributes */ public boolean hasEqualTechnicalAttributes(OsmPrimitive other) { if (other == null) return false; - return - isDeleted() == other.isDeleted() + return isDeleted() == other.isDeleted() && isModified() == other.isModified() && timestamp == other.timestamp Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 8470) @@ -109,6 +109,6 @@ /** * Replace member at position specified by index. - * @param index - * @param member + * @param index index (positive integer) + * @param member relation member to set * @return Member that was at the position */ @@ -133,5 +133,5 @@ /** * Removes member at specified position. - * @param index + * @param index index (positive integer) * @return Member that was at the position */ @@ -218,6 +218,6 @@ /** * Creates new relation - * @param id - * @param version + * @param id the id + * @param version version number (positive integer) */ public Relation(long id, int version) { Index: trunk/src/org/openstreetmap/josm/data/osm/Storage.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 8470) @@ -130,6 +130,6 @@ /** * constructor - * @param ha - * @param capacity + * @param ha hash + * @param capacity capacity * @param safeIterator If set to false, you must not modify the Storage * while iterating over it. If set to true, you can safely Index: trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 8470) @@ -148,5 +148,5 @@ * Adds a user name to the list if it is not there, yet. * - * @param name + * @param name User name */ public void addName(String name) { @@ -157,5 +157,5 @@ * Returns true if the name is in the names list * - * @param name + * @param name User name * @return true if the name is in the names list */ Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (revision 8470) @@ -107,5 +107,5 @@ * equal null) this method does not do anything. * - * @param enlargeDegree + * @param enlargeDegree number of degrees to enlarge on each side */ public void enlargeBoundingBox(double enlargeDegree) { @@ -141,5 +141,5 @@ * equal null) this method does not do anything. * - * @param maxEnlargePercent + * @param maxEnlargePercent maximum enlargement in percentage (100.0 for 100%) */ public void enlargeBoundingBoxLogarithmically(double maxEnlargePercent) { Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8470) @@ -857,6 +857,6 @@ * highlights a given GeneralPath using the settings from BasicStroke to match the line's * style. Width of the highlight is hard coded. - * @param path - * @param line + * @param path path to draw + * @param line line style */ private void drawPathHighlight(GeneralPath path, BasicStroke line) { Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 8470) @@ -99,5 +99,5 @@ * @param in Grid Shift File InputStream * @param loadAccuracy is Accuracy data to be loaded as well as shift data? - * @throws IOException + * @throws IOException if any I/O error occurs */ public void loadGridShiftFile(InputStream in, boolean loadAccuracy) throws IOException { Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 8470) @@ -69,5 +69,5 @@ * @param bigEndian is the file bigEndian? * @param loadAccuracy is the node Accuracy data to be loaded? - * @throws IOException + * @throws IOException if any I/O error occurs */ public NTV2SubGrid(InputStream in, boolean bigEndian, boolean loadAccuracy) throws IOException { @@ -283,5 +283,5 @@ /** * Set an array of Sub Grids of this sub grid - * @param subGrid + * @param subGrid subgrids */ public void setSubGridArray(NTV2SubGrid[] subGrid) { Index: trunk/src/org/openstreetmap/josm/data/validation/Test.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/Test.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/validation/Test.java (revision 8470) @@ -251,5 +251,5 @@ * Fixes the error with the appropriate command * - * @param testError + * @param testError error to fix * @return The command to fix the error */ Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8470) @@ -9,5 +9,4 @@ import java.awt.event.ActionListener; import java.io.BufferedReader; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -154,6 +153,5 @@ * by the nearest + word before this. * - * @throws FileNotFoundException - * @throws IOException + * @throws IOException if any I/O error occurs */ private static void initializeData() throws IOException { Index: trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 8470) @@ -188,5 +188,5 @@ */ public static void explainNestedInvocationTargetException(Exception e) { - InvocationTargetException ex = getNestedException(e, InvocationTargetException.class); + InvocationTargetException ex = ExceptionUtil.getNestedException(e, InvocationTargetException.class); if (ex != null) { // Users should be able to submit a bug report for an invocation target exception @@ -404,26 +404,4 @@ /** - * Replies the first nested exception of type nestedClass (including - * the root exception e) or null, if no such exception is found. - * - * @param - * @param e the root exception - * @param nestedClass the type of the nested exception - * @return the first nested exception of type nestedClass (including - * the root exception e) or null, if no such exception is found. - */ - protected static T getNestedException(Exception e, Class nestedClass) { - Throwable t = e; - while (t != null && !(nestedClass.isInstance(t))) { - t = t.getCause(); - } - if (t == null) - return null; - else if (nestedClass.isInstance(t)) - return nestedClass.cast(t); - return null; - } - - /** * Explains an {@link OsmTransferException} to the user. * @@ -431,25 +409,25 @@ */ public static void explainOsmTransferException(OsmTransferException e) { - if (getNestedException(e, SecurityException.class) != null) { + if (ExceptionUtil.getNestedException(e, SecurityException.class) != null) { explainSecurityException(e); return; } - if (getNestedException(e, SocketException.class) != null) { + if (ExceptionUtil.getNestedException(e, SocketException.class) != null) { explainNestedSocketException(e); return; } - if (getNestedException(e, UnknownHostException.class) != null) { + if (ExceptionUtil.getNestedException(e, UnknownHostException.class) != null) { explainNestedUnkonwnHostException(e); return; } - if (getNestedException(e, IOException.class) != null) { + if (ExceptionUtil.getNestedException(e, IOException.class) != null) { explainNestedIOException(e); return; } - if (getNestedException(e, IllegalDataException.class) != null) { + if (ExceptionUtil.getNestedException(e, IllegalDataException.class) != null) { explainNestedIllegalDataException(e); return; } - if (getNestedException(e, OfflineAccessException.class) != null) { + if (ExceptionUtil.getNestedException(e, OfflineAccessException.class) != null) { explainNestedOfflineAccessException(e); return; @@ -534,5 +512,5 @@ */ public static void explainException(Exception e) { - if (getNestedException(e, InvocationTargetException.class) != null) { + if (ExceptionUtil.getNestedException(e, InvocationTargetException.class) != null) { explainNestedInvocationTargetException(e); return; Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 8470) @@ -592,8 +592,7 @@ /** - * Replies the instance of a toggle dialog of type type managed by this - * map frame + * Replies the instance of a toggle dialog of type type managed by this map frame * - * @param + * @param toggle dialog type * @param type the class of the toggle dialog, i.e. UserListDialog.class * @return the instance of a toggle dialog of type type managed by this @@ -618,5 +617,5 @@ if (dialogsPanel.isVisible()) { Main.pref.putInteger("toggleDialogs.width", splitPane.getWidth()-splitPane.getDividerLocation()); - } + } } Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8470) @@ -396,6 +396,6 @@ * keep the popup on screen and shows a vertical scrollbar, if the * screen is too small. - * @param content - * @param ms + * @param content popup content + * @param ms mouse state * @return popup */ @@ -432,5 +432,5 @@ /** * Calls this to update the element that is shown in the statusbar - * @param ms + * @param ms mouse state */ private void statusBarElementUpdate(MouseState ms) { Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8470) @@ -329,5 +329,5 @@ /** - * @param r + * @param r rectangle * @return Minimum bounds that will cover rectangle */ Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 8470) @@ -107,5 +107,5 @@ /** * Sets a custom text line below currentAction. Can be used to display additional information - * @param text + * @param text custom text */ @Override Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 8470) @@ -92,5 +92,5 @@ /** * Plugins that wish to add custom tile sources to slippy map choose should call this method - * @param tileSourceProvider + * @param tileSourceProvider new tile source provider */ public static void addTileSourceProvider(TileSourceProvider tileSourceProvider) { @@ -237,9 +237,8 @@ /** - * Callback for the OsmMapControl. (Re-)Sets the start and end point of the - * selection rectangle. + * Callback for the OsmMapControl. (Re-)Sets the start and end point of the selection rectangle. * - * @param aStart - * @param aEnd + * @param aStart selection start + * @param aEnd selection end */ public void setSelection(Point aStart, Point aEnd) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 8470) @@ -126,6 +126,6 @@ /** - * - * @param entry + * Replies primitive from my dataset referenced by entry + * @param entry entry * @return Primitive from my dataset referenced by entry */ Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 8470) @@ -401,5 +401,5 @@ /** * Constructs a new {@code ListMerger}. - * @param model + * @param model list merger model */ public ListMerger(ListMergeModel model) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (revision 8470) @@ -182,5 +182,5 @@ * Replies the decision at position row * - * @param row + * @param row position * @return the decision at position row */ Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 8470) @@ -301,5 +301,5 @@ * map frame * - * @param + * @param toggle dialog type * @param type the class of the toggle dialog, i.e. UserListDialog.class * @return the instance of a toggle dialog of type type managed by this Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8470) @@ -501,5 +501,5 @@ * is the editor's business. * - * @param row + * @param row position */ private void editMembership(int row) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 8470) @@ -61,5 +61,5 @@ private final List notSortable = new ArrayList<>(); - public static Node firstOnewayNode(RelationMember m){ + public static Node firstOnewayNode(RelationMember m) { if(!m.isWay()) return null; if("backward".equals(m.getRole())) { @@ -69,5 +69,5 @@ } - public static Node lastOnewayNode(RelationMember m){ + public static Node lastOnewayNode(RelationMember m) { if(!m.isWay()) return null; if("backward".equals(m.getRole())) { @@ -267,9 +267,9 @@ /** * find next node in nw NodeWays structure, if the node is found delete and return it - * @param nw - * @param n + * @param nw nodes and ways + * @param n node * @return node next to n */ - private Integer deleteAndGetAdjacentNode(NodesWays nw, Node n){ + private Integer deleteAndGetAdjacentNode(NodesWays nw, Node n) { Integer j = findAdjacentWay(nw, n); if(j == null) return null; @@ -284,5 +284,5 @@ } - private void deleteWayNode(NodesWays nw, Integer way, Node n){ + private void deleteWayNode(NodesWays nw, Integer way, Node n) { if(nw.oneWay) { doneOneway(way); Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 8470) @@ -281,6 +281,6 @@ /** - * Invoked by - * @param b + * Starts download for the given bounding box + * @param b bounding box to download */ public void startDownload(Bounds b) { Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 8470) @@ -125,5 +125,5 @@ /** * Sets the current history. - * @param history + * @param history current history */ protected void setHistory(History history) { Index: trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java (revision 8470) @@ -173,7 +173,7 @@ * Recursive unzipping function * TODO: May be placed somewhere else - Tools.Utils? - * @param file - * @param dir - * @throws IOException + * @param file zip file + * @param dir output directory + * @throws IOException if any I/O error occurs */ public static void unzipFileRecursively(File file, String dir) throws IOException { Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8470) @@ -353,7 +353,7 @@ * {@link ImageryType#BING}, {@link ImageryType#SCANEX}. * - * @param info + * @param info imagery info * @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found. - * @throws IllegalArgumentException + * @throws IllegalArgumentException if url from imagery info is null or invalid */ public static TileSource getTileSource(ImageryInfo info) { Index: trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 8470) @@ -433,7 +433,7 @@ /** - * - * @param xIndex - * @param yIndex + * Returns east/north for a x/y couple. + * @param xIndex x index + * @param yIndex y index * @return Real EastNorth of given tile. dx/dy is not counted in */ @@ -531,6 +531,6 @@ /** - * - * @param request + * Replies request priority. + * @param request WMS request * @return -1 if request is no longer needed, otherwise priority of request (lower number <=> more important request) */ @@ -719,5 +719,5 @@ * not update existing tiles, only new ones will be subject to the new settings. * - * @param layer + * @param layer WMS layer * @param snap Set to true if the resolution should snap to certain values instead of * matching the current zoom level perfectly @@ -739,5 +739,5 @@ * false they will be removed instantly (and redrawn only after the new resolution * image has been loaded). - * @param layer + * @param layer WMS layer * @param snap Set to true if the resolution should snap to certain values instead of * matching the current zoom level perfectly Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 8470) @@ -45,7 +45,7 @@ /** * draws a primitive - * @param primitive - * @param paintSettings - * @param painter + * @param primitive primitive to draw + * @param paintSettings paint settings + * @param painter painter * @param selected true, if primitive is selected * @param outermember true, if primitive is not selected and outer member of a selected multipolygon relation Index: trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 8470) @@ -39,9 +39,9 @@ * If null, no label is rendered. * @param font the font to be used. Must not be null. - * @param xOffset - * @param yOffset + * @param xOffset x offset + * @param yOffset y offset * @param color the color to be used. Must not be null - * @param haloRadius - * @param haloColor + * @param haloRadius halo radius + * @param haloColor halo color */ public TextElement(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 8470) @@ -158,5 +158,5 @@ * Add validation listener to currently open preferences dialog. Calling to removeValidationListener is not necessary, all listeners will * be automatically removed when dialog is closed - * @param validationListener + * @param validationListener validation listener to add */ public void addValidationListener(ValidationListener validationListener) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (revision 8470) @@ -51,5 +51,5 @@ * next time JOSM is used. * - * @param saveToPreferences + * @param saveToPreferences {@code true} to save to preferences file */ public void setSaveToPreferences(boolean saveToPreferences) { @@ -87,5 +87,5 @@ * Sets the access token secret. Pass in null to remove the current access token secret. * - * @param accessTokenSecret + * @param accessTokenSecret access token secret, or null */ public void setAccessTokenSecret(String accessTokenSecret) { Index: trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (revision 8470) @@ -116,15 +116,15 @@ * @param title Can be {@code null}, in that case task title is not changed */ + void subTask(String title); - void subTask(String title); /** * Shows additional text + * @param text custom text */ + void setCustomText(String text); - void setCustomText(String text); /** - * Show extra text after normal task title. Hack for ProgressInputStream to show number of kB - * already downloaded - * @param text + * Show extra text after normal task title. Hack for ProgressInputStream to show number of kB already downloaded + * @param text extra text */ void setExtraText(String text); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8470) @@ -474,5 +474,6 @@ /** - * @param autoCompletionList + * Sets the editor autocompletion list + * @param autoCompletionList autocompletion list */ public void setAutoCompletionList(AutoCompletionList autoCompletionList) { @@ -520,5 +521,5 @@ * Inject a tag cell editor in the tag table * - * @param editor + * @param editor tag cell editor */ public void setTagCellEditor(TagCellEditor editor) { Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (revision 8470) @@ -271,5 +271,5 @@ * an empty list if key is null or if key is not in {@link #getKeys()}. * - * @param key + * @param key OSM key * @return the list of auto completion values */ Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (revision 8470) @@ -1116,5 +1116,5 @@ /** * Dividers can't have a weight, they don't grow or shrink. - * @throws UnsupportedOperationException + * @throws UnsupportedOperationException always */ @Override Index: trunk/src/org/openstreetmap/josm/io/CachedFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/CachedFile.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/CachedFile.java (revision 8470) @@ -136,5 +136,5 @@ /** * Set the caching strategy. Only applies to URLs. - * @param cachingStrategy + * @param cachingStrategy caching strategy * @return this object */ Index: trunk/src/org/openstreetmap/josm/io/Compression.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/Compression.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/Compression.java (revision 8470) @@ -55,5 +55,5 @@ * Returns an un-compressing {@link InputStream} for {@code in}. * - * @throws IOException + * @throws IOException if any I/O error occurs */ public InputStream getUncompressedInputStream(InputStream in) throws IOException { @@ -74,5 +74,5 @@ * Returns an un-compressing {@link InputStream} for the {@link File} {@code file}. * - * @throws IOException + * @throws IOException if any I/O error occurs */ @SuppressWarnings("resource") @@ -84,5 +84,5 @@ * Returns an un-compressing {@link InputStream} for the {@link URL} {@code url}. * - * @throws IOException + * @throws IOException if any I/O error occurs */ public static InputStream getUncompressedURLInputStream(URL url) throws IOException { @@ -93,5 +93,5 @@ * Returns a compressing {@link OutputStream} for {@code out}. * - * @throws IOException + * @throws IOException if any I/O error occurs */ public OutputStream getCompressedOutputStream(OutputStream out) throws IOException { @@ -112,5 +112,5 @@ * Returns a compressing {@link OutputStream} for the {@link File} {@code file}. * - * @throws IOException + * @throws IOException if any I/O error occurs */ @SuppressWarnings("resource") Index: trunk/src/org/openstreetmap/josm/io/GpxReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 8470) @@ -534,6 +534,6 @@ * @return true if file was properly parsed, false if there was error during * parsing but some data were parsed anyway - * @throws SAXException - * @throws IOException + * @throws SAXException if any SAX parsing error occurs + * @throws IOException if any I/O error occurs */ public boolean parse(boolean tryToFinish) throws SAXException, IOException { Index: trunk/src/org/openstreetmap/josm/io/NoteReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 8470) @@ -197,5 +197,5 @@ * Initializes the reader with a given InputStream * @param source - InputStream containing Notes XML - * @throws IOException + * @throws IOException if any I/O error occurs */ public NoteReader(InputStream source) throws IOException { @@ -206,5 +206,5 @@ * Initializes the reader with a string as a source * @param source UTF-8 string containing Notes XML to parse - * @throws IOException + * @throws IOException if any I/O error occurs */ public NoteReader(String source) throws IOException { @@ -216,6 +216,6 @@ * the resulting Note objects * @return List of Notes parsed from the input data - * @throws SAXException - * @throws IOException + * @throws SAXException if any SAX parsing error occurs + * @throws IOException if any I/O error occurs */ public List parse() throws SAXException, IOException { Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 8470) @@ -802,5 +802,5 @@ * @param monitor Progress monitor * @return Note as it exists on the server after creation (ID assigned) - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ public Note createNote(LatLon latlon, String text, ProgressMonitor monitor) throws OsmTransferException { @@ -824,5 +824,5 @@ * @param monitor Progress monitor * @return Note returned by the API after the comment was added - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ public Note addCommentToNote(Note note, String comment, ProgressMonitor monitor) throws OsmTransferException { @@ -842,5 +842,5 @@ * @param monitor Progress monitor * @return Note returned by the API after the close operation - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ public Note closeNote(Note note, String closeMessage, ProgressMonitor monitor) throws OsmTransferException { @@ -864,5 +864,5 @@ * @param monitor Progress monitor * @return Note returned by the API after the reopen operation - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ public Note reopenNote(Note note, String reactivateMessage, ProgressMonitor monitor) throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 8470) @@ -149,5 +149,5 @@ * * @return the data set - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ protected DataSet getReferringWays(ProgressMonitor progressMonitor) throws OsmTransferException { @@ -160,5 +160,5 @@ * @param progressMonitor the progress monitor * @return the data set - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ protected DataSet getReferringRelations(ProgressMonitor progressMonitor) throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 8470) @@ -106,5 +106,5 @@ * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null * @return the downloaded data - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ @Override Index: trunk/src/org/openstreetmap/josm/io/OsmServerReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 8470) @@ -366,7 +366,7 @@ * Downloads notes from a given raw URL. The URL is assumed to be complete and no API limits are added * - * @param progressMonitor + * @param progressMonitor progress monitor * @return A list of notes parsed from the URL - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ public List parseRawNotes(final ProgressMonitor progressMonitor) throws OsmTransferException { @@ -376,7 +376,7 @@ /** * Download notes from a URL that contains a bzip2 compressed notes dump file - * @param progressMonitor + * @param progressMonitor progress monitor * @return A list of notes parsed from the URL - * @throws OsmTransferException + * @throws OsmTransferException if any error occurs during dialog with OSM API */ public List parseRawNotesBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java (revision 8470) @@ -78,5 +78,5 @@ /** * Increase ticker (progress counter and displayed text) by the given amount. - * @param amount + * @param amount number of ticks */ private void advanceTicker(int amount) { Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (revision 8470) @@ -113,5 +113,5 @@ * Stops the HTTP server * - * @throws IOException + * @throws IOException if any I/O error occurs */ public void stopServer() throws IOException { Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 8470) @@ -114,5 +114,5 @@ * @param v value * @return which one - * @throws IOException + * @throws IOException if any I/O error occurs */ private static GeneralName createGeneralName(String t, String v) throws IOException { Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (revision 8470) @@ -76,5 +76,5 @@ /** * Adds a node, implements the GET /add_node?lon=...&lat=... request. - * @param args + * @param args request arguments */ private void addNode(Map args){ Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 8470) @@ -57,7 +57,7 @@ * Check permission and parameters and handle request. * - * @throws RequestHandlerForbiddenException - * @throws RequestHandlerBadRequestException - * @throws RequestHandlerErrorException + * @throws RequestHandlerForbiddenException if request is forbidden by preferences + * @throws RequestHandlerBadRequestException if request is invalid + * @throws RequestHandlerErrorException if an error occurs while processing request */ public final void handle() throws RequestHandlerForbiddenException, RequestHandlerBadRequestException, RequestHandlerErrorException { @@ -70,5 +70,5 @@ /** * Validates the request before attempting to perform it. - * @throws RequestHandlerBadRequestException + * @throws RequestHandlerBadRequestException if request is invalid * @since 5678 */ @@ -80,6 +80,6 @@ * This method of the subclass will do the real work. * - * @throws RequestHandlerErrorException - * @throws RequestHandlerBadRequestException + * @throws RequestHandlerErrorException if an error occurs while processing request + * @throws RequestHandlerBadRequestException if request is invalid */ protected abstract void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException; @@ -133,8 +133,7 @@ /** - * Check permissions in preferences and display error message - * or ask for permission. - * - * @throws RequestHandlerForbiddenException + * Check permissions in preferences and display error message or ask for permission. + * + * @throws RequestHandlerForbiddenException if request is forbidden by preferences */ public final void checkPermission() throws RequestHandlerForbiddenException { Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 8470) @@ -492,5 +492,5 @@ /** * Sets the name - * @param name + * @param name Plugin name */ public void setName(String name) { Index: trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java (revision 8470) @@ -32,5 +32,5 @@ * @param manifest the plugin manifest * @return a plugin information object - * @throws PluginListParseException + * @throws PluginListParseException if plugin manifest cannot be parsed */ protected static PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException{ Index: trunk/src/org/openstreetmap/josm/tools/CompositeList.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/CompositeList.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/tools/CompositeList.java (revision 8470) @@ -9,5 +9,5 @@ * * Extremely simple single-purpose implementation. - * @param + * @param item type * @since 7109 */ Index: trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 8470) @@ -614,11 +614,12 @@ * the root exception e) or null, if no such exception is found. * - * @param + * @param nested exception type * @param e the root exception * @param nestedClass the type of the nested exception * @return the first nested exception of type nestedClass (including * the root exception e) or null, if no such exception is found. - */ - protected static T getNestedException(Exception e, Class nestedClass) { + * @since 8470 + */ + public static T getNestedException(Exception e, Class nestedClass) { Throwable t = e; while (t != null && !(nestedClass.isInstance(t))) { Index: trunk/src/org/openstreetmap/josm/tools/ExifReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/tools/ExifReader.java (revision 8470) @@ -121,5 +121,5 @@ * @param dirGps The EXIF GPS directory * @return The lat/lon read in the EXIF section, or {@code null} if {@code dirGps} is null - * @throws MetadataException + * @throws MetadataException if invalid metadata is given * @since 6209 */ Index: trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java (revision 8470) @@ -51,5 +51,5 @@ * Create new GeoPropertyIndex. * @param geoProp the input property that should be made faster by this index - * @param maxLevel + * @param maxLevel max level */ public GeoPropertyIndex(GeoProperty geoProp, int maxLevel) { Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 8470) @@ -227,5 +227,5 @@ * @param lineP2 second point in path * @param lineP3 third point in path - * @param testPoint + * @param testPoint point to test * @return true if to the right side, false otherwise */ @@ -714,6 +714,6 @@ * Returns angle of a segment defined with 2 point coordinates. * - * @param p1 - * @param p2 + * @param p1 first point + * @param p2 second point * @return Angle in radians (-pi, pi] */ @@ -729,7 +729,7 @@ * Returns angle of a corner defined with 3 point coordinates. * - * @param p1 + * @param p1 first point * @param p2 Common endpoint - * @param p3 + * @param p3 third point * @return Angle in radians (-pi, pi] */ Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 8469) +++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 8470) @@ -195,8 +195,7 @@ /** * Apply different methods to extract tag-value pairs from arbitrary text - * @param buf + * @param buf buffer * @return null if no format is suitable */ - public static Map readTagsFromText(String buf) { Map tags;