Clean up previous commit

diff --git a/.pmd b/.pmd
index 5b88d72fb63e7e8537d2046b198f8ba9a6075924..4644f286d68bbeaa16cb560ed7eb9ab7585be4b2 100644 (file)
--- a/.pmd
+++ b/.pmd
@@ -4,671 +4,563 @@
     <ruleSetFile>.ruleset</ruleSetFile>
     <rules>
         <rule>
     <ruleSetFile>.ruleset</ruleSetFile>
     <rules>
         <rule>

-            <name>LooseCoupling</name>
-            <ruleset>Type Resolution Rules</ruleset>
-        </rule>
-        <rule>
-            <name>CloneMethodMustImplementCloneable</name>
-            <ruleset>Type Resolution Rules</ruleset>
-        </rule>
-        <rule>
-            <name>UnusedImports</name>
-            <ruleset>Type Resolution Rules</ruleset>
-        </rule>
-        <rule>
-            <name>SignatureDeclareThrowsException</name>
-            <ruleset>Type Resolution Rules</ruleset>
-        </rule>
-        <rule>
-            <name>IfStmtsMustUseBraces</name>
-            <ruleset>Braces Rules</ruleset>
-        </rule>
-        <rule>
-            <name>WhileLoopsMustUseBraces</name>
-            <ruleset>Braces Rules</ruleset>
-        </rule>
-        <rule>
-            <name>IfElseStmtsMustUseBraces</name>
-            <ruleset>Braces Rules</ruleset>
-        </rule>
-        <rule>
-            <name>ForLoopsMustUseBraces</name>
-            <ruleset>Braces Rules</ruleset>
-        </rule>
-        <rule>
-            <name>UseSingleton</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>SimplifyBooleanReturns</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>SimplifyBooleanExpressions</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>SwitchStmtsShouldHaveDefault</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidDeeplyNestedIfStmts</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidReassigningParameters</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>SwitchDensity</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>ConstructorCallsOverridableMethod</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>AccessorClassGeneration</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>FinalFieldCouldBeStatic</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>CloseResource</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>NonStaticInitializer</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>DefaultLabelNotLastInSwitchStmt</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>NonCaseLabelInSwitchStatement</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>OptimizableToArrayCall</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>BadComparison</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>EqualsNull</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>ConfusingTernary</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>InstantiationToGetClass</name>
-            <ruleset>Design Rules</ruleset>
-        </rule>
-        <rule>
-            <name>IdempotentOperations</name>
-            <ruleset>Design Rules</ruleset>
+            <name>AvoidDecimalLiteralsInBigDecimalConstructor</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>SimpleDateFormatNeedsLocale</name>
-            <ruleset>Design Rules</ruleset>
+            <name>AvoidMultipleUnaryOperators</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ImmutableField</name>
-            <ruleset>Design Rules</ruleset>
+            <name>AvoidThreadGroup</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseLocaleWithCaseConversions</name>
-            <ruleset>Design Rules</ruleset>
+            <name>AvoidUsingHardCodedIP</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidProtectedFieldInFinalClass</name>
-            <ruleset>Design Rules</ruleset>
+            <name>AvoidUsingOctalValues</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AssignmentToNonFinalStatic</name>
-            <ruleset>Design Rules</ruleset>
+            <name>BigIntegerInstantiation</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MissingStaticMethodInNonInstantiatableClass</name>
-            <ruleset>Design Rules</ruleset>
+            <name>BooleanInstantiation</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidSynchronizedAtMethodLevel</name>
-            <ruleset>Design Rules</ruleset>
+            <name>BrokenNullCheck</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MissingBreakInSwitch</name>
-            <ruleset>Design Rules</ruleset>
+            <name>CheckResultSet</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseNotifyAllInsteadOfNotify</name>
-            <ruleset>Design Rules</ruleset>
+            <name>ClassCastExceptionWithToArray</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidInstanceofChecksInCatchClause</name>
-            <ruleset>Design Rules</ruleset>
+            <name>CollapsibleIfStatements</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AbstractClassWithoutAbstractMethod</name>
-            <ruleset>Design Rules</ruleset>
+            <name>DoubleCheckedLocking</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>SimplifyConditional</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptyCatchBlock</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>CompareObjectsWithEquals</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptyFinallyBlock</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>PositionLiteralsFirstInComparisons</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptyIfStmt</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnnecessaryLocalBeforeReturn</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptyInitializer</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>NonThreadSafeSingleton</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptyStatementNotInLoop</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UncommentedEmptyMethod</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptyStaticInitializer</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UncommentedEmptyConstructor</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptySwitchStatements</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidConstantsInterface</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptySynchronizedBlock</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnsynchronizedStaticDateFormatter</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptyTryBlock</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>PreserveStackTrace</name>
-            <ruleset>Design Rules</ruleset>
+            <name>EmptyWhileStmt</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseCollectionIsEmpty</name>
-            <ruleset>Design Rules</ruleset>
+            <name>ForLoopShouldBeWhileLoop</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ClassWithOnlyPrivateConstructorsShouldBeFinal</name>
-            <ruleset>Design Rules</ruleset>
+            <name>JumbledIncrementer</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyMethodInAbstractClassShouldBeAbstract</name>
-            <ruleset>Design Rules</ruleset>
+            <name>MisplacedNullCheck</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>SingularField</name>
-            <ruleset>Design Rules</ruleset>
+            <name>OverrideBothEqualsAndHashcode</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ReturnEmptyArrayRatherThanNull</name>
-            <ruleset>Design Rules</ruleset>
+            <name>ReturnFromFinallyBlock</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AbstractClassWithoutAnyMethod</name>
-            <ruleset>Design Rules</ruleset>
+            <name>UnconditionalIfStatement</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>TooFewBranchesForASwitchStatement</name>
-            <ruleset>Design Rules</ruleset>
+            <name>UnnecessaryConversionTemporary</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidCatchingThrowable</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>UnnecessaryFinalModifier</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>SignatureDeclareThrowsException</name>
-            <ruleset>Type Resolution Rules</ruleset>
+            <name>UnnecessaryReturn</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ExceptionAsFlowControl</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>UnusedNullCheckInEquals</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidCatchingNPE</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>UselessOperationOnImmutable</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidThrowingRawExceptionTypes</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>UselessOverridingMethod</name>
+            <ruleset>Basic Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidThrowingNullPointerException</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>IfElseStmtsMustUseBraces</name>
+            <ruleset>Braces Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidRethrowingException</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>CloneThrowsCloneNotSupportedException</name>
+            <ruleset>Clone Implementation Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DoNotExtendJavaLangError</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>ProperCloneImplementation</name>
+            <ruleset>Clone Implementation Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DoNotThrowExceptionInFinally</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>CyclomaticComplexity</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidThrowingNewInstanceOfSameException</name>
-            <ruleset>Strict Exception Rules</ruleset>
+            <name>ExcessiveClassLength</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnusedPrivateField</name>
-            <ruleset>Unused Code Rules</ruleset>
+            <name>ExcessiveMethodLength</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnusedLocalVariable</name>
-            <ruleset>Unused Code Rules</ruleset>
+            <name>ExcessiveParameterList</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnusedPrivateMethod</name>
-            <ruleset>Unused Code Rules</ruleset>
+            <name>ExcessivePublicCount</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnusedFormalParameter</name>
-            <ruleset>Unused Code Rules</ruleset>
+            <name>NcssConstructorCount</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MoreThanOneLogger</name>
-            <ruleset>Java Logging Rules</ruleset>
+            <name>NcssMethodCount</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>LoggerIsNotStaticFinal</name>
-            <ruleset>Java Logging Rules</ruleset>
+            <name>NcssTypeCount</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>SystemPrintln</name>
-            <ruleset>Java Logging Rules</ruleset>
+            <name>TooManyFields</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidPrintStackTrace</name>
-            <ruleset>Java Logging Rules</ruleset>
+            <name>TooManyMethods</name>
+            <ruleset>Code Size Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidDuplicateLiterals</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>AssignmentInOperand</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>StringInstantiation</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>AtLeastOneConstructor</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>StringToString</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>AvoidAccessibilityAlteration</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>InefficientStringBuffering</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>AvoidFinalLocalVariable</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnnecessaryCaseChange</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>AvoidUsingNativeCode</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseStringBufferLength</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>AvoidUsingShortType</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AppendCharacterWithChar</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>AvoidUsingVolatile</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ConsecutiveLiteralAppends</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>BooleanInversion</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseIndexOfChar</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>CallSuperInConstructor</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>InefficientEmptyStringCheck</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>DefaultPackage</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>InsufficientStringBufferDeclaration</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>DoNotCallGarbageCollectionExplicitly</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UselessStringValueOf</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>DontImportSun</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>StringBufferInstantiationWithChar</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>NullAssignment</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseEqualsToCompareStrings</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>SuspiciousOctalEscape</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidStringBufferField</name>
-            <ruleset>String and StringBuffer Rules</ruleset>
+            <name>UnnecessaryConstructor</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ReplaceVectorWithList</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>UnnecessaryParentheses</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ReplaceHashtableWithMap</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>UnusedModifier</name>
+            <ruleset>Controversial Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ReplaceEnumerationWithIterator</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>CouplingBetweenObjects</name>
+            <ruleset>Coupling Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidEnumAsIdentifier</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>ExcessiveImports</name>
+            <ruleset>Coupling Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidAssertAsIdentifier</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AbstractClassWithoutAbstractMethod</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>IntegerInstantiation</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AbstractClassWithoutAnyMethod</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ByteInstantiation</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AccessorClassGeneration</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ShortInstantiation</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AssignmentToNonFinalStatic</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>LongInstantiation</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AvoidConstantsInterface</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>JUnit4TestShouldUseBeforeAnnotation</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AvoidDeeplyNestedIfStmts</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>JUnit4TestShouldUseAfterAnnotation</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AvoidInstanceofChecksInCatchClause</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>JUnit4TestShouldUseTestAnnotation</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AvoidProtectedFieldInFinalClass</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>JUnit4SuitesShouldUseSuiteAnnotation</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AvoidReassigningParameters</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>JUnitUseExpected</name>
-            <ruleset>Migration Rules</ruleset>
+            <name>AvoidSynchronizedAtMethodLevel</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseProperClassLoader</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>BadComparison</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MDBAndSessionBeanNamingConvention</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>ClassWithOnlyPrivateConstructorsShouldBeFinal</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>RemoteSessionInterfaceNamingConvention</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>CloseResource</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>LocalInterfaceSessionNamingConvention</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>CompareObjectsWithEquals</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>LocalHomeNamingConvention</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>ConfusingTernary</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>RemoteInterfaceNamingConvention</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>ConstructorCallsOverridableMethod</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DoNotCallSystemExit</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>DefaultLabelNotLastInSwitchStmt</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>StaticEJBFieldShouldBeFinal</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>EmptyMethodInAbstractClassShouldBeAbstract</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DoNotUseThreads</name>
-            <ruleset>J2EE Rules</ruleset>
+            <name>EqualsNull</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>LocalVariableCouldBeFinal</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>FinalFieldCouldBeStatic</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MethodArgumentCouldBeFinal</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>IdempotentOperations</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidInstantiatingObjectsInLoops</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>ImmutableField</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseArrayListInsteadOfVector</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>InstantiationToGetClass</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>SimplifyStartsWith</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>MissingBreakInSwitch</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseStringBufferForStringAppends</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>MissingStaticMethodInNonInstantiatableClass</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseArraysAsList</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>NonCaseLabelInSwitchStatement</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidArrayLoops</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>NonStaticInitializer</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnnecessaryWrapperObjectCreation</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>NonThreadSafeSingleton</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AddEmptyString</name>
-            <ruleset>Optimization Rules</ruleset>
+            <name>OptimizableToArrayCall</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyCatchBlock</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>PositionLiteralsFirstInComparisons</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyIfStmt</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>PreserveStackTrace</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyWhileStmt</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>ReturnEmptyArrayRatherThanNull</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyTryBlock</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>SimpleDateFormatNeedsLocale</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyFinallyBlock</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>SimplifyBooleanExpressions</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptySwitchStatements</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>SimplifyBooleanReturns</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>JumbledIncrementer</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>SimplifyConditional</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ForLoopShouldBeWhileLoop</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>SingularField</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnnecessaryConversionTemporary</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>SwitchDensity</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>OverrideBothEqualsAndHashcode</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>SwitchStmtsShouldHaveDefault</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DoubleCheckedLocking</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>UncommentedEmptyConstructor</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ReturnFromFinallyBlock</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>UncommentedEmptyMethod</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptySynchronizedBlock</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>UnnecessaryLocalBeforeReturn</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnnecessaryReturn</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>UnsynchronizedStaticDateFormatter</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyStaticInitializer</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>UseCollectionIsEmpty</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnconditionalIfStatement</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>UseLocaleWithCaseConversions</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyStatementNotInLoop</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>UseNotifyAllInsteadOfNotify</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>BooleanInstantiation</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>UseSingleton</name>
+            <ruleset>Design Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnnecessaryFinalModifier</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>AvoidCallingFinalize</name>
+            <ruleset>Finalizer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>CollapsibleIfStatements</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>EmptyFinalizer</name>
+            <ruleset>Finalizer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UselessOverridingMethod</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>FinalizeDoesNotCallSuperFinalize</name>
+            <ruleset>Finalizer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ClassCastExceptionWithToArray</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>FinalizeOnlyCallsSuperFinalize</name>
+            <ruleset>Finalizer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidDecimalLiteralsInBigDecimalConstructor</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>FinalizeOverloaded</name>
+            <ruleset>Finalizer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UselessOperationOnImmutable</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>FinalizeShouldBeProtected</name>
+            <ruleset>Finalizer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MisplacedNullCheck</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>DontImportJavaLang</name>
+            <ruleset>Import Statement Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnusedNullCheckInEquals</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>DuplicateImports</name>
+            <ruleset>Import Statement Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidThreadGroup</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>ImportFromSamePackage</name>
+            <ruleset>Import Statement Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>BrokenNullCheck</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>TooManyStaticImports</name>
+            <ruleset>Import Statement Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>BigIntegerInstantiation</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>DoNotCallSystemExit</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidUsingOctalValues</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>DoNotUseThreads</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidUsingHardCodedIP</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>LocalHomeNamingConvention</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>CheckResultSet</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>LocalInterfaceSessionNamingConvention</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidMultipleUnaryOperators</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>MDBAndSessionBeanNamingConvention</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyInitializer</name>
-            <ruleset>Basic Rules</ruleset>
+            <name>RemoteInterfaceNamingConvention</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MethodReturnsInternalArray</name>
-            <ruleset>Security Code Guidelines</ruleset>
+            <name>RemoteSessionInterfaceNamingConvention</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ArrayIsStoredDirectly</name>
-            <ruleset>Security Code Guidelines</ruleset>
+            <name>StaticEJBFieldShouldBeFinal</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>CouplingBetweenObjects</name>
-            <ruleset>Coupling Rules</ruleset>
+            <name>UseProperClassLoader</name>
+            <ruleset>J2EE Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ExcessiveImports</name>
-            <ruleset>Coupling Rules</ruleset>
+            <name>ProperLogger</name>
+            <ruleset>Jakarta Commons Logging Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>LooseCoupling</name>
-            <ruleset>Type Resolution Rules</ruleset>
+            <name>UseCorrectExceptionLogging</name>
+            <ruleset>Jakarta Commons Logging Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DuplicateImports</name>
-            <ruleset>Import Statement Rules</ruleset>
+            <name>AvoidPrintStackTrace</name>
+            <ruleset>Java Logging Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DontImportJavaLang</name>
-            <ruleset>Import Statement Rules</ruleset>
+            <name>LoggerIsNotStaticFinal</name>
+            <ruleset>Java Logging Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnusedImports</name>
-            <ruleset>Type Resolution Rules</ruleset>
+            <name>MoreThanOneLogger</name>
+            <ruleset>Java Logging Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ImportFromSamePackage</name>
-            <ruleset>Import Statement Rules</ruleset>
+            <name>SystemPrintln</name>
+            <ruleset>Java Logging Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>TooManyStaticImports</name>
-            <ruleset>Import Statement Rules</ruleset>
+            <name>MissingSerialVersionUID</name>
+            <ruleset>JavaBean Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>JUnitStaticSuite</name>
+            <name>JUnitAssertionsShouldIncludeMessage</name>

             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>


