From d4ca53cbce76a7efa77a30eccc6067e9c27b39e6 Mon Sep 17 00:00:00 2001
From: Tom Copeland <tomcopeland@users.sourceforge.net>
Date: Wed, 3 Jul 2002 13:54:09 +0000
Subject: [PATCH] tweak

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@193 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/etc/build.xml         |  6 +++---
 pmd/etc/changelog.txt     |  3 +--
 pmd/rulesets/basic.xml    | 21 ---------------------
 pmd/rulesets/design.xml   | 33 +++++++++++++++++++++++++++++++++
 pmd/rulesets/ticbuild.xml | 23 +----------------------
 5 files changed, 38 insertions(+), 48 deletions(-)
 create mode 100644 pmd/rulesets/design.xml

diff --git a/pmd/etc/build.xml b/pmd/etc/build.xml
index 28ece2cbab..b821c827e5 100644
--- a/pmd/etc/build.xml
+++ b/pmd/etc/build.xml
@@ -29,9 +29,9 @@
 
     <target name="pmd">
         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"/>
-        <pmd reportFile="c:\foo.html" verbose="true" rulesetfiles="rulesets/basic.xml,rulesets/cougaar.xml" format="html">
-            <fileset dir="c:\data\pmd\pmd\src">
-            <!--<fileset dir="c:\j2sdk1.4.0\src">-->
+        <pmd reportFile="c:\jdk14.HTML" verbose="false" rulesetfiles="rulesets/unusedcode.xml" format="html">
+            <!--<fileset dir="c:\data\pmd\pmd\src">-->
+            <fileset dir="c:\j2sdk1.4.0\src">
                 <include name="**/*.java"/>
             </fileset>
         </pmd>
diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index b9c688c1e4..6b3994ab9d 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -1,10 +1,9 @@
-??? - 0.3:
+July 03 2002 - 0.3:
 Added new rules: UseSingletonRule, ShortVariableRule, LongVariableRule, ShortMethodNameRule
 Removed the 'text' report format.
 Moved rules into rulesets which are defined in XML files.
 Added a 'failonerror' attribute to the Ant task.
 
-
 June 27 2002 - 0.2:
 Added new rules: IfElseStmtsMustUseBracesRule, EmptyWhileStmtRule
 Modified command line interface to accept a rule set
diff --git a/pmd/rulesets/basic.xml b/pmd/rulesets/basic.xml
index 7e47093fa1..f8978d006f 100644
--- a/pmd/rulesets/basic.xml
+++ b/pmd/rulesets/basic.xml
@@ -162,27 +162,6 @@ public class ShortMethod {
     </example>
   </rule>
 
-
-  <rule name="UseSingletonRule"
-        message="All methods are static.  Consider using Singleton instead."
-        class="net.sourceforge.pmd.rules.design.UseSingletonRule">
-    <description>
-    If you have a class that has nothing but static methods, consider making it a Singleton
-    </description>
-
-    <example>
-<![CDATA[
-public class MaybeASingleton {
-    public static void foo() {
-     // etc
-    }
-    public static void bar() {
-     // etc
-    }
-}
-]]>
-    </example>
-  </rule>
 </ruleset>
 
 
diff --git a/pmd/rulesets/design.xml b/pmd/rulesets/design.xml
new file mode 100644
index 0000000000..0ce38a5d9e
--- /dev/null
+++ b/pmd/rulesets/design.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<ruleset name="design">
+  <description>
+The Design Ruleset contains a collection of rules that find questionable designs.
+  </description>
+
+
+  <rule name="UseSingletonRule"
+        message="All methods are static.  Consider using Singleton instead."
+        class="net.sourceforge.pmd.rules.design.UseSingletonRule">
+    <description>
+    If you have a class that has nothing but static methods, consider making it a Singleton
+    </description>
+
+    <example>
+<![CDATA[
+public class MaybeASingleton {
+    public static void foo() {
+     // etc
+    }
+    public static void bar() {
+     // etc
+    }
+}
+]]>
+    </example>
+  </rule>
+
+</ruleset>
+
+
+
diff --git a/pmd/rulesets/ticbuild.xml b/pmd/rulesets/ticbuild.xml
index 6dd96035f4..df64412dd8 100644
--- a/pmd/rulesets/ticbuild.xml
+++ b/pmd/rulesets/ticbuild.xml
@@ -2,7 +2,7 @@
 
 <ruleset name="ticbuild">
   <description>
-  These are rules which apply to the build at https://cvs.ultralog.net
+  These are rules which apply to the build at https://cvs.ultralog.net.  Actually, that build contains this ruleset as well as unusedcode.xml, design.xml, and cougaar.xml
   </description>
 
   <rule name="EmptyCatchBlock"
@@ -94,27 +94,6 @@ while (a == b) {
     </example>
   </rule>
 
-
-  <rule name="UseSingletonRule"
-        message="All methods are static.  Consider using Singleton instead."
-        class="net.sourceforge.pmd.rules.design.UseSingletonRule">
-    <description>
-    If you have a class that has nothing but static methods, consider making it a Singleton
-    </description>
-
-    <example>
-<![CDATA[
-public class MaybeASingleton {
-    public static void foo() {
-     // etc
-    }
-    public static void bar() {
-     // etc
-    }
-}
-]]>
-    </example>
-  </rule>
 </ruleset>