Changeset 11739 in josm

Timestamp:

2017-03-17T23:03:26+01:00 (8 years ago)

Author:

Don-vip

Message:

enable more PMD rules

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/MergeLayerAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/bugreport/ReportedException.java (modified) (2 diffs)
• tools/pmd/josm-ruleset.xml (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -42 +42 @@
         if (targetLayer == null)
             return;
-        final Object actionName = MergeLayerAction.this.getValue(NAME);
+        final Object actionName = getValue(NAME);
         Main.worker.submit(() -> {
                 final long start = System.currentTimeMillis();

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -204 +204 @@
             if (area != null) {
                 for (Way wInner : polygon.getInnerWays()) {
-                    AreaElement areaInner = ElemStyles.getAreaElemStyle(wInner, false);
-
-                    if (areaInner != null && area.equals(areaInner)) {
+                    if (area.equals(ElemStyles.getAreaElemStyle(wInner, false))) {
                         errors.add(TestError.builder(this, Severity.OTHER, INNER_STYLE_MISMATCH)
                                 .message(tr("With the currently used mappaint style the style for inner way equals the multipolygon style"))

trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

@@ -239 +239 @@
      */
     public boolean isCurrentUser(String username) {
-        return username != null && this.userName != null && this.userName.equals(username);
+        return this.userName != null && this.userName.equals(username);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -271 +271 @@
                 for (int i = gpxLst.size() - 1; i >= 0; i--) {
                     GpxDataWrapper wrapper = gpxLst.get(i);
-                    if (wrapper.file != null && sel.equals(wrapper.file)) {
+                    if (sel.equals(wrapper.file)) {
                         cbGpx.setSelectedIndex(i);
                         if (!sel.getName().equals(wrapper.name)) {

trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java

@@ -228 +228 @@
     private static String makeCollectionNice(Collection<?> value) {
         int lines = 0;
-        StringBuilder str = new StringBuilder();
+        StringBuilder str = new StringBuilder(32);
         for (Object e : value) {
             str.append("\n    - ");
@@ -246 +246 @@
     public String toString() {
         return "ReportedException [thread=" + caughtOnThread + ", exception=" + getCause()
-                + ", methodWarningFrom=" + methodWarningFrom + "]";
+                + ", methodWarningFrom=" + methodWarningFrom + ']';
     }
 

trunk/tools/pmd/josm-ruleset.xml

@@ -22 +22 @@
         <exclude name="MethodArgumentCouldBeFinal"/>
   </rule>
-  <rule ref="rulesets/java/strictexception.xml"/>
-  <rule ref="rulesets/java/strings.xml"/>
-  <rule ref="rulesets/java/typeresolution.xml"/>
+  <rule ref="rulesets/java/strictexception.xml"/> -->
+  <rule ref="rulesets/java/strings.xml">
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="ConsecutiveLiteralAppends"/>
+        <exclude name="AvoidStringBufferField"/>
+        <exclude name="StringToString"/>
+        <exclude name="UselessStringValueOf"/>
+  </rule>
+  <rule ref="rulesets/java/typeresolution.xml">
+        <exclude name="LooseCoupling"/>
+        <exclude name="SignatureDeclareThrowsException"/>
+  </rule>
+  <rule ref="rulesets/java/typeresolution.xml/SignatureDeclareThrowsException">
+    <properties>
+        <property name="violationSuppressXPath" value="//MethodDeclaration/../Annotation/MarkerAnnotation/Name[@Image='Override']"/>
+        <property name="IgnoreJUnitCompletely" value="true"/>
+    </properties>
+  </rule>
   <rule ref="rulesets/java/unnecessary.xml">
         <exclude name="UselessParentheses"/>
-  </rule> -->
+        <exclude name="UselessOverridingMethod"/>
+  </rule>
   <rule ref="rulesets/java/unusedcode.xml">
         <exclude name="UnusedFormalParameter"/>