@@ -676,7 +568,7 @@
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>

-            <name>JUnitAssertionsShouldIncludeMessage</name>
+            <name>JUnitStaticSuite</name>

             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>


@@ -684,19 +576,19 @@
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>

-            <name>TestClassWithoutTestCases</name>
+            <name>SimplifyBooleanAssertion</name>

             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>

-            <name>UnnecessaryBooleanAssertion</name>
+            <name>TestClassWithoutTestCases</name>

             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>

-            <name>UseAssertEqualsInsteadOfAssertTrue</name>
+            <name>UnnecessaryBooleanAssertion</name>

             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>

-            <name>UseAssertSameInsteadOfAssertTrue</name>
+            <name>UseAssertEqualsInsteadOfAssertTrue</name>

             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>


@@ -704,87 +596,87 @@
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>

-            <name>SimplifyBooleanAssertion</name>
+            <name>UseAssertSameInsteadOfAssertTrue</name>

             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>
             <ruleset>JUnit Rules</ruleset>
         </rule>
         <rule>

-            <name>UnnecessaryConstructor</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>AvoidAssertAsIdentifier</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>NullAssignment</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>AvoidEnumAsIdentifier</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnusedModifier</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>ByteInstantiation</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AssignmentInOperand</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>IntegerInstantiation</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AtLeastOneConstructor</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>JUnit4SuitesShouldUseSuiteAnnotation</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DontImportSun</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>JUnit4TestShouldUseAfterAnnotation</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>SuspiciousOctalEscape</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>JUnit4TestShouldUseBeforeAnnotation</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>CallSuperInConstructor</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>JUnit4TestShouldUseTestAnnotation</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UnnecessaryParentheses</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>JUnitUseExpected</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DefaultPackage</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>LongInstantiation</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>BooleanInversion</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>ReplaceEnumerationWithIterator</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DataflowAnomalyAnalysis</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>ReplaceHashtableWithMap</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidFinalLocalVariable</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>ReplaceVectorWithList</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidUsingShortType</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>ShortInstantiation</name>
+            <ruleset>Migration Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidUsingVolatile</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>AbstractNaming</name>
+            <ruleset>Naming Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidUsingNativeCode</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>AvoidDollarSigns</name>
+            <ruleset>Naming Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidAccessibilityAlteration</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>AvoidFieldNameMatchingMethodName</name>
+            <ruleset>Naming Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>DoNotCallGarbageCollectionExplicitly</name>
-            <ruleset>Controversial Rules</ruleset>
+            <name>AvoidFieldNameMatchingTypeName</name>
+            <ruleset>Naming Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ShortMethodName</name>
+            <name>BooleanGetMethodName</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>VariableNamingConventions</name>
+            <name>ClassNamingConventions</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>


