From a8613accc073982238e7ef062ee715fbbb5bd97c Mon Sep 17 00:00:00 2001
From: Romain Pelisse <rpelisse@users.sourceforge.net>
Date: Sat, 21 Jun 2008 09:43:42 +0000
Subject: [PATCH] Moving all the "Empty rules" out of basic.xml into empty.xml

(Added a ref to empty rules in basic.xml, so that the empty rules are still accessible from basic ruleset).

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@6239 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/etc/changelog.txt                         |  15 +
 .../test/net/sourceforge/pmd/RuleSetTest.java |   2 +-
 .../pmd/rules/basic/BasicRulesTest.java       |  11 -
 .../{basic => empty}/xml/EmptyCatchBlock.xml  |   0
 .../xml/EmptyFinallyBlock.xml                 |   0
 .../{basic => empty}/xml/EmptyIfStmt.xml      |   0
 .../{basic => empty}/xml/EmptyInitializer.xml |   0
 .../xml/EmptyStatementBlock.xml               |   0
 .../xml/EmptyStatementNotInLoop.xml           |   0
 .../xml/EmptyStaticInitializer.xml            |   0
 .../xml/EmptySwitchStatements.xml             |   0
 .../xml/EmptySynchronizedBlock.xml            |   0
 .../{basic => empty}/xml/EmptyTryBlock.xml    |   0
 .../{basic => empty}/xml/EmptyWhileStmt.xml   |   0
 pmd/rulesets/basic.xml                        | 395 +----------------
 pmd/rulesets/empty.xml                        | 403 ++++++++++++++++++
 .../pmd/SimpleRuleSetNameMapper.java          |   1 +
 17 files changed, 425 insertions(+), 402 deletions(-)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyCatchBlock.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyFinallyBlock.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyIfStmt.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyInitializer.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyStatementBlock.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyStatementNotInLoop.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyStaticInitializer.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptySwitchStatements.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptySynchronizedBlock.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyTryBlock.xml (100%)
 rename pmd/regress/test/net/sourceforge/pmd/rules/{basic => empty}/xml/EmptyWhileStmt.xml (100%)
 create mode 100644 pmd/rulesets/empty.xml

diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index c546549dc0..25bc4ea9cb 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -287,6 +287,21 @@ The default Java version processed by PMD is now uniformly Java 1.5.
 RuleViolations in Reports now uses List internally, and RuleViolationComparator is no longer broken
 TokenManager errors now include a file name whenever possible for every AST in PMD
 Added file encoding option to CPD GUI, which already existed for the command line and Ant
+Creating an Empty Code Ruleset and moved the following rules from Basic ruleset:
+        * Empty Code Rules
+        * EmptyCatchBlock
+        * EmptyIfStmt
+        * EmptyWhileStmt
+        * EmptyTryBlock
+        * EmptyFinallyBlock
+        * EmptySwitchStatements
+        * EmptySynchronizedBlock
+        * EmptyStatementNotInLoop
+        * EmptyInitializer
+        * EmptyStatementBlock
+        * EmptyStaticInitializer
+	Basic rulesets still includes a reference to those rules.
+
 
 Fixed bug 1932242 - EmptyMethodInAbstractClassShouldBeAbstract false +
 Fixed bug 1928009 - Error using migration ruleset in PMD 4.2
