Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 8291) @@ -661,5 +661,5 @@ @Override - public void close() throws SecurityException { + public void close() { } }); Index: trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 8291) @@ -117,5 +117,5 @@ * * @return the user info - * @throws OsmTransferException thrown in case of any communication exception + * @throws OsmTransferException in case of any communication exception */ protected UserInfo fetchUserInfo() throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 8291) @@ -42,9 +42,9 @@ * Does nothing if primitives is null or empty. * - * @param targetLayer the target layer. Must not be null. + * @param targetLayer the target layer. Must not be null. * @param children the collection of child primitives. - * @exception IllegalArgumentException thrown if targetLayer is null + * @throws IllegalArgumentException if targetLayer is null */ - public static void downloadReferrers(OsmDataLayer targetLayer, Collection children) throws IllegalArgumentException { + public static void downloadReferrers(OsmDataLayer targetLayer, Collection children) { if (children == null || children.isEmpty()) return; Main.worker.submit(new DownloadReferrersTask(targetLayer, children)); @@ -56,9 +56,9 @@ * Does nothing if primitives is null or empty. * - * @param targetLayer the target layer. Must not be null. + * @param targetLayer the target layer. Must not be null. * @param children the collection of primitives, given as map of ids and types - * @exception IllegalArgumentException thrown if targetLayer is null + * @throws IllegalArgumentException if targetLayer is null */ - public static void downloadReferrers(OsmDataLayer targetLayer, Map children) throws IllegalArgumentException { + public static void downloadReferrers(OsmDataLayer targetLayer, Map children) { if (children == null || children.isEmpty()) return; Main.worker.submit(new DownloadReferrersTask(targetLayer, children)); @@ -66,15 +66,14 @@ /** - * Downloads the primitives referring to the primitive given by id and - * type. + * Downloads the primitives referring to the primitive given by id and type. * - * @param targetLayer the target layer. Must not be null. + * @param targetLayer the target layer. Must not be null. * @param id the primitive id. id > 0 required. * @param type the primitive type. type != null required - * @exception IllegalArgumentException thrown if targetLayer is null - * @exception IllegalArgumentException thrown if id <= 0 - * @exception IllegalArgumentException thrown if type == null + * @throws IllegalArgumentException if targetLayer is null + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if type == null */ - public static void downloadReferrers(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException { + public static void downloadReferrers(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) { if (id <= 0) throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id)); Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 8291) @@ -73,6 +73,6 @@ * * @param layer the layer - * @exception IllegalArgumentException thrown if layer is null - * @exception IllegalArgumentException thrown if layer is neither an instance of {@link OsmDataLayer} + * @throws IllegalArgumentException if layer is null + * @throws IllegalArgumentException if layer is neither an instance of {@link OsmDataLayer} * nor of {@link GpxLayer} */ Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 8291) @@ -254,5 +254,5 @@ * @param nodes the collection of nodes. Ignored if null * @param targetLocationNode this node's location will be used for the target node - * @throws IllegalArgumentException thrown if {@code layer} is null + * @throws IllegalArgumentException if {@code layer} is null */ public static void doMergeNodes(OsmDataLayer layer, Collection nodes, Node targetLocationNode) { @@ -284,5 +284,5 @@ * @param targetLocationNode this node's location will be used for the targetNode. * @return The command necessary to run in order to perform action, or {@code null} if there is nothing to do - * @throws IllegalArgumentException thrown if {@code layer} is null + * @throws IllegalArgumentException if {@code layer} is null */ public static Command mergeNodes(OsmDataLayer layer, Collection nodes, Node targetLocationNode) { @@ -304,5 +304,5 @@ * @param targetLocationNode this node's location will be used for the targetNode. * @return The command necessary to run in order to perform action, or {@code null} if there is nothing to do - * @throws IllegalArgumentException thrown if layer is null + * @throws IllegalArgumentException if layer is null */ public static Command mergeNodes(OsmDataLayer layer, Collection nodes, Node targetNode, Node targetLocationNode) { Index: trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (revision 8291) @@ -65,11 +65,9 @@ * * @param id the id of a primitive in the {@link DataSet} of the current edit layer. Must not be null. - * @throws IllegalArgumentException thrown if id is null - * @exception IllegalStateException thrown if there is no primitive with id in - * the current dataset - * @exception IllegalStateException thrown if there is no current dataset - * + * @throws IllegalArgumentException if id is null + * @throws IllegalStateException if there is no primitive with id in the current dataset + * @throws IllegalStateException if there is no current dataset */ - public static void updatePrimitive(PrimitiveId id) throws IllegalStateException, IllegalArgumentException{ + public static void updatePrimitive(PrimitiveId id) { ensureParameterNotNull(id, "id"); if (getEditLayer() == null) Index: trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 8291) @@ -38,7 +38,10 @@ /** * Uploads the current selection to the server. - * + * @since 2250 */ -public class UploadSelectionAction extends JosmAction{ +public class UploadSelectionAction extends JosmAction { + /** + * Constructs a new {@code UploadSelectionAction}. + */ public UploadSelectionAction() { super( @@ -239,7 +242,7 @@ * @param base the base collection. Must not be null. * @return the "hull" - * @throws IllegalArgumentException thrown if base is null + * @throws IllegalArgumentException if base is null */ - public Set build(Collection base) throws IllegalArgumentException{ + public Set build(Collection base) { CheckParameterUtil.ensureParameterNotNull(base, "base"); hull = new HashSet<>(); Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (revision 8291) @@ -38,5 +38,5 @@ /** * The asynchronous task for downloading referring primitives - * + * @since 2923 */ public class DownloadReferrersTask extends PleaseWaitRunnable { @@ -56,5 +56,4 @@ * @param targetLayer the target layer for the downloaded primitives. Must not be null. * @param children the collection of child primitives for which parents are to be downloaded - * */ public DownloadReferrersTask(OsmDataLayer targetLayer, Collection children) { @@ -103,10 +102,9 @@ * @param id the primitive id. id > 0 required. * @param type the primitive type. type != null required - * @exception IllegalArgumentException thrown if id <= 0 - * @exception IllegalArgumentException thrown if type == null - * @exception IllegalArgumentException thrown if targetLayer == null - * - */ - public DownloadReferrersTask(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException { + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if type == null + * @throws IllegalArgumentException if targetLayer == null + */ + public DownloadReferrersTask(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) { super("Download referrers", false /* don't ignore exception*/); CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer"); @@ -126,9 +124,8 @@ * @param targetLayer the target layer. Must not be null. * @param primitiveId a PrimitiveId object. - * @exception IllegalArgumentException thrown if id <= 0 - * @exception IllegalArgumentException thrown if targetLayer == null - * - */ - public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId) throws IllegalArgumentException { + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if targetLayer == null + */ + public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId) { this(targetLayer, primitiveId, null); } @@ -140,14 +137,14 @@ * @param primitiveId a PrimitiveId object. * @param progressMonitor ProgressMonitor to use or null to create a new one. - * @exception IllegalArgumentException thrown if id <= 0 - * @exception IllegalArgumentException thrown if targetLayer == null - * + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if targetLayer == null */ public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId, - ProgressMonitor progressMonitor) throws IllegalArgumentException { + ProgressMonitor progressMonitor) { super("Download referrers", progressMonitor, false /* don't ignore exception*/); CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer"); if (primitiveId.isNew()) - throw new IllegalArgumentException(MessageFormat.format("Cannot download referrers for new primitives (ID {0})", primitiveId.getUniqueId())); + throw new IllegalArgumentException(MessageFormat.format( + "Cannot download referrers for new primitives (ID {0})", primitiveId.getUniqueId())); canceled = false; this.children = new HashMap<>(); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 8291) @@ -321,6 +321,6 @@ * @param layer the layer in whose context the relation is deleted. Must not be null. * @param toDelete the relation to be deleted. Must not be null. - * @exception IllegalArgumentException thrown if layer is null - * @exception IllegalArgumentException thrown if toDelete is nul + * @throws IllegalArgumentException if layer is null + * @throws IllegalArgumentException if toDelete is nul */ public static void deleteRelation(OsmDataLayer layer, Relation toDelete) { Index: trunk/src/org/openstreetmap/josm/command/Command.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/Command.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/command/Command.java (revision 8291) @@ -119,7 +119,7 @@ * * @param layer the data layer. Must not be null. - * @throws IllegalArgumentException thrown if layer is null - */ - public Command(OsmDataLayer layer) throws IllegalArgumentException { + * @throws IllegalArgumentException if layer is null + */ + public Command(OsmDataLayer layer) { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); this.layer = layer; Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 8291) @@ -57,7 +57,7 @@ * * @param data the primitives to delete. Must neither be null nor empty. - * @throws IllegalArgumentException thrown if data is null or empty - */ - public DeleteCommand(Collection data) throws IllegalArgumentException { + * @throws IllegalArgumentException if data is null or empty + */ + public DeleteCommand(Collection data) { CheckParameterUtil.ensureParameterNotNull(data, "data"); if (data.isEmpty()) @@ -71,7 +71,7 @@ * * @param data the primitive to delete. Must not be null. - * @throws IllegalArgumentException thrown if data is null - */ - public DeleteCommand(OsmPrimitive data) throws IllegalArgumentException { + * @throws IllegalArgumentException if data is null + */ + public DeleteCommand(OsmPrimitive data) { this(Collections.singleton(data)); } @@ -83,8 +83,8 @@ * @param layer the layer context for deleting this primitive. Must not be null. * @param data the primitive to delete. Must not be null. - * @throws IllegalArgumentException thrown if data is null - * @throws IllegalArgumentException thrown if layer is null - */ - public DeleteCommand(OsmDataLayer layer, OsmPrimitive data) throws IllegalArgumentException { + * @throws IllegalArgumentException if data is null + * @throws IllegalArgumentException if layer is null + */ + public DeleteCommand(OsmDataLayer layer, OsmPrimitive data) { this(layer, Collections.singleton(data)); } @@ -96,8 +96,8 @@ * @param layer the layer context for deleting these primitives. Must not be null. * @param data the primitives to delete. Must neither be null nor empty. - * @throws IllegalArgumentException thrown if layer is null - * @throws IllegalArgumentException thrown if data is null or empty - */ - public DeleteCommand(OsmDataLayer layer, Collection data) throws IllegalArgumentException{ + * @throws IllegalArgumentException if layer is null + * @throws IllegalArgumentException if data is null or empty + */ + public DeleteCommand(OsmDataLayer layer, Collection data) { super(layer); CheckParameterUtil.ensureParameterNotNull(data, "data"); @@ -246,7 +246,7 @@ * @param silent Set to true if the user should not be bugged with additional dialogs * @return command A command to perform the deletions, or null of there is nothing to delete. - * @throws IllegalArgumentException thrown if layer is null - */ - public static Command deleteWithReferences(OsmDataLayer layer, Collection selection, boolean silent) throws IllegalArgumentException { + * @throws IllegalArgumentException if layer is null + */ + public static Command deleteWithReferences(OsmDataLayer layer, Collection selection, boolean silent) { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); if (selection == null || selection.isEmpty()) return null; @@ -271,5 +271,5 @@ * @param selection The list of all object to be deleted. * @return command A command to perform the deletions, or null of there is nothing to delete. - * @throws IllegalArgumentException thrown if layer is null + * @throws IllegalArgumentException if layer is null */ public static Command deleteWithReferences(OsmDataLayer layer, Collection selection) { Index: trunk/src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 8291) @@ -215,5 +215,5 @@ * dependencies can't be uploaded. * - * @throws CyclicUploadDependencyException thrown, if a cyclic dependency is detected + * @throws CyclicUploadDependencyException if a cyclic dependency is detected */ public void adjustRelationUploadOrder() throws CyclicUploadDependencyException{ Index: trunk/src/org/openstreetmap/josm/data/Bounds.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 8291) @@ -164,13 +164,13 @@ } - public Bounds(String asString, String separator) throws IllegalArgumentException { + public Bounds(String asString, String separator) { this(asString, separator, ParseMethod.MINLAT_MINLON_MAXLAT_MAXLON); } - public Bounds(String asString, String separator, ParseMethod parseMethod) throws IllegalArgumentException { + public Bounds(String asString, String separator, ParseMethod parseMethod) { this(asString, separator, parseMethod, true); } - public Bounds(String asString, String separator, ParseMethod parseMethod, boolean roundToOsmPrecision) throws IllegalArgumentException { + public Bounds(String asString, String separator, ParseMethod parseMethod, boolean roundToOsmPrecision) { CheckParameterUtil.ensureParameterNotNull(asString, "asString"); String[] components = asString.split(separator); @@ -234,7 +234,7 @@ * @param latExtent the latitude extent. > 0 required. * @param lonExtent the longitude extent. > 0 required. - * @throws IllegalArgumentException thrown if center is null - * @throws IllegalArgumentException thrown if latExtent <= 0 - * @throws IllegalArgumentException thrown if lonExtent <= 0 + * @throws IllegalArgumentException if center is null + * @throws IllegalArgumentException if latExtent <= 0 + * @throws IllegalArgumentException if lonExtent <= 0 */ public Bounds(LatLon center, double latExtent, double lonExtent) { Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 8291) @@ -92,5 +92,5 @@ @Override - public void close() throws SecurityException { + public void close() { } }); Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8291) @@ -7,5 +7,4 @@ import java.io.InputStream; import java.net.HttpURLConnection; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; @@ -378,5 +377,5 @@ } - private HttpURLConnection getURLConnection() throws IOException, MalformedURLException { + private HttpURLConnection getURLConnection() throws IOException { HttpURLConnection urlConn = (HttpURLConnection) getUrl().openConnection(); urlConn.setRequestProperty("Accept", "text/html, image/png, image/jpeg, image/gif, */*"); Index: trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 8291) @@ -102,8 +102,7 @@ * * @param conflict the conflict - * @exception IllegalStateException thrown, if this collection already includes a - * conflict for conflict.getMy() - */ - protected void addConflict(Conflict conflict) throws IllegalStateException { + * @throws IllegalStateException if this collection already includes a conflict for conflict.getMy() + */ + protected void addConflict(Conflict conflict) { if (hasConflictForMy(conflict.getMy())) throw new IllegalStateException(tr("Already registered a conflict for primitive ''{0}''.", conflict.getMy().toString())); @@ -117,9 +116,8 @@ * * @param conflict the conflict to add. Must not be null. - * @throws IllegalArgumentException thrown, if conflict is null - * @throws IllegalStateException thrown if this collection already includes a conflict for conflict.getMy() - * - */ - public void add(Conflict conflict) throws IllegalStateException { + * @throws IllegalArgumentException if conflict is null + * @throws IllegalStateException if this collection already includes a conflict for conflict.getMy() + */ + public void add(Conflict conflict) { CheckParameterUtil.ensureParameterNotNull(conflict, "conflict"); addConflict(conflict); Index: trunk/src/org/openstreetmap/josm/data/imagery/Shape.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/Shape.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/imagery/Shape.java (revision 8291) @@ -23,5 +23,5 @@ private List coords = new ArrayList<>(); - public Shape(String asString, String separator) throws IllegalArgumentException { + public Shape(String asString, String separator) { CheckParameterUtil.ensureParameterNotNull(asString, "asString"); String[] components = asString.split(separator); @@ -61,5 +61,5 @@ } - public void addPoint(String sLat, String sLon) throws IllegalArgumentException { + public void addPoint(String sLat, String sLon) { CheckParameterUtil.ensureParameterNotNull(sLat, "sLat"); CheckParameterUtil.ensureParameterNotNull(sLon, "sLon"); Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 8291) @@ -119,7 +119,7 @@ * * @param other the other parameters. Must not be null. - * @throws IllegalArgumentException thrown if other is null - */ - public OAuthParameters(OAuthParameters other) throws IllegalArgumentException{ + * @throws IllegalArgumentException if other is null + */ + public OAuthParameters(OAuthParameters other) { CheckParameterUtil.ensureParameterNotNull(other, "other"); this.consumerKey = other.consumerKey; @@ -226,5 +226,5 @@ * @throws IllegalArgumentException if consumer is null */ - public OAuthProvider buildProvider(OAuthConsumer consumer) throws IllegalArgumentException { + public OAuthProvider buildProvider(OAuthConsumer consumer) { CheckParameterUtil.ensureParameterNotNull(consumer, "consumer"); return new DefaultOAuthProvider( Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java (revision 8291) @@ -36,7 +36,7 @@ * * @param other the other token. Must not be null. - * @throws IllegalArgumentException thrown if other is null + * @throws IllegalArgumentException if other is null */ - public OAuthToken(OAuthToken other) throws IllegalArgumentException { + public OAuthToken(OAuthToken other) { CheckParameterUtil.ensureParameterNotNull(other, "other"); this.key = other.key; Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 8291) @@ -187,7 +187,7 @@ * @param id the id. > 0 required * @param version the version > 0 required - * @throws IllegalArgumentException thrown if id <= 0 - * @throws IllegalArgumentException thrown if version <= 0 - * @throws DataIntegrityProblemException If id is changed and primitive was already added to the dataset + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if version <= 0 + * @throws DataIntegrityProblemException if id is changed and primitive was already added to the dataset */ @Override @@ -258,9 +258,9 @@ * * @param changesetId the id. >= 0 required. - * @throws IllegalStateException thrown if this primitive is new. - * @throws IllegalArgumentException thrown if id < 0 - */ - @Override - public void setChangesetId(int changesetId) throws IllegalStateException, IllegalArgumentException { + * @throws IllegalStateException if this primitive is new. + * @throws IllegalArgumentException if id < 0 + */ + @Override + public void setChangesetId(int changesetId) { if (this.changesetId == changesetId) return; @@ -396,9 +396,8 @@ * * @see #isVisible() - * @throws IllegalStateException thrown if visible is set to false on an primitive with - * id==0 - */ - @Override - public void setVisible(boolean visible) throws IllegalStateException{ + * @throws IllegalStateException if visible is set to false on an primitive with id==0 + */ + @Override + public void setVisible(boolean visible) { if (isNew() && !visible) throw new IllegalStateException(tr("A primitive with ID = 0 cannot be invisible.")); Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 8291) @@ -6,6 +6,6 @@ import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; -import java.util.Map.Entry; import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive; @@ -36,8 +36,8 @@ * @param primitive the primitive. Must not be null. * @param cmt the modification type. Must not be null. - * @throws IllegalArgumentException thrown if primitive is null - * @throws IllegalArgumentException thrown if cmt is null + * @throws IllegalArgumentException if primitive is null + * @throws IllegalArgumentException if cmt is null */ - public void put(HistoryOsmPrimitive primitive, ChangesetModificationType cmt) throws IllegalArgumentException{ + public void put(HistoryOsmPrimitive primitive, ChangesetModificationType cmt) { CheckParameterUtil.ensureParameterNotNull(primitive,"primitive"); CheckParameterUtil.ensureParameterNotNull(cmt,"cmt"); @@ -112,7 +112,7 @@ * @param cmt the modification type. Must not be null. * @return the set of primitives - * @throws IllegalArgumentException thrown if cmt is null + * @throws IllegalArgumentException if cmt is null */ - public Set getPrimitivesByModificationType(ChangesetModificationType cmt) throws IllegalArgumentException { + public Set getPrimitivesByModificationType(ChangesetModificationType cmt) { CheckParameterUtil.ensureParameterNotNull(cmt,"cmt"); HashSet ret = new HashSet<>(); Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 8291) @@ -936,5 +936,5 @@ * @param type the type of the primitive. Must not be null. * @return the primitive - * @exception NullPointerException thrown, if type is null + * @throws NullPointerException if type is null */ public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type) { Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 8291) @@ -52,7 +52,7 @@ * @param targetDataSet dataset with my primitives. Must not be null. * @param sourceDataSet dataset with their primitives. Ignored, if null. - * @throws IllegalArgumentException thrown if myDataSet is null - */ - public DataSetMerger(DataSet targetDataSet, DataSet sourceDataSet) throws IllegalArgumentException { + * @throws IllegalArgumentException if myDataSet is null + */ + public DataSetMerger(DataSet targetDataSet, DataSet sourceDataSet) { CheckParameterUtil.ensureParameterNotNull(targetDataSet, "targetDataSet"); this.targetDataSet = targetDataSet; @@ -124,5 +124,5 @@ } - protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException { + protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) { PrimitiveId targetId = mergedMap.get(mergeSource.getPrimitiveId()); if (targetId == null) @@ -229,9 +229,9 @@ * * @param source the source way - * @throws IllegalStateException thrown if no target way can be found for the source way - * @throws IllegalStateException thrown if there isn't a target node for one of the nodes in the source way - * - */ - private void mergeNodeList(Way source) throws IllegalStateException { + * @throws IllegalStateException if no target way can be found for the source way + * @throws IllegalStateException if there isn't a target node for one of the nodes in the source way + * + */ + private void mergeNodeList(Way source) { Way target = (Way)getMergeTarget(source); if (target == null) @@ -256,9 +256,9 @@ * Merges the relation members of a source relation onto the corresponding target relation. * @param source the source relation - * @throws IllegalStateException thrown if there is no corresponding target relation - * @throws IllegalStateException thrown if there isn't a corresponding target object for one of the relation + * @throws IllegalStateException if there is no corresponding target relation + * @throws IllegalStateException if there isn't a corresponding target object for one of the relation * members in source */ - private void mergeRelationMembers(Relation source) throws IllegalStateException { + private void mergeRelationMembers(Relation source) { Relation target = (Relation) getMergeTarget(source); if (target == null) Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 8291) @@ -147,5 +147,5 @@ * @throws IllegalArgumentException if id < 0 */ - public Node(long id) throws IllegalArgumentException { + public Node(long id) { super(id, false); } @@ -157,5 +157,5 @@ * @throws IllegalArgumentException if id < 0 */ - public Node(long id, int version) throws IllegalArgumentException { + public Node(long id, int version) { super(id, version, false); } @@ -235,7 +235,7 @@ * * @param other the other primitive. Must not be null. - * @throws IllegalArgumentException thrown if other is null. - * @throws DataIntegrityProblemException thrown if either this is new and other is not, or other is new and this is not - * @throws DataIntegrityProblemException thrown if other is new and other.getId() != this.getId() + * @throws IllegalArgumentException if other is null. + * @throws DataIntegrityProblemException if either this is new and other is not, or other is new and this is not + * @throws DataIntegrityProblemException if other is new and other.getId() != this.getId() */ @Override Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8291) @@ -247,7 +247,7 @@ * @param id the id * @param allowNegativeId - * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false - */ - protected OsmPrimitive(long id, boolean allowNegativeId) throws IllegalArgumentException { + * @throws IllegalArgumentException if id < 0 and allowNegativeId is false + */ + protected OsmPrimitive(long id, boolean allowNegativeId) { if (allowNegativeId) { this.id = id; @@ -278,7 +278,7 @@ * @param version * @param allowNegativeId - * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false - */ - protected OsmPrimitive(long id, int version, boolean allowNegativeId) throws IllegalArgumentException { + * @throws IllegalArgumentException if id < 0 and allowNegativeId is false + */ + protected OsmPrimitive(long id, int version, boolean allowNegativeId) { this(id, allowNegativeId); this.version = (id > 0 ? version : 0); @@ -358,7 +358,7 @@ * @param id the id. > 0 required * @param version the version > 0 required - * @throws IllegalArgumentException thrown if id <= 0 - * @throws IllegalArgumentException thrown if version <= 0 - * @throws DataIntegrityProblemException If id is changed and primitive was already added to the dataset + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if version <= 0 + * @throws DataIntegrityProblemException if id is changed and primitive was already added to the dataset */ @Override @@ -411,5 +411,5 @@ @Override - public void setChangesetId(int changesetId) throws IllegalStateException, IllegalArgumentException { + public void setChangesetId(int changesetId) { boolean locked = writeLock(); try { @@ -543,5 +543,5 @@ @Override - public void setVisible(boolean visible) throws IllegalStateException { + public void setVisible(boolean visible) { boolean locked = writeLock(); try { @@ -1132,7 +1132,7 @@ * * @param other the other primitive. Must not be null. - * @throws IllegalArgumentException thrown if other is null. - * @throws DataIntegrityProblemException thrown if either this is new and other is not, or other is new and this is not - * @throws DataIntegrityProblemException thrown if other isn't new and other.getId() != this.getId() + * @throws IllegalArgumentException if other is null. + * @throws DataIntegrityProblemException if either this is new and other is not, or other is new and this is not + * @throws DataIntegrityProblemException if other isn't new and other.getId() != this.getId() */ public void mergeFrom(OsmPrimitive other) { Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 8291) @@ -210,7 +210,7 @@ * * @param id the id. > 0 required - * @throws IllegalArgumentException thrown if id < 0 - */ - public Relation(long id) throws IllegalArgumentException { + * @throws IllegalArgumentException if id < 0 + */ + public Relation(long id) { super(id, false); } Index: trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (revision 8291) @@ -128,5 +128,5 @@ * @param role Can be null, in this case it's save as "" * @param member Cannot be null - * @throws IllegalArgumentException thrown if member is null + * @throws IllegalArgumentException if member is null */ public RelationMember(String role, OsmPrimitive member) { Index: trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (revision 8291) @@ -597,8 +597,8 @@ * * @param primitive the primitive - * @throws IllegalStateException thrown if this tag collection can't be applied + * @throws IllegalStateException if this tag collection can't be applied * because there are keys with multiple values */ - public void applyTo(Tagged primitive) throws IllegalStateException { + public void applyTo(Tagged primitive) { if (primitive == null) return; if (! isApplicableToPrimitive()) @@ -617,9 +617,9 @@ * primitives is null * - * @param primitives the collection of primitives - * @throws IllegalStateException thrown if this tag collection can't be applied + * @param primitives the collection of primitives + * @throws IllegalStateException if this tag collection can't be applied * because there are keys with multiple values */ - public void applyTo(Collection primitives) throws IllegalStateException{ + public void applyTo(Collection primitives) { if (primitives == null) return; if (! isApplicableToPrimitive()) @@ -635,8 +635,8 @@ * * @param primitive the primitive - * @throws IllegalStateException thrown if this tag collection can't be applied + * @throws IllegalStateException if this tag collection can't be applied * because there are keys with multiple values */ - public void replaceTagsOf(Tagged primitive) throws IllegalStateException { + public void replaceTagsOf(Tagged primitive) { if (primitive == null) return; if (! isApplicableToPrimitive()) @@ -653,8 +653,8 @@ * * @param primitives the collection of primitives - * @throws IllegalStateException thrown if this tag collection can't be applied + * @throws IllegalStateException if this tag collection can't be applied * because there are keys with multiple values */ - public void replaceTagsOf(Collection primitives) throws IllegalStateException { + public void replaceTagsOf(Collection primitives) { if (primitives == null) return; if (! isApplicableToPrimitive()) Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 8291) @@ -127,5 +127,5 @@ * @param index the position * @return the node at position index - * @exception IndexOutOfBoundsException thrown if index < 0 + * @throws IndexOutOfBoundsException if index < 0 * or index >= {@link #getNodesCount()} * @since 1862 @@ -262,5 +262,5 @@ * @since 343 */ - public Way(long id) throws IllegalArgumentException { + public Way(long id) { super(id, false); } @@ -273,5 +273,5 @@ * @since 2620 */ - public Way(long id, int version) throws IllegalArgumentException { + public Way(long id, int version) { super(id, version, false); } @@ -419,9 +419,9 @@ * * @param n the node. Ignored, if null - * @throws IllegalStateException thrown, if this way is marked as incomplete. We can't add a node + * @throws IllegalStateException if this way is marked as incomplete. We can't add a node * to an incomplete way * @since 1313 */ - public void addNode(Node n) throws IllegalStateException { + public void addNode(Node n) { if (n==null) return; @@ -445,10 +445,10 @@ * @param offs the offset * @param n the node. Ignored, if null. - * @throws IllegalStateException thrown, if this way is marked as incomplete. We can't add a node + * @throws IllegalStateException if this way is marked as incomplete. We can't add a node * to an incomplete way - * @throws IndexOutOfBoundsException thrown if offs is out of bounds + * @throws IndexOutOfBoundsException if offs is out of bounds * @since 1313 */ - public void addNode(int offs, Node n) throws IllegalStateException, IndexOutOfBoundsException { + public void addNode(int offs, Node n) throws IndexOutOfBoundsException { if (n==null) return; Index: trunk/src/org/openstreetmap/josm/data/osm/history/History.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/History.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/history/History.java (revision 8291) @@ -48,7 +48,6 @@ * @param type the primitive type. Must not be null. * @param versions a list of versions. Can be null. - * @throws IllegalArgumentException thrown if id <= 0 + * @throws IllegalArgumentException if id <= 0 * @throws IllegalArgumentException if type is null - * */ protected History(long id, OsmPrimitiveType type, List versions) { Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 8291) @@ -139,8 +139,8 @@ * @return the history. null, if there isn't a history for id and * type. - * @throws IllegalArgumentException thrown if id <= 0 - * @throws IllegalArgumentException thrown if type is null - */ - public History getHistory(long id, OsmPrimitiveType type) throws IllegalArgumentException{ + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if type is null + */ + public History getHistory(long id, OsmPrimitiveType type) { if (id <= 0) throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected, got {1}", "id", id)); @@ -157,7 +157,7 @@ * @return the history for a primitive with id id. null, if no * such history exists - * @throws IllegalArgumentException thrown if pid is null - */ - public History getHistory(PrimitiveId pid) throws IllegalArgumentException{ + * @throws IllegalArgumentException if pid is null + */ + public History getHistory(PrimitiveId pid) { CheckParameterUtil.ensureParameterNotNull(pid, "pid"); List versions = data.get(pid); Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (revision 8291) @@ -31,5 +31,5 @@ * @throws IllegalArgumentException if preconditions are violated */ - public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords) throws IllegalArgumentException { + public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords) { this(id, version, visible, user, changesetId, timestamp, coords, true); } @@ -50,5 +50,5 @@ * @since 5440 */ - public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords, boolean checkHistoricParams) throws IllegalArgumentException { + public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords, boolean checkHistoricParams) { super(id, version, visible, user, changesetId, timestamp, checkHistoricParams); setCoords(coords); Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (revision 8291) @@ -56,5 +56,5 @@ * @throws IllegalArgumentException if preconditions are violated */ - public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp) throws IllegalArgumentException { + public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp) { this(id, version, visible, user, changesetId, timestamp, true); } @@ -75,5 +75,5 @@ * @since 5440 */ - public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) throws IllegalArgumentException { + public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) { ensurePositiveLong(id, "id"); ensurePositiveLong(version, "version"); Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (revision 8291) @@ -35,5 +35,5 @@ * @throws IllegalArgumentException if preconditions are violated */ - public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp) throws IllegalArgumentException { + public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp) { super(id, version, visible, user, changesetId, timestamp); } @@ -53,5 +53,5 @@ * @since 5440 */ - public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) throws IllegalArgumentException { + public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) { super(id, version, visible, user, changesetId, timestamp, checkHistoricParams); } @@ -68,5 +68,5 @@ * @param members list of members for this relation * - * @throws IllegalArgumentException thrown if preconditions are violated + * @throws IllegalArgumentException if preconditions are violated */ public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List members) { @@ -108,5 +108,5 @@ * @param idx the index * @return the idx-th member - * @throws IndexOutOfBoundsException thrown, if idx is out of bounds + * @throws IndexOutOfBoundsException if idx is out of bounds */ public RelationMemberData getRelationMember(int idx) throws IndexOutOfBoundsException { @@ -129,7 +129,7 @@ * * @param member the member (must not be null) - * @exception IllegalArgumentException thrown, if member is null + * @throws IllegalArgumentException if member is null */ - public void addMember(RelationMemberData member) throws IllegalArgumentException { + public void addMember(RelationMemberData member) { CheckParameterUtil.ensureParameterNotNull(member, "member"); members.add(member); Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (revision 8291) @@ -34,5 +34,5 @@ * @throws IllegalArgumentException if preconditions are violated */ - public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp) throws IllegalArgumentException { + public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp) { super(id, version, visible, user, changesetId, timestamp); } @@ -52,5 +52,5 @@ * @since 5440 */ - public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) throws IllegalArgumentException { + public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) { super(id, version, visible, user, changesetId, timestamp, checkHistoricParams); } @@ -68,5 +68,5 @@ * @throws IllegalArgumentException if preconditions are violated */ - public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List nodeIdList) throws IllegalArgumentException { + public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List nodeIdList) { this(id, version, visible, user, changesetId, timestamp); CheckParameterUtil.ensureParameterNotNull(nodeIdList, "nodeIdList"); @@ -95,5 +95,5 @@ * @param idx the index * @return the idx-th node id - * @exception IndexOutOfBoundsException thrown, if idx < 0 || idx >= {#see {@link #getNumNodes()} + * @throws IndexOutOfBoundsException if idx < 0 || idx >= {#see {@link #getNumNodes()} */ public long getNodeId(int idx) throws IndexOutOfBoundsException { Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (revision 8291) @@ -42,8 +42,7 @@ * * @param selectionBase the dataset. Must not be null. - * @exception IllegalArgumentException thrown if selectionBase is null - * + * @throws IllegalArgumentException if selectionBase is null */ - public MergeSourceBuildingVisitor(DataSet selectionBase) throws IllegalArgumentException { + public MergeSourceBuildingVisitor(DataSet selectionBase) { CheckParameterUtil.ensureParameterNotNull(selectionBase, "selectionBase"); this.selectionBase = selectionBase; Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java (revision 8291) @@ -60,8 +60,8 @@ * @param isInactiveMode if true, the paint visitor shall render OSM objects such that they * look inactive. Example: rendering of data in an inactive layer using light gray as color only. - * @throws IllegalArgumentException thrown if {@code g} is null - * @throws IllegalArgumentException thrown if {@code nc} is null - */ - public AbstractMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) throws IllegalArgumentException{ + * @throws IllegalArgumentException if {@code g} is null + * @throws IllegalArgumentException if {@code nc} is null + */ + public AbstractMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) { CheckParameterUtil.ensureParameterNotNull(g); CheckParameterUtil.ensureParameterNotNull(nc); Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 8291) @@ -165,7 +165,7 @@ * @return true, if {@code Renderer} is already a registered map renderer * class - * @throws IllegalArgumentException thrown if {@code renderer} is null - */ - public boolean isRegistered(Class renderer) throws IllegalArgumentException { + * @throws IllegalArgumentException if {@code renderer} is null + */ + public boolean isRegistered(Class renderer) { CheckParameterUtil.ensureParameterNotNull(renderer); for (Descriptor d: descriptors) { @@ -181,8 +181,8 @@ * @param displayName the display name to be displayed in UIs (i.e. in the preference dialog) * @param description the description - * @throws IllegalArgumentException thrown if {@code renderer} is null - * @throws IllegalStateException thrown if {@code renderer} is already registered - */ - public void register(Class renderer, String displayName, String description) throws IllegalArgumentException, IllegalStateException{ + * @throws IllegalArgumentException if {@code renderer} is null + * @throws IllegalStateException if {@code renderer} is already registered + */ + public void register(Class renderer, String displayName, String description) { CheckParameterUtil.ensureParameterNotNull(renderer); if (isRegistered(renderer)) @@ -227,9 +227,8 @@ * * @param renderer the map renderer class. Must not be null. - * @throws IllegalArgumentException thrown if {@code renderer} is null - * @throws IllegalStateException thrown if {@code renderer} isn't registered yet - * - */ - public void activate(Class renderer) throws IllegalArgumentException, IllegalStateException{ + * @throws IllegalArgumentException if {@code renderer} is null + * @throws IllegalStateException if {@code renderer} isn't registered yet + */ + public void activate(Class renderer) { CheckParameterUtil.ensureParameterNotNull(renderer); if (!isRegistered(renderer)) @@ -246,8 +245,7 @@ *

Activates the default map renderer.

* - * @throws IllegalStateException thrown if the default renderer {@link StyledMapRenderer} isn't registered - * - */ - public void activateDefault() throws IllegalStateException{ + * @throws IllegalStateException if the default renderer {@link StyledMapRenderer} isn't registered + */ + public void activateDefault() { Class defaultRenderer = StyledMapRenderer.class; if (!isRegistered(defaultRenderer)) @@ -261,5 +259,5 @@ *

Creates an instance of the currently active renderer.

* - * @throws MapRendererFactoryException thrown if creating an instance fails + * @throws MapRendererFactoryException if creating an instance fails * @see AbstractMapRenderer#AbstractMapRenderer(Graphics2D, NavigatableComponent, boolean) */ Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8291) @@ -330,6 +330,6 @@ * @param isInactiveMode if true, the paint visitor shall render OSM objects such that they * look inactive. Example: rendering of data in an inactive layer using light gray as color only. - * @throws IllegalArgumentException thrown if {@code g} is null - * @throws IllegalArgumentException thrown if {@code nc} is null + * @throws IllegalArgumentException if {@code g} is null + * @throws IllegalArgumentException if {@code nc} is null */ public StyledMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) { Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 8291) @@ -101,6 +101,6 @@ * @param isInactiveMode if true, the paint visitor shall render OSM objects such that they * look inactive. Example: rendering of data in an inactive layer using light gray as color only. - * @throws IllegalArgumentException thrown if {@code g} is null - * @throws IllegalArgumentException thrown if {@code nc} is null + * @throws IllegalArgumentException if {@code g} is null + * @throws IllegalArgumentException if {@code nc} is null */ public WireframeMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) { Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8291) @@ -624,5 +624,5 @@ public boolean valueBool = false; - private Pattern getPattern(String str) throws IllegalStateException, PatternSyntaxException { + private Pattern getPattern(String str) throws PatternSyntaxException { if (str.endsWith("/i")) return Pattern.compile(str.substring(1,str.length()-2), Pattern.CASE_INSENSITIVE); @@ -632,5 +632,5 @@ throw new IllegalStateException(); } - public CheckerElement(String exp) throws IllegalStateException, PatternSyntaxException { + public CheckerElement(String exp) throws PatternSyntaxException { Matcher m = Pattern.compile("(.+)([!=]=)(.+)").matcher(exp); m.matches(); Index: trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java (revision 8291) @@ -114,5 +114,5 @@ * @throws IllegalArgumentException if n1 or n2 is {@code null} or without coordinates */ - public static List getSegmentCells(Node n1, Node n2, double gridDetail) throws IllegalArgumentException { + public static List getSegmentCells(Node n1, Node n2, double gridDetail) { CheckParameterUtil.ensureParameterNotNull(n1, "n1"); CheckParameterUtil.ensureParameterNotNull(n1, "n2"); @@ -131,5 +131,5 @@ * @since 6869 */ - public static List getSegmentCells(EastNorth en1, EastNorth en2, double gridDetail) throws IllegalArgumentException { + public static List getSegmentCells(EastNorth en1, EastNorth en2, double gridDetail) { CheckParameterUtil.ensureParameterNotNull(en1, "en1"); CheckParameterUtil.ensureParameterNotNull(en2, "en2"); Index: trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 8291) @@ -100,8 +100,8 @@ * * @param userName the user name. Must not be null. Must not be empty (whitespace only). - * @throws IllegalArgumentException thrown if userName is null - * @throws IllegalArgumentException thrown if userName is empty - */ - public void setPartiallyIdentified(String userName) throws IllegalArgumentException { + * @throws IllegalArgumentException if userName is null + * @throws IllegalArgumentException if userName is empty + */ + public void setPartiallyIdentified(String userName) { CheckParameterUtil.ensureParameterNotNull(userName, "userName"); if (userName.trim().isEmpty()) @@ -117,9 +117,9 @@ * @param username the user name. Must not be null. Must not be empty. * @param userinfo additional information about the user, retrieved from the OSM server and including the user id - * @throws IllegalArgumentException thrown if userName is null - * @throws IllegalArgumentException thrown if userName is empty - * @throws IllegalArgumentException thrown if userinfo is null - */ - public void setFullyIdentified(String username, UserInfo userinfo) throws IllegalArgumentException { + * @throws IllegalArgumentException if userName is null + * @throws IllegalArgumentException if userName is empty + * @throws IllegalArgumentException if userinfo is null + */ + public void setFullyIdentified(String username, UserInfo userinfo) { CheckParameterUtil.ensureParameterNotNull(username, "username"); if (username.trim().isEmpty()) Index: trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 8291) @@ -701,5 +701,5 @@ /** * Set the new dimension to the view. - * + * * @deprecated use #zoomTo(BoundingXYVisitor) */ @@ -791,5 +791,5 @@ * * @param layer the layer to be activate; must be one of the layers in the list of layers - * @exception IllegalArgumentException thrown if layer is not in the lis of layers + * @throws IllegalArgumentException if layer is not in the lis of layers */ public void setActiveLayer(Layer layer) { Index: trunk/src/org/openstreetmap/josm/gui/MenuScroller.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 8291) @@ -334,5 +334,5 @@ * called when there are no more refrences to it. * - * @exception Throwable if an error occurs. + * @throws Throwable if an error occurs. * @see MenuScroller#dispose() */ Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 8291) @@ -58,7 +58,7 @@ * exception will be handled by showing a dialog. When this runnable is executed using executor framework * then use false unless you read result of task (because exception will get lost if you don't) - * @throws IllegalArgumentException thrown if parent is null - */ - public PleaseWaitRunnable(Component parent, String title, boolean ignoreException) throws IllegalArgumentException{ + * @throws IllegalArgumentException if parent is null + */ + public PleaseWaitRunnable(Component parent, String title, boolean ignoreException) { CheckParameterUtil.ensureParameterNotNull(parent, "parent"); this.title = title; Index: trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 8291) @@ -530,5 +530,5 @@ private TileBounds tileBounds = null; - public TileAddressValidator(JTextComponent tc) throws IllegalArgumentException { + public TileAddressValidator(JTextComponent tc) { super(tc); } @@ -589,5 +589,5 @@ private int tileIndex; - public TileCoordinateValidator(JTextComponent tc) throws IllegalArgumentException { + public TileCoordinateValidator(JTextComponent tc) { super(tc); } Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (revision 8291) @@ -78,5 +78,5 @@ * @param role one of the two roles in this pair * @return the opposite role - * @exception IllegalStateException if role is not participating in this pair + * @throws IllegalStateException if role is not participating in this pair */ public ListRole getOppositeRole(ListRole role) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 8291) @@ -410,6 +410,5 @@ * @param rows the indices * @param current the row index before which the nodes are inserted - * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes - * + * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ protected void copyBeforeCurrent(ListRole source, int [] rows, int current) { @@ -424,6 +423,5 @@ * @param rows the indices * @param current the row index before which the nodes are inserted - * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes - * + * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ public void copyMyBeforeCurrent(int [] rows, int current) { @@ -437,6 +435,5 @@ * @param rows the indices * @param current the row index before which the nodes are inserted - * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes - * + * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ public void copyTheirBeforeCurrent(int [] rows, int current) { @@ -451,6 +448,5 @@ * @param rows the indices * @param current the row index after which the nodes are inserted - * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes - * + * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ protected void copyAfterCurrent(ListRole source, int [] rows, int current) { @@ -466,6 +462,5 @@ * @param rows the indices * @param current the row index after which the nodes are inserted - * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes - * + * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ public void copyMyAfterCurrent(int [] rows, int current) { @@ -479,6 +474,5 @@ * @param rows the indices * @param current the row index after which the nodes are inserted - * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes - * + * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes */ public void copyTheirAfterCurrent(int [] rows, int current) { @@ -648,5 +642,5 @@ * @return true if the entry at row is equal to the entry at the * same position in the opposite list of the current {@link ComparePairType} - * @exception IllegalStateException thrown, if this model is not participating in the + * @throws IllegalStateException if this model is not participating in the * current {@link ComparePairType} * @see ComparePairType#getOppositeRole(ListRole) @@ -672,6 +666,6 @@ * @return true if the entry at the current position is present in the opposite list * of the current {@link ComparePairType}. - * @exception IllegalStateException thrown, if this model is not participating in the - * current {@link ComparePairType} + * @throws IllegalStateException if this model is not participating in the + * current {@link ComparePairType} * @see ComparePairType#getOppositeRole(ListRole) * @see #getRole() Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (revision 8291) @@ -27,6 +27,6 @@ * @param their their way (i.e. the way in the server dataset) * @param mergedMap The map of merged primitives if the conflict results from merging two layers - * @exception IllegalArgumentException thrown, if my is null - * @exception IllegalArgumentException thrown, if their is null + * @throws IllegalArgumentException if my is null + * @throws IllegalArgumentException if their is null */ public void populate(Way my, Way their, Map mergedMap) { @@ -54,5 +54,5 @@ * @param conflict the conflict data set * @return the command - * @exception IllegalStateException thrown, if the merge is not yet frozen + * @throws IllegalStateException if the merge is not yet frozen */ public WayNodesConflictResolverCommand buildResolveCommand(Conflict conflict) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 8291) @@ -260,7 +260,7 @@ * @param decision the decision (must not be null) * - * @throws IllegalArgumentException thrown, if decision is null - */ - public void decideDeletedStateConflict(MergeDecisionType decision) throws IllegalArgumentException{ + * @throws IllegalArgumentException if decision is null + */ + public void decideDeletedStateConflict(MergeDecisionType decision) { CheckParameterUtil.ensureParameterNotNull(decision, "decision"); Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (revision 8291) @@ -102,7 +102,7 @@ * @param their their relation. Must not be null * @return the command - * @exception IllegalArgumentException thrown, if my is null - * @exception IllegalArgumentException thrown, if their is null - * @exception IllegalStateException thrown, if the merge is not yet frozen + * @throws IllegalArgumentException if my is null + * @throws IllegalArgumentException if their is null + * @throws IllegalStateException if the merge is not yet frozen */ public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (revision 8291) @@ -44,7 +44,7 @@ * @param my my version of the OSM primitive (i.e. the version known in the local dataset). Must not be null. * @param their their version of the OSM primitive (i.e. the version known on the server). Must not be null. - * @throws IllegalArgumentException thrown if key is null - * @throws IllegalArgumentException thrown if my is null - * @throws IllegalArgumentException thrown if their is null + * @throws IllegalArgumentException if key is null + * @throws IllegalArgumentException if my is null + * @throws IllegalArgumentException if their is null */ public TagMergeItem(String key, OsmPrimitive my, OsmPrimitive their) { @@ -61,8 +61,7 @@ * * @param decision the merge decision. Must not be null. - * @exception IllegalArgumentException thrown if decision is null - * + * @throws IllegalArgumentException if decision is null */ - public void decide(MergeDecisionType decision) throws IllegalArgumentException { + public void decide(MergeDecisionType decision) { CheckParameterUtil.ensureParameterNotNull(decision, "decision"); this.mergeDecision = decision; @@ -91,8 +90,8 @@ * * @param primitive the OSM primitive. Must not be null. - * @exception IllegalArgumentException thrown, if primitive is null - * @exception IllegalStateException thrown, if this merge item is undecided + * @throws IllegalArgumentException if primitive is null + * @throws IllegalStateException if this merge item is undecided */ - public void applyToMyPrimitive(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException { + public void applyToMyPrimitive(OsmPrimitive primitive) { CheckParameterUtil.ensureParameterNotNull(primitive, "primitive"); if (mergeDecision == MergeDecisionType.UNDECIDED) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 8291) @@ -48,9 +48,9 @@ * * @param tags the tags. Must not be null. - * @exception IllegalArgumentException thrown if tags is null - * @exception IllegalArgumentException thrown if there are more than one keys - * @exception IllegalArgumentException thrown if tags is empty - */ - public MultiValueResolutionDecision(TagCollection tags) throws IllegalArgumentException { + * @throws IllegalArgumentException if tags is null + * @throws IllegalArgumentException if there are more than one keys + * @throws IllegalArgumentException if tags is empty + */ + public MultiValueResolutionDecision(TagCollection tags) { CheckParameterUtil.ensureParameterNotNull(tags, "tags"); if (tags.isEmpty()) @@ -104,8 +104,8 @@ * * @param value the value to keep - * @throws IllegalArgumentException thrown if value is null - * @throws IllegalStateException thrown if value is not in the list of known values for this tag - */ - public void keepOne(String value) throws IllegalArgumentException, IllegalStateException { + * @throws IllegalArgumentException if value is null + * @throws IllegalStateException if value is not in the list of known values for this tag + */ + public void keepOne(String value) { CheckParameterUtil.ensureParameterNotNull(value, "value"); if (!tags.getValues().contains(value)) @@ -141,7 +141,7 @@ * * @return the chosen value - * @throws IllegalStateException thrown if this resolution is not yet decided - */ - public String getChosenValue() throws IllegalStateException { + * @throws IllegalStateException if this resolution is not yet decided + */ + public String getChosenValue() { switch(type) { case UNDECIDED: throw new IllegalStateException(tr("Not decided yet.")); @@ -234,5 +234,5 @@ * * @param primitive the primitive - * @throws IllegalStateException thrown if this resolution is not resolved yet + * @throws IllegalStateException if this resolution is not resolved yet * */ @@ -253,5 +253,5 @@ * * @param primitives the collection of primitives - * @throws IllegalStateException thrown if this resolution is not resolved yet + * @throws IllegalStateException if this resolution is not resolved yet */ public void applyTo(Collection primitives) { @@ -270,6 +270,6 @@ * @param primitive the primitive * @return the change command - * @throws IllegalArgumentException thrown if primitive is null - * @throws IllegalStateException thrown if this resolution is not resolved yet + * @throws IllegalArgumentException if primitive is null + * @throws IllegalStateException if this resolution is not resolved yet */ public Command buildChangeCommand(OsmPrimitive primitive) { @@ -284,8 +284,8 @@ * Builds a change command for applying this resolution to a collection of primitives * - * @param primitives the collection of primitives + * @param primitives the collection of primitives * @return the change command - * @throws IllegalArgumentException thrown if primitives is null - * @throws IllegalStateException thrown if this resolution is not resolved yet + * @throws IllegalArgumentException if primitives is null + * @throws IllegalStateException if this resolution is not resolved yet */ public Command buildChangeCommand(Collection primitives) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (revision 8291) @@ -18,5 +18,5 @@ private RelationMemberConflictDecisionType decision; - public RelationMemberConflictDecision(Relation relation, int pos) throws IllegalArgumentException { + public RelationMemberConflictDecision(Relation relation, int pos) { CheckParameterUtil.ensureParameterNotNull(relation, "relation"); RelationMember member = relation.getMember(pos); Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 8291) @@ -127,5 +127,5 @@ * @param tags the tag collection with the tags. Must not be null. * @param keysWithConflicts the set of tag keys with conflicts - * @throws IllegalArgumentException thrown if tags is null + * @throws IllegalArgumentException if tags is null */ public void populate(TagCollection tags, Set keysWithConflicts) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8291) @@ -97,8 +97,8 @@ * * @return the instance of the dialog - * @throws IllegalStateException thrown, if the dialog is not created yet + * @throws IllegalStateException if the dialog is not created yet * @see #createInstance(MapFrame) */ - public static LayerListDialog getInstance() throws IllegalStateException { + public static LayerListDialog getInstance() { if (instance == null) throw new IllegalStateException("Dialog not created yet. Invoke createInstance() first"); @@ -535,7 +535,7 @@ * * @param layer the layer. Must not be null. - * @exception IllegalArgumentException thrown, if layer is null - */ - public LayerOpacityAction(Layer layer) throws IllegalArgumentException { + * @throws IllegalArgumentException if layer is null + */ + public LayerOpacityAction(Layer layer) { this(); putValue(NAME, tr("Opacity")); @@ -756,5 +756,5 @@ * @throws IllegalArgumentException if {@code layer} is null */ - public MergeAction(Layer layer) throws IllegalArgumentException { + public MergeAction(Layer layer) { this(); CheckParameterUtil.ensureParameterNotNull(layer, "layer"); @@ -831,5 +831,5 @@ * @throws IllegalArgumentException if {@code layer} is null */ - public DuplicateAction(Layer layer) throws IllegalArgumentException { + public DuplicateAction(Layer layer) { this(); CheckParameterUtil.ensureParameterNotNull(layer, "layer"); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (revision 8291) @@ -64,7 +64,7 @@ * * @param changesetId the changeset id. > 0 required. - * @throws IllegalArgumentException thrown if changesetId <= 0 - */ - public ChangesetContentDownloadTask(int changesetId) throws IllegalArgumentException{ + * @throws IllegalArgumentException if changesetId <= 0 + */ + public ChangesetContentDownloadTask(int changesetId) { super(tr("Downloading changeset content"), false /* don't ignore exceptions */); if (changesetId <= 0) @@ -89,8 +89,8 @@ * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}. * @param changesetId the changeset id. {@code >0} required. - * @throws IllegalArgumentException thrown if {@code changesetId <= 0} - * @throws IllegalArgumentException thrown if parent is {@code null} - */ - public ChangesetContentDownloadTask(Component parent, int changesetId) throws IllegalArgumentException{ + * @throws IllegalArgumentException if {@code changesetId <= 0} + * @throws IllegalArgumentException if parent is {@code null} + */ + public ChangesetContentDownloadTask(Component parent, int changesetId) { super(parent, tr("Downloading changeset content"), false /* don't ignore exceptions */); if (changesetId <= 0) @@ -105,7 +105,7 @@ * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}. * @param changesetIds the changeset ids. Empty collection assumed, if {@code null}. - * @throws IllegalArgumentException thrown if parent is {@code null} - */ - public ChangesetContentDownloadTask(Component parent, Collection changesetIds) throws IllegalArgumentException { + * @throws IllegalArgumentException if parent is {@code null} + */ + public ChangesetContentDownloadTask(Component parent, Collection changesetIds) { super(parent, tr("Downloading changeset content"), false /* don't ignore exceptions */); init(changesetIds); @@ -129,5 +129,5 @@ * * @param changesetId the changeset id - * @throws OsmTransferException thrown if something went wrong + * @throws OsmTransferException if something went wrong */ protected void downloadChangeset(int changesetId) throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 8291) @@ -57,5 +57,5 @@ * @param changesets the collection of changesets. Assumes an empty collection if null. * @return the download task - * @throws IllegalArgumentException thrown if parent is null + * @throws IllegalArgumentException if parent is null */ public static ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection changesets) { @@ -124,7 +124,7 @@ * @param dialogParent the parent reference component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be null. * @param ids the collection of ids. Empty collection assumed if null. - * @throws IllegalArgumentException thrown if dialogParent is null - */ - public ChangesetHeaderDownloadTask(Component dialogParent, Collection ids) throws IllegalArgumentException{ + * @throws IllegalArgumentException if dialogParent is null + */ + public ChangesetHeaderDownloadTask(Component dialogParent, Collection ids) { this(dialogParent, ids, false); } @@ -139,9 +139,8 @@ * @param ids the collection of ids. Empty collection assumed if null. * @param includeDiscussion determines if discussion comments must be downloaded or not - * @throws IllegalArgumentException thrown if dialogParent is null + * @throws IllegalArgumentException if dialogParent is null * @since 7704 */ - public ChangesetHeaderDownloadTask(Component dialogParent, Collection ids, boolean includeDiscussion) - throws IllegalArgumentException { + public ChangesetHeaderDownloadTask(Component dialogParent, Collection ids, boolean includeDiscussion) { super(dialogParent, tr("Download changesets"), false /* don't ignore exceptions */); init(ids); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 8291) @@ -514,10 +514,9 @@ * * @param query the query. Must not be null. - * @throws IllegalArgumentException thrown if query is null - * @throws IllegalStateException thrown if one of the available values for query parameters in + * @throws IllegalArgumentException if query is null + * @throws IllegalStateException if one of the available values for query parameters in * this panel isn't valid - * */ - public void fillInQuery(ChangesetQuery query) throws IllegalStateException, IllegalArgumentException { + public void fillInQuery(ChangesetQuery query) { CheckParameterUtil.ensureParameterNotNull(query, "query"); if (rbRestrictToMyself.isSelected()) { @@ -838,5 +837,5 @@ } - public void fillInQuery(ChangesetQuery query) throws IllegalStateException{ + public void fillInQuery(ChangesetQuery query) { if (!isValidChangesetQuery()) throw new IllegalStateException(tr("Cannot build changeset query with time based restrictions. Input is not valid.")); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (revision 8291) @@ -54,7 +54,7 @@ * * @param query the query to submit to the OSM server. Must not be null. - * @throws IllegalArgumentException thrown if query is null. + * @throws IllegalArgumentException if query is null. */ - public ChangesetQueryTask(ChangesetQuery query) throws IllegalArgumentException { + public ChangesetQueryTask(ChangesetQuery query) { super(tr("Querying and downloading changesets",false /* don't ignore exceptions */)); CheckParameterUtil.ensureParameterNotNull(query, "query"); @@ -68,8 +68,8 @@ * Must not be null. * @param query the query to submit to the OSM server. Must not be null. - * @throws IllegalArgumentException thrown if query is null. - * @throws IllegalArgumentException thrown if parent is null + * @throws IllegalArgumentException if query is null. + * @throws IllegalArgumentException if parent is null */ - public ChangesetQueryTask(Component parent, ChangesetQuery query) throws IllegalArgumentException { + public ChangesetQueryTask(Component parent, ChangesetQuery query) { super(parent, tr("Querying and downloading changesets"), false /* don't ignore exceptions */); CheckParameterUtil.ensureParameterNotNull(query, "query"); @@ -144,5 +144,5 @@ * Tries to fully identify the current JOSM user * - * @throws OsmTransferException thrown if something went wrong + * @throws OsmTransferException if something went wrong */ protected void fullyIdentifyCurrentUser() throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 8291) @@ -114,7 +114,7 @@ * * @param layer the {@link OsmDataLayer} this browser is related to. Must not be null. - * @exception IllegalArgumentException thrown, if layer is null - */ - public ChildRelationBrowser(OsmDataLayer layer) throws IllegalArgumentException { + * @throws IllegalArgumentException if layer is null + */ + public ChildRelationBrowser(OsmDataLayer layer) { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); this.layer = layer; @@ -128,7 +128,7 @@ * @param layer the {@link OsmDataLayer} this browser is related to. Must not be null. * @param root the root relation - * @exception IllegalArgumentException thrown, if layer is null - */ - public ChildRelationBrowser(OsmDataLayer layer, Relation root) throws IllegalArgumentException { + * @throws IllegalArgumentException if layer is null + */ + public ChildRelationBrowser(OsmDataLayer layer, Relation root) { this(layer); populate(root); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 8291) @@ -39,8 +39,8 @@ * @param relations a collection of relations. Must not be null. * @param layer the layer which data is to be merged into - * @throws IllegalArgumentException thrown if relations is null - * @throws IllegalArgumentException thrown if layer is null + * @throws IllegalArgumentException if relations is null + * @throws IllegalArgumentException if layer is null */ - public DownloadRelationTask(Collection relations, OsmDataLayer layer) throws IllegalArgumentException{ + public DownloadRelationTask(Collection relations, OsmDataLayer layer) { super(tr("Download relations"), false /* don't ignore exception */); CheckParameterUtil.ensureParameterNotNull(relations, "relations"); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8291) @@ -748,6 +748,5 @@ * @throws IllegalArgumentException if orig is null */ - public static Command addPrimitivesToRelation(final Relation orig, Collection primitivesToAdd) - throws IllegalArgumentException { + public static Command addPrimitivesToRelation(final Relation orig, Collection primitivesToAdd) { CheckParameterUtil.ensureParameterNotNull(orig, "orig"); try { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 8291) @@ -69,7 +69,7 @@ * @param monitor the progress monitor to be used * - * @exception IllegalArgumentException thrown if child is null - * @exception IllegalArgumentException thrown if layer is null - * @exception IllegalArgumentException thrown if child.getId() == 0 + * @throws IllegalArgumentException if child is null + * @throws IllegalArgumentException if layer is null + * @throws IllegalArgumentException if child.getId() == 0 */ public ParentRelationLoadingTask(Relation child, OsmDataLayer layer, boolean full, PleaseWaitProgressMonitor monitor ) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 8291) @@ -112,8 +112,7 @@ * @param selectedMembers a collection of members in relation which the editor * should display selected when the editor is first displayed on screen - * @throws IllegalArgumentException thrown if layer is null - */ - protected RelationEditor(OsmDataLayer layer, Relation relation, Collection selectedMembers) throws IllegalArgumentException{ - // Initalizes ExtendedDialog + * @throws IllegalArgumentException if layer is null + */ + protected RelationEditor(OsmDataLayer layer, Relation relation, Collection selectedMembers) { super(Main.parent, "", Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 8291) @@ -26,7 +26,7 @@ * * @param layer the data layer. Must not be null. - * @exception IllegalArgumentException thrown if layer is null + * @throws IllegalArgumentException if layer is null */ - public SelectionTableModel(OsmDataLayer layer) throws IllegalArgumentException { + public SelectionTableModel(OsmDataLayer layer) { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); this.layer = layer; Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 8291) @@ -39,6 +39,6 @@ * Constructs a new {@code Bookmark} with the given contents. * @param list Bookmark contents as a list of 5 elements. First item is the name, then come bounds arguments (minlat, minlon, maxlat, maxlon) - * @throws NumberFormatException If the bounds arguments are not numbers - * @throws IllegalArgumentException If list contain less than 5 elements + * @throws NumberFormatException if the bounds arguments are not numbers + * @throws IllegalArgumentException if list contain less than 5 elements */ public Bookmark(Collection list) throws NumberFormatException, IllegalArgumentException { Index: trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java (revision 8291) @@ -39,6 +39,6 @@ * @param helpTopicUrl the absolute help topic URL * @return the content, filtered and transformed for being displayed in the internal help browser - * @throws HelpContentReaderException thrown if problem occurs - * @throws MissingHelpContentException thrown if this helpTopicUrl doesn't point to an existing Wiki help page + * @throws HelpContentReaderException if problem occurs + * @throws MissingHelpContentException if this helpTopicUrl doesn't point to an existing Wiki help page */ public String fetchHelpTopicContent(String helpTopicUrl, boolean dotest) throws HelpContentReaderException { @@ -77,6 +77,6 @@ * @param in the input stream * @return the content - * @throws HelpContentReaderException thrown if an exception occurs - * @throws MissingHelpContentException thrown, if the content read isn't a help page + * @throws HelpContentReaderException if an exception occurs + * @throws MissingHelpContentException if the content read isn't a help page * @since 5936 */ Index: trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 8291) @@ -102,7 +102,7 @@ * * @param model the model. Must not be null. - * @throws IllegalArgumentException thrown if model is null + * @throws IllegalArgumentException if model is null */ - public CoordinateInfoViewer(HistoryBrowserModel model) throws IllegalArgumentException{ + public CoordinateInfoViewer(HistoryBrowserModel model) { CheckParameterUtil.ensureParameterNotNull(model, "model"); setModel(model); Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 8291) @@ -115,5 +115,5 @@ * * @param history the history. Must not be null. - * @throws IllegalArgumentException thrown if history is null + * @throws IllegalArgumentException if history is null */ public HistoryBrowserModel(History history) { @@ -247,7 +247,7 @@ * @param pointInTimeType the type of the point in time (must not be null) * @return the tag table model - * @exception IllegalArgumentException thrown, if pointInTimeType is null - */ - public TagTableModel getTagTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException { + * @throws IllegalArgumentException if pointInTimeType is null + */ + public TagTableModel getTagTableModel(PointInTimeType pointInTimeType) { CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType"); if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) @@ -260,5 +260,5 @@ } - public DiffTableModel getNodeListTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException { + public DiffTableModel getNodeListTableModel(PointInTimeType pointInTimeType) { CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType"); if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) @@ -271,5 +271,5 @@ } - public DiffTableModel getRelationMemberTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException { + public DiffTableModel getRelationMemberTableModel(PointInTimeType pointInTimeType) { CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType"); if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) @@ -287,6 +287,6 @@ * * @param reference the reference history primitive. Must not be null. - * @throws IllegalArgumentException thrown if reference is null - * @throws IllegalStateException thrown if this model isn't a assigned a history yet + * @throws IllegalArgumentException if reference is null + * @throws IllegalStateException if this model isn't a assigned a history yet * @throws IllegalArgumentException if reference isn't an history primitive for the history managed by this mode * @@ -294,5 +294,5 @@ * @see PointInTimeType */ - public void setReferencePointInTime(HistoryOsmPrimitive reference) throws IllegalArgumentException, IllegalStateException{ + public void setReferencePointInTime(HistoryOsmPrimitive reference) { CheckParameterUtil.ensureParameterNotNull(reference, "reference"); if (history == null) @@ -317,6 +317,6 @@ * * @param current the reference history primitive. Must not be {@code null}. - * @throws IllegalArgumentException thrown if reference is {@code null} - * @throws IllegalStateException thrown if this model isn't a assigned a history yet + * @throws IllegalArgumentException if reference is {@code null} + * @throws IllegalStateException if this model isn't a assigned a history yet * @throws IllegalArgumentException if reference isn't an history primitive for the history managed by this mode * @@ -324,5 +324,5 @@ * @see PointInTimeType */ - public void setCurrentPointInTime(HistoryOsmPrimitive current) throws IllegalArgumentException, IllegalStateException{ + public void setCurrentPointInTime(HistoryOsmPrimitive current) { CheckParameterUtil.ensureParameterNotNull(current, "current"); if (history == null) @@ -364,7 +364,7 @@ * @param type the type of the point in time (must not be null) * @return the respective primitive. Can be null. - * @exception IllegalArgumentException thrown, if type is null - */ - public HistoryOsmPrimitive getPointInTime(PointInTimeType type) throws IllegalArgumentException { + * @throws IllegalArgumentException if type is null + */ + public HistoryOsmPrimitive getPointInTime(PointInTimeType type) { CheckParameterUtil.ensureParameterNotNull(type, "type"); if (type.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 8291) @@ -70,5 +70,5 @@ * parent for {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. * Must not be null. - * @throws IllegalArgumentException thrown if parent is null + * @throws IllegalArgumentException if parent is null */ public HistoryLoadTask(Component parent) { @@ -85,5 +85,5 @@ * @return this task */ - public HistoryLoadTask add(long id, OsmPrimitiveType type) throws IllegalArgumentException { + public HistoryLoadTask add(long id, OsmPrimitiveType type) { if (id <= 0) throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got {1}.", "id", id)); @@ -111,5 +111,5 @@ * @param primitive the history item * @return this task - * @throws IllegalArgumentException thrown if primitive is null + * @throws IllegalArgumentException if primitive is null */ public HistoryLoadTask add(HistoryOsmPrimitive primitive) { @@ -124,5 +124,5 @@ * @param history the history. Must not be null. * @return this task - * @throws IllegalArgumentException thrown if history is null + * @throws IllegalArgumentException if history is null */ public HistoryLoadTask add(History history) { @@ -137,6 +137,6 @@ * @param primitive the OSM primitive. Must not be null. primitive.getId() > 0 required. * @return this task - * @throws IllegalArgumentException thrown if the primitive is null - * @throws IllegalArgumentException thrown if primitive.getId() <= 0 + * @throws IllegalArgumentException if the primitive is null + * @throws IllegalArgumentException if primitive.getId() <= 0 */ public HistoryLoadTask add(OsmPrimitive primitive) { @@ -152,6 +152,6 @@ * primitive.getId() > 0 required. * @return this task - * @throws IllegalArgumentException thrown if primitives is null - * @throws IllegalArgumentException thrown if one of the ids in the collection <= 0 + * @throws IllegalArgumentException if primitives is null + * @throws IllegalArgumentException if one of the ids in the collection <= 0 */ public HistoryLoadTask add(Collection primitives) { Index: trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 8291) @@ -172,9 +172,8 @@ * @param model the model (must not be null) * @param pointInTimeType the point in time this panel visualizes (must not be null) - * @exception IllegalArgumentException thrown, if model is null - * @exception IllegalArgumentException thrown, if pointInTimeType is null - * + * @throws IllegalArgumentException if model is null + * @throws IllegalArgumentException if pointInTimeType is null */ - public VersionInfoPanel(HistoryBrowserModel model, PointInTimeType pointInTimeType) throws IllegalArgumentException { + public VersionInfoPanel(HistoryBrowserModel model, PointInTimeType pointInTimeType) { CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType"); CheckParameterUtil.ensureParameterNotNull(model, "model"); Index: trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 8291) @@ -109,5 +109,5 @@ * @param changesetCommentModel the model for the changeset comment. Must not be null * @param changesetSourceModel the model for the changeset source. Must not be null. - * @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null + * @throws IllegalArgumentException if {@code changesetCommentModel} is null */ public BasicUploadSettingsPanel(ChangesetCommentModel changesetCommentModel, ChangesetCommentModel changesetSourceModel) { Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 8291) @@ -162,5 +162,5 @@ * * @param changesetCommentModel the changeset comment model. Must not be null. - * @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null + * @throws IllegalArgumentException if {@code changesetCommentModel} is null */ public ChangesetManagementPanel(ChangesetCommentModel changesetCommentModel) { Index: trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 8291) @@ -54,7 +54,7 @@ * @param fullRelation true if a full download is required, i.e., * a download including the immediate children of a relation. - * @throws IllegalArgumentException thrown if layer is null. + * @throws IllegalArgumentException if layer is null. */ - public DownloadPrimitivesTask(OsmDataLayer layer, List ids, boolean fullRelation) throws IllegalArgumentException { + public DownloadPrimitivesTask(OsmDataLayer layer, List ids, boolean fullRelation) { this(layer, ids, fullRelation, null); } @@ -69,8 +69,8 @@ * a download including the immediate children of a relation. * @param progressMonitor ProgressMonitor to use or null to create a new one. - * @throws IllegalArgumentException thrown if layer is null. + * @throws IllegalArgumentException if layer is null. */ public DownloadPrimitivesTask(OsmDataLayer layer, List ids, boolean fullRelation, - ProgressMonitor progressMonitor) throws IllegalArgumentException { + ProgressMonitor progressMonitor) { super(tr("Download objects"), progressMonitor, false /* don't ignore exception */); ensureParameterNotNull(layer, "layer"); Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 8291) @@ -26,5 +26,5 @@ * Constructs a new {@code SaveLayerInfo}. * @param layer the layer. Must not be null. - * @throws IllegalArgumentException thrown if layer is null + * @throws IllegalArgumentException if layer is null */ public SaveLayerInfo(AbstractModifiableLayer layer) { Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 8291) @@ -34,5 +34,5 @@ * @param layerInfo information about the layer to be saved to save. Must not be null. * @param monitor the monitor. Set to {@link NullProgressMonitor#INSTANCE} if null - * @throws IllegalArgumentException thrown if layer is null + * @throws IllegalArgumentException if layer is null */ protected SaveLayerTask(SaveLayerInfo layerInfo, ProgressMonitor monitor) { Index: trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (revision 8291) @@ -39,7 +39,7 @@ * @param changesetCommentModel the changeset comment model. Must not be null. * @param changesetSourceModel the changeset source model. Must not be null. - * @throws IllegalArgumentException thrown if {@code changesetCommentModel} is null + * @throws IllegalArgumentException if {@code changesetCommentModel} is null */ - public TagSettingsPanel(ChangesetCommentModel changesetCommentModel, ChangesetCommentModel changesetSourceModel) throws IllegalArgumentException{ + public TagSettingsPanel(ChangesetCommentModel changesetCommentModel, ChangesetCommentModel changesetSourceModel) { CheckParameterUtil.ensureParameterNotNull(changesetCommentModel, "changesetCommentModel"); CheckParameterUtil.ensureParameterNotNull(changesetSourceModel, "changesetSourceModel"); Index: trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 8291) @@ -45,7 +45,7 @@ * @param toUpdate a collection of primitives to update from the server. Set to * the empty collection if null. - * @throws IllegalArgumentException thrown if layer is null. + * @throws IllegalArgumentException if layer is null. */ - public UpdatePrimitivesTask(OsmDataLayer layer, Collection toUpdate) throws IllegalArgumentException{ + public UpdatePrimitivesTask(OsmDataLayer layer, Collection toUpdate) { super(tr("Update objects"), false /* don't ignore exception */); ensureParameterNotNull(layer, "layer"); Index: trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 8291) @@ -56,6 +56,6 @@ * @param monitor a progress monitor. If monitor is null, uses {@link NullProgressMonitor#INSTANCE} * @param changeset the changeset to be used - * @throws IllegalArgumentException thrown, if layer is null - * @throws IllegalArgumentException thrown if strategy is null + * @throws IllegalArgumentException if layer is null + * @throws IllegalArgumentException if strategy is null */ public UploadLayerTask(UploadStrategySpecification strategy, OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset) { @@ -86,5 +86,5 @@ * @param e the exception throw by the API * @param monitor a progress monitor - * @throws OsmTransferException thrown if we can't recover from the exception + * @throws OsmTransferException if we can't recover from the exception */ protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException{ Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 8291) @@ -60,8 +60,8 @@ * @param changeset the changeset to use for uploading. Must not be null. changeset.getId() * can be 0 in which case the upload task creates a new changeset - * @throws IllegalArgumentException thrown if layer is null - * @throws IllegalArgumentException thrown if toUpload is null - * @throws IllegalArgumentException thrown if strategy is null - * @throws IllegalArgumentException thrown if changeset is null + * @throws IllegalArgumentException if layer is null + * @throws IllegalArgumentException if toUpload is null + * @throws IllegalArgumentException if strategy is null + * @throws IllegalArgumentException if changeset is null */ public UploadPrimitivesTask(UploadStrategySpecification strategy, OsmDataLayer layer, APIDataSet toUpload, Changeset changeset) { @@ -184,5 +184,5 @@ * @param e the exception throw by the API * @param monitor a progress monitor - * @throws OsmTransferException thrown if we can't recover from the exception + * @throws OsmTransferException if we can't recover from the exception */ protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException{ Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8291) @@ -334,5 +334,5 @@ * @throws IllegalArgumentException */ - public static TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException { + public static TileSource getTileSource(ImageryInfo info) { if (info.getImageryType() == ImageryType.TMS) { checkUrl(info.getUrl()); Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java (revision 8291) @@ -65,5 +65,5 @@ * @throws IllegalArgumentException if {@code param} is {@code null} */ - public Environment(Environment other) throws IllegalArgumentException { + public Environment(Environment other) { CheckParameterUtil.ensureParameterNotNull(other); this.osm = other.osm; Index: trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 8291) @@ -113,7 +113,7 @@ * @return the text element or null, if the style properties don't include * properties for text rendering - * @throws IllegalArgumentException thrown if {@code defaultTextColor} is null - */ - public static TextElement create(Environment env, Color defaultTextColor, boolean defaultAnnotate) throws IllegalArgumentException{ + * @throws IllegalArgumentException if {@code defaultTextColor} is null + */ + public static TextElement create(Environment env, Color defaultTextColor, boolean defaultAnnotate) { CheckParameterUtil.ensureParameterNotNull(defaultTextColor); Cascade c = env.mc.getCascade(env.layer); Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 8291) @@ -228,7 +228,7 @@ * * @param css the MapCSS style declaration. Must not be null. - * @throws IllegalArgumentException thrown if {@code css} is null + * @throws IllegalArgumentException if {@code css} is null */ - public MapCSSStyleSource(String css) throws IllegalArgumentException{ + public MapCSSStyleSource(String css) { super(null, null, null); CheckParameterUtil.ensureParameterNotNull(css); Index: trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (revision 8291) @@ -125,7 +125,7 @@ * * @param pref the preferences. Must not be null. - * @throws IllegalArgumentException thrown if pref is null + * @throws IllegalArgumentException if pref is null */ - public void initFromPreferences(Preferences pref) throws IllegalArgumentException{ + public void initFromPreferences(Preferences pref) { CheckParameterUtil.ensureParameterNotNull(pref, "pref"); pnlAdvancedProperties.initFromPreferences(pref); Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 8291) @@ -206,7 +206,7 @@ * * @param parameters the advanced parameters. Must not be null. - * @throws IllegalArgumentException thrown if parameters is null. - */ - public void setAdvancedParameters(OAuthParameters parameters) throws IllegalArgumentException{ + * @throws IllegalArgumentException if parameters is null. + */ + public void setAdvancedParameters(OAuthParameters parameters) { CheckParameterUtil.ensureParameterNotNull(parameters, "parameters"); if (parameters.equals(OAuthParameters.createDefault(apiUrl))) { @@ -235,7 +235,7 @@ * * @param pref the preferences. Must not be null. - * @throws IllegalArgumentException thrown if pref is null - */ - public void initFromPreferences(Preferences pref) throws IllegalArgumentException { + * @throws IllegalArgumentException if pref is null + */ + public void initFromPreferences(Preferences pref) { CheckParameterUtil.ensureParameterNotNull(pref, "pref"); setApiUrl(pref.get("osm-server.url")); @@ -260,7 +260,7 @@ * * @param pref the preferences. Must not be null. - * @throws IllegalArgumentException thrown if pref is null. - */ - public void rememberPreferences(Preferences pref) throws IllegalArgumentException { + * @throws IllegalArgumentException if pref is null. + */ + public void rememberPreferences(Preferences pref) { CheckParameterUtil.ensureParameterNotNull(pref, "pref"); pref.put("oauth.settings.use-default", cbUseDefaults.isSelected()); Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 8291) @@ -29,7 +29,7 @@ import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator; import org.openstreetmap.josm.gui.widgets.HtmlPanel; +import org.openstreetmap.josm.gui.widgets.JosmTextField; import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.gui.widgets.JosmTextField; /** @@ -177,5 +177,5 @@ private static class AccessTokenKeyValidator extends AbstractTextComponentValidator { - public AccessTokenKeyValidator(JTextComponent tc) throws IllegalArgumentException { + public AccessTokenKeyValidator(JTextComponent tc) { super(tc); } @@ -197,5 +197,5 @@ private static class AccessTokenSecretValidator extends AbstractTextComponentValidator { - public AccessTokenSecretValidator(JTextComponent tc) throws IllegalArgumentException { + public AccessTokenSecretValidator(JTextComponent tc) { super(tc); } Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 8291) @@ -206,7 +206,7 @@ * * @param apiUrl the API URL. Must not be null. - * @throws IllegalArgumentException thrown if apiUrl is null - */ - public OAuthAuthorizationWizard(String apiUrl) throws IllegalArgumentException { + * @throws IllegalArgumentException if apiUrl is null + */ + public OAuthAuthorizationWizard(String apiUrl) { this(Main.parent, apiUrl); } @@ -217,5 +217,5 @@ * @param parent the component relative to which the dialog is displayed * @param apiUrl the API URL. Must not be null. - * @throws IllegalArgumentException thrown if apiUrl is null + * @throws IllegalArgumentException if apiUrl is null */ public OAuthAuthorizationWizard(Component parent, String apiUrl) { Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 8291) @@ -73,5 +73,5 @@ * @throws IllegalArgumentException if parameters is null */ - public OsmOAuthAuthorizationClient(OAuthParameters parameters) throws IllegalArgumentException { + public OsmOAuthAuthorizationClient(OAuthParameters parameters) { CheckParameterUtil.ensureParameterNotNull(parameters, "parameters"); oauthProviderParameters = new OAuthParameters(parameters); @@ -89,5 +89,5 @@ * @throws IllegalArgumentException if requestToken is null */ - public OsmOAuthAuthorizationClient(OAuthParameters parameters, OAuthToken requestToken) throws IllegalArgumentException { + public OsmOAuthAuthorizationClient(OAuthParameters parameters, OAuthToken requestToken) { CheckParameterUtil.ensureParameterNotNull(parameters, "parameters"); oauthProviderParameters = new OAuthParameters(parameters); @@ -510,5 +510,5 @@ * @throws OsmTransferCanceledException if the task is canceled by the user */ - public void authorise(OAuthToken requestToken, String osmUserName, String osmPassword, OsmPrivileges privileges, ProgressMonitor monitor) throws IllegalArgumentException, OsmOAuthAuthorizationException, OsmTransferCanceledException{ + public void authorise(OAuthToken requestToken, String osmUserName, String osmPassword, OsmPrivileges privileges, ProgressMonitor monitor) throws OsmOAuthAuthorizationException, OsmTransferCanceledException{ CheckParameterUtil.ensureParameterNotNull(requestToken, "requestToken"); CheckParameterUtil.ensureParameterNotNull(osmUserName, "osmUserName"); Index: trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java (revision 8291) @@ -40,6 +40,6 @@ * @param parameters the OAuth parameters. Must not be null. * @param requestToken the request token for which an Access Token is retrieved. Must not be null. - * @throws IllegalArgumentException thrown if parameters is null. - * @throws IllegalArgumentException thrown if requestToken is null. + * @throws IllegalArgumentException if parameters is null. + * @throws IllegalArgumentException if requestToken is null. */ public RetrieveAccessTokenTask(Component parent, OAuthParameters parameters, OAuthToken requestToken) { Index: trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (revision 8291) @@ -37,5 +37,5 @@ * is displayed * @param parameters the OAuth parameters. Must not be null. - * @throws IllegalArgumentException thrown if parameters is null. + * @throws IllegalArgumentException if parameters is null. */ public RetrieveRequestTokenTask(Component parent, OAuthParameters parameters ) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (revision 8291) @@ -43,7 +43,7 @@ * @param parent the parent component relative to which the {@link PleaseWaitRunnable}-Dialog is displayed * @param url the url. Must not be null. - * @throws IllegalArgumentException thrown if url is null. - */ - public ApiUrlTestTask(Component parent, String url) throws IllegalArgumentException { + * @throws IllegalArgumentException if url is null. + */ + public ApiUrlTestTask(Component parent, String url) { super(parent, tr("Testing OSM API URL ''{0}''", url), false /* don't ignore exceptions */); CheckParameterUtil.ensureParameterNotNull(url,"url"); Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (revision 8291) @@ -145,7 +145,7 @@ * @param pref the preferences. Must not be null. * @param cm the credential manager. Must not be null. - * @throws IllegalArgumentException thrown if cm is null - */ - public void init(Preferences pref, CredentialsAgent cm) throws IllegalArgumentException { + * @throws IllegalArgumentException if cm is null + */ + public void init(Preferences pref, CredentialsAgent cm) { CheckParameterUtil.ensureParameterNotNull(pref, "pref"); CheckParameterUtil.ensureParameterNotNull(cm, "cm"); @@ -171,8 +171,8 @@ * @param preferences the preferences. Must not be null. * @param cm the credentials manager. Must not be null. - * @throws IllegalArgumentException thrown if preferences is null - * @throws IllegalArgumentException thrown if cm is null - */ - public void save(Preferences preferences, CredentialsAgent cm) throws IllegalArgumentException { + * @throws IllegalArgumentException if preferences is null + * @throws IllegalArgumentException if cm is null + */ + public void save(Preferences preferences, CredentialsAgent cm) { CheckParameterUtil.ensureParameterNotNull(preferences, "preferences"); CheckParameterUtil.ensureParameterNotNull(cm, "cm"); Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 8291) @@ -242,5 +242,5 @@ private static class ApiUrlValidator extends AbstractTextComponentValidator { - public ApiUrlValidator(JTextComponent tc) throws IllegalArgumentException { + public ApiUrlValidator(JTextComponent tc) { super(tc); } Index: trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (revision 8291) @@ -22,6 +22,5 @@ * * @param delegate the delegate which renders the progress information. Must not be null. - * @throws IllegalArgumentException thrown if delegate is null - * + * @throws IllegalArgumentException if delegate is null */ public SwingRenderingProgressMonitor(ProgressRenderer delegate) { Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 8291) @@ -67,8 +67,8 @@ * @param rowSelectionModel the row selection model. Must not be null. * @param colSelectionModel the column selection model. Must not be null. - * @throws IllegalArgumentException thrown if {@code rowSelectionModel} is null - * @throws IllegalArgumentException thrown if {@code colSelectionModel} is null - */ - public TagEditorModel(DefaultListSelectionModel rowSelectionModel, DefaultListSelectionModel colSelectionModel) throws IllegalArgumentException{ + * @throws IllegalArgumentException if {@code rowSelectionModel} is null + * @throws IllegalArgumentException if {@code colSelectionModel} is null + */ + public TagEditorModel(DefaultListSelectionModel rowSelectionModel, DefaultListSelectionModel colSelectionModel) { CheckParameterUtil.ensureParameterNotNull(rowSelectionModel, "rowSelectionModel"); CheckParameterUtil.ensureParameterNotNull(colSelectionModel, "colSelectionModel"); @@ -173,5 +173,5 @@ * @param tag the tag. Must not be null. * - * @exception IllegalArgumentException thrown, if tag is null + * @throws IllegalArgumentException if tag is null */ public void add(TagModel tag) { Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 8291) @@ -10,6 +10,6 @@ import java.awt.event.FocusEvent; import java.util.EnumSet; + import javax.swing.AbstractAction; - import javax.swing.BoxLayout; import javax.swing.JButton; @@ -175,7 +175,7 @@ * * @param layer the data layer. Must not be null. - * @throws IllegalArgumentException thrown if {@code layer} is null - */ - public void initAutoCompletion(OsmDataLayer layer) throws IllegalArgumentException{ + * @throws IllegalArgumentException if {@code layer} is null + */ + public void initAutoCompletion(OsmDataLayer layer) { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 8291) @@ -57,5 +57,5 @@ * @param filter the filter expression; must not be null * - * @exception IllegalArgumentException thrown, if filter is null + * @throws IllegalArgumentException if filter is null */ public void applyFilter(String filter) { @@ -100,5 +100,5 @@ * * @param other another auto completion list; must not be null - * @exception IllegalArgumentException thrown, if other is null + * @throws IllegalArgumentException if other is null */ public void add(AutoCompletionList other) { @@ -116,5 +116,5 @@ * * @param other a list of AutoCompletionListItem; must not be null - * @exception IllegalArgumentException thrown, if other is null + * @throws IllegalArgumentException if other is null */ public void add(List other) { @@ -264,5 +264,5 @@ * @return the item * - * @exception IndexOutOfBoundsException thrown, if idx is out of bounds + * @throws IndexOutOfBoundsException if idx is out of bounds */ public AutoCompletionListItem getFilteredItem(int idx) { Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (revision 8291) @@ -78,5 +78,5 @@ * sets the value * @param value the value; must not be null - * @exception IllegalArgumentException thrown, if value if null + * @throws IllegalArgumentException if value if null */ public void setValue(String value) { Index: trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java (revision 8291) @@ -90,7 +90,7 @@ * @param adjustable the adjustable * @return true, if the adjustable is participating in synchronized scrolling, false otherwise - * @throws IllegalStateException thrown, if adjustable is not registered for synchronized scrolling + * @throws IllegalStateException if adjustable is not registered for synchronized scrolling */ - protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) throws IllegalStateException { + protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) { if (! synchronizedAdjustables.contains(adjustable)) throw new IllegalStateException(tr("Adjustable {0} not registered yet.", adjustable)); @@ -110,6 +110,6 @@ * @param view the checkbox to control whether an adjustable participates in synchronized adjustment * @param adjustable the adjustable - * @exception IllegalArgumentException thrown, if view is null - * @exception IllegalArgumentException thrown, if adjustable is null + * @throws IllegalArgumentException if view is null + * @throws IllegalArgumentException if adjustable is null */ public void adapt(final JCheckBox view, final Adjustable adjustable) { Index: trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java (revision 8291) @@ -154,6 +154,5 @@ * * - * @exception IllegalArgumentException if mode is an - * illegal file selection mode + * @throws IllegalArgumentException if mode is an illegal file selection mode */ public abstract void setFileSelectionMode(int selectionMode); @@ -197,6 +196,5 @@ * dialog is dismissed * - * @exception HeadlessException if GraphicsEnvironment.isHeadless() - * returns true. + * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true. * @see java.awt.GraphicsEnvironment#isHeadless */ @@ -218,6 +216,5 @@ * dialog is dismissed * - * @exception HeadlessException if GraphicsEnvironment.isHeadless() - * returns true. + * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true. * @see java.awt.GraphicsEnvironment#isHeadless */ Index: trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 8291) @@ -85,7 +85,7 @@ * * @param tc the text component. Must not be null. - * @throws IllegalArgumentException thrown if tc is null + * @throws IllegalArgumentException if tc is null */ - public AbstractTextComponentValidator(JTextComponent tc) throws IllegalArgumentException { + public AbstractTextComponentValidator(JTextComponent tc) { this(tc, true); } @@ -95,9 +95,9 @@ * This can be useful if the enter key stroke needs to be forwarded to the default button in a dialog. */ - public AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) throws IllegalArgumentException { + public AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) { this(tc, true, true, addActionListener); } - public AbstractTextComponentValidator(JTextComponent tc, boolean addFocusListener, boolean addDocumentListener, boolean addActionListener) throws IllegalArgumentException { + public AbstractTextComponentValidator(JTextComponent tc, boolean addFocusListener, boolean addDocumentListener, boolean addActionListener) { CheckParameterUtil.ensureParameterNotNull(tc, "tc"); this.tc = tc; Index: trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java (revision 8291) @@ -90,5 +90,5 @@ * is set to zero, the preferred width will be whatever * naturally results from the component implementation - * @exception IllegalArgumentException if columns < 0 + * @throws IllegalArgumentException if columns < 0 */ public DisableShortcutsOnFocusGainedTextField(Document doc, String text, int columns) { Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java (revision 8291) @@ -39,5 +39,5 @@ * * @param initialPage the URL - * @exception IOException if the URL is null or cannot be accessed + * @throws IOException if the URL is null or cannot be accessed */ public JosmEditorPane(URL initialPage) throws IOException { @@ -51,5 +51,5 @@ * * @param url the URL - * @exception IOException if the URL is null or cannot be accessed + * @throws IOException if the URL is null or cannot be accessed */ public JosmEditorPane(String url) throws IOException { @@ -65,5 +65,5 @@ * @param type mime type of the given text * @param text the text to initialize with; may be null - * @exception NullPointerException if the type parameter + * @throws NullPointerException if the type parameter * is null */ Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java (revision 8291) @@ -51,5 +51,5 @@ * @param rows the number of rows >= 0 * @param columns the number of columns >= 0 - * @exception IllegalArgumentException if the rows or columns + * @throws IllegalArgumentException if the rows or columns * arguments are negative. */ @@ -65,5 +65,5 @@ * @param rows the number of rows >= 0 * @param columns the number of columns >= 0 - * @exception IllegalArgumentException if the rows or columns + * @throws IllegalArgumentException if the rows or columns * arguments are negative. */ @@ -81,5 +81,5 @@ * @param rows the number of rows >= 0 * @param columns the number of columns >= 0 - * @exception IllegalArgumentException if the rows or columns + * @throws IllegalArgumentException if the rows or columns * arguments are negative. */ Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (revision 8291) @@ -43,5 +43,5 @@ * is set to zero, the preferred width will be whatever * naturally results from the component implementation - * @exception IllegalArgumentException if columns < 0 + * @throws IllegalArgumentException if columns < 0 */ public JosmTextField(Document doc, String text, int columns) { @@ -64,5 +64,5 @@ * naturally results from the component implementation * @param undoRedo Enables or not Undo/Redo feature. Not recommended for table cell editors, unless each cell provides its own editor - * @exception IllegalArgumentException if columns < 0 + * @throws IllegalArgumentException if columns < 0 */ public JosmTextField(Document doc, String text, int columns, boolean undoRedo) { Index: trunk/src/org/openstreetmap/josm/io/AbstractReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/AbstractReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/AbstractReader.java (revision 8291) @@ -52,5 +52,5 @@ */ protected final Map> relations = new HashMap<>(); - + /** * Replies the parsed data set @@ -61,5 +61,5 @@ return ds; } - + /** * Processes the parsed nodes after parsing. Just adds them to @@ -79,5 +79,5 @@ * adds the way to the dataset * - * @throws IllegalDataException thrown if a data integrity problem is detected + * @throws IllegalDataException if a data integrity problem is detected */ protected void processWaysAfterParsing() throws IllegalDataException{ @@ -119,7 +119,6 @@ * Completes the parsed relations with its members. * - * @throws IllegalDataException thrown if a data integrity problem is detected, i.e. if a + * @throws IllegalDataException if a data integrity problem is detected, i.e. if a * relation member refers to a local primitive which wasn't available in the data - * */ protected void processRelationsAfterParsing() throws IllegalDataException { @@ -191,5 +190,5 @@ } } - + protected final void prepareDataSet() throws IllegalDataException { try { Index: trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 8291) @@ -32,6 +32,5 @@ * @param query the query part * @return the query object - * @throws ChangesetQueryUrlException thrown if query doesn't consist of valid query parameters - * + * @throws ChangesetQueryUrlException if query doesn't consist of valid query parameters */ public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{ @@ -67,8 +66,8 @@ * @param uid the uid of the user. > 0 expected. * @return the query object with the applied restriction - * @throws IllegalArgumentException thrown if uid <= 0 + * @throws IllegalArgumentException if uid <= 0 * @see #forUser(String) */ - public ChangesetQuery forUser(int uid) throws IllegalArgumentException{ + public ChangesetQuery forUser(int uid) { if (uid <= 0) throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "uid", uid)); @@ -86,5 +85,5 @@ * @param username the username. Must not be null. * @return the query object with the applied restriction - * @throws IllegalArgumentException thrown if username is null. + * @throws IllegalArgumentException if username is null. * @see #forUser(int) */ @@ -133,8 +132,8 @@ * * @return the restricted changeset query - * @throws IllegalArgumentException thrown if either of the parameters isn't a valid longitude or + * @throws IllegalArgumentException if either of the parameters isn't a valid longitude or * latitude value */ - public ChangesetQuery inBbox(double minLon, double minLat, double maxLon, double maxLat) throws IllegalArgumentException{ + public ChangesetQuery inBbox(double minLon, double minLat, double maxLon, double maxLat) { if (!LatLon.isValidLon(minLon)) throw new IllegalArgumentException(tr("Illegal longitude value for parameter ''{0}'', got {1}", "minLon", minLon)); @@ -156,6 +155,6 @@ * * @return the restricted changeset query - * @throws IllegalArgumentException thrown if min is null - * @throws IllegalArgumentException thrown if max is null + * @throws IllegalArgumentException if min is null + * @throws IllegalArgumentException if max is null */ public ChangesetQuery inBbox(LatLon min, LatLon max) { @@ -171,7 +170,7 @@ * @param bbox the bounding box. Must not be null. * @return the changeset query - * @throws IllegalArgumentException thrown if bbox is null. - */ - public ChangesetQuery inBbox(Bounds bbox) throws IllegalArgumentException { + * @throws IllegalArgumentException if bbox is null. + */ + public ChangesetQuery inBbox(Bounds bbox) { CheckParameterUtil.ensureParameterNotNull(bbox, "bbox"); this.bounds = bbox; @@ -185,7 +184,7 @@ * @param d the date . Must not be null. * @return the restricted changeset query - * @throws IllegalArgumentException thrown if d is null - */ - public ChangesetQuery closedAfter(Date d) throws IllegalArgumentException{ + * @throws IllegalArgumentException if d is null + */ + public ChangesetQuery closedAfter(Date d) { CheckParameterUtil.ensureParameterNotNull(d, "d"); this.closedAfter = d; @@ -201,8 +200,8 @@ * @param createdBefore only reply changesets created before this date. Must not be null. * @return the restricted changeset query - * @throws IllegalArgumentException thrown if closedAfter is null - * @throws IllegalArgumentException thrown if createdBefore is null - */ - public ChangesetQuery closedAfterAndCreatedBefore(Date closedAfter, Date createdBefore ) throws IllegalArgumentException { + * @throws IllegalArgumentException if closedAfter is null + * @throws IllegalArgumentException if createdBefore is null + */ + public ChangesetQuery closedAfterAndCreatedBefore(Date closedAfter, Date createdBefore ) { CheckParameterUtil.ensureParameterNotNull(closedAfter, "closedAfter"); CheckParameterUtil.ensureParameterNotNull(createdBefore, "createdBefore"); @@ -241,5 +240,5 @@ * @param changesetIds the changeset ids * @return the query object with the applied restriction - * @throws IllegalArgumentException thrown if changesetIds is null. + * @throws IllegalArgumentException if changesetIds is null. */ public ChangesetQuery forChangesetIds(Collection changesetIds) { Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 8291) @@ -113,5 +113,5 @@ * @throws NoSuchElementException if ds does not include an {@link OsmPrimitive} with id=id */ - protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws IllegalArgumentException, NoSuchElementException{ + protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws NoSuchElementException{ CheckParameterUtil.ensureParameterNotNull(ds, "ds"); if (id <= 0) return; Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 8291) @@ -90,5 +90,5 @@ * @param serverUrl the server URL * @return the OsmApi - * @throws IllegalArgumentException thrown, if serverUrl is null + * @throws IllegalArgumentException if serverUrl is null * */ @@ -134,5 +134,5 @@ * * @param serverUrl the server URL. Must not be null - * @throws IllegalArgumentException thrown, if serverUrl is null + * @throws IllegalArgumentException if serverUrl is null */ protected OsmApi(String serverUrl) { @@ -417,5 +417,5 @@ * @param progressMonitor the progress monitor * @throws OsmTransferException signifying a non-200 return code, or connection errors - * @throws IllegalArgumentException thrown if changeset is null + * @throws IllegalArgumentException if changeset is null */ public void openChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException { @@ -487,6 +487,6 @@ * * @throws OsmTransferException if something goes wrong. - * @throws IllegalArgumentException thrown if changeset is null - * @throws IllegalArgumentException thrown if changeset.getId() <= 0 + * @throws IllegalArgumentException if changeset is null + * @throws IllegalArgumentException if changeset.getId() <= 0 */ public void closeChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException { @@ -756,6 +756,5 @@ * Ensures that the current changeset can be used for uploading data * - * @throws OsmTransferException thrown if the current changeset can't be used for - * uploading data + * @throws OsmTransferException if the current changeset can't be used for uploading data */ protected void ensureValidChangeset() throws OsmTransferException { @@ -781,6 +780,6 @@ * * @param changeset the changeset - * @throws IllegalArgumentException thrown if changeset.getId() <= 0 - * @throws IllegalArgumentException thrown if !changeset.isOpen() + * @throws IllegalArgumentException if changeset.getId() <= 0 + * @throws IllegalArgumentException if !changeset.isOpen() */ public void setChangeset(Changeset changeset) { Index: trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 8291) @@ -70,7 +70,7 @@ * Writes the prolog of the OsmChange document * - * @throws IllegalStateException thrown if the prologs has already been written + * @throws IllegalStateException if the prologs has already been written */ - public void start() throws IllegalStateException{ + public void start() { if (prologWritten) throw new IllegalStateException(tr("Prolog of OsmChange document already written. Please write only once.")); @@ -85,9 +85,9 @@ * * @param primitives the collection of primitives. Ignored if null. - * @throws IllegalStateException thrown if the prologs has not been written yet + * @throws IllegalStateException if the prologs has not been written yet * @see #start() * @see #append(IPrimitive) */ - public void append(Collection primitives) throws IllegalStateException{ + public void append(Collection primitives) { if (primitives == null) return; if (!prologWritten) @@ -102,8 +102,7 @@ * * @param p the primitive. Ignored if null. - * @throws IllegalStateException thrown if the prologs has not been written yet + * @throws IllegalStateException if the prologs has not been written yet * @see #start() * @see #append(Collection) - */ public void append(IPrimitive p) { @@ -117,7 +116,7 @@ * Writes the epilog of the OsmChange document * - * @throws IllegalStateException thrown if the prologs has not been written yet + * @throws IllegalStateException if the prologs has not been written yet */ - public void finish() throws IllegalStateException { + public void finish() { if (!prologWritten) throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write first.")); Index: trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java (revision 8291) @@ -103,6 +103,6 @@ * * @return the dataset with the parsed data - * @throws IllegalDataException thrown if the an error was found while parsing the data from the source - * @throws IllegalArgumentException thrown if source is null + * @throws IllegalDataException if the an error was found while parsing the data from the source + * @throws IllegalArgumentException if source is null */ public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException { Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 8291) @@ -269,5 +269,5 @@ * * @return the list of changesets - * @throws IllegalDataException thrown if the an error was found while parsing the data from the source + * @throws IllegalDataException if the an error was found while parsing the data from the source */ @SuppressWarnings("resource") Index: trunk/src/org/openstreetmap/josm/io/OsmConnection.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmConnection.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmConnection.java (revision 8291) @@ -73,5 +73,5 @@ * * @param con the connection - * @throws OsmTransferException thrown if something went wrong. Check for nested exceptions + * @throws OsmTransferException if something went wrong. Check for nested exceptions */ protected void addBasicAuthorizationHeader(HttpURLConnection con) throws OsmTransferException { @@ -110,6 +110,6 @@ * @param connection the connection * - * @throws OsmTransferException thrown if there is currently no OAuth Access Token configured - * @throws OsmTransferException thrown if signing fails + * @throws OsmTransferException if there is currently no OAuth Access Token configured + * @throws OsmTransferException if signing fails */ protected void addOAuthAuthorizationHeader(HttpURLConnection connection) throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/io/OsmExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmExporter.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmExporter.java (revision 8291) @@ -63,10 +63,10 @@ * @throws IllegalArgumentException if {@code layer} is not an instance of {@code OsmDataLayer} */ - public void exportData(File file, Layer layer, boolean noBackup) throws IllegalArgumentException { + public void exportData(File file, Layer layer, boolean noBackup) { checkOsmDataLayer(layer); save(file, (OsmDataLayer) layer, noBackup); } - protected static void checkOsmDataLayer(Layer layer) throws IllegalArgumentException { + protected static void checkOsmDataLayer(Layer layer) { if (!(layer instanceof OsmDataLayer)) { throw new IllegalArgumentException(MessageFormat.format("Expected instance of OsmDataLayer. Got ''{0}''.", layer Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 8291) @@ -644,6 +644,6 @@ * * @return the dataset with the parsed data - * @throws IllegalDataException thrown if the an error was found while parsing the data from the source - * @throws IllegalArgumentException thrown if source is null + * @throws IllegalDataException if the an error was found while parsing the data from the source + * @throws IllegalArgumentException if source is null */ public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException { Index: trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 8291) @@ -47,8 +47,8 @@ * @param primitive the primitive to be read. Must not be null. primitive.id > 0 expected * - * @exception IllegalArgumentException thrown if primitive is null - * @exception IllegalArgumentException thrown if primitive.id <= 0 - */ - public OsmServerBackreferenceReader(OsmPrimitive primitive) throws IllegalArgumentException { + * @throws IllegalArgumentException if primitive is null + * @throws IllegalArgumentException if primitive.id <= 0 + */ + public OsmServerBackreferenceReader(OsmPrimitive primitive) { CheckParameterUtil.ensureValidPrimitiveId(primitive, "primitive"); this.id = primitive.getId(); @@ -63,9 +63,8 @@ * @param type the type of the primitive. Must not be null. * - * @exception IllegalArgumentException thrown if id <= 0 - * @exception IllegalArgumentException thrown if type is null - * - */ - public OsmServerBackreferenceReader(long id, OsmPrimitiveType type) throws IllegalArgumentException { + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if type is null + */ + public OsmServerBackreferenceReader(long id, OsmPrimitiveType type) { if (id <= 0) throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id)); @@ -95,9 +94,8 @@ * @param readFull true, if referers should be read fully (i.e. including their immediate children) * - * @exception IllegalArgumentException thrown if id <= 0 - * @exception IllegalArgumentException thrown if type is null - * - */ - public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) throws IllegalArgumentException { + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if type is null + */ + public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) { this(id, type); this.readFull = readFull; @@ -185,5 +183,5 @@ * @param progressMonitor the progress monitor * @return the modified dataset - * @throws OsmTransferException thrown if an exception occurs. + * @throws OsmTransferException if an exception occurs. */ protected DataSet readIncompletePrimitives(DataSet ds, ProgressMonitor progressMonitor) throws OsmTransferException { @@ -224,5 +222,5 @@ * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null. * @return the dataset with the referring primitives - * @exception OsmTransferException thrown if an error occurs while communicating with the server + * @throws OsmTransferException if an error occurs while communicating with the server */ @Override Index: trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (revision 8291) @@ -58,6 +58,6 @@ * @param monitor a progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null * @return the list of changesets read from the server - * @throws IllegalArgumentException thrown if query is null - * @throws OsmTransferException thrown if something goes wrong w + * @throws IllegalArgumentException if query is null + * @throws OsmTransferException if something goes wrong w */ public List queryChangesets(ChangesetQuery query, ProgressMonitor monitor) throws OsmTransferException { @@ -96,5 +96,5 @@ * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null * @return the changeset read - * @throws OsmTransferException thrown if something goes wrong + * @throws OsmTransferException if something goes wrong * @throws IllegalArgumentException if id <= 0 * @since 7704 @@ -137,5 +137,5 @@ * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null * @return the changeset read - * @throws OsmTransferException thrown if something goes wrong + * @throws OsmTransferException if something goes wrong * @throws IllegalArgumentException if id <= 0 * @since 7704 @@ -187,8 +187,8 @@ * @param monitor the progress monitor. {@link NullProgressMonitor#INSTANCE} assumed if null. * @return the changeset content - * @throws IllegalArgumentException thrown if id <= 0 - * @throws OsmTransferException thrown if something went wrong - */ - public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws IllegalArgumentException, OsmTransferException { + * @throws IllegalArgumentException if id <= 0 + * @throws OsmTransferException if something went wrong + */ + public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws OsmTransferException { if (id <= 0) throw new IllegalArgumentException(MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id)); Index: trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (revision 8291) @@ -29,7 +29,7 @@ * @param id the id of the primitive * - * @exception IllegalArgumentException thrown, if type is null + * @throws IllegalArgumentException if type is null */ - public OsmServerHistoryReader(OsmPrimitiveType type, long id) throws IllegalArgumentException { + public OsmServerHistoryReader(OsmPrimitiveType type, long id) { CheckParameterUtil.ensureParameterNotNull(type, "type"); if (id < 0) @@ -52,5 +52,5 @@ * * @return the data set with the parsed history data - * @throws OsmTransferException thrown, if an exception occurs + * @throws OsmTransferException if an exception occurs */ public HistoryDataSet parseHistory(ProgressMonitor progressMonitor) throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (revision 8291) @@ -40,8 +40,8 @@ * @param full true, if a full download is requested (i.e. a download including * immediate children); false, otherwise - * @throws IllegalArgumentException thrown if id <= 0 - * @throws IllegalArgumentException thrown if type is null + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if type is null */ - public OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full) throws IllegalArgumentException { + public OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full) { this(id, type, full, -1); } @@ -53,12 +53,12 @@ * @param type the type. Must not be null. * @param version the specific version number, if required; -1, otherwise - * @throws IllegalArgumentException thrown if id <= 0 - * @throws IllegalArgumentException thrown if type is null + * @throws IllegalArgumentException if id <= 0 + * @throws IllegalArgumentException if type is null */ - public OsmServerObjectReader(long id, OsmPrimitiveType type, int version) throws IllegalArgumentException { + public OsmServerObjectReader(long id, OsmPrimitiveType type, int version) { this(id, type, false, version); } - protected OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full, int version) throws IllegalArgumentException { + protected OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full, int version) { if (id <= 0) throw new IllegalArgumentException(MessageFormat.format("Expected value > 0 for parameter ''{0}'', got {1}", "id", id)); @@ -75,6 +75,6 @@ * @param full true, if a full download is requested (i.e. a download including * immediate children); false, otherwise - * @throws IllegalArgumentException thrown if id is null - * @throws IllegalArgumentException thrown if id.getUniqueId() <= 0 + * @throws IllegalArgumentException if id is null + * @throws IllegalArgumentException if id.getUniqueId() <= 0 */ public OsmServerObjectReader(PrimitiveId id, boolean full) { @@ -87,6 +87,6 @@ * @param id the object id. Must not be null. Unique id > 0 required. * @param version the specific version number, if required; -1, otherwise - * @throws IllegalArgumentException thrown if id is null - * @throws IllegalArgumentException thrown if id.getUniqueId() <= 0 + * @throws IllegalArgumentException if id is null + * @throws IllegalArgumentException if id.getUniqueId() <= 0 */ public OsmServerObjectReader(PrimitiveId id, int version) { Index: trunk/src/org/openstreetmap/josm/io/OsmServerReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 8291) @@ -46,5 +46,5 @@ * @param progressMonitor progress monitoring and abort handler * @return A reader reading the input stream (servers answer) or null. - * @throws OsmTransferException thrown if data transfer errors occur + * @throws OsmTransferException if data transfer errors occur */ protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException { @@ -60,5 +60,5 @@ * @param reason The reason to show on console. Can be {@code null} if no reason is given * @return A reader reading the input stream (servers answer) or null. - * @throws OsmTransferException thrown if data transfer errors occur + * @throws OsmTransferException if data transfer errors occur */ protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException { @@ -86,5 +86,5 @@ * @param progressMonitor progress monitoring and abort handler * @return An reader reading the input stream (servers answer) or null. - * @throws OsmTransferException thrown if data transfer errors occur + * @throws OsmTransferException if data transfer errors occur */ protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException { @@ -99,5 +99,5 @@ * @param reason The reason to show on console. Can be {@code null} if no reason is given * @return An reader reading the input stream (servers answer) or null. - * @throws OsmTransferException thrown if data transfer errors occur + * @throws OsmTransferException if data transfer errors occur */ protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException { @@ -114,5 +114,5 @@ * for {@code filename} and uncompress a gzip/bzip2 stream. * @return An reader reading the input stream (servers answer) or null. - * @throws OsmTransferException thrown if data transfer errors occur + * @throws OsmTransferException if data transfer errors occur */ @SuppressWarnings("resource") Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 8291) @@ -83,5 +83,5 @@ * @param primitives the collection of primitives to upload * @param progressMonitor the progress monitor - * @throws OsmTransferException thrown if an exception occurs + * @throws OsmTransferException if an exception occurs */ protected void uploadChangesIndividually(Collection primitives, ProgressMonitor progressMonitor) throws OsmTransferException { @@ -125,5 +125,5 @@ * @param primitives the collection of primitives to upload * @param progressMonitor the progress monitor - * @throws OsmTransferException thrown if an exception occurs + * @throws OsmTransferException if an exception occurs */ protected void uploadChangesAsDiffUpload(Collection primitives, ProgressMonitor progressMonitor) throws OsmTransferException { @@ -144,6 +144,6 @@ * @param progressMonitor the progress monitor * @param chunkSize the size of the individual upload chunks. > 0 required. - * @throws IllegalArgumentException thrown if chunkSize <= 0 - * @throws OsmTransferException thrown if an exception occurs + * @throws IllegalArgumentException if chunkSize <= 0 + * @throws OsmTransferException if an exception occurs */ protected void uploadChangesInChunks(Collection primitives, ProgressMonitor progressMonitor, int chunkSize) throws OsmTransferException, IllegalArgumentException { @@ -186,7 +186,7 @@ * @param changeset the changeset the data is uploaded to. Must not be null. * @param monitor the progress monitor. If null, assumes {@link NullProgressMonitor#INSTANCE} - * @throws IllegalArgumentException thrown if changeset is null - * @throws IllegalArgumentException thrown if strategy is null - * @throws OsmTransferException thrown if something goes wrong + * @throws IllegalArgumentException if changeset is null + * @throws IllegalArgumentException if strategy is null + * @throws OsmTransferException if something goes wrong */ public void uploadOsm(UploadStrategySpecification strategy, Collection primitives, Changeset changeset, ProgressMonitor monitor) throws OsmTransferException { Index: trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java (revision 8291) @@ -28,5 +28,5 @@ * @param host the hostname for these credentials * @return the credentials - * @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface + * @throws CredentialsAgentException if a problem occurs in a implementation of this interface */ PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException; @@ -39,5 +39,5 @@ * @param host the hostname for these credentials * @param credentials the credentials - * @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface + * @throws CredentialsAgentException if a problem occurs in a implementation of this interface */ void store(RequestorType requestorType, String host, PasswordAuthentication credentials) throws CredentialsAgentException; @@ -50,5 +50,5 @@ * @param noSuccessWithLastResponse true, if the last request with the supplied credentials failed; false otherwise. * If true, implementations of this interface are advised to prompt the user for new credentials. - * @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface + * @throws CredentialsAgentException if a problem occurs in a implementation of this interface */ @@ -60,5 +60,5 @@ * * @return the current OAuth Access Token to access the OSM server. - * @throws CredentialsAgentException thrown if something goes wrong + * @throws CredentialsAgentException if something goes wrong */ OAuthToken lookupOAuthAccessToken() throws CredentialsAgentException; @@ -68,5 +68,5 @@ * * @param accessToken the access Token. null, to remove the Access Token. - * @throws CredentialsAgentException thrown if something goes wrong + * @throws CredentialsAgentException if something goes wrong */ void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsAgentException; Index: trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java (revision 8291) @@ -99,5 +99,5 @@ * * @return the current OAuth Access Token to access the OSM server. - * @throws CredentialsAgentException thrown if something goes wrong + * @throws CredentialsAgentException if something goes wrong */ @Override @@ -114,5 +114,5 @@ * * @param accessToken the access Token. null, to remove the Access Token. - * @throws CredentialsAgentException thrown if something goes wrong + * @throws CredentialsAgentException if something goes wrong */ @Override Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java (revision 8291) @@ -118,5 +118,5 @@ * * @param out the DER stream to encode the DNSName to. - * @exception IOException on encoding errors. + * @throws IOException on encoding errors. */ @Override Index: trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 8291) @@ -54,7 +54,7 @@ * @param toUpdate a collection of plugin descriptions for plugins to update/download. Must not be null. * @param title the title to display in the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} - * @throws IllegalArgumentException thrown if toUpdate is null - */ - public PluginDownloadTask(Component parent, Collection toUpdate, String title) throws IllegalArgumentException{ + * @throws IllegalArgumentException if toUpdate is null + */ + public PluginDownloadTask(Component parent, Collection toUpdate, String title) { super(parent, title == null ? "" : title, false /* don't ignore exceptions */); CheckParameterUtil.ensureParameterNotNull(toUpdate, "toUpdate"); @@ -68,5 +68,5 @@ * @param toUpdate a collection of plugin descriptions for plugins to update/download. Must not be null. * @param title the title to display in the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} - * @throws IllegalArgumentException thrown if toUpdate is null + * @throws IllegalArgumentException if toUpdate is null */ public PluginDownloadTask(ProgressMonitor monitor, Collection toUpdate, String title) { @@ -80,7 +80,7 @@ * * @param toUpdate the collection of plugins to update. Must not be null. - * @throws IllegalArgumentException thrown if toUpdate is null - */ - public void setPluginsToDownload(Collection toUpdate) throws IllegalArgumentException{ + * @throws IllegalArgumentException if toUpdate is null + */ + public void setPluginsToDownload(Collection toUpdate) { CheckParameterUtil.ensureParameterNotNull(toUpdate, "toUpdate"); this.toUpdate.clear(); Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 8291) @@ -883,9 +883,8 @@ * @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null. * @param displayErrMsg if {@code true}, a blocking error message is displayed in case of I/O exception. - * @throws IllegalArgumentException thrown if plugins is null + * @throws IllegalArgumentException if plugins is null */ public static Collection updatePlugins(Component parent, - Collection pluginsWanted, ProgressMonitor monitor, boolean displayErrMsg) - throws IllegalArgumentException { + Collection pluginsWanted, ProgressMonitor monitor, boolean displayErrMsg) { Collection plugins = null; pluginDownloadTask = null; Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 8291) @@ -106,5 +106,5 @@ * @param file the plugin jar * @param name the plugin name - * @throws PluginException thrown if reading the manifest file fails + * @throws PluginException if reading the manifest file fails */ public PluginInformation(File file, String name) throws PluginException { @@ -135,5 +135,5 @@ * @param name the plugin name * @param url the download URL for the plugin - * @throws PluginException thrown if the plugin information can't be read from the input stream + * @throws PluginException if the plugin information can't be read from the input stream */ public PluginInformation(InputStream manifestStream, String name, String url) throws PluginException { Index: trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java (revision 8291) @@ -55,5 +55,5 @@ * @param in the input stream from which to parse * @return the list of plugin information objects - * @throws PluginListParseException thrown if something goes wrong while parsing + * @throws PluginListParseException if something goes wrong while parsing */ public List parse(InputStream in) throws PluginListParseException{ Index: trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (revision 8291) @@ -106,6 +106,6 @@ * @param id the primitive id * @param parameterName the name of the parameter to be checked - * @throws IllegalArgumentException thrown if id is null - * @throws IllegalArgumentException thrown if id.getType() != NODE + * @throws IllegalArgumentException if id is null + * @throws IllegalArgumentException if id.getType() != NODE */ public static void ensureValidNodeId(PrimitiveId id, String parameterName) throws IllegalArgumentException { Index: trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 8291) @@ -34,5 +34,5 @@ * @param uri The URI to display * @return null for success or a string in case of an error. - * @throws IllegalStateException thrown if no platform is set to which opening the URL can be dispatched, + * @throws IllegalStateException if no platform is set to which opening the URL can be dispatched, * {@link Main#platform} */ @@ -81,5 +81,5 @@ * @param url The URL to display * @return null for success or a string in case of an error. - * @throws IllegalStateException thrown if no platform is set to which opening the URL can be dispatched, + * @throws IllegalStateException if no platform is set to which opening the URL can be dispatched, * {@link Main#platform} */ Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 8291) @@ -22,5 +22,5 @@ } - public static Bounds parse(String url) throws IllegalArgumentException { + public static Bounds parse(String url) { try { // a percent sign indicates an encoded URL (RFC 1738). @@ -83,5 +83,5 @@ * @return Bounds if hashurl, {@code null} otherwise */ - private static Bounds parseHashURLs(String url) throws IllegalArgumentException { + private static Bounds parseHashURLs(String url) { int startIndex = url.indexOf("#map="); if (startIndex == -1) return null; Index: trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 8291) @@ -353,6 +353,6 @@ * @param out The destination file * @return the path to the target file - * @throws java.io.IOException If any I/O error occurs - * @throws IllegalArgumentException If {@code in} or {@code out} is {@code null} + * @throws IOException if any I/O error occurs + * @throws IllegalArgumentException if {@code in} or {@code out} is {@code null} * @since 7003 */ @@ -367,6 +367,6 @@ * @param in The source directory * @param out The destination directory - * @throws IOException If any I/O error ooccurs - * @throws IllegalArgumentException If {@code in} or {@code out} is {@code null} + * @throws IOException if any I/O error ooccurs + * @throws IllegalArgumentException if {@code in} or {@code out} is {@code null} * @since 7835 */ Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 8290) +++ trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 8291) @@ -222,5 +222,5 @@ * * @param preferenceKey the preference key - * @throws WindowGeometryException thrown if no such key exist or if the preference value has + * @throws WindowGeometryException if no such key exist or if the preference value has * an illegal format */