@@ -792,23 +684,23 @@
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>ClassNamingConventions</name>
+            <name>MethodWithSameNameAsEnclosingClass</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>AbstractNaming</name>
+            <name>MisleadingVariableName</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>AvoidDollarSigns</name>
+            <name>NoPackage</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>MethodWithSameNameAsEnclosingClass</name>
+            <name>PackageCase</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>SuspiciousHashcodeMethodName</name>
+            <name>ShortMethodName</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>


@@ -820,126 +712,186 @@
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>AvoidFieldNameMatchingTypeName</name>
+            <name>SuspiciousHashcodeMethodName</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>AvoidFieldNameMatchingMethodName</name>
+            <name>VariableNamingConventions</name>

             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>
             <ruleset>Naming Rules</ruleset>
         </rule>
         <rule>

-            <name>NoPackage</name>
-            <ruleset>Naming Rules</ruleset>
+            <name>AddEmptyString</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>PackageCase</name>
-            <ruleset>Naming Rules</ruleset>
+            <name>AvoidArrayLoops</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MisleadingVariableName</name>
-            <ruleset>Naming Rules</ruleset>
+            <name>LocalVariableCouldBeFinal</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>BooleanGetMethodName</name>
-            <ruleset>Naming Rules</ruleset>
+            <name>MethodArgumentCouldBeFinal</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>NPathComplexity</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>SimplifyStartsWith</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ExcessiveMethodLength</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>UnnecessaryWrapperObjectCreation</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ExcessiveParameterList</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>UseArrayListInsteadOfVector</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ExcessiveClassLength</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>UseArraysAsList</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>CyclomaticComplexity</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>UseStringBufferForStringAppends</name>
+            <ruleset>Optimization Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ExcessivePublicCount</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>ArrayIsStoredDirectly</name>
+            <ruleset>Security Code Guidelines</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>TooManyFields</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>MethodReturnsInternalArray</name>
+            <ruleset>Security Code Guidelines</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>NcssMethodCount</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>AvoidCatchingNPE</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>NcssTypeCount</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>AvoidCatchingThrowable</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>NcssConstructorCount</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>AvoidRethrowingException</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>TooManyMethods</name>
-            <ruleset>Code Size Rules</ruleset>
+            <name>AvoidThrowingNewInstanceOfSameException</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>EmptyFinalizer</name>
-            <ruleset>Finalizer Rules</ruleset>
+            <name>AvoidThrowingNullPointerException</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>FinalizeOnlyCallsSuperFinalize</name>
-            <ruleset>Finalizer Rules</ruleset>
+            <name>AvoidThrowingRawExceptionTypes</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>FinalizeOverloaded</name>
-            <ruleset>Finalizer Rules</ruleset>
+            <name>DoNotExtendJavaLangError</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>FinalizeDoesNotCallSuperFinalize</name>
-            <ruleset>Finalizer Rules</ruleset>
+            <name>DoNotThrowExceptionInFinally</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>FinalizeShouldBeProtected</name>
-            <ruleset>Finalizer Rules</ruleset>
+            <name>ExceptionAsFlowControl</name>
+            <ruleset>Strict Exception Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>AvoidCallingFinalize</name>
-            <ruleset>Finalizer Rules</ruleset>
+            <name>AppendCharacterWithChar</name>
+            <ruleset>String and StringBuffer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>UseCorrectExceptionLogging</name>
-            <ruleset>Jakarta Commons Logging Rules</ruleset>
+            <name>AvoidDuplicateLiterals</name>
+            <ruleset>String and StringBuffer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ProperLogger</name>
-            <ruleset>Jakarta Commons Logging Rules</ruleset>
+            <name>AvoidStringBufferField</name>
+            <ruleset>String and StringBuffer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>BeanMembersShouldSerialize</name>
-            <ruleset>JavaBean Rules</ruleset>
+            <name>ConsecutiveLiteralAppends</name>
+            <ruleset>String and StringBuffer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>MissingSerialVersionUID</name>
-            <ruleset>JavaBean Rules</ruleset>
+            <name>InefficientEmptyStringCheck</name>
+            <ruleset>String and StringBuffer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>ProperCloneImplementation</name>
-            <ruleset>Clone Implementation Rules</ruleset>
+            <name>InefficientStringBuffering</name>
+            <ruleset>String and StringBuffer Rules</ruleset>

         </rule>
         <rule>
         </rule>
         <rule>