diff --git a/pmd/regress/test/net/sourceforge/pmd/RuleSetTest.java b/pmd/regress/test/net/sourceforge/pmd/RuleSetTest.java
index fc4be0d8d2..7567967ad7 100644
--- a/pmd/regress/test/net/sourceforge/pmd/RuleSetTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/RuleSetTest.java
@@ -339,7 +339,7 @@ public class RuleSetTest extends RuleTst {
 
 	RuleSet ruleSet1 = new RuleSet();
 	ruleSet1.setName("RuleSet1");
-	Rule rule = findRule("basic", "EmptyIfStmt");
+	Rule rule = findRule("empty", "EmptyIfStmt");
 	assertTrue("RuleChain rule", rule.usesRuleChain());
 	ruleSet1.addRule(rule);
 
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java b/pmd/regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java
index 09ea5863d7..5e019951e5 100644
--- a/pmd/regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/rules/basic/BasicRulesTest.java
@@ -25,17 +25,6 @@ public class BasicRulesTest extends SimpleAggregatorTst {
         addRule("basic", "ClassCastExceptionWithToArray");
         addRule("basic", "CollapsibleIfStatements");
         addRule("basic", "DoubleCheckedLocking");
-        addRule("basic", "EmptyCatchBlock");
-        addRule("basic", "EmptyFinallyBlock");
-        addRule("basic", "EmptyIfStmt");
-        addRule("basic", "EmptyInitializer");
-        addRule("basic", "EmptyStatementBlock");
-        addRule("basic", "EmptyStatementNotInLoop");
-        addRule("basic", "EmptyStaticInitializer");
-        addRule("basic", "EmptySwitchStatements");
-        addRule("basic", "EmptySynchronizedBlock");
-        addRule("basic", "EmptyTryBlock");
-        addRule("basic", "EmptyWhileStmt");
 	addRule("basic", "ExtendsObject");
         addRule("basic", "ForLoopShouldBeWhileLoop");
         addRule("basic", "JumbledIncrementer");
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyCatchBlock.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyCatchBlock.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyCatchBlock.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyCatchBlock.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyFinallyBlock.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyFinallyBlock.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyFinallyBlock.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyFinallyBlock.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyIfStmt.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyIfStmt.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyIfStmt.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyIfStmt.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyInitializer.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyInitializer.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyInitializer.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyInitializer.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyStatementBlock.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementBlock.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyStatementBlock.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementBlock.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyStatementNotInLoop.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementNotInLoop.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyStatementNotInLoop.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStatementNotInLoop.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyStaticInitializer.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStaticInitializer.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyStaticInitializer.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyStaticInitializer.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptySwitchStatements.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptySwitchStatements.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptySwitchStatements.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptySwitchStatements.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptySynchronizedBlock.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptySynchronizedBlock.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptySynchronizedBlock.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptySynchronizedBlock.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyTryBlock.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyTryBlock.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyTryBlock.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyTryBlock.xml
diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyWhileStmt.xml b/pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyWhileStmt.xml
similarity index 100%
rename from pmd/regress/test/net/sourceforge/pmd/rules/basic/xml/EmptyWhileStmt.xml
rename to pmd/regress/test/net/sourceforge/pmd/rules/empty/xml/EmptyWhileStmt.xml
diff --git a/pmd/rulesets/basic.xml b/pmd/rulesets/basic.xml
index 2388ad144e..a55ce640a9 100644
--- a/pmd/rulesets/basic.xml
+++ b/pmd/rulesets/basic.xml
@@ -8,221 +8,8 @@
   <description>
 The Basic Ruleset contains a collection of good practices which everyone should follow.
   </description>
-
-
-    <rule name="EmptyCatchBlock"
-  		  language="java"
-  	  	  since="0.1"
-          message="Avoid empty catch blocks"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">
-      <description>
-Empty Catch Block finds instances where an exception is caught,
-but nothing is done.  In most circumstances, this swallows an exception
-which should either be acted on or reported.
-      </description>
-      <priority>3</priority>
-      <properties>
-          <property name="xpath">
-              <value>
-    <![CDATA[
-//CatchStatement
- [count(Block/BlockStatement) = 0 and ($allowCommentedBlocks != 'true' or Block/@containsComment = 'false')]
- [FormalParameter/Type/ReferenceType
-   /ClassOrInterfaceType[@Image != 'InterruptedException' and @Image != 'CloneNotSupportedException']
- ]
- ]]>
-             </value>
-          </property>
-          <property name="allowCommentedBlocks" description="Empty blocks containing comments will be skipped">
-              <value>false</value>
-          </property>
-      </properties>
-      <example>
-  <![CDATA[
-public void doSomething() {
-  try {
-    FileInputStream fis = new FileInputStream("/tmp/bugger");
-  } catch (IOException ioe) {
-      // not good
-  }
-}
- ]]>
-      </example>
-    </rule>
-
-    <rule name="EmptyIfStmt"
-    		 language="java"
-    		 since="0.1"
-          message="Avoid empty 'if' statements"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyIfStmt">
-      <description>
-Empty If Statement finds instances where a condition is checked but nothing is done about it.
-    </description>
-        <priority>3</priority>
-      <properties>
-          <property name="xpath">
-              <value>
-<![CDATA[
-//IfStatement/Statement
- [EmptyStatement or Block[count(*) = 0]]
- ]]>
-              </value>
-          </property>
-      </properties>
-      <example>
-    <![CDATA[
-public class Foo {
- void bar(int x) {
-  if (x == 0) {
-   // empty!
-  }
- }
-}
- ]]>
-       </example>
-    </rule>
-
-
-    <rule name="EmptyWhileStmt"
-    		 language="java"
-    		 since="0.2"
-          message="Avoid empty 'while' statements"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyWhileStmt">
-       <description>
-Empty While Statement finds all instances where a while statement
-does nothing.  If it is a timing loop, then you should use Thread.sleep() for it; if
-it's a while loop that does a lot in the exit expression, rewrite it to make it clearer.
-       </description>
-       <priority>3</priority>
-      <properties>
-          <property name="xpath">
-              <value>
-<![CDATA[
-//WhileStatement/Statement[./Block[count(*) = 0]  or ./EmptyStatement]
-]]>
-              </value>
-          </property>
-      </properties>
-       <example>
-  <![CDATA[
-public class Foo {
- void bar(int a, int b) {
-  while (a == b) {
-   // empty!
-  }
- }
-}
- ]]>
-       </example>
-    </rule>
-
-
-    <rule name="EmptyTryBlock"
-    		 language="java"
-    		 since="0.4"
-          message="Avoid empty try blocks"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyTryBlock">
-      <description>
-Avoid empty try blocks - what's the point?
-      </description>
-      <priority>3</priority>
-      <properties>
-          <property name="xpath">
-              <value>
-<![CDATA[
-//TryStatement/Block[1][count(*) = 0]
-]]>
-              </value>
-          </property>
-      </properties>
-      <example>
-  <![CDATA[
-public class Foo {
- public void bar() {
-  try {
-  } catch (Exception e) {
-    e.printStackTrace();
-  }
- }
-}
-]]>
-      </example>
-    </rule>
-
-    <rule name="EmptyFinallyBlock"
-    		 language="java"
-    		 since="0.4"
-          message="Avoid empty finally blocks"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyFinallyBlock">
-      <description>
-Avoid empty finally blocks - these can be deleted.
-      </description>
-      <priority>3</priority>
-      <properties>
-          <property name="xpath">
-              <value>
-<![CDATA[
-//FinallyStatement[count(Block/BlockStatement) = 0]
- ]]>
-              </value>
-          </property>
-      </properties>
-      <example>
-  <![CDATA[
-public class Foo {
- public void bar() {
-  try {
-    int x=2;
-   } finally {
-    // empty!
-   }
- }
-}
- ]]>
-      </example>
-    </rule>
-
-
-    <rule name="EmptySwitchStatements"
-    		 language="java"
-    		 since="1.0"
-          message="Avoid empty switch statements"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptySwitchStatements">
-      <description>
-Avoid empty switch statements.
-      </description>
-      <priority>3</priority>
-      <properties>
-          <property name="xpath">
-              <value>
-<![CDATA[
-//SwitchStatement[count(*) = 1]
- ]]>
-              </value>
-          </property>
-      </properties>
-      <example>
-  <![CDATA[
-public class Foo {
- public void bar() {
-  int x = 2;
-  switch (x) {
-   // once there was code here
-   // but it's been commented out or something
-  }
- }
-}]]>
-      </example>
-      </rule>
-
-
-    <rule name="JumbledIncrementer"
+   
+	<rule name="JumbledIncrementer"
     		language="java"
     		since="1.0"
          message="Avoid modifying an outer loop incrementer in an inner loop for update expression"
@@ -421,38 +208,6 @@ public class Bar {
       </example>
     </rule>
 
-    <rule name="EmptySynchronizedBlock"
-    		 language="java"
-    		 since="1.3"
-          message="Avoid empty synchronized blocks"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptySynchronizedBlock">
-      <description>
-  Avoid empty synchronized blocks - they're useless.
-      </description>
-      <priority>3</priority>
-      <properties>
-          <property name="xpath">
-              <value>
-<![CDATA[
-//SynchronizedStatement/Block[1][count(*) = 0]
-]]>
-              </value>
-          </property>
-      </properties>
-      <example>
-<![CDATA[
-public class Foo {
- public void bar() {
-  synchronized (this) {
-   // empty!
-  }
- }
-}
-]]>
-      </example>
-    </rule>
-
     <rule name="UnnecessaryReturn"
     		 since="1.3"
           message="Avoid unnecessary return statements"
@@ -474,37 +229,6 @@ public class Foo {
       </example>
     </rule>
 
-
-    <rule name="EmptyStaticInitializer"
-    		 language="java"
-    		  since="1.5"
-           message="Empty static initializer was found"
-           class="net.sourceforge.pmd.lang.rule.XPathRule"
-           externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyStaticInitializer">
-       <description>
-An empty static initializer was found.
-       </description>
-       <priority>3</priority>
-         <properties>
-             <property name="xpath">
-                 <value>
-<![CDATA[
-//Initializer[@Static='true']/Block[count(*)=0]
-]]>
-                 </value>
-             </property>
-         </properties>
-       <example>
-   <![CDATA[
-public class Foo {
- static {
-  // empty
- }
- }
-]]>
-       </example>
-     </rule>
-
     <rule name="UnconditionalIfStatement"
     		 language="java"
     		  since="1.5"
@@ -539,51 +263,6 @@ public class Foo {
       </example>
     </rule>
 
-    <rule name="EmptyStatementNotInLoop"
-    		 language="java"
-    		 since="1.5"
-          message="An empty statement (semicolon) not part of a loop"
-          class="net.sourceforge.pmd.lang.rule.XPathRule"
-          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyStatementNotInLoop">
-       <description>
-An empty statement (aka a semicolon by itself) that is not used
-as the sole body of a for loop or while loop is probably a bug.  It
-could also be a double semicolon, which is useless and should be
-removed.
-       </description>
-       <priority>3</priority>
-        <properties>
-            <property name="xpath">
-                <value>
-<![CDATA[
-//EmptyStatement
- [not(
-       ../../../ForStatement
-       or ../../../WhileStatement
-       or ../../../BlockStatement/ClassOrInterfaceDeclaration
-       or ../../../../../../ForStatement/Statement[1]
-        /Block[1]/BlockStatement[1]/Statement/EmptyStatement
-       or ../../../../../../WhileStatement/Statement[1]
-        /Block[1]/BlockStatement[1]/Statement/EmptyStatement)
- ]
-]]>
-                </value>
-            </property>
-        </properties>
-       <example>
-<![CDATA[
-public class MyClass {
-   public void doit() {
-      // this is probably not what you meant to do
-      ;
-      // the extra semicolon here this is not necessary
-      System.out.println("look at the extra semicolon");;
-   }
-}
-]]>
-       </example>
-     </rule>
-
     <rule name="BooleanInstantiation"
     	 since="1.2"
        message="Avoid instantiating Boolean objects; reference Boolean.TRUE or Boolean.FALSE or call Boolean.valueOf() instead."
@@ -1220,71 +899,7 @@ public class Test {
             ]]>
         </example>
     </rule>
-    <rule 	name="EmptyInitializer"
-		    language="java"
-	  		since="5.0"   	
-          	message="Empty initializer was found"
-          	class="net.sourceforge.pmd.lang.rule.XPathRule"
-          	externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyInitializer">
-       <description>
-An empty initializer was found.
-       </description>
-       <priority>3</priority>
-         <properties>
-             <property name="xpath">
-                 <value>
-<![CDATA[
-//Initializer/Block[count(*)=0]
-]]>
-                 </value>
-             </property>
-         </properties>
-       <example>
-   <![CDATA[
-public class Foo {
-
-   static {} // Why ?
-
-   {} // Again, why ?
-
-}
-    ]]>
-    </example>
-  </rule>
-
-
-  <rule name="EmptyStatementBlock"
-        language="java"
-        since="5.0"
-        message="Avoid empty block statements."
-        class="net.sourceforge.pmd.lang.rule.XPathRule"
-	externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyStatementBlock">
-    <description>Empty block statements are useless so they should be removed.</description>
-    <priority>3</priority>
-    <properties>
-       <property name="xpath">
-          <value>
-          <![CDATA[
-//BlockStatement/Statement/Block[count(*) = 0]
-          ]]>
-          </value>
-       </property>
-    </properties>
-    <example>
-    <![CDATA[
-public class Foo {
-
-   private int _bar;
-
-   public void setBar(int bar) {
-      { _bar = bar; } // Why not?
-      {} // But remove this.
-   }
-
-}
-    ]]>
-    </example>
-  </rule>
+    
 
   <rule name="ExtendsObject"
   		language="java"
@@ -1377,5 +992,5 @@ public class Foo {
         </example>
     </rule>
     
-</ruleset>
-
+    <rule ref="rulesets/empty.xml"/>
+</ruleset>
\ No newline at end of file
diff --git a/pmd/rulesets/empty.xml b/pmd/rulesets/empty.xml
new file mode 100644
index 0000000000..ef0b9f615a
--- /dev/null
+++ b/pmd/rulesets/empty.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0"?>
+
+<ruleset name="Empty Code Rules"
+    xmlns="http://pmd.sf.net/ruleset/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+  <description>
+The Empty Code Ruleset contains a collection of rules that find empty statement of any kind (empty method,
+empty block statement, empty try or catch block,...).
+  </description>
+
+ <rule name="EmptyCatchBlock"
+  		  language="java"
+  	  	  since="0.1"
+          message="Avoid empty catch blocks"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyCatchBlock">
+      <description>
+Empty Catch Block finds instances where an exception is caught,
+but nothing is done.  In most circumstances, this swallows an exception
+which should either be acted on or reported.
+      </description>
+      <priority>3</priority>
+      <properties>
+          <property name="xpath">
+              <value>
+    <![CDATA[
+//CatchStatement
+ [count(Block/BlockStatement) = 0 and ($allowCommentedBlocks != 'true' or Block/@containsComment = 'false')]
+ [FormalParameter/Type/ReferenceType
+   /ClassOrInterfaceType[@Image != 'InterruptedException' and @Image != 'CloneNotSupportedException']
+ ]
+ ]]>
+             </value>
+          </property>
+          <property name="allowCommentedBlocks" description="Empty blocks containing comments will be skipped">
+              <value>false</value>
+          </property>
+      </properties>
+      <example>
+  <![CDATA[
+public void doSomething() {
+  try {
+    FileInputStream fis = new FileInputStream("/tmp/bugger");
+  } catch (IOException ioe) {
+      // not good
+  }
+}
+ ]]>
+      </example>
+    </rule>
+
+    <rule name="EmptyIfStmt"
+    		 language="java"
+    		 since="0.1"
+          message="Avoid empty 'if' statements"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyIfStmt">
+      <description>
+Empty If Statement finds instances where a condition is checked but nothing is done about it.
+    </description>
+        <priority>3</priority>
+      <properties>
+          <property name="xpath">
+              <value>
+<![CDATA[
+//IfStatement/Statement
+ [EmptyStatement or Block[count(*) = 0]]
+ ]]>
+              </value>
+          </property>
+      </properties>
+      <example>
+    <![CDATA[
+public class Foo {
+ void bar(int x) {
+  if (x == 0) {
+   // empty!
+  }
+ }
+}
+ ]]>
+       </example>
+    </rule>
+
+
+    <rule name="EmptyWhileStmt"
+    		 language="java"
+    		 since="0.2"
+          message="Avoid empty 'while' statements"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyWhileStmt">
+       <description>
+Empty While Statement finds all instances where a while statement
+does nothing.  If it is a timing loop, then you should use Thread.sleep() for it; if
+it's a while loop that does a lot in the exit expression, rewrite it to make it clearer.
+       </description>
+       <priority>3</priority>
+      <properties>
+          <property name="xpath">
+              <value>
+<![CDATA[
+//WhileStatement/Statement[./Block[count(*) = 0]  or ./EmptyStatement]
+]]>
+              </value>
+          </property>
+      </properties>
+       <example>
+  <![CDATA[
+public class Foo {
+ void bar(int a, int b) {
+  while (a == b) {
+   // empty!
+  }
+ }
+}
+ ]]>
+       </example>
+    </rule>
+
+
+    <rule name="EmptyTryBlock"
+    		 language="java"
+    		 since="0.4"
+          message="Avoid empty try blocks"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyTryBlock">
+      <description>
+Avoid empty try blocks - what's the point?
+      </description>
+      <priority>3</priority>
+      <properties>
+          <property name="xpath">
+              <value>
+<![CDATA[
+//TryStatement/Block[1][count(*) = 0]
+]]>
+              </value>
+          </property>
+      </properties>
+      <example>
+  <![CDATA[
+public class Foo {
+ public void bar() {
+  try {
+  } catch (Exception e) {
+    e.printStackTrace();
+  }
+ }
+}
+]]>
+      </example>
+    </rule>
+
+    <rule name="EmptyFinallyBlock"
+    		 language="java"
+    		 since="0.4"
+          message="Avoid empty finally blocks"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyFinallyBlock">
+      <description>
+Avoid empty finally blocks - these can be deleted.
+      </description>
+      <priority>3</priority>
+      <properties>
+          <property name="xpath">
+              <value>
+<![CDATA[
+//FinallyStatement[count(Block/BlockStatement) = 0]
+ ]]>
+              </value>
+          </property>
+      </properties>
+      <example>
+  <![CDATA[
+public class Foo {
+ public void bar() {
+  try {
+    int x=2;
+   } finally {
+    // empty!
+   }
+ }
+}
+ ]]>
+      </example>
+    </rule>
+
+
+    <rule name="EmptySwitchStatements"
+    		 language="java"
+    		 since="1.0"
+          message="Avoid empty switch statements"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptySwitchStatements">
+      <description>
+Avoid empty switch statements.
+      </description>
+      <priority>3</priority>
+      <properties>
+          <property name="xpath">
+              <value>
+<![CDATA[
+//SwitchStatement[count(*) = 1]
+ ]]>
+              </value>
+          </property>
+      </properties>
+      <example>
+  <![CDATA[
+public class Foo {
+ public void bar() {
+  int x = 2;
+  switch (x) {
+   // once there was code here
+   // but it's been commented out or something
+  }
+ }
+}]]>
+      </example>
+      </rule>
+
+    <rule name="EmptySynchronizedBlock"
+    		 language="java"
+    		 since="1.3"
+          message="Avoid empty synchronized blocks"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptySynchronizedBlock">
+      <description>
+  Avoid empty synchronized blocks - they're useless.
+      </description>
+      <priority>3</priority>
+      <properties>
+          <property name="xpath">
+              <value>
+<![CDATA[
+//SynchronizedStatement/Block[1][count(*) = 0]
+]]>
+              </value>
+          </property>
+      </properties>
+      <example>
+<![CDATA[
+public class Foo {
+ public void bar() {
+  synchronized (this) {
+   // empty!
+  }
+ }
+}
+]]>
+      </example>
+    </rule>
+
+
+    <rule name="EmptyStatementNotInLoop"
+    		 language="java"
+    		 since="1.5"
+          message="An empty statement (semicolon) not part of a loop"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyStatementNotInLoop">
+       <description>
+An empty statement (aka a semicolon by itself) that is not used
+as the sole body of a for loop or while loop is probably a bug.  It
+could also be a double semicolon, which is useless and should be
+removed.
+       </description>
+       <priority>3</priority>
+        <properties>
+            <property name="xpath">
+                <value>
+<![CDATA[
+//EmptyStatement
+ [not(
+       ../../../ForStatement
+       or ../../../WhileStatement
+       or ../../../BlockStatement/ClassOrInterfaceDeclaration
+       or ../../../../../../ForStatement/Statement[1]
+        /Block[1]/BlockStatement[1]/Statement/EmptyStatement
+       or ../../../../../../WhileStatement/Statement[1]
+        /Block[1]/BlockStatement[1]/Statement/EmptyStatement)
+ ]
+]]>
+                </value>
+            </property>
+        </properties>
+       <example>
+<![CDATA[
+public class MyClass {
+   public void doit() {
+      // this is probably not what you meant to do
+      ;
+      // the extra semicolon here this is not necessary
+      System.out.println("look at the extra semicolon");;
+   }
+}
+]]>
+       </example>
+     </rule>
+
+<rule 	name="EmptyInitializer"
+		    language="java"
+	  		since="5.0"   	
+          	message="Empty initializer was found"
+          	class="net.sourceforge.pmd.lang.rule.XPathRule"
+          	externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyInitializer">
+       <description>
+An empty initializer was found.
+       </description>
+       <priority>3</priority>
+         <properties>
+             <property name="xpath">
+                 <value>
+<![CDATA[
+//Initializer/Block[count(*)=0]
+]]>
+                 </value>
+             </property>
+         </properties>
+       <example>
+   <![CDATA[
+public class Foo {
+
+   static {} // Why ?
+
+   {} // Again, why ?
+
+}
+    ]]>
+    </example>
+  </rule>
+
+
+  <rule name="EmptyStatementBlock"
+        language="java"
+        since="5.0"
+        message="Avoid empty block statements."
+        class="net.sourceforge.pmd.lang.rule.XPathRule"
+	externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyStatementBlock">
+    <description>Empty block statements are useless so they should be removed.</description>
+    <priority>3</priority>
+    <properties>
+       <property name="xpath">
+          <value>
+          <![CDATA[
+//BlockStatement/Statement/Block[count(*) = 0]
+          ]]>
+          </value>
+       </property>
+    </properties>
+    <example>
+    <![CDATA[
+public class Foo {
+
+   private int _bar;
+
+   public void setBar(int bar) {
+      { _bar = bar; } // Why not?
+      {} // But remove this.
+   }
+
+}
+    ]]>
+    </example>
+  </rule>
+
+
+
+    <rule name="EmptyStaticInitializer"
+    		 language="java"
+    		  since="1.5"
+           message="Empty static initializer was found"
+           class="net.sourceforge.pmd.lang.rule.XPathRule"
+           externalInfoUrl="http://pmd.sourceforge.net/rules/basic.html#EmptyStaticInitializer">
+       <description>
+An empty static initializer was found.
+       </description>
+       <priority>3</priority>
+         <properties>
+             <property name="xpath">
+                 <value>
+<![CDATA[
+//Initializer[@Static='true']/Block[count(*)=0]
+]]>
+                 </value>
+             </property>
+         </properties>
+       <example>
+   <![CDATA[
+public class Foo {
+ static {
+  // empty
+ }
+ }
+]]>
+       </example>
+     </rule>
+
+
+
+
+</ruleset>
\ No newline at end of file
diff --git a/pmd/src/net/sourceforge/pmd/SimpleRuleSetNameMapper.java b/pmd/src/net/sourceforge/pmd/SimpleRuleSetNameMapper.java
index d167d54d1d..5053cadd28 100644
--- a/pmd/src/net/sourceforge/pmd/SimpleRuleSetNameMapper.java
+++ b/pmd/src/net/sourceforge/pmd/SimpleRuleSetNameMapper.java
@@ -50,6 +50,7 @@ public class SimpleRuleSetNameMapper {
         nameMap.put("controversial", "rulesets/controversial.xml");
         nameMap.put("coupling", "rulesets/coupling.xml");
         nameMap.put("design", "rulesets/design.xml");
+        nameMap.put("empty", "rulesets/empty.xml");
         nameMap.put("finalizers", "rulesets/finalizers.xml");
         nameMap.put("imports", "rulesets/imports.xml");
         nameMap.put("j2ee", "rulesets/j2ee.xml");