Changeset 15588 in josm for trunk/tools/pmd

Timestamp:

2019-12-13T22:12:24+01:00 (5 years ago)

Author:

Don-vip

Message:

tools update: checkstyle 8.27, pmd 6.20, spotbugs 3.1.12

Location:

trunk/tools/pmd

Files:

• asm-6.2.1.jar (deleted)
• asm-7.1.jar (added)
• designer.bat (modified) (1 diff)
• flowless-0.6.jar (deleted)
• josm-ruleset.xml (modified) (3 diffs)
• pmd-core-6.10.0.jar (deleted)
• pmd-core-6.20.0.jar (added)
• pmd-java-6.10.0.jar (deleted)
• pmd-java-6.20.0.jar (added)
• pmd-ui-6.10.0.jar (deleted)
• pmd-ui-6.19.0.jar (added)
• reactfx-2.0-M5.jar (deleted)
• richtextfx-0.9.0.jar (deleted)
• undofx-2.0.0.jar (deleted)
• wellbehavedfx-0.3.3.jar (deleted)

trunk/tools/pmd/designer.bat

@@ -2 +2 @@
 set TOPDIR=%~dp0..
 set OPTS=
-set MAIN_CLASS=net.sourceforge.pmd.util.fxdesigner.Designer
+set MAIN_CLASS=net.sourceforge.pmd.util.fxdesigner.DesignerStarter
 
-java -classpath "%TOPDIR%\pmd\*" %OPTS% %MAIN_CLASS% %*
+
+:: sets the jver variable to the java version, eg 901 for 9.0.1+x or 180 for 1.8.0_171-b11
+:: sets the jvendor variable to either java (oracle) or openjdk
+for /f tokens^=1^,3^,4^,5^ delims^=.-_+^"^  %%j in ('java -version 2^>^&1 ^| find "version"') do (
+  set jvendor=%%j
+  if %%l EQU ea (
+    set /A "jver=%%k00"
+  ) else (
+    set /A jver=%%k%%l%%m
+  )
+)
+
+Set "jreopts="
+:: oracle java 9 and 10 has javafx included as a module
+if /I "%jvendor%" EQU "java" (
+    if %jver% GEQ 900 (
+        if %jver% LSS 1100 (
+            :: enable reflection
+            Set jreopts=--add-opens javafx.controls/javafx.scene.control.skin=ALL-UNNAMED
+        )
+    )
+)
+
+set "_needjfxlib=0"
+if /I "%jvendor%" EQU "openjdk" set _needjfxlib=1
+if /I "%jvendor%" EQU "java" (
+    if %jver% GEQ 1100 set _needjfxlib=1
+)
+if %_needjfxlib% EQU 1 (
+    if %jver% LSS 1000 (
+        echo For openjfx at least java 10 is required.
+        pause
+        exit
+    )
+    if [%JAVAFX_HOME%] EQU [] (
+        echo The environment variable JAVAFX_HOME is missing.
+        pause
+        exit
+    )
+    set "classpath=%TOPDIR%\pmd\*;%JAVAFX_HOME%\lib\*"
+) else (
+    set "classpath=%TOPDIR%\pmd\*"
+)
+
+
+java %PMD_JAVA_OPTS% %jreopts% -classpath "%classpath%" %OPTS% %MAIN_CLASS% %*

trunk/tools/pmd/josm-ruleset.xml

@@ -12 +12 @@
     <exclude name="ArrayIsStoredDirectly"/>
     <exclude name="AvoidPrintStackTrace"/>
+    <exclude name="AvoidReassigningLoopVariables"/>
     <exclude name="AvoidReassigningParameters"/>
     <exclude name="AvoidStringBufferField"/>
@@ -17 +18 @@
     <exclude name="ConstantsInInterface"/>
     <exclude name="ForLoopCanBeForeach"/>
+    <exclude name="ForLoopVariableCount"/>
     <exclude name="GuardLogStatement"/>
     <exclude name="JUnit4TestShouldUseAfterAnnotation"/>
@@ -162 +164 @@
     <exclude name="BeanMembersShouldSerialize"/>
     <exclude name="CloneThrowsCloneNotSupportedException"/>
+    <!-- <exclude name="CloseResource"/> -->
     <exclude name="CompareObjectsWithEquals"/>
     <exclude name="ConstructorCallsOverridableMethod"/>