-            <name>CloneThrowsCloneNotSupportedException</name>
-            <ruleset>Clone Implementation Rules</ruleset>
+            <name>InsufficientStringBufferDeclaration</name>
+            <ruleset>String and StringBuffer Rules</ruleset>
+        </rule>
+        <rule>
+            <name>StringBufferInstantiationWithChar</name>
+            <ruleset>String and StringBuffer Rules</ruleset>
+        </rule>
+        <rule>
+            <name>StringInstantiation</name>
+            <ruleset>String and StringBuffer Rules</ruleset>
+        </rule>
+        <rule>
+            <name>StringToString</name>
+            <ruleset>String and StringBuffer Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UnnecessaryCaseChange</name>
+            <ruleset>String and StringBuffer Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UseEqualsToCompareStrings</name>
+            <ruleset>String and StringBuffer Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UseIndexOfChar</name>
+            <ruleset>String and StringBuffer Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UselessStringValueOf</name>
+            <ruleset>String and StringBuffer Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UseStringBufferLength</name>
+            <ruleset>String and StringBuffer Rules</ruleset>

         </rule>
         <rule>
             <name>CloneMethodMustImplementCloneable</name>
             <ruleset>Type Resolution Rules</ruleset>
         </rule>
         </rule>
         <rule>
             <name>CloneMethodMustImplementCloneable</name>
             <ruleset>Type Resolution Rules</ruleset>
         </rule>

