From 6a0f9aab42c6afeb0577754c6edab486e9e8b4dc Mon Sep 17 00:00:00 2001 From: Tom Copeland Date: Mon, 9 Sep 2002 19:18:10 +0000 Subject: [PATCH] rls preps git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@878 51baf565-9d33-0410-a72c-fc3788e3496d --- pmd/etc/build.xml | 2 +- pmd/etc/doing_the_next_pmd_release.txt | 1 - pmd/maven.xml | 2 +- pmd/pmd.xml | 161 ------------------------- pmd/project.xml | 8 +- pmd/rulesets/basic.xml | 94 +++++++++------ pmd/rulesets/braces.xml | 22 +++- pmd/rulesets/design.xml | 23 ++++ pmd/rulesets/imports.xml | 15 +++ pmd/rulesets/newrules.xml | 76 ------------ pmd/xdocs/running.xml | 6 +- 11 files changed, 127 insertions(+), 283 deletions(-) delete mode 100644 pmd/pmd.xml diff --git a/pmd/etc/build.xml b/pmd/etc/build.xml index 13c9e71c5f..884aabdfc1 100644 --- a/pmd/etc/build.xml +++ b/pmd/etc/build.xml @@ -8,7 +8,7 @@ - + diff --git a/pmd/etc/doing_the_next_pmd_release.txt b/pmd/etc/doing_the_next_pmd_release.txt index 1f90e977a0..54881ad904 100644 --- a/pmd/etc/doing_the_next_pmd_release.txt +++ b/pmd/etc/doing_the_next_pmd_release.txt @@ -5,7 +5,6 @@ move rules from "newrules.xml" into a real ruleset file update jar task to reflect pmd-1.0rc1 update xdocs/running.xml to reflect pmd-1.0rc1 update release number in project.xml -update release number in pmd.xml set ANT_HOME=c:\ant ant dist diff --git a/pmd/maven.xml b/pmd/maven.xml index 2cf3ed0dcc..b6ff129f03 100644 --- a/pmd/maven.xml +++ b/pmd/maven.xml @@ -28,7 +28,7 @@ extension=".xml" includes="**/*.xml" basedir="${rulesets.dir}" - style="${dvsl.dir}/rule-format.dvsl" + style="c:\data\pmd\pmd\dvsl\rule-format.dvsl" destdir="${maven.gen.docs}/rules"> diff --git a/pmd/pmd.xml b/pmd/pmd.xml deleted file mode 100644 index 95cf5d9d7f..0000000000 --- a/pmd/pmd.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pmd/project.xml b/pmd/project.xml index 6974c7a393..52e76dd837 100644 --- a/pmd/project.xml +++ b/pmd/project.xml @@ -3,7 +3,7 @@ 3 pmd PMD - 0.9 + 1.0rc1 Project Ultra*Log @ DARPA http://pmd.sourceforge.net/ @@ -47,9 +47,9 @@ - 0.9 - 0.9 - pmd_release_0_9 + 1.0rc1 + 1.0rc1 + pmd_release_1_0rc1 dev diff --git a/pmd/rulesets/basic.xml b/pmd/rulesets/basic.xml index 020dbb66d0..ff8f110d41 100644 --- a/pmd/rulesets/basic.xml +++ b/pmd/rulesets/basic.xml @@ -81,41 +81,7 @@ while (a == b) { - - -Override both public boolean Object.equals(Object other), and public int Object.hashCode(), or override neither. Even if you are inheriting a hashCode() from a parent class, consider implementing hashCode and explicitly delegating to your superclass. - - - - - - + + + Avoid empty switch statements. + + + + + + + + + +Override both public boolean Object.equals(Object other), and public int Object.hashCode(), or override neither. Even if you are inheriting a hashCode() from a parent class, consider implementing hashCode and explicitly delegating to your superclass. + + + + + + + + diff --git a/pmd/rulesets/braces.xml b/pmd/rulesets/braces.xml index 367f3334b9..65cf03f3a8 100644 --- a/pmd/rulesets/braces.xml +++ b/pmd/rulesets/braces.xml @@ -64,7 +64,27 @@ The Braces Ruleset contains a collection of braces rules. - + + + + Avoid using if statements without using curly braces + + + + + + + + diff --git a/pmd/rulesets/design.xml b/pmd/rulesets/design.xml index 2a43001348..ef8aaa1af2 100644 --- a/pmd/rulesets/design.xml +++ b/pmd/rulesets/design.xml @@ -190,6 +190,29 @@ public class Foo { + + + + Switch statements should have a default label. + + + + + + + + diff --git a/pmd/rulesets/imports.xml b/pmd/rulesets/imports.xml index 12c5e3aa9c..174716013e 100644 --- a/pmd/rulesets/imports.xml +++ b/pmd/rulesets/imports.xml @@ -53,6 +53,21 @@ public class Foo {} + + + Avoid unused import statements. + + + + + + diff --git a/pmd/rulesets/newrules.xml b/pmd/rulesets/newrules.xml index 35ad6bf1ce..f7d567eadb 100644 --- a/pmd/rulesets/newrules.xml +++ b/pmd/rulesets/newrules.xml @@ -5,83 +5,7 @@ These are new ones for the next release - - - Avoid unused import statements. - - - - - - - - - Avoid empty switch statements. - - - - - - - - - - Switch statements should have a default label. - - - - - - - - - - Avoid using if statements without using curly braces - - - - - - diff --git a/pmd/xdocs/running.xml b/pmd/xdocs/running.xml index 1292545e76..2bb13d37dd 100644 --- a/pmd/xdocs/running.xml +++ b/pmd/xdocs/running.xml @@ -12,7 +12,7 @@
  • Type run <filename> <report format>, <rule set file>i.e.:


    • -C:\tmp\pmd-0.9\pmd\etc>run c:\data\pmd\pmd\test-data\Unused1.java xml rulesets/unusedcode.xml
+C:\tmp\pmd-1.0rc1\pmd\etc>run c:\data\pmd\pmd\test-data\Unused1.java xml rulesets/unusedcode.xml
 <?xml version="1.0"?><pmd>
 <file name="c:\data\pmd\pmd\test-data\Unused1.java">
 <violation line="5" rule="UnusedLocalVariable">
@@ -20,7 +20,7 @@ Avoid unused local variables such as 'fr'
 </violation>
 </file></pmd>
 
-C:\tmp\pmd-0.8\pmd\etc>
+C:\tmp\pmd-1.0rc1\pmd\etc>


  • Notice that in this case the output is in XML, so you can redirect it to a file and XSLT it or whatever
    • @@ -29,7 +29,7 @@ C:\tmp\pmd-0.8\pmd\etc>
    • Add a new Ant target to your build file - here's some examples.
      • -
    • Make sure the pmd-0.9.jar file is on your classpath.
      • +
    • Make sure the pmd-1.0rc1.jar file is on your classpath.
    • Run Ant like you normally do.