Changeset 8291 in josm
- Timestamp:
- 2015-04-29T01:44:01+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 136 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r8168 r8291 661 661 662 662 @Override 663 public void close() throws SecurityException{663 public void close() { 664 664 } 665 665 }); -
trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
r7434 r8291 117 117 * 118 118 * @return the user info 119 * @throws OsmTransferException thrownin case of any communication exception119 * @throws OsmTransferException in case of any communication exception 120 120 */ 121 121 protected UserInfo fetchUserInfo() throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
r6883 r8291 42 42 * Does nothing if primitives is null or empty. 43 43 * 44 * @param targetLayer 44 * @param targetLayer the target layer. Must not be null. 45 45 * @param children the collection of child primitives. 46 * @ exception IllegalArgumentException thrown if targetLayer is null46 * @throws IllegalArgumentException if targetLayer is null 47 47 */ 48 public static void downloadReferrers(OsmDataLayer targetLayer, Collection<OsmPrimitive> children) throws IllegalArgumentException{48 public static void downloadReferrers(OsmDataLayer targetLayer, Collection<OsmPrimitive> children) { 49 49 if (children == null || children.isEmpty()) return; 50 50 Main.worker.submit(new DownloadReferrersTask(targetLayer, children)); … … 56 56 * Does nothing if primitives is null or empty. 57 57 * 58 * @param targetLayer 58 * @param targetLayer the target layer. Must not be null. 59 59 * @param children the collection of primitives, given as map of ids and types 60 * @ exception IllegalArgumentException thrown if targetLayer is null60 * @throws IllegalArgumentException if targetLayer is null 61 61 */ 62 public static void downloadReferrers(OsmDataLayer targetLayer, Map<Long, OsmPrimitiveType> children) throws IllegalArgumentException{62 public static void downloadReferrers(OsmDataLayer targetLayer, Map<Long, OsmPrimitiveType> children) { 63 63 if (children == null || children.isEmpty()) return; 64 64 Main.worker.submit(new DownloadReferrersTask(targetLayer, children)); … … 66 66 67 67 /** 68 * Downloads the primitives referring to the primitive given by <code>id</code> and 69 * <code>type</code>. 68 * Downloads the primitives referring to the primitive given by <code>id</code> and <code>type</code>. 70 69 * 71 * @param targetLayer 70 * @param targetLayer the target layer. Must not be null. 72 71 * @param id the primitive id. id > 0 required. 73 72 * @param type the primitive type. type != null required 74 * @ exception IllegalArgumentException thrown if targetLayer is null75 * @ exception IllegalArgumentException thrown if id <= 076 * @ exception IllegalArgumentException thrown if type == null73 * @throws IllegalArgumentException if targetLayer is null 74 * @throws IllegalArgumentException if id <= 0 75 * @throws IllegalArgumentException if type == null 77 76 */ 78 public static void downloadReferrers(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException{77 public static void downloadReferrers(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) { 79 78 if (id <= 0) 80 79 throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id)); -
trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java
r7414 r8291 73 73 * 74 74 * @param layer the layer 75 * @ exception IllegalArgumentException thrown if layer is null76 * @ exception IllegalArgumentException thrown if layer is neither an instance of {@link OsmDataLayer}75 * @throws IllegalArgumentException if layer is null 76 * @throws IllegalArgumentException if layer is neither an instance of {@link OsmDataLayer} 77 77 * nor of {@link GpxLayer} 78 78 */ -
trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
r7859 r8291 254 254 * @param nodes the collection of nodes. Ignored if null 255 255 * @param targetLocationNode this node's location will be used for the target node 256 * @throws IllegalArgumentException thrownif {@code layer} is null256 * @throws IllegalArgumentException if {@code layer} is null 257 257 */ 258 258 public static void doMergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetLocationNode) { … … 284 284 * @param targetLocationNode this node's location will be used for the targetNode. 285 285 * @return The command necessary to run in order to perform action, or {@code null} if there is nothing to do 286 * @throws IllegalArgumentException thrownif {@code layer} is null286 * @throws IllegalArgumentException if {@code layer} is null 287 287 */ 288 288 public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetLocationNode) { … … 304 304 * @param targetLocationNode this node's location will be used for the targetNode. 305 305 * @return The command necessary to run in order to perform action, or {@code null} if there is nothing to do 306 * @throws IllegalArgumentException thrownif layer is null306 * @throws IllegalArgumentException if layer is null 307 307 */ 308 308 public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetNode, Node targetLocationNode) { -
trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
r7434 r8291 65 65 * 66 66 * @param id the id of a primitive in the {@link DataSet} of the current edit layer. Must not be null. 67 * @throws IllegalArgumentException thrown if id is null 68 * @exception IllegalStateException thrown if there is no primitive with <code>id</code> in 69 * the current dataset 70 * @exception IllegalStateException thrown if there is no current dataset 71 * 67 * @throws IllegalArgumentException if id is null 68 * @throws IllegalStateException if there is no primitive with <code>id</code> in the current dataset 69 * @throws IllegalStateException if there is no current dataset 72 70 */ 73 public static void updatePrimitive(PrimitiveId id) throws IllegalStateException, IllegalArgumentException{71 public static void updatePrimitive(PrimitiveId id) { 74 72 ensureParameterNotNull(id, "id"); 75 73 if (getEditLayer() == null) -
trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
r7005 r8291 38 38 /** 39 39 * Uploads the current selection to the server. 40 * 40 * @since 2250 41 41 */ 42 public class UploadSelectionAction extends JosmAction{ 42 public class UploadSelectionAction extends JosmAction { 43 /** 44 * Constructs a new {@code UploadSelectionAction}. 45 */ 43 46 public UploadSelectionAction() { 44 47 super( … … 239 242 * @param base the base collection. Must not be null. 240 243 * @return the "hull" 241 * @throws IllegalArgumentException thrownif base is null244 * @throws IllegalArgumentException if base is null 242 245 */ 243 public Set<OsmPrimitive> build(Collection<OsmPrimitive> base) throws IllegalArgumentException{246 public Set<OsmPrimitive> build(Collection<OsmPrimitive> base) { 244 247 CheckParameterUtil.ensureParameterNotNull(base, "base"); 245 248 hull = new HashSet<>(); -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java
r7005 r8291 38 38 /** 39 39 * The asynchronous task for downloading referring primitives 40 * 40 * @since 2923 41 41 */ 42 42 public class DownloadReferrersTask extends PleaseWaitRunnable { … … 56 56 * @param targetLayer the target layer for the downloaded primitives. Must not be null. 57 57 * @param children the collection of child primitives for which parents are to be downloaded 58 *59 58 */ 60 59 public DownloadReferrersTask(OsmDataLayer targetLayer, Collection<OsmPrimitive> children) { … … 103 102 * @param id the primitive id. id > 0 required. 104 103 * @param type the primitive type. type != null required 105 * @exception IllegalArgumentException thrown if id <= 0 106 * @exception IllegalArgumentException thrown if type == null 107 * @exception IllegalArgumentException thrown if targetLayer == null 108 * 109 */ 110 public DownloadReferrersTask(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException { 104 * @throws IllegalArgumentException if id <= 0 105 * @throws IllegalArgumentException if type == null 106 * @throws IllegalArgumentException if targetLayer == null 107 */ 108 public DownloadReferrersTask(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) { 111 109 super("Download referrers", false /* don't ignore exception*/); 112 110 CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer"); … … 126 124 * @param targetLayer the target layer. Must not be null. 127 125 * @param primitiveId a PrimitiveId object. 128 * @exception IllegalArgumentException thrown if id <= 0 129 * @exception IllegalArgumentException thrown if targetLayer == null 130 * 131 */ 132 public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId) throws IllegalArgumentException { 126 * @throws IllegalArgumentException if id <= 0 127 * @throws IllegalArgumentException if targetLayer == null 128 */ 129 public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId) { 133 130 this(targetLayer, primitiveId, null); 134 131 } … … 140 137 * @param primitiveId a PrimitiveId object. 141 138 * @param progressMonitor ProgressMonitor to use or null to create a new one. 142 * @exception IllegalArgumentException thrown if id <= 0 143 * @exception IllegalArgumentException thrown if targetLayer == null 144 * 139 * @throws IllegalArgumentException if id <= 0 140 * @throws IllegalArgumentException if targetLayer == null 145 141 */ 146 142 public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId, 147 ProgressMonitor progressMonitor) throws IllegalArgumentException{143 ProgressMonitor progressMonitor) { 148 144 super("Download referrers", progressMonitor, false /* don't ignore exception*/); 149 145 CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer"); 150 146 if (primitiveId.isNew()) 151 throw new IllegalArgumentException(MessageFormat.format("Cannot download referrers for new primitives (ID {0})", primitiveId.getUniqueId())); 147 throw new IllegalArgumentException(MessageFormat.format( 148 "Cannot download referrers for new primitives (ID {0})", primitiveId.getUniqueId())); 152 149 canceled = false; 153 150 this.children = new HashMap<>(); -
trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
r8285 r8291 321 321 * @param layer the layer in whose context the relation is deleted. Must not be null. 322 322 * @param toDelete the relation to be deleted. Must not be null. 323 * @ exception IllegalArgumentException thrown if layer is null324 * @ exception IllegalArgumentException thrown if toDelete is nul323 * @throws IllegalArgumentException if layer is null 324 * @throws IllegalArgumentException if toDelete is nul 325 325 */ 326 326 public static void deleteRelation(OsmDataLayer layer, Relation toDelete) { -
trunk/src/org/openstreetmap/josm/command/Command.java
r8285 r8291 119 119 * 120 120 * @param layer the data layer. Must not be null. 121 * @throws IllegalArgumentException thrownif layer is null122 */ 123 public Command(OsmDataLayer layer) throws IllegalArgumentException{121 * @throws IllegalArgumentException if layer is null 122 */ 123 public Command(OsmDataLayer layer) { 124 124 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); 125 125 this.layer = layer; -
trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
r7675 r8291 57 57 * 58 58 * @param data the primitives to delete. Must neither be null nor empty. 59 * @throws IllegalArgumentException thrownif data is null or empty60 */ 61 public DeleteCommand(Collection<? extends OsmPrimitive> data) throws IllegalArgumentException{59 * @throws IllegalArgumentException if data is null or empty 60 */ 61 public DeleteCommand(Collection<? extends OsmPrimitive> data) { 62 62 CheckParameterUtil.ensureParameterNotNull(data, "data"); 63 63 if (data.isEmpty()) … … 71 71 * 72 72 * @param data the primitive to delete. Must not be null. 73 * @throws IllegalArgumentException thrownif data is null74 */ 75 public DeleteCommand(OsmPrimitive data) throws IllegalArgumentException{73 * @throws IllegalArgumentException if data is null 74 */ 75 public DeleteCommand(OsmPrimitive data) { 76 76 this(Collections.singleton(data)); 77 77 } … … 83 83 * @param layer the layer context for deleting this primitive. Must not be null. 84 84 * @param data the primitive to delete. Must not be null. 85 * @throws IllegalArgumentException thrownif data is null86 * @throws IllegalArgumentException thrownif layer is null87 */ 88 public DeleteCommand(OsmDataLayer layer, OsmPrimitive data) throws IllegalArgumentException{85 * @throws IllegalArgumentException if data is null 86 * @throws IllegalArgumentException if layer is null 87 */ 88 public DeleteCommand(OsmDataLayer layer, OsmPrimitive data) { 89 89 this(layer, Collections.singleton(data)); 90 90 } … … 96 96 * @param layer the layer context for deleting these primitives. Must not be null. 97 97 * @param data the primitives to delete. Must neither be null nor empty. 98 * @throws IllegalArgumentException thrownif layer is null99 * @throws IllegalArgumentException thrownif data is null or empty100 */ 101 public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) throws IllegalArgumentException{98 * @throws IllegalArgumentException if layer is null 99 * @throws IllegalArgumentException if data is null or empty 100 */ 101 public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) { 102 102 super(layer); 103 103 CheckParameterUtil.ensureParameterNotNull(data, "data"); … … 246 246 * @param silent Set to true if the user should not be bugged with additional dialogs 247 247 * @return command A command to perform the deletions, or null of there is nothing to delete. 248 * @throws IllegalArgumentException thrownif layer is null249 */ 250 public static Command deleteWithReferences(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection, boolean silent) throws IllegalArgumentException{248 * @throws IllegalArgumentException if layer is null 249 */ 250 public static Command deleteWithReferences(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection, boolean silent) { 251 251 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); 252 252 if (selection == null || selection.isEmpty()) return null; … … 271 271 * @param selection The list of all object to be deleted. 272 272 * @return command A command to perform the deletions, or null of there is nothing to delete. 273 * @throws IllegalArgumentException thrownif layer is null273 * @throws IllegalArgumentException if layer is null 274 274 */ 275 275 public static Command deleteWithReferences(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection) { -
trunk/src/org/openstreetmap/josm/data/APIDataSet.java
r7599 r8291 215 215 * dependencies can't be uploaded. 216 216 * 217 * @throws CyclicUploadDependencyException thrown,if a cyclic dependency is detected217 * @throws CyclicUploadDependencyException if a cyclic dependency is detected 218 218 */ 219 219 public void adjustRelationUploadOrder() throws CyclicUploadDependencyException{ -
trunk/src/org/openstreetmap/josm/data/Bounds.java
r6830 r8291 164 164 } 165 165 166 public Bounds(String asString, String separator) throws IllegalArgumentException{166 public Bounds(String asString, String separator) { 167 167 this(asString, separator, ParseMethod.MINLAT_MINLON_MAXLAT_MAXLON); 168 168 } 169 169 170 public Bounds(String asString, String separator, ParseMethod parseMethod) throws IllegalArgumentException{170 public Bounds(String asString, String separator, ParseMethod parseMethod) { 171 171 this(asString, separator, parseMethod, true); 172 172 } 173 173 174 public Bounds(String asString, String separator, ParseMethod parseMethod, boolean roundToOsmPrecision) throws IllegalArgumentException{174 public Bounds(String asString, String separator, ParseMethod parseMethod, boolean roundToOsmPrecision) { 175 175 CheckParameterUtil.ensureParameterNotNull(asString, "asString"); 176 176 String[] components = asString.split(separator); … … 234 234 * @param latExtent the latitude extent. > 0 required. 235 235 * @param lonExtent the longitude extent. > 0 required. 236 * @throws IllegalArgumentException thrownif center is null237 * @throws IllegalArgumentException thrownif latExtent <= 0238 * @throws IllegalArgumentException thrownif lonExtent <= 0236 * @throws IllegalArgumentException if center is null 237 * @throws IllegalArgumentException if latExtent <= 0 238 * @throws IllegalArgumentException if lonExtent <= 0 239 239 */ 240 240 public Bounds(LatLon center, double latExtent, double lonExtent) { -
trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
r8186 r8291 92 92 93 93 @Override 94 public void close() throws SecurityException{94 public void close() { 95 95 } 96 96 }); -
trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
r8286 r8291 7 7 import java.io.InputStream; 8 8 import java.net.HttpURLConnection; 9 import java.net.MalformedURLException;10 9 import java.net.URL; 11 10 import java.net.URLConnection; … … 378 377 } 379 378 380 private HttpURLConnection getURLConnection() throws IOException , MalformedURLException{379 private HttpURLConnection getURLConnection() throws IOException { 381 380 HttpURLConnection urlConn = (HttpURLConnection) getUrl().openConnection(); 382 381 urlConn.setRequestProperty("Accept", "text/html, image/png, image/jpeg, image/gif, */*"); -
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r7509 r8291 102 102 * 103 103 * @param conflict the conflict 104 * @exception IllegalStateException thrown, if this collection already includes a 105 * conflict for conflict.getMy() 106 */ 107 protected void addConflict(Conflict<?> conflict) throws IllegalStateException { 104 * @throws IllegalStateException if this collection already includes a conflict for conflict.getMy() 105 */ 106 protected void addConflict(Conflict<?> conflict) { 108 107 if (hasConflictForMy(conflict.getMy())) 109 108 throw new IllegalStateException(tr("Already registered a conflict for primitive ''{0}''.", conflict.getMy().toString())); … … 117 116 * 118 117 * @param conflict the conflict to add. Must not be null. 119 * @throws IllegalArgumentException thrown, if conflict is null 120 * @throws IllegalStateException thrown if this collection already includes a conflict for conflict.getMy() 121 * 122 */ 123 public void add(Conflict<?> conflict) throws IllegalStateException { 118 * @throws IllegalArgumentException if conflict is null 119 * @throws IllegalStateException if this collection already includes a conflict for conflict.getMy() 120 */ 121 public void add(Conflict<?> conflict) { 124 122 CheckParameterUtil.ensureParameterNotNull(conflict, "conflict"); 125 123 addConflict(conflict); -
trunk/src/org/openstreetmap/josm/data/imagery/Shape.java
r7509 r8291 23 23 private List<Coordinate> coords = new ArrayList<>(); 24 24 25 public Shape(String asString, String separator) throws IllegalArgumentException{25 public Shape(String asString, String separator) { 26 26 CheckParameterUtil.ensureParameterNotNull(asString, "asString"); 27 27 String[] components = asString.split(separator); … … 61 61 } 62 62 63 public void addPoint(String sLat, String sLon) throws IllegalArgumentException{63 public void addPoint(String sLat, String sLon) { 64 64 CheckParameterUtil.ensureParameterNotNull(sLat, "sLat"); 65 65 CheckParameterUtil.ensureParameterNotNull(sLon, "sLon"); -
trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
r6897 r8291 119 119 * 120 120 * @param other the other parameters. Must not be null. 121 * @throws IllegalArgumentException thrownif other is null122 */ 123 public OAuthParameters(OAuthParameters other) throws IllegalArgumentException{121 * @throws IllegalArgumentException if other is null 122 */ 123 public OAuthParameters(OAuthParameters other) { 124 124 CheckParameterUtil.ensureParameterNotNull(other, "other"); 125 125 this.consumerKey = other.consumerKey; … … 226 226 * @throws IllegalArgumentException if consumer is null 227 227 */ 228 public OAuthProvider buildProvider(OAuthConsumer consumer) throws IllegalArgumentException{228 public OAuthProvider buildProvider(OAuthConsumer consumer) { 229 229 CheckParameterUtil.ensureParameterNotNull(consumer, "consumer"); 230 230 return new DefaultOAuthProvider( -
trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
r6883 r8291 36 36 * 37 37 * @param other the other token. Must not be null. 38 * @throws IllegalArgumentException thrownif other is null38 * @throws IllegalArgumentException if other is null 39 39 */ 40 public OAuthToken(OAuthToken other) throws IllegalArgumentException{40 public OAuthToken(OAuthToken other) { 41 41 CheckParameterUtil.ensureParameterNotNull(other, "other"); 42 42 this.key = other.key; -
trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
r8290 r8291 187 187 * @param id the id. > 0 required 188 188 * @param version the version > 0 required 189 * @throws IllegalArgumentException thrownif id <= 0190 * @throws IllegalArgumentException thrownif version <= 0191 * @throws DataIntegrityProblemException If id is changed and primitive was already added to the dataset189 * @throws IllegalArgumentException if id <= 0 190 * @throws IllegalArgumentException if version <= 0 191 * @throws DataIntegrityProblemException if id is changed and primitive was already added to the dataset 192 192 */ 193 193 @Override … … 258 258 * 259 259 * @param changesetId the id. >= 0 required. 260 * @throws IllegalStateException thrownif this primitive is new.261 * @throws IllegalArgumentException thrownif id < 0262 */ 263 @Override 264 public void setChangesetId(int changesetId) throws IllegalStateException, IllegalArgumentException{260 * @throws IllegalStateException if this primitive is new. 261 * @throws IllegalArgumentException if id < 0 262 */ 263 @Override 264 public void setChangesetId(int changesetId) { 265 265 if (this.changesetId == changesetId) 266 266 return; … … 396 396 * 397 397 * @see #isVisible() 398 * @throws IllegalStateException thrown if visible is set to false on an primitive with 399 * id==0 400 */ 401 @Override 402 public void setVisible(boolean visible) throws IllegalStateException{ 398 * @throws IllegalStateException if visible is set to false on an primitive with id==0 399 */ 400 @Override 401 public void setVisible(boolean visible) { 403 402 if (isNew() && !visible) 404 403 throw new IllegalStateException(tr("A primitive with ID = 0 cannot be invisible.")); -
trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
r7005 r8291 6 6 import java.util.Iterator; 7 7 import java.util.Map; 8 import java.util.Map.Entry; 8 9 import java.util.Set; 9 import java.util.Map.Entry;10 10 11 11 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive; … … 36 36 * @param primitive the primitive. Must not be null. 37 37 * @param cmt the modification type. Must not be null. 38 * @throws IllegalArgumentException thrownif primitive is null39 * @throws IllegalArgumentException thrownif cmt is null38 * @throws IllegalArgumentException if primitive is null 39 * @throws IllegalArgumentException if cmt is null 40 40 */ 41 public void put(HistoryOsmPrimitive primitive, ChangesetModificationType cmt) throws IllegalArgumentException{41 public void put(HistoryOsmPrimitive primitive, ChangesetModificationType cmt) { 42 42 CheckParameterUtil.ensureParameterNotNull(primitive,"primitive"); 43 43 CheckParameterUtil.ensureParameterNotNull(cmt,"cmt"); … … 112 112 * @param cmt the modification type. Must not be null. 113 113 * @return the set of primitives 114 * @throws IllegalArgumentException thrownif cmt is null114 * @throws IllegalArgumentException if cmt is null 115 115 */ 116 public Set<HistoryOsmPrimitive> getPrimitivesByModificationType(ChangesetModificationType cmt) throws IllegalArgumentException{116 public Set<HistoryOsmPrimitive> getPrimitivesByModificationType(ChangesetModificationType cmt) { 117 117 CheckParameterUtil.ensureParameterNotNull(cmt,"cmt"); 118 118 HashSet<HistoryOsmPrimitive> ret = new HashSet<>(); -
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r7816 r8291 936 936 * @param type the type of the primitive. Must not be null. 937 937 * @return the primitive 938 * @ exception NullPointerException thrown,if type is null938 * @throws NullPointerException if type is null 939 939 */ 940 940 public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type) { -
trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
r7005 r8291 52 52 * @param targetDataSet dataset with my primitives. Must not be null. 53 53 * @param sourceDataSet dataset with their primitives. Ignored, if null. 54 * @throws IllegalArgumentException thrownif myDataSet is null55 */ 56 public DataSetMerger(DataSet targetDataSet, DataSet sourceDataSet) throws IllegalArgumentException{54 * @throws IllegalArgumentException if myDataSet is null 55 */ 56 public DataSetMerger(DataSet targetDataSet, DataSet sourceDataSet) { 57 57 CheckParameterUtil.ensureParameterNotNull(targetDataSet, "targetDataSet"); 58 58 this.targetDataSet = targetDataSet; … … 124 124 } 125 125 126 protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException{126 protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) { 127 127 PrimitiveId targetId = mergedMap.get(mergeSource.getPrimitiveId()); 128 128 if (targetId == null) … … 229 229 * 230 230 * @param source the source way 231 * @throws IllegalStateException thrownif no target way can be found for the source way232 * @throws IllegalStateException thrownif there isn't a target node for one of the nodes in the source way233 * 234 */ 235 private void mergeNodeList(Way source) throws IllegalStateException{231 * @throws IllegalStateException if no target way can be found for the source way 232 * @throws IllegalStateException if there isn't a target node for one of the nodes in the source way 233 * 234 */ 235 private void mergeNodeList(Way source) { 236 236 Way target = (Way)getMergeTarget(source); 237 237 if (target == null) … … 256 256 * Merges the relation members of a source relation onto the corresponding target relation. 257 257 * @param source the source relation 258 * @throws IllegalStateException thrownif there is no corresponding target relation259 * @throws IllegalStateException thrownif there isn't a corresponding target object for one of the relation258 * @throws IllegalStateException if there is no corresponding target relation 259 * @throws IllegalStateException if there isn't a corresponding target object for one of the relation 260 260 * members in source 261 261 */ 262 private void mergeRelationMembers(Relation source) throws IllegalStateException{262 private void mergeRelationMembers(Relation source) { 263 263 Relation target = (Relation) getMergeTarget(source); 264 264 if (target == null) -
trunk/src/org/openstreetmap/josm/data/osm/Node.java
r7828 r8291 147 147 * @throws IllegalArgumentException if id < 0 148 148 */ 149 public Node(long id) throws IllegalArgumentException{149 public Node(long id) { 150 150 super(id, false); 151 151 } … … 157 157 * @throws IllegalArgumentException if id < 0 158 158 */ 159 public Node(long id, int version) throws IllegalArgumentException{159 public Node(long id, int version) { 160 160 super(id, version, false); 161 161 } … … 235 235 * 236 236 * @param other the other primitive. Must not be null. 237 * @throws IllegalArgumentException thrownif other is null.238 * @throws DataIntegrityProblemException thrownif either this is new and other is not, or other is new and this is not239 * @throws DataIntegrityProblemException thrownif other is new and other.getId() != this.getId()237 * @throws IllegalArgumentException if other is null. 238 * @throws DataIntegrityProblemException if either this is new and other is not, or other is new and this is not 239 * @throws DataIntegrityProblemException if other is new and other.getId() != this.getId() 240 240 */ 241 241 @Override -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r7621 r8291 247 247 * @param id the id 248 248 * @param allowNegativeId 249 * @throws IllegalArgumentException thrownif id < 0 and allowNegativeId is false250 */ 251 protected OsmPrimitive(long id, boolean allowNegativeId) throws IllegalArgumentException{249 * @throws IllegalArgumentException if id < 0 and allowNegativeId is false 250 */ 251 protected OsmPrimitive(long id, boolean allowNegativeId) { 252 252 if (allowNegativeId) { 253 253 this.id = id; … … 278 278 * @param version 279 279 * @param allowNegativeId 280 * @throws IllegalArgumentException thrownif id < 0 and allowNegativeId is false281 */ 282 protected OsmPrimitive(long id, int version, boolean allowNegativeId) throws IllegalArgumentException{280 * @throws IllegalArgumentException if id < 0 and allowNegativeId is false 281 */ 282 protected OsmPrimitive(long id, int version, boolean allowNegativeId) { 283 283 this(id, allowNegativeId); 284 284 this.version = (id > 0 ? version : 0); … … 358 358 * @param id the id. > 0 required 359 359 * @param version the version > 0 required 360 * @throws IllegalArgumentException thrownif id <= 0361 * @throws IllegalArgumentException thrownif version <= 0362 * @throws DataIntegrityProblemException If id is changed and primitive was already added to the dataset360 * @throws IllegalArgumentException if id <= 0 361 * @throws IllegalArgumentException if version <= 0 362 * @throws DataIntegrityProblemException if id is changed and primitive was already added to the dataset 363 363 */ 364 364 @Override … … 411 411 412 412 @Override 413 public void setChangesetId(int changesetId) throws IllegalStateException, IllegalArgumentException{413 public void setChangesetId(int changesetId) { 414 414 boolean locked = writeLock(); 415 415 try { … … 543 543 544 544 @Override 545 public void setVisible(boolean visible) throws IllegalStateException{545 public void setVisible(boolean visible) { 546 546 boolean locked = writeLock(); 547 547 try { … … 1132 1132 * 1133 1133 * @param other the other primitive. Must not be null. 1134 * @throws IllegalArgumentException thrownif other is null.1135 * @throws DataIntegrityProblemException thrownif either this is new and other is not, or other is new and this is not1136 * @throws DataIntegrityProblemException thrownif other isn't new and other.getId() != this.getId()1134 * @throws IllegalArgumentException if other is null. 1135 * @throws DataIntegrityProblemException if either this is new and other is not, or other is new and this is not 1136 * @throws DataIntegrityProblemException if other isn't new and other.getId() != this.getId() 1137 1137 */ 1138 1138 public void mergeFrom(OsmPrimitive other) { -
trunk/src/org/openstreetmap/josm/data/osm/Relation.java
r7796 r8291 210 210 * 211 211 * @param id the id. > 0 required 212 * @throws IllegalArgumentException thrownif id < 0213 */ 214 public Relation(long id) throws IllegalArgumentException{212 * @throws IllegalArgumentException if id < 0 213 */ 214 public Relation(long id) { 215 215 super(id, false); 216 216 } -
trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java
r7864 r8291 128 128 * @param role Can be null, in this case it's save as "" 129 129 * @param member Cannot be null 130 * @throws IllegalArgumentException thrownif member is <code>null</code>130 * @throws IllegalArgumentException if member is <code>null</code> 131 131 */ 132 132 public RelationMember(String role, OsmPrimitive member) { -
trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java
r7743 r8291 597 597 * 598 598 * @param primitive the primitive 599 * @throws IllegalStateException thrownif this tag collection can't be applied599 * @throws IllegalStateException if this tag collection can't be applied 600 600 * because there are keys with multiple values 601 601 */ 602 public void applyTo(Tagged primitive) throws IllegalStateException{602 public void applyTo(Tagged primitive) { 603 603 if (primitive == null) return; 604 604 if (! isApplicableToPrimitive()) … … 617 617 * primitives is null 618 618 * 619 * @param primitives 620 * @throws IllegalStateException thrownif this tag collection can't be applied619 * @param primitives the collection of primitives 620 * @throws IllegalStateException if this tag collection can't be applied 621 621 * because there are keys with multiple values 622 622 */ 623 public void applyTo(Collection<? extends Tagged> primitives) throws IllegalStateException{623 public void applyTo(Collection<? extends Tagged> primitives) { 624 624 if (primitives == null) return; 625 625 if (! isApplicableToPrimitive()) … … 635 635 * 636 636 * @param primitive the primitive 637 * @throws IllegalStateException thrownif this tag collection can't be applied637 * @throws IllegalStateException if this tag collection can't be applied 638 638 * because there are keys with multiple values 639 639 */ 640 public void replaceTagsOf(Tagged primitive) throws IllegalStateException{640 public void replaceTagsOf(Tagged primitive) { 641 641 if (primitive == null) return; 642 642 if (! isApplicableToPrimitive()) … … 653 653 * 654 654 * @param primitives the collection of primitives 655 * @throws IllegalStateException thrownif this tag collection can't be applied655 * @throws IllegalStateException if this tag collection can't be applied 656 656 * because there are keys with multiple values 657 657 */ 658 public void replaceTagsOf(Collection<? extends Tagged> primitives) throws IllegalStateException{658 public void replaceTagsOf(Collection<? extends Tagged> primitives) { 659 659 if (primitives == null) return; 660 660 if (! isApplicableToPrimitive()) -
trunk/src/org/openstreetmap/josm/data/osm/Way.java
r7828 r8291 127 127 * @param index the position 128 128 * @return the node at position <code>index</code> 129 * @ exception IndexOutOfBoundsException thrown if <code>index</code> < 0129 * @throws IndexOutOfBoundsException if <code>index</code> < 0 130 130 * or <code>index</code> >= {@link #getNodesCount()} 131 131 * @since 1862 … … 262 262 * @since 343 263 263 */ 264 public Way(long id) throws IllegalArgumentException{264 public Way(long id) { 265 265 super(id, false); 266 266 } … … 273 273 * @since 2620 274 274 */ 275 public Way(long id, int version) throws IllegalArgumentException{275 public Way(long id, int version) { 276 276 super(id, version, false); 277 277 } … … 419 419 * 420 420 * @param n the node. Ignored, if null 421 * @throws IllegalStateException thrown,if this way is marked as incomplete. We can't add a node421 * @throws IllegalStateException if this way is marked as incomplete. We can't add a node 422 422 * to an incomplete way 423 423 * @since 1313 424 424 */ 425 public void addNode(Node n) throws IllegalStateException{425 public void addNode(Node n) { 426 426 if (n==null) return; 427 427 … … 445 445 * @param offs the offset 446 446 * @param n the node. Ignored, if null. 447 * @throws IllegalStateException thrown,if this way is marked as incomplete. We can't add a node447 * @throws IllegalStateException if this way is marked as incomplete. We can't add a node 448 448 * to an incomplete way 449 * @throws IndexOutOfBoundsException thrownif offs is out of bounds449 * @throws IndexOutOfBoundsException if offs is out of bounds 450 450 * @since 1313 451 451 */ 452 public void addNode(int offs, Node n) throws I llegalStateException, IndexOutOfBoundsException {452 public void addNode(int offs, Node n) throws IndexOutOfBoundsException { 453 453 if (n==null) return; 454 454 -
trunk/src/org/openstreetmap/josm/data/osm/history/History.java
r7527 r8291 48 48 * @param type the primitive type. Must not be null. 49 49 * @param versions a list of versions. Can be null. 50 * @throws IllegalArgumentException thrownif id <= 050 * @throws IllegalArgumentException if id <= 0 51 51 * @throws IllegalArgumentException if type is null 52 *53 52 */ 54 53 protected History(long id, OsmPrimitiveType type, List<HistoryOsmPrimitive> versions) { -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
r8126 r8291 139 139 * @return the history. null, if there isn't a history for <code>id</code> and 140 140 * <code>type</code>. 141 * @throws IllegalArgumentException thrownif id <= 0142 * @throws IllegalArgumentException thrownif type is null143 */ 144 public History getHistory(long id, OsmPrimitiveType type) throws IllegalArgumentException{141 * @throws IllegalArgumentException if id <= 0 142 * @throws IllegalArgumentException if type is null 143 */ 144 public History getHistory(long id, OsmPrimitiveType type) { 145 145 if (id <= 0) 146 146 throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected, got {1}", "id", id)); … … 157 157 * @return the history for a primitive with id <code>id</code>. null, if no 158 158 * such history exists 159 * @throws IllegalArgumentException thrownif pid is null160 */ 161 public History getHistory(PrimitiveId pid) throws IllegalArgumentException{159 * @throws IllegalArgumentException if pid is null 160 */ 161 public History getHistory(PrimitiveId pid) { 162 162 CheckParameterUtil.ensureParameterNotNull(pid, "pid"); 163 163 List<HistoryOsmPrimitive> versions = data.get(pid); -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
r6890 r8291 31 31 * @throws IllegalArgumentException if preconditions are violated 32 32 */ 33 public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords) throws IllegalArgumentException{33 public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords) { 34 34 this(id, version, visible, user, changesetId, timestamp, coords, true); 35 35 } … … 50 50 * @since 5440 51 51 */ 52 public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords, boolean checkHistoricParams) throws IllegalArgumentException{52 public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords, boolean checkHistoricParams) { 53 53 super(id, version, visible, user, changesetId, timestamp, checkHistoricParams); 54 54 setCoords(coords); -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
r7005 r8291 56 56 * @throws IllegalArgumentException if preconditions are violated 57 57 */ 58 public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp) throws IllegalArgumentException{58 public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp) { 59 59 this(id, version, visible, user, changesetId, timestamp, true); 60 60 } … … 75 75 * @since 5440 76 76 */ 77 public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) throws IllegalArgumentException{77 public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) { 78 78 ensurePositiveLong(id, "id"); 79 79 ensurePositiveLong(version, "version"); -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
r7005 r8291 35 35 * @throws IllegalArgumentException if preconditions are violated 36 36 */ 37 public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp) throws IllegalArgumentException{37 public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp) { 38 38 super(id, version, visible, user, changesetId, timestamp); 39 39 } … … 53 53 * @since 5440 54 54 */ 55 public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) throws IllegalArgumentException{55 public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) { 56 56 super(id, version, visible, user, changesetId, timestamp, checkHistoricParams); 57 57 } … … 68 68 * @param members list of members for this relation 69 69 * 70 * @throws IllegalArgumentException thrownif preconditions are violated70 * @throws IllegalArgumentException if preconditions are violated 71 71 */ 72 72 public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<RelationMemberData> members) { … … 108 108 * @param idx the index 109 109 * @return the idx-th member 110 * @throws IndexOutOfBoundsException thrown,if idx is out of bounds110 * @throws IndexOutOfBoundsException if idx is out of bounds 111 111 */ 112 112 public RelationMemberData getRelationMember(int idx) throws IndexOutOfBoundsException { … … 129 129 * 130 130 * @param member the member (must not be null) 131 * @ exception IllegalArgumentException thrown,if member is null131 * @throws IllegalArgumentException if member is null 132 132 */ 133 public void addMember(RelationMemberData member) throws IllegalArgumentException{133 public void addMember(RelationMemberData member) { 134 134 CheckParameterUtil.ensureParameterNotNull(member, "member"); 135 135 members.add(member); -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
r7005 r8291 34 34 * @throws IllegalArgumentException if preconditions are violated 35 35 */ 36 public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp) throws IllegalArgumentException{36 public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp) { 37 37 super(id, version, visible, user, changesetId, timestamp); 38 38 } … … 52 52 * @since 5440 53 53 */ 54 public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) throws IllegalArgumentException{54 public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) { 55 55 super(id, version, visible, user, changesetId, timestamp, checkHistoricParams); 56 56 } … … 68 68 * @throws IllegalArgumentException if preconditions are violated 69 69 */ 70 public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<Long> nodeIdList) throws IllegalArgumentException{70 public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<Long> nodeIdList) { 71 71 this(id, version, visible, user, changesetId, timestamp); 72 72 CheckParameterUtil.ensureParameterNotNull(nodeIdList, "nodeIdList"); … … 95 95 * @param idx the index 96 96 * @return the idx-th node id 97 * @ exception IndexOutOfBoundsException thrown,if idx < 0 || idx >= {#see {@link #getNumNodes()}97 * @throws IndexOutOfBoundsException if idx < 0 || idx >= {#see {@link #getNumNodes()} 98 98 */ 99 99 public long getNodeId(int idx) throws IndexOutOfBoundsException { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
r7005 r8291 42 42 * 43 43 * @param selectionBase the dataset. Must not be null. 44 * @exception IllegalArgumentException thrown if selectionBase is null 45 * 44 * @throws IllegalArgumentException if selectionBase is null 46 45 */ 47 public MergeSourceBuildingVisitor(DataSet selectionBase) throws IllegalArgumentException{46 public MergeSourceBuildingVisitor(DataSet selectionBase) { 48 47 CheckParameterUtil.ensureParameterNotNull(selectionBase, "selectionBase"); 49 48 this.selectionBase = selectionBase; -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
r7549 r8291 60 60 * @param isInactiveMode if true, the paint visitor shall render OSM objects such that they 61 61 * look inactive. Example: rendering of data in an inactive layer using light gray as color only. 62 * @throws IllegalArgumentException thrownif {@code g} is null63 * @throws IllegalArgumentException thrownif {@code nc} is null64 */ 65 public AbstractMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) throws IllegalArgumentException{62 * @throws IllegalArgumentException if {@code g} is null 63 * @throws IllegalArgumentException if {@code nc} is null 64 */ 65 public AbstractMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) { 66 66 CheckParameterUtil.ensureParameterNotNull(g); 67 67 CheckParameterUtil.ensureParameterNotNull(nc); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
r8126 r8291 165 165 * @return true, if {@code Renderer} is already a registered map renderer 166 166 * class 167 * @throws IllegalArgumentException thrownif {@code renderer} is null168 */ 169 public boolean isRegistered(Class<? extends AbstractMapRenderer> renderer) throws IllegalArgumentException{167 * @throws IllegalArgumentException if {@code renderer} is null 168 */ 169 public boolean isRegistered(Class<? extends AbstractMapRenderer> renderer) { 170 170 CheckParameterUtil.ensureParameterNotNull(renderer); 171 171 for (Descriptor d: descriptors) { … … 181 181 * @param displayName the display name to be displayed in UIs (i.e. in the preference dialog) 182 182 * @param description the description 183 * @throws IllegalArgumentException thrownif {@code renderer} is null184 * @throws IllegalStateException thrownif {@code renderer} is already registered185 */ 186 public void register(Class<? extends AbstractMapRenderer> renderer, String displayName, String description) throws IllegalArgumentException, IllegalStateException{183 * @throws IllegalArgumentException if {@code renderer} is null 184 * @throws IllegalStateException if {@code renderer} is already registered 185 */ 186 public void register(Class<? extends AbstractMapRenderer> renderer, String displayName, String description) { 187 187 CheckParameterUtil.ensureParameterNotNull(renderer); 188 188 if (isRegistered(renderer)) … … 227 227 * 228 228 * @param renderer the map renderer class. Must not be null. 229 * @throws IllegalArgumentException thrown if {@code renderer} is null 230 * @throws IllegalStateException thrown if {@code renderer} isn't registered yet 231 * 232 */ 233 public void activate(Class<? extends AbstractMapRenderer> renderer) throws IllegalArgumentException, IllegalStateException{ 229 * @throws IllegalArgumentException if {@code renderer} is null 230 * @throws IllegalStateException if {@code renderer} isn't registered yet 231 */ 232 public void activate(Class<? extends AbstractMapRenderer> renderer) { 234 233 CheckParameterUtil.ensureParameterNotNull(renderer); 235 234 if (!isRegistered(renderer)) … … 246 245 * <p>Activates the default map renderer.</p> 247 246 * 248 * @throws IllegalStateException thrown if the default renderer {@link StyledMapRenderer} isn't registered 249 * 250 */ 251 public void activateDefault() throws IllegalStateException{ 247 * @throws IllegalStateException if the default renderer {@link StyledMapRenderer} isn't registered 248 */ 249 public void activateDefault() { 252 250 Class<? extends AbstractMapRenderer> defaultRenderer = StyledMapRenderer.class; 253 251 if (!isRegistered(defaultRenderer)) … … 261 259 * <p>Creates an instance of the currently active renderer.</p> 262 260 * 263 * @throws MapRendererFactoryException thrownif creating an instance fails261 * @throws MapRendererFactoryException if creating an instance fails 264 262 * @see AbstractMapRenderer#AbstractMapRenderer(Graphics2D, NavigatableComponent, boolean) 265 263 */ -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r8285 r8291 330 330 * @param isInactiveMode if true, the paint visitor shall render OSM objects such that they 331 331 * look inactive. Example: rendering of data in an inactive layer using light gray as color only. 332 * @throws IllegalArgumentException thrownif {@code g} is null333 * @throws IllegalArgumentException thrownif {@code nc} is null332 * @throws IllegalArgumentException if {@code g} is null 333 * @throws IllegalArgumentException if {@code nc} is null 334 334 */ 335 335 public StyledMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
r7555 r8291 101 101 * @param isInactiveMode if true, the paint visitor shall render OSM objects such that they 102 102 * look inactive. Example: rendering of data in an inactive layer using light gray as color only. 103 * @throws IllegalArgumentException thrownif {@code g} is null104 * @throws IllegalArgumentException thrownif {@code nc} is null103 * @throws IllegalArgumentException if {@code g} is null 104 * @throws IllegalArgumentException if {@code nc} is null 105 105 */ 106 106 public WireframeMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) { -
trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
r8285 r8291 624 624 public boolean valueBool = false; 625 625 626 private Pattern getPattern(String str) throws IllegalStateException,PatternSyntaxException {626 private Pattern getPattern(String str) throws PatternSyntaxException { 627 627 if (str.endsWith("/i")) 628 628 return Pattern.compile(str.substring(1,str.length()-2), Pattern.CASE_INSENSITIVE); … … 632 632 throw new IllegalStateException(); 633 633 } 634 public CheckerElement(String exp) throws IllegalStateException,PatternSyntaxException {634 public CheckerElement(String exp) throws PatternSyntaxException { 635 635 Matcher m = Pattern.compile("(.+)([!=]=)(.+)").matcher(exp); 636 636 m.matches(); -
trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java
r7005 r8291 114 114 * @throws IllegalArgumentException if n1 or n2 is {@code null} or without coordinates 115 115 */ 116 public static List<Point2D> getSegmentCells(Node n1, Node n2, double gridDetail) throws IllegalArgumentException{116 public static List<Point2D> getSegmentCells(Node n1, Node n2, double gridDetail) { 117 117 CheckParameterUtil.ensureParameterNotNull(n1, "n1"); 118 118 CheckParameterUtil.ensureParameterNotNull(n1, "n2"); … … 131 131 * @since 6869 132 132 */ 133 public static List<Point2D> getSegmentCells(EastNorth en1, EastNorth en2, double gridDetail) throws IllegalArgumentException{133 public static List<Point2D> getSegmentCells(EastNorth en1, EastNorth en2, double gridDetail) { 134 134 CheckParameterUtil.ensureParameterNotNull(en1, "en1"); 135 135 CheckParameterUtil.ensureParameterNotNull(en2, "en2"); -
trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
r8126 r8291 100 100 * 101 101 * @param userName the user name. Must not be null. Must not be empty (whitespace only). 102 * @throws IllegalArgumentException thrownif userName is null103 * @throws IllegalArgumentException thrownif userName is empty104 */ 105 public void setPartiallyIdentified(String userName) throws IllegalArgumentException{102 * @throws IllegalArgumentException if userName is null 103 * @throws IllegalArgumentException if userName is empty 104 */ 105 public void setPartiallyIdentified(String userName) { 106 106 CheckParameterUtil.ensureParameterNotNull(userName, "userName"); 107 107 if (userName.trim().isEmpty()) … … 117 117 * @param username the user name. Must not be null. Must not be empty. 118 118 * @param userinfo additional information about the user, retrieved from the OSM server and including the user id 119 * @throws IllegalArgumentException thrownif userName is null120 * @throws IllegalArgumentException thrownif userName is empty121 * @throws IllegalArgumentException thrownif userinfo is null122 */ 123 public void setFullyIdentified(String username, UserInfo userinfo) throws IllegalArgumentException{119 * @throws IllegalArgumentException if userName is null 120 * @throws IllegalArgumentException if userName is empty 121 * @throws IllegalArgumentException if userinfo is null 122 */ 123 public void setFullyIdentified(String username, UserInfo userinfo) { 124 124 CheckParameterUtil.ensureParameterNotNull(username, "username"); 125 125 if (username.trim().isEmpty()) -
trunk/src/org/openstreetmap/josm/gui/MapView.java
r8029 r8291 701 701 /** 702 702 * Set the new dimension to the view. 703 * 703 * 704 704 * @deprecated use #zoomTo(BoundingXYVisitor) 705 705 */ … … 791 791 * 792 792 * @param layer the layer to be activate; must be one of the layers in the list of layers 793 * @ exception IllegalArgumentException thrown if layer is not in the lis of layers793 * @throws IllegalArgumentException if layer is not in the lis of layers 794 794 */ 795 795 public void setActiveLayer(Layer layer) { -
trunk/src/org/openstreetmap/josm/gui/MenuScroller.java
r8285 r8291 334 334 * called when there are no more refrences to it. 335 335 * 336 * @ exceptionThrowable if an error occurs.336 * @throws Throwable if an error occurs. 337 337 * @see MenuScroller#dispose() 338 338 */ -
trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
r7980 r8291 58 58 * exception will be handled by showing a dialog. When this runnable is executed using executor framework 59 59 * then use false unless you read result of task (because exception will get lost if you don't) 60 * @throws IllegalArgumentException thrownif parent is null61 */ 62 public PleaseWaitRunnable(Component parent, String title, boolean ignoreException) throws IllegalArgumentException{60 * @throws IllegalArgumentException if parent is null 61 */ 62 public PleaseWaitRunnable(Component parent, String title, boolean ignoreException) { 63 63 CheckParameterUtil.ensureParameterNotNull(parent, "parent"); 64 64 this.title = title; -
trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
r7005 r8291 530 530 private TileBounds tileBounds = null; 531 531 532 public TileAddressValidator(JTextComponent tc) throws IllegalArgumentException{532 public TileAddressValidator(JTextComponent tc) { 533 533 super(tc); 534 534 } … … 589 589 private int tileIndex; 590 590 591 public TileCoordinateValidator(JTextComponent tc) throws IllegalArgumentException{591 public TileCoordinateValidator(JTextComponent tc) { 592 592 super(tc); 593 593 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
r6222 r8291 78 78 * @param role one of the two roles in this pair 79 79 * @return the opposite role 80 * @ exceptionIllegalStateException if role is not participating in this pair80 * @throws IllegalStateException if role is not participating in this pair 81 81 */ 82 82 public ListRole getOppositeRole(ListRole role) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r7864 r8291 410 410 * @param rows the indices 411 411 * @param current the row index before which the nodes are inserted 412 * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes 413 * 412 * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes 414 413 */ 415 414 protected void copyBeforeCurrent(ListRole source, int [] rows, int current) { … … 424 423 * @param rows the indices 425 424 * @param current the row index before which the nodes are inserted 426 * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes 427 * 425 * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes 428 426 */ 429 427 public void copyMyBeforeCurrent(int [] rows, int current) { … … 437 435 * @param rows the indices 438 436 * @param current the row index before which the nodes are inserted 439 * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes 440 * 437 * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes 441 438 */ 442 439 public void copyTheirBeforeCurrent(int [] rows, int current) { … … 451 448 * @param rows the indices 452 449 * @param current the row index after which the nodes are inserted 453 * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes 454 * 450 * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes 455 451 */ 456 452 protected void copyAfterCurrent(ListRole source, int [] rows, int current) { … … 466 462 * @param rows the indices 467 463 * @param current the row index after which the nodes are inserted 468 * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes 469 * 464 * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes 470 465 */ 471 466 public void copyMyAfterCurrent(int [] rows, int current) { … … 479 474 * @param rows the indices 480 475 * @param current the row index after which the nodes are inserted 481 * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes 482 * 476 * @throws IllegalArgumentException if current < 0 or >= #nodes in list of merged nodes 483 477 */ 484 478 public void copyTheirAfterCurrent(int [] rows, int current) { … … 648 642 * @return true if the entry at <code>row</code> is equal to the entry at the 649 643 * same position in the opposite list of the current {@link ComparePairType} 650 * @ exception IllegalStateException thrown,if this model is not participating in the644 * @throws IllegalStateException if this model is not participating in the 651 645 * current {@link ComparePairType} 652 646 * @see ComparePairType#getOppositeRole(ListRole) … … 672 666 * @return true if the entry at the current position is present in the opposite list 673 667 * of the current {@link ComparePairType}. 674 * @ exception IllegalStateException thrown,if this model is not participating in the675 * current 668 * @throws IllegalStateException if this model is not participating in the 669 * current {@link ComparePairType} 676 670 * @see ComparePairType#getOppositeRole(ListRole) 677 671 * @see #getRole() -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
r7005 r8291 27 27 * @param their their way (i.e. the way in the server dataset) 28 28 * @param mergedMap The map of merged primitives if the conflict results from merging two layers 29 * @ exception IllegalArgumentException thrown,if my is null30 * @ exception IllegalArgumentException thrown,if their is null29 * @throws IllegalArgumentException if my is null 30 * @throws IllegalArgumentException if their is null 31 31 */ 32 32 public void populate(Way my, Way their, Map<PrimitiveId, PrimitiveId> mergedMap) { … … 54 54 * @param conflict the conflict data set 55 55 * @return the command 56 * @ exception IllegalStateException thrown,if the merge is not yet frozen56 * @throws IllegalStateException if the merge is not yet frozen 57 57 */ 58 58 public WayNodesConflictResolverCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
r7005 r8291 260 260 * @param decision the decision (must not be null) 261 261 * 262 * @throws IllegalArgumentException thrown,if decision is null263 */ 264 public void decideDeletedStateConflict(MergeDecisionType decision) throws IllegalArgumentException{262 * @throws IllegalArgumentException if decision is null 263 */ 264 public void decideDeletedStateConflict(MergeDecisionType decision) { 265 265 CheckParameterUtil.ensureParameterNotNull(decision, "decision"); 266 266 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
r6887 r8291 102 102 * @param their their relation. Must not be null 103 103 * @return the command 104 * @ exception IllegalArgumentException thrown,if my is null105 * @ exception IllegalArgumentException thrown,if their is null106 * @ exception IllegalStateException thrown,if the merge is not yet frozen104 * @throws IllegalArgumentException if my is null 105 * @throws IllegalArgumentException if their is null 106 * @throws IllegalStateException if the merge is not yet frozen 107 107 */ 108 108 public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java
r6265 r8291 44 44 * @param my my version of the OSM primitive (i.e. the version known in the local dataset). Must not be null. 45 45 * @param their their version of the OSM primitive (i.e. the version known on the server). Must not be null. 46 * @throws IllegalArgumentException thrownif key is null47 * @throws IllegalArgumentException thrownif my is null48 * @throws IllegalArgumentException thrownif their is null46 * @throws IllegalArgumentException if key is null 47 * @throws IllegalArgumentException if my is null 48 * @throws IllegalArgumentException if their is null 49 49 */ 50 50 public TagMergeItem(String key, OsmPrimitive my, OsmPrimitive their) { … … 61 61 * 62 62 * @param decision the merge decision. Must not be null. 63 * @exception IllegalArgumentException thrown if decision is null 64 * 63 * @throws IllegalArgumentException if decision is null 65 64 */ 66 public void decide(MergeDecisionType decision) throws IllegalArgumentException{65 public void decide(MergeDecisionType decision) { 67 66 CheckParameterUtil.ensureParameterNotNull(decision, "decision"); 68 67 this.mergeDecision = decision; … … 91 90 * 92 91 * @param primitive the OSM primitive. Must not be null. 93 * @ exception IllegalArgumentException thrown,if primitive is null94 * @ exception IllegalStateException thrown,if this merge item is undecided92 * @throws IllegalArgumentException if primitive is null 93 * @throws IllegalStateException if this merge item is undecided 95 94 */ 96 public void applyToMyPrimitive(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException{95 public void applyToMyPrimitive(OsmPrimitive primitive) { 97 96 CheckParameterUtil.ensureParameterNotNull(primitive, "primitive"); 98 97 if (mergeDecision == MergeDecisionType.UNDECIDED) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
r7801 r8291 48 48 * 49 49 * @param tags the tags. Must not be null. 50 * @ exception IllegalArgumentException thrown if tags is null51 * @ exception IllegalArgumentException thrown if there are more than one keys52 * @ exception IllegalArgumentException thrown if tags is empty53 */ 54 public MultiValueResolutionDecision(TagCollection tags) throws IllegalArgumentException{50 * @throws IllegalArgumentException if tags is null 51 * @throws IllegalArgumentException if there are more than one keys 52 * @throws IllegalArgumentException if tags is empty 53 */ 54 public MultiValueResolutionDecision(TagCollection tags) { 55 55 CheckParameterUtil.ensureParameterNotNull(tags, "tags"); 56 56 if (tags.isEmpty()) … … 104 104 * 105 105 * @param value the value to keep 106 * @throws IllegalArgumentException thrownif value is null107 * @throws IllegalStateException thrownif value is not in the list of known values for this tag108 */ 109 public void keepOne(String value) throws IllegalArgumentException, IllegalStateException{106 * @throws IllegalArgumentException if value is null 107 * @throws IllegalStateException if value is not in the list of known values for this tag 108 */ 109 public void keepOne(String value) { 110 110 CheckParameterUtil.ensureParameterNotNull(value, "value"); 111 111 if (!tags.getValues().contains(value)) … … 141 141 * 142 142 * @return the chosen value 143 * @throws IllegalStateException thrownif this resolution is not yet decided144 */ 145 public String getChosenValue() throws IllegalStateException{143 * @throws IllegalStateException if this resolution is not yet decided 144 */ 145 public String getChosenValue() { 146 146 switch(type) { 147 147 case UNDECIDED: throw new IllegalStateException(tr("Not decided yet.")); … … 234 234 * 235 235 * @param primitive the primitive 236 * @throws IllegalStateException thrownif this resolution is not resolved yet236 * @throws IllegalStateException if this resolution is not resolved yet 237 237 * 238 238 */ … … 253 253 * 254 254 * @param primitives the collection of primitives 255 * @throws IllegalStateException thrownif this resolution is not resolved yet255 * @throws IllegalStateException if this resolution is not resolved yet 256 256 */ 257 257 public void applyTo(Collection<? extends OsmPrimitive> primitives) { … … 270 270 * @param primitive the primitive 271 271 * @return the change command 272 * @throws IllegalArgumentException thrownif primitive is null273 * @throws IllegalStateException thrownif this resolution is not resolved yet272 * @throws IllegalArgumentException if primitive is null 273 * @throws IllegalStateException if this resolution is not resolved yet 274 274 */ 275 275 public Command buildChangeCommand(OsmPrimitive primitive) { … … 284 284 * Builds a change command for applying this resolution to a collection of primitives 285 285 * 286 * @param primitives 286 * @param primitives the collection of primitives 287 287 * @return the change command 288 * @throws IllegalArgumentException thrownif primitives is null289 * @throws IllegalStateException thrownif this resolution is not resolved yet288 * @throws IllegalArgumentException if primitives is null 289 * @throws IllegalStateException if this resolution is not resolved yet 290 290 */ 291 291 public Command buildChangeCommand(Collection<? extends OsmPrimitive> primitives) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java
r6362 r8291 18 18 private RelationMemberConflictDecisionType decision; 19 19 20 public RelationMemberConflictDecision(Relation relation, int pos) throws IllegalArgumentException{20 public RelationMemberConflictDecision(Relation relation, int pos) { 21 21 CheckParameterUtil.ensureParameterNotNull(relation, "relation"); 22 22 RelationMember member = relation.getMember(pos); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
r7743 r8291 127 127 * @param tags the tag collection with the tags. Must not be null. 128 128 * @param keysWithConflicts the set of tag keys with conflicts 129 * @throws IllegalArgumentException thrownif tags is null129 * @throws IllegalArgumentException if tags is null 130 130 */ 131 131 public void populate(TagCollection tags, Set<String> keysWithConflicts) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
r8285 r8291 97 97 * 98 98 * @return the instance of the dialog 99 * @throws IllegalStateException thrown,if the dialog is not created yet99 * @throws IllegalStateException if the dialog is not created yet 100 100 * @see #createInstance(MapFrame) 101 101 */ 102 public static LayerListDialog getInstance() throws IllegalStateException{102 public static LayerListDialog getInstance() { 103 103 if (instance == null) 104 104 throw new IllegalStateException("Dialog not created yet. Invoke createInstance() first"); … … 535 535 * 536 536 * @param layer the layer. Must not be null. 537 * @ exception IllegalArgumentException thrown,if layer is null538 */ 539 public LayerOpacityAction(Layer layer) throws IllegalArgumentException{537 * @throws IllegalArgumentException if layer is null 538 */ 539 public LayerOpacityAction(Layer layer) { 540 540 this(); 541 541 putValue(NAME, tr("Opacity")); … … 756 756 * @throws IllegalArgumentException if {@code layer} is null 757 757 */ 758 public MergeAction(Layer layer) throws IllegalArgumentException{758 public MergeAction(Layer layer) { 759 759 this(); 760 760 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); … … 831 831 * @throws IllegalArgumentException if {@code layer} is null 832 832 */ 833 public DuplicateAction(Layer layer) throws IllegalArgumentException{833 public DuplicateAction(Layer layer) { 834 834 this(); 835 835 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
r7704 r8291 64 64 * 65 65 * @param changesetId the changeset id. > 0 required. 66 * @throws IllegalArgumentException thrownif changesetId <= 067 */ 68 public ChangesetContentDownloadTask(int changesetId) throws IllegalArgumentException{66 * @throws IllegalArgumentException if changesetId <= 0 67 */ 68 public ChangesetContentDownloadTask(int changesetId) { 69 69 super(tr("Downloading changeset content"), false /* don't ignore exceptions */); 70 70 if (changesetId <= 0) … … 89 89 * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}. 90 90 * @param changesetId the changeset id. {@code >0} required. 91 * @throws IllegalArgumentException thrownif {@code changesetId <= 0}92 * @throws IllegalArgumentException thrownif parent is {@code null}93 */ 94 public ChangesetContentDownloadTask(Component parent, int changesetId) throws IllegalArgumentException{91 * @throws IllegalArgumentException if {@code changesetId <= 0} 92 * @throws IllegalArgumentException if parent is {@code null} 93 */ 94 public ChangesetContentDownloadTask(Component parent, int changesetId) { 95 95 super(parent, tr("Downloading changeset content"), false /* don't ignore exceptions */); 96 96 if (changesetId <= 0) … … 105 105 * @param parent the parent component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be {@code null}. 106 106 * @param changesetIds the changeset ids. Empty collection assumed, if {@code null}. 107 * @throws IllegalArgumentException thrownif parent is {@code null}108 */ 109 public ChangesetContentDownloadTask(Component parent, Collection<Integer> changesetIds) throws IllegalArgumentException{107 * @throws IllegalArgumentException if parent is {@code null} 108 */ 109 public ChangesetContentDownloadTask(Component parent, Collection<Integer> changesetIds) { 110 110 super(parent, tr("Downloading changeset content"), false /* don't ignore exceptions */); 111 111 init(changesetIds); … … 129 129 * 130 130 * @param changesetId the changeset id 131 * @throws OsmTransferException thrownif something went wrong131 * @throws OsmTransferException if something went wrong 132 132 */ 133 133 protected void downloadChangeset(int changesetId) throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
r7704 r8291 57 57 * @param changesets the collection of changesets. Assumes an empty collection if null. 58 58 * @return the download task 59 * @throws IllegalArgumentException thrownif parent is null59 * @throws IllegalArgumentException if parent is null 60 60 */ 61 61 public static ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection<Changeset> changesets) { … … 124 124 * @param dialogParent the parent reference component for the {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. Must not be null. 125 125 * @param ids the collection of ids. Empty collection assumed if null. 126 * @throws IllegalArgumentException thrownif dialogParent is null127 */ 128 public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids) throws IllegalArgumentException{126 * @throws IllegalArgumentException if dialogParent is null 127 */ 128 public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids) { 129 129 this(dialogParent, ids, false); 130 130 } … … 139 139 * @param ids the collection of ids. Empty collection assumed if null. 140 140 * @param includeDiscussion determines if discussion comments must be downloaded or not 141 * @throws IllegalArgumentException thrownif dialogParent is null141 * @throws IllegalArgumentException if dialogParent is null 142 142 * @since 7704 143 143 */ 144 public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids, boolean includeDiscussion) 145 throws IllegalArgumentException { 144 public ChangesetHeaderDownloadTask(Component dialogParent, Collection<Integer> ids, boolean includeDiscussion) { 146 145 super(dialogParent, tr("Download changesets"), false /* don't ignore exceptions */); 147 146 init(ids); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
r7299 r8291 514 514 * 515 515 * @param query the query. Must not be null. 516 * @throws IllegalArgumentException thrownif query is null517 * @throws IllegalStateException thrownif one of the available values for query parameters in516 * @throws IllegalArgumentException if query is null 517 * @throws IllegalStateException if one of the available values for query parameters in 518 518 * this panel isn't valid 519 *520 519 */ 521 public void fillInQuery(ChangesetQuery query) throws IllegalStateException, IllegalArgumentException{520 public void fillInQuery(ChangesetQuery query) { 522 521 CheckParameterUtil.ensureParameterNotNull(query, "query"); 523 522 if (rbRestrictToMyself.isSelected()) { … … 838 837 } 839 838 840 public void fillInQuery(ChangesetQuery query) throws IllegalStateException{839 public void fillInQuery(ChangesetQuery query) { 841 840 if (!isValidChangesetQuery()) 842 841 throw new IllegalStateException(tr("Cannot build changeset query with time based restrictions. Input is not valid.")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
r7005 r8291 54 54 * 55 55 * @param query the query to submit to the OSM server. Must not be null. 56 * @throws IllegalArgumentException thrownif query is null.56 * @throws IllegalArgumentException if query is null. 57 57 */ 58 public ChangesetQueryTask(ChangesetQuery query) throws IllegalArgumentException{58 public ChangesetQueryTask(ChangesetQuery query) { 59 59 super(tr("Querying and downloading changesets",false /* don't ignore exceptions */)); 60 60 CheckParameterUtil.ensureParameterNotNull(query, "query"); … … 68 68 * Must not be null. 69 69 * @param query the query to submit to the OSM server. Must not be null. 70 * @throws IllegalArgumentException thrownif query is null.71 * @throws IllegalArgumentException thrownif parent is null70 * @throws IllegalArgumentException if query is null. 71 * @throws IllegalArgumentException if parent is null 72 72 */ 73 public ChangesetQueryTask(Component parent, ChangesetQuery query) throws IllegalArgumentException{73 public ChangesetQueryTask(Component parent, ChangesetQuery query) { 74 74 super(parent, tr("Querying and downloading changesets"), false /* don't ignore exceptions */); 75 75 CheckParameterUtil.ensureParameterNotNull(query, "query"); … … 144 144 * Tries to fully identify the current JOSM user 145 145 * 146 * @throws OsmTransferException thrownif something went wrong146 * @throws OsmTransferException if something went wrong 147 147 */ 148 148 protected void fullyIdentifyCurrentUser() throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r7092 r8291 114 114 * 115 115 * @param layer the {@link OsmDataLayer} this browser is related to. Must not be null. 116 * @ exception IllegalArgumentException thrown,if layer is null117 */ 118 public ChildRelationBrowser(OsmDataLayer layer) throws IllegalArgumentException{116 * @throws IllegalArgumentException if layer is null 117 */ 118 public ChildRelationBrowser(OsmDataLayer layer) { 119 119 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); 120 120 this.layer = layer; … … 128 128 * @param layer the {@link OsmDataLayer} this browser is related to. Must not be null. 129 129 * @param root the root relation 130 * @ exception IllegalArgumentException thrown,if layer is null131 */ 132 public ChildRelationBrowser(OsmDataLayer layer, Relation root) throws IllegalArgumentException{130 * @throws IllegalArgumentException if layer is null 131 */ 132 public ChildRelationBrowser(OsmDataLayer layer, Relation root) { 133 133 this(layer); 134 134 populate(root); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java
r6248 r8291 39 39 * @param relations a collection of relations. Must not be null. 40 40 * @param layer the layer which data is to be merged into 41 * @throws IllegalArgumentException thrownif relations is null42 * @throws IllegalArgumentException thrownif layer is null41 * @throws IllegalArgumentException if relations is null 42 * @throws IllegalArgumentException if layer is null 43 43 */ 44 public DownloadRelationTask(Collection<Relation> relations, OsmDataLayer layer) throws IllegalArgumentException{44 public DownloadRelationTask(Collection<Relation> relations, OsmDataLayer layer) { 45 45 super(tr("Download relations"), false /* don't ignore exception */); 46 46 CheckParameterUtil.ensureParameterNotNull(relations, "relations"); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r7801 r8291 748 748 * @throws IllegalArgumentException if orig is null 749 749 */ 750 public static Command addPrimitivesToRelation(final Relation orig, Collection<? extends OsmPrimitive> primitivesToAdd) 751 throws IllegalArgumentException { 750 public static Command addPrimitivesToRelation(final Relation orig, Collection<? extends OsmPrimitive> primitivesToAdd) { 752 751 CheckParameterUtil.ensureParameterNotNull(orig, "orig"); 753 752 try { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
r7575 r8291 69 69 * @param monitor the progress monitor to be used 70 70 * 71 * @ exception IllegalArgumentException thrown if child is null72 * @ exception IllegalArgumentException thrown if layer is null73 * @ exception IllegalArgumentException thrown if child.getId() == 071 * @throws IllegalArgumentException if child is null 72 * @throws IllegalArgumentException if layer is null 73 * @throws IllegalArgumentException if child.getId() == 0 74 74 */ 75 75 public ParentRelationLoadingTask(Relation child, OsmDataLayer layer, boolean full, PleaseWaitProgressMonitor monitor ) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
r7005 r8291 112 112 * @param selectedMembers a collection of members in <code>relation</code> which the editor 113 113 * should display selected when the editor is first displayed on screen 114 * @throws IllegalArgumentException thrown if layer is null 115 */ 116 protected RelationEditor(OsmDataLayer layer, Relation relation, Collection<RelationMember> selectedMembers) throws IllegalArgumentException{ 117 // Initalizes ExtendedDialog 114 * @throws IllegalArgumentException if layer is null 115 */ 116 protected RelationEditor(OsmDataLayer layer, Relation relation, Collection<RelationMember> selectedMembers) { 118 117 super(Main.parent, 119 118 "", -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
r7005 r8291 26 26 * 27 27 * @param layer the data layer. Must not be null. 28 * @ exception IllegalArgumentException thrown if layer is null28 * @throws IllegalArgumentException if layer is null 29 29 */ 30 public SelectionTableModel(OsmDataLayer layer) throws IllegalArgumentException{30 public SelectionTableModel(OsmDataLayer layer) { 31 31 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); 32 32 this.layer = layer; -
trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java
r7027 r8291 39 39 * Constructs a new {@code Bookmark} with the given contents. 40 40 * @param list Bookmark contents as a list of 5 elements. First item is the name, then come bounds arguments (minlat, minlon, maxlat, maxlon) 41 * @throws NumberFormatException If the bounds arguments are not numbers42 * @throws IllegalArgumentException If list contain less than 5 elements41 * @throws NumberFormatException if the bounds arguments are not numbers 42 * @throws IllegalArgumentException if list contain less than 5 elements 43 43 */ 44 44 public Bookmark(Collection<String> list) throws NumberFormatException, IllegalArgumentException { -
trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
r7082 r8291 39 39 * @param helpTopicUrl the absolute help topic URL 40 40 * @return the content, filtered and transformed for being displayed in the internal help browser 41 * @throws HelpContentReaderException thrownif problem occurs42 * @throws MissingHelpContentException thrownif this helpTopicUrl doesn't point to an existing Wiki help page41 * @throws HelpContentReaderException if problem occurs 42 * @throws MissingHelpContentException if this helpTopicUrl doesn't point to an existing Wiki help page 43 43 */ 44 44 public String fetchHelpTopicContent(String helpTopicUrl, boolean dotest) throws HelpContentReaderException { … … 77 77 * @param in the input stream 78 78 * @return the content 79 * @throws HelpContentReaderException thrownif an exception occurs80 * @throws MissingHelpContentException thrown,if the content read isn't a help page79 * @throws HelpContentReaderException if an exception occurs 80 * @throws MissingHelpContentException if the content read isn't a help page 81 81 * @since 5936 82 82 */ -
trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
r6883 r8291 102 102 * 103 103 * @param model the model. Must not be null. 104 * @throws IllegalArgumentException thrownif model is null104 * @throws IllegalArgumentException if model is null 105 105 */ 106 public CoordinateInfoViewer(HistoryBrowserModel model) throws IllegalArgumentException{106 public CoordinateInfoViewer(HistoryBrowserModel model) { 107 107 CheckParameterUtil.ensureParameterNotNull(model, "model"); 108 108 setModel(model); -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
r8219 r8291 115 115 * 116 116 * @param history the history. Must not be null. 117 * @throws IllegalArgumentException thrownif history is null117 * @throws IllegalArgumentException if history is null 118 118 */ 119 119 public HistoryBrowserModel(History history) { … … 247 247 * @param pointInTimeType the type of the point in time (must not be null) 248 248 * @return the tag table model 249 * @ exception IllegalArgumentException thrown,if pointInTimeType is null250 */ 251 public TagTableModel getTagTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException{249 * @throws IllegalArgumentException if pointInTimeType is null 250 */ 251 public TagTableModel getTagTableModel(PointInTimeType pointInTimeType) { 252 252 CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType"); 253 253 if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) … … 260 260 } 261 261 262 public DiffTableModel getNodeListTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException{262 public DiffTableModel getNodeListTableModel(PointInTimeType pointInTimeType) { 263 263 CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType"); 264 264 if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) … … 271 271 } 272 272 273 public DiffTableModel getRelationMemberTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException{273 public DiffTableModel getRelationMemberTableModel(PointInTimeType pointInTimeType) { 274 274 CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType"); 275 275 if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) … … 287 287 * 288 288 * @param reference the reference history primitive. Must not be null. 289 * @throws IllegalArgumentException thrownif reference is null290 * @throws IllegalStateException thrownif this model isn't a assigned a history yet289 * @throws IllegalArgumentException if reference is null 290 * @throws IllegalStateException if this model isn't a assigned a history yet 291 291 * @throws IllegalArgumentException if reference isn't an history primitive for the history managed by this mode 292 292 * … … 294 294 * @see PointInTimeType 295 295 */ 296 public void setReferencePointInTime(HistoryOsmPrimitive reference) throws IllegalArgumentException, IllegalStateException{296 public void setReferencePointInTime(HistoryOsmPrimitive reference) { 297 297 CheckParameterUtil.ensureParameterNotNull(reference, "reference"); 298 298 if (history == null) … … 317 317 * 318 318 * @param current the reference history primitive. Must not be {@code null}. 319 * @throws IllegalArgumentException thrownif reference is {@code null}320 * @throws IllegalStateException thrownif this model isn't a assigned a history yet319 * @throws IllegalArgumentException if reference is {@code null} 320 * @throws IllegalStateException if this model isn't a assigned a history yet 321 321 * @throws IllegalArgumentException if reference isn't an history primitive for the history managed by this mode 322 322 * … … 324 324 * @see PointInTimeType 325 325 */ 326 public void setCurrentPointInTime(HistoryOsmPrimitive current) throws IllegalArgumentException, IllegalStateException{326 public void setCurrentPointInTime(HistoryOsmPrimitive current) { 327 327 CheckParameterUtil.ensureParameterNotNull(current, "current"); 328 328 if (history == null) … … 364 364 * @param type the type of the point in time (must not be null) 365 365 * @return the respective primitive. Can be null. 366 * @ exception IllegalArgumentException thrown,if type is null367 */ 368 public HistoryOsmPrimitive getPointInTime(PointInTimeType type) throws IllegalArgumentException{366 * @throws IllegalArgumentException if type is null 367 */ 368 public HistoryOsmPrimitive getPointInTime(PointInTimeType type) { 369 369 CheckParameterUtil.ensureParameterNotNull(type, "type"); 370 370 if (type.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) -
trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
r7005 r8291 70 70 * parent for {@link org.openstreetmap.josm.gui.PleaseWaitDialog}. 71 71 * Must not be <code>null</code>. 72 * @throws IllegalArgumentException thrownif parent is <code>null</code>72 * @throws IllegalArgumentException if parent is <code>null</code> 73 73 */ 74 74 public HistoryLoadTask(Component parent) { … … 85 85 * @return this task 86 86 */ 87 public HistoryLoadTask add(long id, OsmPrimitiveType type) throws IllegalArgumentException{87 public HistoryLoadTask add(long id, OsmPrimitiveType type) { 88 88 if (id <= 0) 89 89 throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got {1}.", "id", id)); … … 111 111 * @param primitive the history item 112 112 * @return this task 113 * @throws IllegalArgumentException thrownif primitive is null113 * @throws IllegalArgumentException if primitive is null 114 114 */ 115 115 public HistoryLoadTask add(HistoryOsmPrimitive primitive) { … … 124 124 * @param history the history. Must not be null. 125 125 * @return this task 126 * @throws IllegalArgumentException thrownif history is null126 * @throws IllegalArgumentException if history is null 127 127 */ 128 128 public HistoryLoadTask add(History history) { … … 137 137 * @param primitive the OSM primitive. Must not be null. primitive.getId() > 0 required. 138 138 * @return this task 139 * @throws IllegalArgumentException thrownif the primitive is null140 * @throws IllegalArgumentException thrownif primitive.getId() <= 0139 * @throws IllegalArgumentException if the primitive is null 140 * @throws IllegalArgumentException if primitive.getId() <= 0 141 141 */ 142 142 public HistoryLoadTask add(OsmPrimitive primitive) { … … 152 152 * <code>primitive.getId() > 0</code> required. 153 153 * @return this task 154 * @throws IllegalArgumentException thrownif primitives is <code>null</code>155 * @throws IllegalArgumentException thrownif one of the ids in the collection <= 0154 * @throws IllegalArgumentException if primitives is <code>null</code> 155 * @throws IllegalArgumentException if one of the ids in the collection <= 0 156 156 */ 157 157 public HistoryLoadTask add(Collection<? extends OsmPrimitive> primitives) { -
trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
r8254 r8291 172 172 * @param model the model (must not be null) 173 173 * @param pointInTimeType the point in time this panel visualizes (must not be null) 174 * @exception IllegalArgumentException thrown, if model is null 175 * @exception IllegalArgumentException thrown, if pointInTimeType is null 176 * 174 * @throws IllegalArgumentException if model is null 175 * @throws IllegalArgumentException if pointInTimeType is null 177 176 */ 178 public VersionInfoPanel(HistoryBrowserModel model, PointInTimeType pointInTimeType) throws IllegalArgumentException{177 public VersionInfoPanel(HistoryBrowserModel model, PointInTimeType pointInTimeType) { 179 178 CheckParameterUtil.ensureParameterNotNull(pointInTimeType, "pointInTimeType"); 180 179 CheckParameterUtil.ensureParameterNotNull(model, "model"); -
trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
r8285 r8291 109 109 * @param changesetCommentModel the model for the changeset comment. Must not be null 110 110 * @param changesetSourceModel the model for the changeset source. Must not be null. 111 * @throws IllegalArgumentException thrownif {@code changesetCommentModel} is null111 * @throws IllegalArgumentException if {@code changesetCommentModel} is null 112 112 */ 113 113 public BasicUploadSettingsPanel(ChangesetCommentModel changesetCommentModel, ChangesetCommentModel changesetSourceModel) { -
trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
r7017 r8291 162 162 * 163 163 * @param changesetCommentModel the changeset comment model. Must not be null. 164 * @throws IllegalArgumentException thrownif {@code changesetCommentModel} is null164 * @throws IllegalArgumentException if {@code changesetCommentModel} is null 165 165 */ 166 166 public ChangesetManagementPanel(ChangesetCommentModel changesetCommentModel) { -
trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java
r7432 r8291 54 54 * @param fullRelation true if a full download is required, i.e., 55 55 * a download including the immediate children of a relation. 56 * @throws IllegalArgumentException thrownif layer is null.56 * @throws IllegalArgumentException if layer is null. 57 57 */ 58 public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation) throws IllegalArgumentException{58 public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation) { 59 59 this(layer, ids, fullRelation, null); 60 60 } … … 69 69 * a download including the immediate children of a relation. 70 70 * @param progressMonitor ProgressMonitor to use or null to create a new one. 71 * @throws IllegalArgumentException thrownif layer is null.71 * @throws IllegalArgumentException if layer is null. 72 72 */ 73 73 public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation, 74 ProgressMonitor progressMonitor) throws IllegalArgumentException{74 ProgressMonitor progressMonitor) { 75 75 super(tr("Download objects"), progressMonitor, false /* don't ignore exception */); 76 76 ensureParameterNotNull(layer, "layer"); -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java
r7402 r8291 26 26 * Constructs a new {@code SaveLayerInfo}. 27 27 * @param layer the layer. Must not be null. 28 * @throws IllegalArgumentException thrownif layer is null28 * @throws IllegalArgumentException if layer is null 29 29 */ 30 30 public SaveLayerInfo(AbstractModifiableLayer layer) { -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java
r7402 r8291 34 34 * @param layerInfo information about the layer to be saved to save. Must not be null. 35 35 * @param monitor the monitor. Set to {@link NullProgressMonitor#INSTANCE} if null 36 * @throws IllegalArgumentException thrownif layer is null36 * @throws IllegalArgumentException if layer is null 37 37 */ 38 38 protected SaveLayerTask(SaveLayerInfo layerInfo, ProgressMonitor monitor) { -
trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java
r7005 r8291 39 39 * @param changesetCommentModel the changeset comment model. Must not be null. 40 40 * @param changesetSourceModel the changeset source model. Must not be null. 41 * @throws IllegalArgumentException thrownif {@code changesetCommentModel} is null41 * @throws IllegalArgumentException if {@code changesetCommentModel} is null 42 42 */ 43 public TagSettingsPanel(ChangesetCommentModel changesetCommentModel, ChangesetCommentModel changesetSourceModel) throws IllegalArgumentException{43 public TagSettingsPanel(ChangesetCommentModel changesetCommentModel, ChangesetCommentModel changesetSourceModel) { 44 44 CheckParameterUtil.ensureParameterNotNull(changesetCommentModel, "changesetCommentModel"); 45 45 CheckParameterUtil.ensureParameterNotNull(changesetSourceModel, "changesetSourceModel"); -
trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
r6142 r8291 45 45 * @param toUpdate a collection of primitives to update from the server. Set to 46 46 * the empty collection if null. 47 * @throws IllegalArgumentException thrownif layer is null.47 * @throws IllegalArgumentException if layer is null. 48 48 */ 49 public UpdatePrimitivesTask(OsmDataLayer layer, Collection<? extends OsmPrimitive> toUpdate) throws IllegalArgumentException{49 public UpdatePrimitivesTask(OsmDataLayer layer, Collection<? extends OsmPrimitive> toUpdate) { 50 50 super(tr("Update objects"), false /* don't ignore exception */); 51 51 ensureParameterNotNull(layer, "layer"); -
trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
r7358 r8291 56 56 * @param monitor a progress monitor. If monitor is null, uses {@link NullProgressMonitor#INSTANCE} 57 57 * @param changeset the changeset to be used 58 * @throws IllegalArgumentException thrown,if layer is null59 * @throws IllegalArgumentException thrownif strategy is null58 * @throws IllegalArgumentException if layer is null 59 * @throws IllegalArgumentException if strategy is null 60 60 */ 61 61 public UploadLayerTask(UploadStrategySpecification strategy, OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset) { … … 86 86 * @param e the exception throw by the API 87 87 * @param monitor a progress monitor 88 * @throws OsmTransferException thrownif we can't recover from the exception88 * @throws OsmTransferException if we can't recover from the exception 89 89 */ 90 90 protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException{ -
trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
r7025 r8291 60 60 * @param changeset the changeset to use for uploading. Must not be null. changeset.getId() 61 61 * can be 0 in which case the upload task creates a new changeset 62 * @throws IllegalArgumentException thrownif layer is null63 * @throws IllegalArgumentException thrownif toUpload is null64 * @throws IllegalArgumentException thrownif strategy is null65 * @throws IllegalArgumentException thrownif changeset is null62 * @throws IllegalArgumentException if layer is null 63 * @throws IllegalArgumentException if toUpload is null 64 * @throws IllegalArgumentException if strategy is null 65 * @throws IllegalArgumentException if changeset is null 66 66 */ 67 67 public UploadPrimitivesTask(UploadStrategySpecification strategy, OsmDataLayer layer, APIDataSet toUpload, Changeset changeset) { … … 184 184 * @param e the exception throw by the API 185 185 * @param monitor a progress monitor 186 * @throws OsmTransferException thrownif we can't recover from the exception186 * @throws OsmTransferException if we can't recover from the exception 187 187 */ 188 188 protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException{ -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r8288 r8291 334 334 * @throws IllegalArgumentException 335 335 */ 336 public static TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException{336 public static TileSource getTileSource(ImageryInfo info) { 337 337 if (info.getImageryType() == ImageryType.TMS) { 338 338 checkUrl(info.getUrl()); -
trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java
r8206 r8291 65 65 * @throws IllegalArgumentException if {@code param} is {@code null} 66 66 */ 67 public Environment(Environment other) throws IllegalArgumentException{67 public Environment(Environment other) { 68 68 CheckParameterUtil.ensureParameterNotNull(other); 69 69 this.osm = other.osm; -
trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java
r8087 r8291 113 113 * @return the text element or null, if the style properties don't include 114 114 * properties for text rendering 115 * @throws IllegalArgumentException thrownif {@code defaultTextColor} is null116 */ 117 public static TextElement create(Environment env, Color defaultTextColor, boolean defaultAnnotate) throws IllegalArgumentException{115 * @throws IllegalArgumentException if {@code defaultTextColor} is null 116 */ 117 public static TextElement create(Environment env, Color defaultTextColor, boolean defaultAnnotate) { 118 118 CheckParameterUtil.ensureParameterNotNull(defaultTextColor); 119 119 Cascade c = env.mc.getCascade(env.layer); -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
r8141 r8291 228 228 * 229 229 * @param css the MapCSS style declaration. Must not be null. 230 * @throws IllegalArgumentException thrownif {@code css} is null230 * @throws IllegalArgumentException if {@code css} is null 231 231 */ 232 public MapCSSStyleSource(String css) throws IllegalArgumentException{232 public MapCSSStyleSource(String css) { 233 233 super(null, null, null); 234 234 CheckParameterUtil.ensureParameterNotNull(css); -
trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java
r6883 r8291 125 125 * 126 126 * @param pref the preferences. Must not be null. 127 * @throws IllegalArgumentException thrownif pref is null127 * @throws IllegalArgumentException if pref is null 128 128 */ 129 public void initFromPreferences(Preferences pref) throws IllegalArgumentException{129 public void initFromPreferences(Preferences pref) { 130 130 CheckParameterUtil.ensureParameterNotNull(pref, "pref"); 131 131 pnlAdvancedProperties.initFromPreferences(pref); -
trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
r6890 r8291 206 206 * 207 207 * @param parameters the advanced parameters. Must not be null. 208 * @throws IllegalArgumentException thrownif parameters is null.209 */ 210 public void setAdvancedParameters(OAuthParameters parameters) throws IllegalArgumentException{208 * @throws IllegalArgumentException if parameters is null. 209 */ 210 public void setAdvancedParameters(OAuthParameters parameters) { 211 211 CheckParameterUtil.ensureParameterNotNull(parameters, "parameters"); 212 212 if (parameters.equals(OAuthParameters.createDefault(apiUrl))) { … … 235 235 * 236 236 * @param pref the preferences. Must not be null. 237 * @throws IllegalArgumentException thrownif pref is null238 */ 239 public void initFromPreferences(Preferences pref) throws IllegalArgumentException{237 * @throws IllegalArgumentException if pref is null 238 */ 239 public void initFromPreferences(Preferences pref) { 240 240 CheckParameterUtil.ensureParameterNotNull(pref, "pref"); 241 241 setApiUrl(pref.get("osm-server.url")); … … 260 260 * 261 261 * @param pref the preferences. Must not be null. 262 * @throws IllegalArgumentException thrownif pref is null.263 */ 264 public void rememberPreferences(Preferences pref) throws IllegalArgumentException{262 * @throws IllegalArgumentException if pref is null. 263 */ 264 public void rememberPreferences(Preferences pref) { 265 265 CheckParameterUtil.ensureParameterNotNull(pref, "pref"); 266 266 pref.put("oauth.settings.use-default", cbUseDefaults.isSelected()); -
trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
r6890 r8291 29 29 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator; 30 30 import org.openstreetmap.josm.gui.widgets.HtmlPanel; 31 import org.openstreetmap.josm.gui.widgets.JosmTextField; 31 32 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator; 32 33 import org.openstreetmap.josm.tools.ImageProvider; 33 import org.openstreetmap.josm.gui.widgets.JosmTextField;34 34 35 35 /** … … 177 177 private static class AccessTokenKeyValidator extends AbstractTextComponentValidator { 178 178 179 public AccessTokenKeyValidator(JTextComponent tc) throws IllegalArgumentException{179 public AccessTokenKeyValidator(JTextComponent tc) { 180 180 super(tc); 181 181 } … … 197 197 198 198 private static class AccessTokenSecretValidator extends AbstractTextComponentValidator { 199 public AccessTokenSecretValidator(JTextComponent tc) throws IllegalArgumentException{199 public AccessTokenSecretValidator(JTextComponent tc) { 200 200 super(tc); 201 201 } -
trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
r6890 r8291 206 206 * 207 207 * @param apiUrl the API URL. Must not be null. 208 * @throws IllegalArgumentException thrownif apiUrl is null209 */ 210 public OAuthAuthorizationWizard(String apiUrl) throws IllegalArgumentException{208 * @throws IllegalArgumentException if apiUrl is null 209 */ 210 public OAuthAuthorizationWizard(String apiUrl) { 211 211 this(Main.parent, apiUrl); 212 212 } … … 217 217 * @param parent the component relative to which the dialog is displayed 218 218 * @param apiUrl the API URL. Must not be null. 219 * @throws IllegalArgumentException thrownif apiUrl is null219 * @throws IllegalArgumentException if apiUrl is null 220 220 */ 221 221 public OAuthAuthorizationWizard(Component parent, String apiUrl) { -
trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
r8285 r8291 73 73 * @throws IllegalArgumentException if parameters is null 74 74 */ 75 public OsmOAuthAuthorizationClient(OAuthParameters parameters) throws IllegalArgumentException{75 public OsmOAuthAuthorizationClient(OAuthParameters parameters) { 76 76 CheckParameterUtil.ensureParameterNotNull(parameters, "parameters"); 77 77 oauthProviderParameters = new OAuthParameters(parameters); … … 89 89 * @throws IllegalArgumentException if requestToken is null 90 90 */ 91 public OsmOAuthAuthorizationClient(OAuthParameters parameters, OAuthToken requestToken) throws IllegalArgumentException{91 public OsmOAuthAuthorizationClient(OAuthParameters parameters, OAuthToken requestToken) { 92 92 CheckParameterUtil.ensureParameterNotNull(parameters, "parameters"); 93 93 oauthProviderParameters = new OAuthParameters(parameters); … … 510 510 * @throws OsmTransferCanceledException if the task is canceled by the user 511 511 */ 512 public void authorise(OAuthToken requestToken, String osmUserName, String osmPassword, OsmPrivileges privileges, ProgressMonitor monitor) throws IllegalArgumentException,OsmOAuthAuthorizationException, OsmTransferCanceledException{512 public void authorise(OAuthToken requestToken, String osmUserName, String osmPassword, OsmPrivileges privileges, ProgressMonitor monitor) throws OsmOAuthAuthorizationException, OsmTransferCanceledException{ 513 513 CheckParameterUtil.ensureParameterNotNull(requestToken, "requestToken"); 514 514 CheckParameterUtil.ensureParameterNotNull(osmUserName, "osmUserName"); -
trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java
r6643 r8291 40 40 * @param parameters the OAuth parameters. Must not be null. 41 41 * @param requestToken the request token for which an Access Token is retrieved. Must not be null. 42 * @throws IllegalArgumentException thrownif parameters is null.43 * @throws IllegalArgumentException thrownif requestToken is null.42 * @throws IllegalArgumentException if parameters is null. 43 * @throws IllegalArgumentException if requestToken is null. 44 44 */ 45 45 public RetrieveAccessTokenTask(Component parent, OAuthParameters parameters, OAuthToken requestToken) { -
trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java
r6643 r8291 37 37 * is displayed 38 38 * @param parameters the OAuth parameters. Must not be null. 39 * @throws IllegalArgumentException thrownif parameters is null.39 * @throws IllegalArgumentException if parameters is null. 40 40 */ 41 41 public RetrieveRequestTokenTask(Component parent, OAuthParameters parameters ) { -
trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java
r7473 r8291 43 43 * @param parent the parent component relative to which the {@link PleaseWaitRunnable}-Dialog is displayed 44 44 * @param url the url. Must not be null. 45 * @throws IllegalArgumentException thrownif url is null.46 */ 47 public ApiUrlTestTask(Component parent, String url) throws IllegalArgumentException{45 * @throws IllegalArgumentException if url is null. 46 */ 47 public ApiUrlTestTask(Component parent, String url) { 48 48 super(parent, tr("Testing OSM API URL ''{0}''", url), false /* don't ignore exceptions */); 49 49 CheckParameterUtil.ensureParameterNotNull(url,"url"); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
r8126 r8291 145 145 * @param pref the preferences. Must not be null. 146 146 * @param cm the credential manager. Must not be null. 147 * @throws IllegalArgumentException thrownif cm is null148 */ 149 public void init(Preferences pref, CredentialsAgent cm) throws IllegalArgumentException{147 * @throws IllegalArgumentException if cm is null 148 */ 149 public void init(Preferences pref, CredentialsAgent cm) { 150 150 CheckParameterUtil.ensureParameterNotNull(pref, "pref"); 151 151 CheckParameterUtil.ensureParameterNotNull(cm, "cm"); … … 171 171 * @param preferences the preferences. Must not be null. 172 172 * @param cm the credentials manager. Must not be null. 173 * @throws IllegalArgumentException thrownif preferences is null174 * @throws IllegalArgumentException thrownif cm is null175 */ 176 public void save(Preferences preferences, CredentialsAgent cm) throws IllegalArgumentException{173 * @throws IllegalArgumentException if preferences is null 174 * @throws IllegalArgumentException if cm is null 175 */ 176 public void save(Preferences preferences, CredentialsAgent cm) { 177 177 CheckParameterUtil.ensureParameterNotNull(preferences, "preferences"); 178 178 CheckParameterUtil.ensureParameterNotNull(cm, "cm"); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
r6890 r8291 242 242 243 243 private static class ApiUrlValidator extends AbstractTextComponentValidator { 244 public ApiUrlValidator(JTextComponent tc) throws IllegalArgumentException{244 public ApiUrlValidator(JTextComponent tc) { 245 245 super(tc); 246 246 } -
trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
r6084 r8291 22 22 * 23 23 * @param delegate the delegate which renders the progress information. Must not be null. 24 * @throws IllegalArgumentException thrown if delegate is null 25 * 24 * @throws IllegalArgumentException if delegate is null 26 25 */ 27 26 public SwingRenderingProgressMonitor(ProgressRenderer delegate) { -
trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
r7864 r8291 67 67 * @param rowSelectionModel the row selection model. Must not be null. 68 68 * @param colSelectionModel the column selection model. Must not be null. 69 * @throws IllegalArgumentException thrownif {@code rowSelectionModel} is null70 * @throws IllegalArgumentException thrownif {@code colSelectionModel} is null71 */ 72 public TagEditorModel(DefaultListSelectionModel rowSelectionModel, DefaultListSelectionModel colSelectionModel) throws IllegalArgumentException{69 * @throws IllegalArgumentException if {@code rowSelectionModel} is null 70 * @throws IllegalArgumentException if {@code colSelectionModel} is null 71 */ 72 public TagEditorModel(DefaultListSelectionModel rowSelectionModel, DefaultListSelectionModel colSelectionModel) { 73 73 CheckParameterUtil.ensureParameterNotNull(rowSelectionModel, "rowSelectionModel"); 74 74 CheckParameterUtil.ensureParameterNotNull(colSelectionModel, "colSelectionModel"); … … 173 173 * @param tag the tag. Must not be null. 174 174 * 175 * @ exception IllegalArgumentException thrown,if tag is null175 * @throws IllegalArgumentException if tag is null 176 176 */ 177 177 public void add(TagModel tag) { -
trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
r7509 r8291 10 10 import java.awt.event.FocusEvent; 11 11 import java.util.EnumSet; 12 12 13 import javax.swing.AbstractAction; 13 14 14 import javax.swing.BoxLayout; 15 15 import javax.swing.JButton; … … 175 175 * 176 176 * @param layer the data layer. Must not be null. 177 * @throws IllegalArgumentException thrownif {@code layer} is null178 */ 179 public void initAutoCompletion(OsmDataLayer layer) throws IllegalArgumentException{177 * @throws IllegalArgumentException if {@code layer} is null 178 */ 179 public void initAutoCompletion(OsmDataLayer layer) { 180 180 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); 181 181 -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
r7864 r8291 57 57 * @param filter the filter expression; must not be null 58 58 * 59 * @ exception IllegalArgumentException thrown,if filter is null59 * @throws IllegalArgumentException if filter is null 60 60 */ 61 61 public void applyFilter(String filter) { … … 100 100 * 101 101 * @param other another auto completion list; must not be null 102 * @ exception IllegalArgumentException thrown,if other is null102 * @throws IllegalArgumentException if other is null 103 103 */ 104 104 public void add(AutoCompletionList other) { … … 116 116 * 117 117 * @param other a list of AutoCompletionListItem; must not be null 118 * @ exception IllegalArgumentException thrown,if other is null118 * @throws IllegalArgumentException if other is null 119 119 */ 120 120 public void add(List<AutoCompletionListItem> other) { … … 264 264 * @return the item 265 265 * 266 * @ exception IndexOutOfBoundsException thrown,if idx is out of bounds266 * @throws IndexOutOfBoundsException if idx is out of bounds 267 267 */ 268 268 public AutoCompletionListItem getFilteredItem(int idx) { -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java
r7863 r8291 78 78 * sets the value 79 79 * @param value the value; must not be null 80 * @ exception IllegalArgumentException thrown,if value if null80 * @throws IllegalArgumentException if value if null 81 81 */ 82 82 public void setValue(String value) { -
trunk/src/org/openstreetmap/josm/gui/util/AdjustmentSynchronizer.java
r7005 r8291 90 90 * @param adjustable the adjustable 91 91 * @return true, if the adjustable is participating in synchronized scrolling, false otherwise 92 * @throws IllegalStateException thrown,if adjustable is not registered for synchronized scrolling92 * @throws IllegalStateException if adjustable is not registered for synchronized scrolling 93 93 */ 94 protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) throws IllegalStateException{94 protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) { 95 95 if (! synchronizedAdjustables.contains(adjustable)) 96 96 throw new IllegalStateException(tr("Adjustable {0} not registered yet.", adjustable)); … … 110 110 * @param view the checkbox to control whether an adjustable participates in synchronized adjustment 111 111 * @param adjustable the adjustable 112 * @ exception IllegalArgumentException thrown,if view is null113 * @ exception IllegalArgumentException thrown,if adjustable is null112 * @throws IllegalArgumentException if view is null 113 * @throws IllegalArgumentException if adjustable is null 114 114 */ 115 115 public void adapt(final JCheckBox view, final Adjustable adjustable) { -
trunk/src/org/openstreetmap/josm/gui/widgets/AbstractFileChooser.java
r8126 r8291 154 154 * </ul> 155 155 * 156 * @exception IllegalArgumentException if <code>mode</code> is an 157 * illegal file selection mode 156 * @throws IllegalArgumentException if <code>mode</code> is an illegal file selection mode 158 157 */ 159 158 public abstract void setFileSelectionMode(int selectionMode); … … 197 196 * dialog is dismissed 198 197 * </ul> 199 * @exception HeadlessException if GraphicsEnvironment.isHeadless() 200 * returns true. 198 * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true. 201 199 * @see java.awt.GraphicsEnvironment#isHeadless 202 200 */ … … 218 216 * dialog is dismissed 219 217 * </ul> 220 * @exception HeadlessException if GraphicsEnvironment.isHeadless() 221 * returns true. 218 * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true. 222 219 * @see java.awt.GraphicsEnvironment#isHeadless 223 220 */ -
trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
r7083 r8291 85 85 * 86 86 * @param tc the text component. Must not be null. 87 * @throws IllegalArgumentException thrownif tc is null87 * @throws IllegalArgumentException if tc is null 88 88 */ 89 public AbstractTextComponentValidator(JTextComponent tc) throws IllegalArgumentException{89 public AbstractTextComponentValidator(JTextComponent tc) { 90 90 this(tc, true); 91 91 } … … 95 95 * This can be useful if the enter key stroke needs to be forwarded to the default button in a dialog. 96 96 */ 97 public AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) throws IllegalArgumentException{97 public AbstractTextComponentValidator(JTextComponent tc, boolean addActionListener) { 98 98 this(tc, true, true, addActionListener); 99 99 } 100 100 101 public AbstractTextComponentValidator(JTextComponent tc, boolean addFocusListener, boolean addDocumentListener, boolean addActionListener) throws IllegalArgumentException{101 public AbstractTextComponentValidator(JTextComponent tc, boolean addFocusListener, boolean addDocumentListener, boolean addActionListener) { 102 102 CheckParameterUtil.ensureParameterNotNull(tc, "tc"); 103 103 this.tc = tc; -
trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java
r7937 r8291 90 90 * is set to zero, the preferred width will be whatever 91 91 * naturally results from the component implementation 92 * @ exceptionIllegalArgumentException if <code>columns</code> < 092 * @throws IllegalArgumentException if <code>columns</code> < 0 93 93 */ 94 94 public DisableShortcutsOnFocusGainedTextField(Document doc, String text, int columns) { -
trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java
r8290 r8291 39 39 * 40 40 * @param initialPage the URL 41 * @ exceptionIOException if the URL is <code>null</code> or cannot be accessed41 * @throws IOException if the URL is <code>null</code> or cannot be accessed 42 42 */ 43 43 public JosmEditorPane(URL initialPage) throws IOException { … … 51 51 * 52 52 * @param url the URL 53 * @ exceptionIOException if the URL is <code>null</code> or cannot be accessed53 * @throws IOException if the URL is <code>null</code> or cannot be accessed 54 54 */ 55 55 public JosmEditorPane(String url) throws IOException { … … 65 65 * @param type mime type of the given text 66 66 * @param text the text to initialize with; may be <code>null</code> 67 * @ exceptionNullPointerException if the <code>type</code> parameter67 * @throws NullPointerException if the <code>type</code> parameter 68 68 * is <code>null</code> 69 69 */ -
trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
r8005 r8291 51 51 * @param rows the number of rows >= 0 52 52 * @param columns the number of columns >= 0 53 * @ exceptionIllegalArgumentException if the rows or columns53 * @throws IllegalArgumentException if the rows or columns 54 54 * arguments are negative. 55 55 */ … … 65 65 * @param rows the number of rows >= 0 66 66 * @param columns the number of columns >= 0 67 * @ exceptionIllegalArgumentException if the rows or columns67 * @throws IllegalArgumentException if the rows or columns 68 68 * arguments are negative. 69 69 */ … … 81 81 * @param rows the number of rows >= 0 82 82 * @param columns the number of columns >= 0 83 * @ exceptionIllegalArgumentException if the rows or columns83 * @throws IllegalArgumentException if the rows or columns 84 84 * arguments are negative. 85 85 */ -
trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
r8038 r8291 43 43 * is set to zero, the preferred width will be whatever 44 44 * naturally results from the component implementation 45 * @ exceptionIllegalArgumentException if <code>columns</code> < 045 * @throws IllegalArgumentException if <code>columns</code> < 0 46 46 */ 47 47 public JosmTextField(Document doc, String text, int columns) { … … 64 64 * naturally results from the component implementation 65 65 * @param undoRedo Enables or not Undo/Redo feature. Not recommended for table cell editors, unless each cell provides its own editor 66 * @ exceptionIllegalArgumentException if <code>columns</code> < 066 * @throws IllegalArgumentException if <code>columns</code> < 0 67 67 */ 68 68 public JosmTextField(Document doc, String text, int columns, boolean undoRedo) { -
trunk/src/org/openstreetmap/josm/io/AbstractReader.java
r7937 r8291 52 52 */ 53 53 protected final Map<Long, Collection<RelationMemberData>> relations = new HashMap<>(); 54 54 55 55 /** 56 56 * Replies the parsed data set … … 61 61 return ds; 62 62 } 63 63 64 64 /** 65 65 * Processes the parsed nodes after parsing. Just adds them to … … 79 79 * adds the way to the dataset 80 80 * 81 * @throws IllegalDataException thrownif a data integrity problem is detected81 * @throws IllegalDataException if a data integrity problem is detected 82 82 */ 83 83 protected void processWaysAfterParsing() throws IllegalDataException{ … … 119 119 * Completes the parsed relations with its members. 120 120 * 121 * @throws IllegalDataException thrownif a data integrity problem is detected, i.e. if a121 * @throws IllegalDataException if a data integrity problem is detected, i.e. if a 122 122 * relation member refers to a local primitive which wasn't available in the data 123 *124 123 */ 125 124 protected void processRelationsAfterParsing() throws IllegalDataException { … … 191 190 } 192 191 } 193 192 194 193 protected final void prepareDataSet() throws IllegalDataException { 195 194 try { -
trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java
r7303 r8291 32 32 * @param query the query part 33 33 * @return the query object 34 * @throws ChangesetQueryUrlException thrown if query doesn't consist of valid query parameters 35 * 34 * @throws ChangesetQueryUrlException if query doesn't consist of valid query parameters 36 35 */ 37 36 public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{ … … 67 66 * @param uid the uid of the user. > 0 expected. 68 67 * @return the query object with the applied restriction 69 * @throws IllegalArgumentException thrownif uid <= 068 * @throws IllegalArgumentException if uid <= 0 70 69 * @see #forUser(String) 71 70 */ 72 public ChangesetQuery forUser(int uid) throws IllegalArgumentException{71 public ChangesetQuery forUser(int uid) { 73 72 if (uid <= 0) 74 73 throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "uid", uid)); … … 86 85 * @param username the username. Must not be null. 87 86 * @return the query object with the applied restriction 88 * @throws IllegalArgumentException thrownif username is null.87 * @throws IllegalArgumentException if username is null. 89 88 * @see #forUser(int) 90 89 */ … … 133 132 * 134 133 * @return the restricted changeset query 135 * @throws IllegalArgumentException thrownif either of the parameters isn't a valid longitude or134 * @throws IllegalArgumentException if either of the parameters isn't a valid longitude or 136 135 * latitude value 137 136 */ 138 public ChangesetQuery inBbox(double minLon, double minLat, double maxLon, double maxLat) throws IllegalArgumentException{137 public ChangesetQuery inBbox(double minLon, double minLat, double maxLon, double maxLat) { 139 138 if (!LatLon.isValidLon(minLon)) 140 139 throw new IllegalArgumentException(tr("Illegal longitude value for parameter ''{0}'', got {1}", "minLon", minLon)); … … 156 155 * 157 156 * @return the restricted changeset query 158 * @throws IllegalArgumentException thrownif min is null159 * @throws IllegalArgumentException thrownif max is null157 * @throws IllegalArgumentException if min is null 158 * @throws IllegalArgumentException if max is null 160 159 */ 161 160 public ChangesetQuery inBbox(LatLon min, LatLon max) { … … 171 170 * @param bbox the bounding box. Must not be null. 172 171 * @return the changeset query 173 * @throws IllegalArgumentException thrownif bbox is null.174 */ 175 public ChangesetQuery inBbox(Bounds bbox) throws IllegalArgumentException{172 * @throws IllegalArgumentException if bbox is null. 173 */ 174 public ChangesetQuery inBbox(Bounds bbox) { 176 175 CheckParameterUtil.ensureParameterNotNull(bbox, "bbox"); 177 176 this.bounds = bbox; … … 185 184 * @param d the date . Must not be null. 186 185 * @return the restricted changeset query 187 * @throws IllegalArgumentException thrownif d is null188 */ 189 public ChangesetQuery closedAfter(Date d) throws IllegalArgumentException{186 * @throws IllegalArgumentException if d is null 187 */ 188 public ChangesetQuery closedAfter(Date d) { 190 189 CheckParameterUtil.ensureParameterNotNull(d, "d"); 191 190 this.closedAfter = d; … … 201 200 * @param createdBefore only reply changesets created before this date. Must not be null. 202 201 * @return the restricted changeset query 203 * @throws IllegalArgumentException thrownif closedAfter is null204 * @throws IllegalArgumentException thrownif createdBefore is null205 */ 206 public ChangesetQuery closedAfterAndCreatedBefore(Date closedAfter, Date createdBefore ) throws IllegalArgumentException{202 * @throws IllegalArgumentException if closedAfter is null 203 * @throws IllegalArgumentException if createdBefore is null 204 */ 205 public ChangesetQuery closedAfterAndCreatedBefore(Date closedAfter, Date createdBefore ) { 207 206 CheckParameterUtil.ensureParameterNotNull(closedAfter, "closedAfter"); 208 207 CheckParameterUtil.ensureParameterNotNull(createdBefore, "createdBefore"); … … 241 240 * @param changesetIds the changeset ids 242 241 * @return the query object with the applied restriction 243 * @throws IllegalArgumentException thrownif changesetIds is null.242 * @throws IllegalArgumentException if changesetIds is null. 244 243 */ 245 244 public ChangesetQuery forChangesetIds(Collection<Long> changesetIds) { -
trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
r7432 r8291 113 113 * @throws NoSuchElementException if ds does not include an {@link OsmPrimitive} with id=<code>id</code> 114 114 */ 115 protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws IllegalArgumentException,NoSuchElementException{115 protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws NoSuchElementException{ 116 116 CheckParameterUtil.ensureParameterNotNull(ds, "ds"); 117 117 if (id <= 0) return; -
trunk/src/org/openstreetmap/josm/io/OsmApi.java
r8285 r8291 90 90 * @param serverUrl the server URL 91 91 * @return the OsmApi 92 * @throws IllegalArgumentException thrown,if serverUrl is null92 * @throws IllegalArgumentException if serverUrl is null 93 93 * 94 94 */ … … 134 134 * 135 135 * @param serverUrl the server URL. Must not be null 136 * @throws IllegalArgumentException thrown,if serverUrl is null136 * @throws IllegalArgumentException if serverUrl is null 137 137 */ 138 138 protected OsmApi(String serverUrl) { … … 417 417 * @param progressMonitor the progress monitor 418 418 * @throws OsmTransferException signifying a non-200 return code, or connection errors 419 * @throws IllegalArgumentException thrownif changeset is null419 * @throws IllegalArgumentException if changeset is null 420 420 */ 421 421 public void openChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException { … … 487 487 * 488 488 * @throws OsmTransferException if something goes wrong. 489 * @throws IllegalArgumentException thrownif changeset is null490 * @throws IllegalArgumentException thrownif changeset.getId() <= 0489 * @throws IllegalArgumentException if changeset is null 490 * @throws IllegalArgumentException if changeset.getId() <= 0 491 491 */ 492 492 public void closeChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException { … … 756 756 * Ensures that the current changeset can be used for uploading data 757 757 * 758 * @throws OsmTransferException thrown if the current changeset can't be used for 759 * uploading data 758 * @throws OsmTransferException if the current changeset can't be used for uploading data 760 759 */ 761 760 protected void ensureValidChangeset() throws OsmTransferException { … … 781 780 * 782 781 * @param changeset the changeset 783 * @throws IllegalArgumentException thrownif changeset.getId() <= 0784 * @throws IllegalArgumentException thrownif !changeset.isOpen()782 * @throws IllegalArgumentException if changeset.getId() <= 0 783 * @throws IllegalArgumentException if !changeset.isOpen() 785 784 */ 786 785 public void setChangeset(Changeset changeset) { -
trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java
r6889 r8291 70 70 * Writes the prolog of the OsmChange document 71 71 * 72 * @throws IllegalStateException thrownif the prologs has already been written72 * @throws IllegalStateException if the prologs has already been written 73 73 */ 74 public void start() throws IllegalStateException{74 public void start() { 75 75 if (prologWritten) 76 76 throw new IllegalStateException(tr("Prolog of OsmChange document already written. Please write only once.")); … … 85 85 * 86 86 * @param primitives the collection of primitives. Ignored if null. 87 * @throws IllegalStateException thrownif the prologs has not been written yet87 * @throws IllegalStateException if the prologs has not been written yet 88 88 * @see #start() 89 89 * @see #append(IPrimitive) 90 90 */ 91 public void append(Collection<? extends IPrimitive> primitives) throws IllegalStateException{91 public void append(Collection<? extends IPrimitive> primitives) { 92 92 if (primitives == null) return; 93 93 if (!prologWritten) … … 102 102 * 103 103 * @param p the primitive. Ignored if null. 104 * @throws IllegalStateException thrownif the prologs has not been written yet104 * @throws IllegalStateException if the prologs has not been written yet 105 105 * @see #start() 106 106 * @see #append(Collection) 107 108 107 */ 109 108 public void append(IPrimitive p) { … … 117 116 * Writes the epilog of the OsmChange document 118 117 * 119 * @throws IllegalStateException thrownif the prologs has not been written yet118 * @throws IllegalStateException if the prologs has not been written yet 120 119 */ 121 public void finish() throws IllegalStateException{120 public void finish() { 122 121 if (!prologWritten) 123 122 throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write first.")); -
trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java
r7937 r8291 103 103 * 104 104 * @return the dataset with the parsed data 105 * @throws IllegalDataException thrownif the an error was found while parsing the data from the source106 * @throws IllegalArgumentException thrownif source is <code>null</code>105 * @throws IllegalDataException if the an error was found while parsing the data from the source 106 * @throws IllegalArgumentException if source is <code>null</code> 107 107 */ 108 108 public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException { -
trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java
r8287 r8291 269 269 * 270 270 * @return the list of changesets 271 * @throws IllegalDataException thrownif the an error was found while parsing the data from the source271 * @throws IllegalDataException if the an error was found while parsing the data from the source 272 272 */ 273 273 @SuppressWarnings("resource") -
trunk/src/org/openstreetmap/josm/io/OsmConnection.java
r7082 r8291 73 73 * 74 74 * @param con the connection 75 * @throws OsmTransferException thrownif something went wrong. Check for nested exceptions75 * @throws OsmTransferException if something went wrong. Check for nested exceptions 76 76 */ 77 77 protected void addBasicAuthorizationHeader(HttpURLConnection con) throws OsmTransferException { … … 110 110 * @param connection the connection 111 111 * 112 * @throws OsmTransferException thrownif there is currently no OAuth Access Token configured113 * @throws OsmTransferException thrownif signing fails112 * @throws OsmTransferException if there is currently no OAuth Access Token configured 113 * @throws OsmTransferException if signing fails 114 114 */ 115 115 protected void addOAuthAuthorizationHeader(HttpURLConnection connection) throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/io/OsmExporter.java
r7562 r8291 63 63 * @throws IllegalArgumentException if {@code layer} is not an instance of {@code OsmDataLayer} 64 64 */ 65 public void exportData(File file, Layer layer, boolean noBackup) throws IllegalArgumentException{65 public void exportData(File file, Layer layer, boolean noBackup) { 66 66 checkOsmDataLayer(layer); 67 67 save(file, (OsmDataLayer) layer, noBackup); 68 68 } 69 69 70 protected static void checkOsmDataLayer(Layer layer) throws IllegalArgumentException{70 protected static void checkOsmDataLayer(Layer layer) { 71 71 if (!(layer instanceof OsmDataLayer)) { 72 72 throw new IllegalArgumentException(MessageFormat.format("Expected instance of OsmDataLayer. Got ''{0}''.", layer -
trunk/src/org/openstreetmap/josm/io/OsmReader.java
r8126 r8291 644 644 * 645 645 * @return the dataset with the parsed data 646 * @throws IllegalDataException thrownif the an error was found while parsing the data from the source647 * @throws IllegalArgumentException thrownif source is null646 * @throws IllegalDataException if the an error was found while parsing the data from the source 647 * @throws IllegalArgumentException if source is null 648 648 */ 649 649 public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException { -
trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
r7092 r8291 47 47 * @param primitive the primitive to be read. Must not be null. primitive.id > 0 expected 48 48 * 49 * @ exception IllegalArgumentException thrown if primitive is null50 * @ exception IllegalArgumentException thrown if primitive.id <= 051 */ 52 public OsmServerBackreferenceReader(OsmPrimitive primitive) throws IllegalArgumentException{49 * @throws IllegalArgumentException if primitive is null 50 * @throws IllegalArgumentException if primitive.id <= 0 51 */ 52 public OsmServerBackreferenceReader(OsmPrimitive primitive) { 53 53 CheckParameterUtil.ensureValidPrimitiveId(primitive, "primitive"); 54 54 this.id = primitive.getId(); … … 63 63 * @param type the type of the primitive. Must not be null. 64 64 * 65 * @exception IllegalArgumentException thrown if id <= 0 66 * @exception IllegalArgumentException thrown if type is null 67 * 68 */ 69 public OsmServerBackreferenceReader(long id, OsmPrimitiveType type) throws IllegalArgumentException { 65 * @throws IllegalArgumentException if id <= 0 66 * @throws IllegalArgumentException if type is null 67 */ 68 public OsmServerBackreferenceReader(long id, OsmPrimitiveType type) { 70 69 if (id <= 0) 71 70 throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id)); … … 95 94 * @param readFull true, if referers should be read fully (i.e. including their immediate children) 96 95 * 97 * @exception IllegalArgumentException thrown if id <= 0 98 * @exception IllegalArgumentException thrown if type is null 99 * 100 */ 101 public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) throws IllegalArgumentException { 96 * @throws IllegalArgumentException if id <= 0 97 * @throws IllegalArgumentException if type is null 98 */ 99 public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) { 102 100 this(id, type); 103 101 this.readFull = readFull; … … 185 183 * @param progressMonitor the progress monitor 186 184 * @return the modified dataset 187 * @throws OsmTransferException thrownif an exception occurs.185 * @throws OsmTransferException if an exception occurs. 188 186 */ 189 187 protected DataSet readIncompletePrimitives(DataSet ds, ProgressMonitor progressMonitor) throws OsmTransferException { … … 224 222 * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null. 225 223 * @return the dataset with the referring primitives 226 * @ exception OsmTransferException thrown if an error occurs while communicating with the server224 * @throws OsmTransferException if an error occurs while communicating with the server 227 225 */ 228 226 @Override -
trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
r7704 r8291 58 58 * @param monitor a progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null 59 59 * @return the list of changesets read from the server 60 * @throws IllegalArgumentException thrownif query is null61 * @throws OsmTransferException thrownif something goes wrong w60 * @throws IllegalArgumentException if query is null 61 * @throws OsmTransferException if something goes wrong w 62 62 */ 63 63 public List<Changeset> queryChangesets(ChangesetQuery query, ProgressMonitor monitor) throws OsmTransferException { … … 96 96 * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null 97 97 * @return the changeset read 98 * @throws OsmTransferException thrownif something goes wrong98 * @throws OsmTransferException if something goes wrong 99 99 * @throws IllegalArgumentException if id <= 0 100 100 * @since 7704 … … 137 137 * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null 138 138 * @return the changeset read 139 * @throws OsmTransferException thrownif something goes wrong139 * @throws OsmTransferException if something goes wrong 140 140 * @throws IllegalArgumentException if id <= 0 141 141 * @since 7704 … … 187 187 * @param monitor the progress monitor. {@link NullProgressMonitor#INSTANCE} assumed if null. 188 188 * @return the changeset content 189 * @throws IllegalArgumentException thrownif id <= 0190 * @throws OsmTransferException thrownif something went wrong191 */ 192 public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws IllegalArgumentException,OsmTransferException {189 * @throws IllegalArgumentException if id <= 0 190 * @throws OsmTransferException if something went wrong 191 */ 192 public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws OsmTransferException { 193 193 if (id <= 0) 194 194 throw new IllegalArgumentException(MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id)); -
trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
r7033 r8291 29 29 * @param id the id of the primitive 30 30 * 31 * @ exception IllegalArgumentException thrown,if type is null31 * @throws IllegalArgumentException if type is null 32 32 */ 33 public OsmServerHistoryReader(OsmPrimitiveType type, long id) throws IllegalArgumentException{33 public OsmServerHistoryReader(OsmPrimitiveType type, long id) { 34 34 CheckParameterUtil.ensureParameterNotNull(type, "type"); 35 35 if (id < 0) … … 52 52 * 53 53 * @return the data set with the parsed history data 54 * @throws OsmTransferException thrown,if an exception occurs54 * @throws OsmTransferException if an exception occurs 55 55 */ 56 56 public HistoryDataSet parseHistory(ProgressMonitor progressMonitor) throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
r7432 r8291 40 40 * @param full true, if a full download is requested (i.e. a download including 41 41 * immediate children); false, otherwise 42 * @throws IllegalArgumentException thrownif id <= 043 * @throws IllegalArgumentException thrownif type is null42 * @throws IllegalArgumentException if id <= 0 43 * @throws IllegalArgumentException if type is null 44 44 */ 45 public OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full) throws IllegalArgumentException{45 public OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full) { 46 46 this(id, type, full, -1); 47 47 } … … 53 53 * @param type the type. Must not be null. 54 54 * @param version the specific version number, if required; -1, otherwise 55 * @throws IllegalArgumentException thrownif id <= 056 * @throws IllegalArgumentException thrownif type is null55 * @throws IllegalArgumentException if id <= 0 56 * @throws IllegalArgumentException if type is null 57 57 */ 58 public OsmServerObjectReader(long id, OsmPrimitiveType type, int version) throws IllegalArgumentException{58 public OsmServerObjectReader(long id, OsmPrimitiveType type, int version) { 59 59 this(id, type, false, version); 60 60 } 61 61 62 protected OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full, int version) throws IllegalArgumentException{62 protected OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full, int version) { 63 63 if (id <= 0) 64 64 throw new IllegalArgumentException(MessageFormat.format("Expected value > 0 for parameter ''{0}'', got {1}", "id", id)); … … 75 75 * @param full true, if a full download is requested (i.e. a download including 76 76 * immediate children); false, otherwise 77 * @throws IllegalArgumentException thrownif id is null78 * @throws IllegalArgumentException thrownif id.getUniqueId() <= 077 * @throws IllegalArgumentException if id is null 78 * @throws IllegalArgumentException if id.getUniqueId() <= 0 79 79 */ 80 80 public OsmServerObjectReader(PrimitiveId id, boolean full) { … … 87 87 * @param id the object id. Must not be null. Unique id > 0 required. 88 88 * @param version the specific version number, if required; -1, otherwise 89 * @throws IllegalArgumentException thrownif id is null90 * @throws IllegalArgumentException thrownif id.getUniqueId() <= 089 * @throws IllegalArgumentException if id is null 90 * @throws IllegalArgumentException if id.getUniqueId() <= 0 91 91 */ 92 92 public OsmServerObjectReader(PrimitiveId id, int version) { -
trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
r8218 r8291 46 46 * @param progressMonitor progress monitoring and abort handler 47 47 * @return A reader reading the input stream (servers answer) or <code>null</code>. 48 * @throws OsmTransferException thrownif data transfer errors occur48 * @throws OsmTransferException if data transfer errors occur 49 49 */ 50 50 protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException { … … 60 60 * @param reason The reason to show on console. Can be {@code null} if no reason is given 61 61 * @return A reader reading the input stream (servers answer) or <code>null</code>. 62 * @throws OsmTransferException thrownif data transfer errors occur62 * @throws OsmTransferException if data transfer errors occur 63 63 */ 64 64 protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException { … … 86 86 * @param progressMonitor progress monitoring and abort handler 87 87 * @return An reader reading the input stream (servers answer) or <code>null</code>. 88 * @throws OsmTransferException thrownif data transfer errors occur88 * @throws OsmTransferException if data transfer errors occur 89 89 */ 90 90 protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException { … … 99 99 * @param reason The reason to show on console. Can be {@code null} if no reason is given 100 100 * @return An reader reading the input stream (servers answer) or <code>null</code>. 101 * @throws OsmTransferException thrownif data transfer errors occur101 * @throws OsmTransferException if data transfer errors occur 102 102 */ 103 103 protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException { … … 114 114 * for {@code filename} and uncompress a gzip/bzip2 stream. 115 115 * @return An reader reading the input stream (servers answer) or <code>null</code>. 116 * @throws OsmTransferException thrownif data transfer errors occur116 * @throws OsmTransferException if data transfer errors occur 117 117 */ 118 118 @SuppressWarnings("resource") -
trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
r8285 r8291 83 83 * @param primitives the collection of primitives to upload 84 84 * @param progressMonitor the progress monitor 85 * @throws OsmTransferException thrownif an exception occurs85 * @throws OsmTransferException if an exception occurs 86 86 */ 87 87 protected void uploadChangesIndividually(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException { … … 125 125 * @param primitives the collection of primitives to upload 126 126 * @param progressMonitor the progress monitor 127 * @throws OsmTransferException thrownif an exception occurs127 * @throws OsmTransferException if an exception occurs 128 128 */ 129 129 protected void uploadChangesAsDiffUpload(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException { … … 144 144 * @param progressMonitor the progress monitor 145 145 * @param chunkSize the size of the individual upload chunks. > 0 required. 146 * @throws IllegalArgumentException thrownif chunkSize <= 0147 * @throws OsmTransferException thrownif an exception occurs146 * @throws IllegalArgumentException if chunkSize <= 0 147 * @throws OsmTransferException if an exception occurs 148 148 */ 149 149 protected void uploadChangesInChunks(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor, int chunkSize) throws OsmTransferException, IllegalArgumentException { … … 186 186 * @param changeset the changeset the data is uploaded to. Must not be null. 187 187 * @param monitor the progress monitor. If null, assumes {@link NullProgressMonitor#INSTANCE} 188 * @throws IllegalArgumentException thrownif changeset is null189 * @throws IllegalArgumentException thrownif strategy is null190 * @throws OsmTransferException thrownif something goes wrong188 * @throws IllegalArgumentException if changeset is null 189 * @throws IllegalArgumentException if strategy is null 190 * @throws OsmTransferException if something goes wrong 191 191 */ 192 192 public void uploadOsm(UploadStrategySpecification strategy, Collection<? extends OsmPrimitive> primitives, Changeset changeset, ProgressMonitor monitor) throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java
r6830 r8291 28 28 * @param host the hostname for these credentials 29 29 * @return the credentials 30 * @throws CredentialsAgentException thrownif a problem occurs in a implementation of this interface30 * @throws CredentialsAgentException if a problem occurs in a implementation of this interface 31 31 */ 32 32 PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException; … … 39 39 * @param host the hostname for these credentials 40 40 * @param credentials the credentials 41 * @throws CredentialsAgentException thrownif a problem occurs in a implementation of this interface41 * @throws CredentialsAgentException if a problem occurs in a implementation of this interface 42 42 */ 43 43 void store(RequestorType requestorType, String host, PasswordAuthentication credentials) throws CredentialsAgentException; … … 50 50 * @param noSuccessWithLastResponse true, if the last request with the supplied credentials failed; false otherwise. 51 51 * If true, implementations of this interface are advised to prompt the user for new credentials. 52 * @throws CredentialsAgentException thrownif a problem occurs in a implementation of this interface52 * @throws CredentialsAgentException if a problem occurs in a implementation of this interface 53 53 54 54 */ … … 60 60 * 61 61 * @return the current OAuth Access Token to access the OSM server. 62 * @throws CredentialsAgentException thrownif something goes wrong62 * @throws CredentialsAgentException if something goes wrong 63 63 */ 64 64 OAuthToken lookupOAuthAccessToken() throws CredentialsAgentException; … … 68 68 * 69 69 * @param accessToken the access Token. null, to remove the Access Token. 70 * @throws CredentialsAgentException thrownif something goes wrong70 * @throws CredentialsAgentException if something goes wrong 71 71 */ 72 72 void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsAgentException; -
trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java
r7083 r8291 99 99 * 100 100 * @return the current OAuth Access Token to access the OSM server. 101 * @throws CredentialsAgentException thrownif something goes wrong101 * @throws CredentialsAgentException if something goes wrong 102 102 */ 103 103 @Override … … 114 114 * 115 115 * @param accessToken the access Token. null, to remove the Access Token. 116 * @throws CredentialsAgentException thrownif something goes wrong116 * @throws CredentialsAgentException if something goes wrong 117 117 */ 118 118 @Override -
trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java
r7937 r8291 118 118 * 119 119 * @param out the DER stream to encode the DNSName to. 120 * @ exceptionIOException on encoding errors.120 * @throws IOException on encoding errors. 121 121 */ 122 122 @Override -
trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
r8061 r8291 54 54 * @param toUpdate a collection of plugin descriptions for plugins to update/download. Must not be null. 55 55 * @param title the title to display in the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} 56 * @throws IllegalArgumentException thrownif toUpdate is null57 */ 58 public PluginDownloadTask(Component parent, Collection<PluginInformation> toUpdate, String title) throws IllegalArgumentException{56 * @throws IllegalArgumentException if toUpdate is null 57 */ 58 public PluginDownloadTask(Component parent, Collection<PluginInformation> toUpdate, String title) { 59 59 super(parent, title == null ? "" : title, false /* don't ignore exceptions */); 60 60 CheckParameterUtil.ensureParameterNotNull(toUpdate, "toUpdate"); … … 68 68 * @param toUpdate a collection of plugin descriptions for plugins to update/download. Must not be null. 69 69 * @param title the title to display in the {@link org.openstreetmap.josm.gui.PleaseWaitDialog} 70 * @throws IllegalArgumentException thrownif toUpdate is null70 * @throws IllegalArgumentException if toUpdate is null 71 71 */ 72 72 public PluginDownloadTask(ProgressMonitor monitor, Collection<PluginInformation> toUpdate, String title) { … … 80 80 * 81 81 * @param toUpdate the collection of plugins to update. Must not be null. 82 * @throws IllegalArgumentException thrownif toUpdate is null83 */ 84 public void setPluginsToDownload(Collection<PluginInformation> toUpdate) throws IllegalArgumentException{82 * @throws IllegalArgumentException if toUpdate is null 83 */ 84 public void setPluginsToDownload(Collection<PluginInformation> toUpdate) { 85 85 CheckParameterUtil.ensureParameterNotNull(toUpdate, "toUpdate"); 86 86 this.toUpdate.clear(); -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r8126 r8291 883 883 * @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null. 884 884 * @param displayErrMsg if {@code true}, a blocking error message is displayed in case of I/O exception. 885 * @throws IllegalArgumentException thrownif plugins is null885 * @throws IllegalArgumentException if plugins is null 886 886 */ 887 887 public static Collection<PluginInformation> updatePlugins(Component parent, 888 Collection<PluginInformation> pluginsWanted, ProgressMonitor monitor, boolean displayErrMsg) 889 throws IllegalArgumentException { 888 Collection<PluginInformation> pluginsWanted, ProgressMonitor monitor, boolean displayErrMsg) { 890 889 Collection<PluginInformation> plugins = null; 891 890 pluginDownloadTask = null; -
trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
r8101 r8291 106 106 * @param file the plugin jar 107 107 * @param name the plugin name 108 * @throws PluginException thrownif reading the manifest file fails108 * @throws PluginException if reading the manifest file fails 109 109 */ 110 110 public PluginInformation(File file, String name) throws PluginException { … … 135 135 * @param name the plugin name 136 136 * @param url the download URL for the plugin 137 * @throws PluginException thrownif the plugin information can't be read from the input stream137 * @throws PluginException if the plugin information can't be read from the input stream 138 138 */ 139 139 public PluginInformation(InputStream manifestStream, String name, String url) throws PluginException { -
trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java
r7082 r8291 55 55 * @param in the input stream from which to parse 56 56 * @return the list of plugin information objects 57 * @throws PluginListParseException thrownif something goes wrong while parsing57 * @throws PluginListParseException if something goes wrong while parsing 58 58 */ 59 59 public List<PluginInformation> parse(InputStream in) throws PluginListParseException{ -
trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java
r6506 r8291 106 106 * @param id the primitive id 107 107 * @param parameterName the name of the parameter to be checked 108 * @throws IllegalArgumentException thrownif id is null109 * @throws IllegalArgumentException thrownif id.getType() != NODE108 * @throws IllegalArgumentException if id is null 109 * @throws IllegalArgumentException if id.getType() != NODE 110 110 */ 111 111 public static void ensureValidNodeId(PrimitiveId id, String parameterName) throws IllegalArgumentException { -
trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java
r7335 r8291 34 34 * @param uri The URI to display 35 35 * @return <code>null</code> for success or a string in case of an error. 36 * @throws IllegalStateException thrownif no platform is set to which opening the URL can be dispatched,36 * @throws IllegalStateException if no platform is set to which opening the URL can be dispatched, 37 37 * {@link Main#platform} 38 38 */ … … 81 81 * @param url The URL to display 82 82 * @return <code>null</code> for success or a string in case of an error. 83 * @throws IllegalStateException thrownif no platform is set to which opening the URL can be dispatched,83 * @throws IllegalStateException if no platform is set to which opening the URL can be dispatched, 84 84 * {@link Main#platform} 85 85 */ -
trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
r7005 r8291 22 22 } 23 23 24 public static Bounds parse(String url) throws IllegalArgumentException{24 public static Bounds parse(String url) { 25 25 try { 26 26 // a percent sign indicates an encoded URL (RFC 1738). … … 83 83 * @return Bounds if hashurl, {@code null} otherwise 84 84 */ 85 private static Bounds parseHashURLs(String url) throws IllegalArgumentException{85 private static Bounds parseHashURLs(String url) { 86 86 int startIndex = url.indexOf("#map="); 87 87 if (startIndex == -1) return null; -
trunk/src/org/openstreetmap/josm/tools/Utils.java
r8287 r8291 353 353 * @param out The destination file 354 354 * @return the path to the target file 355 * @throws java.io.IOException If any I/O error occurs356 * @throws IllegalArgumentException If {@code in} or {@code out} is {@code null}355 * @throws IOException if any I/O error occurs 356 * @throws IllegalArgumentException if {@code in} or {@code out} is {@code null} 357 357 * @since 7003 358 358 */ … … 367 367 * @param in The source directory 368 368 * @param out The destination directory 369 * @throws IOException If any I/O error ooccurs370 * @throws IllegalArgumentException If {@code in} or {@code out} is {@code null}369 * @throws IOException if any I/O error ooccurs 370 * @throws IllegalArgumentException if {@code in} or {@code out} is {@code null} 371 371 * @since 7835 372 372 */ -
trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
r7463 r8291 222 222 * 223 223 * @param preferenceKey the preference key 224 * @throws WindowGeometryException thrownif no such key exist or if the preference value has224 * @throws WindowGeometryException if no such key exist or if the preference value has 225 225 * an illegal format 226 226 */
Note:
See TracChangeset
for help on using the changeset viewer.