Changeset 13207 in josm for trunk

Timestamp:

2017-12-17T01:25:46+01:00 (6 years ago)

Author:

Don-vip

Message:

enable PMD rule PreserveStackTrace + add missing jars to run new PMD rule designer

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/projection/ProjectionCLI.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java (modified) (10 diffs)
• src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/ChangesetClosedException.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/OsmApi.java (modified) (1 diff)
• tools/pmd/antlr-runtime-3.5.2.jar (added)
• tools/pmd/flowless-0.6.jar (added)
• tools/pmd/josm-ruleset.xml (modified) (1 diff)
• tools/pmd/pmd-ui-6.0.0.jar (added)
• tools/pmd/reactfx-2.0-M5.jar (added)
• tools/pmd/richtextfx-0.8.1.jar (added)
• tools/pmd/undofx-1.3.1.jar (added)
• tools/pmd/wellbehavedfx-0.3.jar (added)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -6 +6 @@
 import java.awt.Graphics2D;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -307 +306 @@
             Constructor<?> c = activeRenderer.getConstructor(Graphics2D.class, NavigatableComponent.class, boolean.class);
             return AbstractMapRenderer.class.cast(c.newInstance(g, viewport, isInactiveMode));
-        } catch (InvocationTargetException e) {
-            Logging.debug(e);
-            throw new MapRendererFactoryException(e.getCause());
         } catch (ReflectiveOperationException | IllegalArgumentException e) {
             throw new MapRendererFactoryException(e);

trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java

@@ -196 +196 @@
             return Double.parseDouble(s);
         } catch (NumberFormatException nfe) {
-            throw new IllegalArgumentException(tr("Unable to parse number ''{0}''", s));
+            throw new IllegalArgumentException(tr("Unable to parse number ''{0}''", s), nfe);
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -231 +231 @@
                 } catch (NumberFormatException nfe) {
                     throw new IllegalArgumentException(
-                            tr("Expected integer number for option {0}, but got ''{1}''", "--zoom", getopt.getOptarg()));
+                            tr("Expected integer number for option {0}, but got ''{1}''", "--zoom", getopt.getOptarg()), nfe);
                 }
                 if (argZoom < 0)
@@ -242 +242 @@
                         argBounds = new Bounds(getopt.getOptarg(), ",", Bounds.ParseMethod.LEFT_BOTTOM_RIGHT_TOP, false);
                     } catch (IllegalArgumentException iae) { // NOPMD
-                        throw new IllegalArgumentException(tr("Unable to parse {0} parameter: {1}", "--bounds", iae.getMessage()));
+                        throw new IllegalArgumentException(tr("Unable to parse {0} parameter: {1}", "--bounds", iae.getMessage()), iae);
                     }
                 }
@@ -268 +268 @@
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(
-                                tr("Expected floating point number for option {0}, but got ''{1}''", "--scale", getopt.getOptarg()));
+                                tr("Expected floating point number for option {0}, but got ''{1}''", "--scale", getopt.getOptarg()), nfe);
                     }
                     break;
@@ -282 +282 @@
                         argAnchor = new LatLon(lat, lon);
                     } catch (IllegalArgumentException iae) { // NOPMD
-                        throw new IllegalArgumentException(tr("In option {0}: {1}", "--anchor", iae.getMessage()));
+                        throw new IllegalArgumentException(tr("In option {0}: {1}", "--anchor", iae.getMessage()), iae);
                     }
                     break;