+        <rule>
+            <name>LooseCoupling</name>
+            <ruleset>Type Resolution Rules</ruleset>
+        </rule>
+        <rule>
+            <name>SignatureDeclareThrowsException</name>
+            <ruleset>Type Resolution Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UnusedImports</name>
+            <ruleset>Type Resolution Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UnusedFormalParameter</name>
+            <ruleset>Unused Code Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UnusedLocalVariable</name>
+            <ruleset>Unused Code Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UnusedPrivateField</name>
+            <ruleset>Unused Code Rules</ruleset>
+        </rule>
+        <rule>
+            <name>UnusedPrivateMethod</name>
+            <ruleset>Unused Code Rules</ruleset>
+        </rule>

     </rules>
     <includeDerivedFiles>false</includeDerivedFiles>
     </rules>
     <includeDerivedFiles>false</includeDerivedFiles>

-    <violationsAsErrors>true</violationsAsErrors>
+    <violationsAsErrors>false</violationsAsErrors>

 </pmd>
 </pmd>

diff --git a/src/ro/ieval/unical/AddEventActivity.java b/src/ro/ieval/unical/AddEventActivity.java
index 0fc26ab477c6eeb54e93d37032fe3474b86f1918..caa901557cff34d95600f7949f279d461020c4c8 100644 (file)
--- a/src/ro/ieval/unical/AddEventActivity.java
+++ b/src/ro/ieval/unical/AddEventActivity.java
@@ -2,15 +2,10 @@ package ro.ieval.unical;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.Fragment;

