Changeset 8291 in josm for trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

Timestamp:

2015-04-29T01:44:01+02:00 (9 years ago)

Author:

Don-vip

Message:

fix squid:RedundantThrowsDeclarationCheck + consistent Javadoc for exceptions

File:

• trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -102 +102 @@
      *
      * @param conflict the conflict
-     * @exception IllegalStateException thrown, if this collection already includes a
-     * conflict for conflict.getMy()
-     */
-    protected void addConflict(Conflict<?> conflict) throws IllegalStateException {
+     * @throws IllegalStateException if this collection already includes a conflict for conflict.getMy()
+     */
+    protected void addConflict(Conflict<?> conflict) {
         if (hasConflictForMy(conflict.getMy()))
             throw new IllegalStateException(tr("Already registered a conflict for primitive ''{0}''.", conflict.getMy().toString()));
@@ -117 +116 @@
      *
      * @param conflict the conflict to add. Must not be null.
-     * @throws IllegalArgumentException thrown, if conflict is null
-     * @throws IllegalStateException thrown if this collection already includes a conflict for conflict.getMy()
-     *
-     */
-    public void add(Conflict<?> conflict) throws IllegalStateException {
+     * @throws IllegalArgumentException if conflict is null
+     * @throws IllegalStateException if this collection already includes a conflict for conflict.getMy()
+     */
+    public void add(Conflict<?> conflict) {
         CheckParameterUtil.ensureParameterNotNull(conflict, "conflict");
         addConflict(conflict);