@@ -290 +290 @@
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(
-                                tr("Expected floating point number for option {0}, but got ''{1}''", "--width-m", getopt.getOptarg()));
+                                tr("Expected floating point number for option {0}, but got ''{1}''", "--width-m", getopt.getOptarg()), nfe);
                     }
                     if (argWidthM <= 0) throw new IllegalArgumentException(
@@ -300 +300 @@
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(
-                                tr("Expected floating point number for option {0}, but got ''{1}''", "--height-m", getopt.getOptarg()));
+                                tr("Expected floating point number for option {0}, but got ''{1}''", "--height-m", getopt.getOptarg()), nfe);
                     }
                     if (argHeightM <= 0) throw new IllegalArgumentException(
@@ -310 +310 @@
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(
-                                tr("Expected integer number for option {0}, but got ''{1}''", "--width-px", getopt.getOptarg()));
+                                tr("Expected integer number for option {0}, but got ''{1}''", "--width-px", getopt.getOptarg()), nfe);
                     }
                     if (argWidthPx <= 0) throw new IllegalArgumentException(
@@ -320 +320 @@
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(
-                                tr("Expected integer number for option {0}, but got ''{1}''", "--height-px", getopt.getOptarg()));
+                                tr("Expected integer number for option {0}, but got ''{1}''", "--height-px", getopt.getOptarg()), nfe);
                     }
                     if (argHeightPx <= 0) throw new IllegalArgumentException(
@@ -333 +333 @@
                     } catch (NumberFormatException nfe) {
                         throw new IllegalArgumentException(
-                                tr("Expected integer number for option {0}, but got ''{1}''", "--max-image-size", getopt.getOptarg()));
+                                tr("Expected integer number for option {0}, but got ''{1}''", "--max-image-size", getopt.getOptarg()), nfe);
                     }
                     if (argMaxImageSize < 0) throw new IllegalArgumentException(
@@ -551 +551 @@
             return OsmReader.parseDataSet(Files.newInputStream(Paths.get(argInput)), null);
         } catch (IllegalDataException e) {
-            throw new IllegalDataException(tr("In .osm data file ''{0}'' - ", argInput) + e.getMessage());
+            throw new IllegalDataException(tr("In .osm data file ''{0}'' - ", argInput) + e.getMessage(), e);
         }
     }

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -328 +328 @@
                 throw new OsmOAuthAuthorizationException(tr("Failed to authenticate user ''{0}'' with password ''***'' as OAuth user",
                         userName));
-        } catch (OsmOAuthAuthorizationException e) {
-            Logging.debug(e);
-            throw new OsmLoginFailedException(e.getCause());
-        } catch (IOException e) {
+        } catch (OsmOAuthAuthorizationException | IOException e) {
             throw new OsmLoginFailedException(e);
         } finally {

trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java

@@ -98 +98 @@
 
     /**
-     * Creates the exception with the given error header and the given
-     * source.
+     * Creates the exception with the given error header and source.
      *
      * @param errorHeader the error header
@@ -105 +104 @@
      */
     public ChangesetClosedException(String errorHeader, Source source) {
-        super(errorHeader);
+        this(errorHeader, source, null);
+    }
+
+    /**
+     * Creates the exception with the given error header, source and cause.
+     *
+     * @param errorHeader the error header
+     * @param source the source for the exception
+     * @param cause  The cause (which is saved for later retrieval by the {@link #getCause} method).
+     *               A null value is permitted, and indicates that the cause is nonexistent or unknown.
+     * @since 13207
+     */
+    public ChangesetClosedException(String errorHeader, Source source, Throwable cause) {
+        super(errorHeader, cause);
         parseErrorHeader(errorHeader);
         this.source = source == null ? Source.UNSPECIFIED : source;

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -487 +487 @@
             String errorHeader = e.getErrorHeader();
             if (e.getResponseCode() == HttpURLConnection.HTTP_CONFLICT && ChangesetClosedException.errorHeaderMatchesPattern(errorHeader))
-                throw new ChangesetClosedException(errorHeader, ChangesetClosedException.Source.UPDATE_CHANGESET);
+                throw new ChangesetClosedException(errorHeader, ChangesetClosedException.Source.UPDATE_CHANGESET, e);
             throw e;
         } finally {

trunk/tools/pmd/josm-ruleset.xml

@@ -30 +30 @@
     <exclude name="UnusedFormalParameter"/>
     <exclude name="UseVarargs"/>
+  </rule>
+  <rule ref="category/java/bestpractices.xml/PreserveStackTrace">
+    <properties>
+        <property name="violationSuppressXPath" value="//PrimaryExpression/PrimaryPrefix/Name[@Image='BugReport.intercept']"/>
+    </properties>
   </rule>
   <rule ref="category/java/bestpractices.xml/UnusedFormalParameter">