-import android.app.FragmentTransaction;
-import android.app.ActionBar.Tab;
-import android.content.Intent;

 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

-import android.widget.TabHost;
-import android.widget.TabHost.TabSpec;

 
 public final class AddEventActivity extends Activity {
        @Override
 
 public final class AddEventActivity extends Activity {
        @Override


@@ -18,15 +13,15 @@ public final class AddEventActivity extends Activity {
                super.onCreate(savedInstanceState);
                setContentView(R.layout.add_event);
                setTitle(R.string.addeventtitle);
                super.onCreate(savedInstanceState);
                setContentView(R.layout.add_event);
                setTitle(R.string.addeventtitle);

-               ActionBar actionBar = getActionBar();
+               final ActionBar actionBar = getActionBar();

                actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
                actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);

-               ActionBar.Tab t1 = actionBar.newTab().setText(this.getString(R.string.addevtab1));
-               ActionBar.Tab t2 = actionBar.newTab().setText(this.getString(R.string.addevtab2));
-               ActionBar.Tab t3 = actionBar.newTab().setText(this.getString(R.string.addevtab3));
+               final ActionBar.Tab t1 = actionBar.newTab().setText(this.getString(R.string.addevtab1));
+               final ActionBar.Tab t2 = actionBar.newTab().setText(this.getString(R.string.addevtab2));
+               final ActionBar.Tab t3 = actionBar.newTab().setText(this.getString(R.string.addevtab3));

                
                

-               Fragment f1 = new AddEventBasicTabFragment();
-               Fragment f2 = new AddEventDetailsTabFragment();
-               Fragment f3 = new AddEventOtherTabFragment();
+               final Fragment f1 = new TrivialFragment(R.layout.add_event_basic_tab);
+               final Fragment f2 = new TrivialFragment(R.layout.add_event_details_tab);
+               final Fragment f3 = new TrivialFragment(R.layout.add_event_other_tab);

                
                t1.setTabListener(new AddEventTabListener(f1));
                t2.setTabListener(new AddEventTabListener(f2));
                
                t1.setTabListener(new AddEventTabListener(f1));
                t2.setTabListener(new AddEventTabListener(f2));

diff --git a/src/ro/ieval/unical/AddEventBasicTabFragment.java b/src/ro/ieval/unical/AddEventBasicTabFragment.java
deleted file mode 100644 (file)
index 53596d2..0000000
--- a/src/ro/ieval/unical/AddEventBasicTabFragment.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ro.ieval.unical;
-import ro.ieval.unical.R;
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-
-public class AddEventBasicTabFragment extends Fragment {
-       @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.add_event_basic_tab, container, false);
-    }
-}

diff --git a/src/ro/ieval/unical/AddEventDetailsTabFragment.java b/src/ro/ieval/unical/AddEventDetailsTabFragment.java
deleted file mode 100644 (file)
index 20def85..0000000
--- a/src/ro/ieval/unical/AddEventDetailsTabFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ro.ieval.unical;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class AddEventDetailsTabFragment extends Fragment {
-       @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.add_event_details_tab, container, false);
-    }
-}

diff --git a/src/ro/ieval/unical/AddEventOtherTabFragment.java b/src/ro/ieval/unical/AddEventOtherTabFragment.java
deleted file mode 100644 (file)
index 5e28544..0000000
--- a/src/ro/ieval/unical/AddEventOtherTabFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ro.ieval.unical;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class AddEventOtherTabFragment extends Fragment {
-       @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.add_event_other_tab, container, false);
-    }
-}

diff --git a/src/ro/ieval/unical/AddEventTabListener.java b/src/ro/ieval/unical/AddEventTabListener.java
index 1a4661ae794e0746eb0164c6a4cbdbae4ed3630a..61ac236fbe224bc60422fdb6f7deeb57cab22ed8 100644 (file)
--- a/src/ro/ieval/unical/AddEventTabListener.java
+++ b/src/ro/ieval/unical/AddEventTabListener.java
@@ -8,22 +8,22 @@ import android.app.FragmentTransaction;
 public class AddEventTabListener implements ActionBar.TabListener {
        public Fragment fragment;
 
 public class AddEventTabListener implements ActionBar.TabListener {
        public Fragment fragment;
 

-       public AddEventTabListener(Fragment fragment) {
+       public AddEventTabListener(final Fragment fragment) {

                this.fragment = fragment;
        }
 
        @Override
                this.fragment = fragment;
        }
 
        @Override

-       public void onTabSelected(Tab tab, FragmentTransaction ft) {
+       public void onTabSelected(final Tab tab, final FragmentTransaction ft) {

                ft.replace(R.id.fragment_container, fragment);
        }
 
        @Override
                ft.replace(R.id.fragment_container, fragment);
        }
 
        @Override

-       public void onTabUnselected(Tab tab, FragmentTransaction ft) {
+       public void onTabUnselected(final Tab tab, final FragmentTransaction ft) {

                ft.remove(fragment);
        }
 
        @Override
                ft.remove(fragment);
        }
 
        @Override

-       public void onTabReselected(Tab tab, FragmentTransaction ft) {
+       public void onTabReselected(final Tab tab, final FragmentTransaction ft) {

                // TODO Auto-generated method stub
                
        }
                // TODO Auto-generated method stub
                
        }

diff --git a/src/ro/ieval/unical/TrivialFragment.java b/src/ro/ieval/unical/TrivialFragment.java
new file mode 100644 (file)
index 0000000..727814a
--- /dev/null
+++ b/src/ro/ieval/unical/TrivialFragment.java
@@ -0,0 +1,19 @@
+package ro.ieval.unical;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public final class TrivialFragment extends Fragment {
+       private final int layout;
+       public TrivialFragment(final int layout){
+               this.layout=layout;
+       }
+
+       @Override
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
+        return inflater.inflate(layout, container, false);
+    }
+}