From 4b01aad267bc0abdeed88f94e9fd67f320d2ec1b Mon Sep 17 00:00:00 2001 From: Xavier Le Vourch Date: Mon, 29 Jan 2007 02:26:05 +0000 Subject: [PATCH] Checking in some Java 5 changes git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@5004 51baf565-9d33-0410-a72c-fc3788e3496d --- pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java | 4 ++-- .../pmd/properties/NonRuleWithAllPropertyTypes.java | 2 +- pmd/src/net/sourceforge/pmd/AbstractRule.java | 6 +++--- pmd/src/net/sourceforge/pmd/dfa/DaaRule.java | 2 +- .../sourceforge/pmd/rules/AvoidDeeplyNestedIfStmtsRule.java | 4 ++-- .../pmd/rules/BeanMembersShouldSerializeRule.java | 4 ++-- pmd/src/net/sourceforge/pmd/rules/CloseResource.java | 2 +- .../net/sourceforge/pmd/rules/CouplingBetweenObjects.java | 4 ++-- .../sourceforge/pmd/rules/VariableNamingConventions.java | 2 +- .../pmd/rules/design/NonThreadSafeSingleton.java | 2 +- pmd/src/net/sourceforge/pmd/rules/design/TooManyFields.java | 4 ++-- .../pmd/rules/strings/ConsecutiveLiteralAppends.java | 4 ++-- pmd/src/net/sourceforge/pmd/stat/StatisticalRule.java | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java index d8aa4c836b..b13bcf3c76 100644 --- a/pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java +++ b/pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java @@ -45,7 +45,7 @@ public class AbstractRuleTest extends TestCase { private static final Map propertyDescriptorsByName = asFixedMap(new PropertyDescriptor[] { pd, xpath }); - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } @@ -62,7 +62,7 @@ public class AbstractRuleTest extends TestCase { private static final Map propertyDescriptorsByName = asFixedMap(new PropertyDescriptor[] { pd }); - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } diff --git a/pmd/regress/test/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java b/pmd/regress/test/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java index 72c93f4d80..b3c7c253ca 100644 --- a/pmd/regress/test/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java +++ b/pmd/regress/test/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java @@ -47,7 +47,7 @@ class NonRuleWithAllPropertyTypes extends AbstractRule { super(); } - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } } diff --git a/pmd/src/net/sourceforge/pmd/AbstractRule.java b/pmd/src/net/sourceforge/pmd/AbstractRule.java index 1433c9199e..3abe5bc328 100644 --- a/pmd/src/net/sourceforge/pmd/AbstractRule.java +++ b/pmd/src/net/sourceforge/pmd/AbstractRule.java @@ -451,8 +451,8 @@ public abstract class AbstractRule extends JavaParserVisitorAdapter implements R * * @return Map */ - protected Map propertiesByName() { - return Collections.EMPTY_MAP; + protected Map propertiesByName() { + return Collections.emptyMap(); } /** @@ -462,7 +462,7 @@ public abstract class AbstractRule extends JavaParserVisitorAdapter implements R * @return PropertyDescriptor */ public PropertyDescriptor propertyDescriptorFor(String propertyName) { - PropertyDescriptor desc = (PropertyDescriptor)propertiesByName().get(propertyName); + PropertyDescriptor desc = propertiesByName().get(propertyName); if (desc == null) throw new IllegalArgumentException("unknown property: " + propertyName); return desc; } diff --git a/pmd/src/net/sourceforge/pmd/dfa/DaaRule.java b/pmd/src/net/sourceforge/pmd/dfa/DaaRule.java index f8fdb73c56..669b241204 100644 --- a/pmd/src/net/sourceforge/pmd/dfa/DaaRule.java +++ b/pmd/src/net/sourceforge/pmd/dfa/DaaRule.java @@ -45,7 +45,7 @@ public class DaaRule extends AbstractRule implements Executable { private static final Map propertyDescriptorsByName = asFixedMap( new PropertyDescriptor[] { maxPathDescriptor, maxViolationsDescriptor}); - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } diff --git a/pmd/src/net/sourceforge/pmd/rules/AvoidDeeplyNestedIfStmtsRule.java b/pmd/src/net/sourceforge/pmd/rules/AvoidDeeplyNestedIfStmtsRule.java index 9f27c798cf..be80449a77 100644 --- a/pmd/src/net/sourceforge/pmd/rules/AvoidDeeplyNestedIfStmtsRule.java +++ b/pmd/src/net/sourceforge/pmd/rules/AvoidDeeplyNestedIfStmtsRule.java @@ -23,7 +23,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractRule { 1.0f ); - private static final Map propertyDescriptorsByName = asFixedMap(problemDepthDescriptor); + private static final Map propertyDescriptorsByName = asFixedMap(problemDepthDescriptor); public Object visit(ASTCompilationUnit node, Object data) { depth = 0; @@ -46,7 +46,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractRule { /** * @return Map */ - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } } diff --git a/pmd/src/net/sourceforge/pmd/rules/BeanMembersShouldSerializeRule.java b/pmd/src/net/sourceforge/pmd/rules/BeanMembersShouldSerializeRule.java index 69b3db02f3..f5576307e9 100644 --- a/pmd/src/net/sourceforge/pmd/rules/BeanMembersShouldSerializeRule.java +++ b/pmd/src/net/sourceforge/pmd/rules/BeanMembersShouldSerializeRule.java @@ -30,7 +30,7 @@ public class BeanMembersShouldSerializeRule extends AbstractRule { "prefix", "Prefix somethingorother?", "", 1.0f ); - private static final Map propertyDescriptorsByName = asFixedMap(prefixDescriptor); + private static final Map propertyDescriptorsByName = asFixedMap(prefixDescriptor); public Object visit(ASTCompilationUnit node, Object data) { @@ -111,7 +111,7 @@ public class BeanMembersShouldSerializeRule extends AbstractRule { /** * @return Map */ - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } } diff --git a/pmd/src/net/sourceforge/pmd/rules/CloseResource.java b/pmd/src/net/sourceforge/pmd/rules/CloseResource.java index 8e9309b278..8fd6f5f204 100644 --- a/pmd/src/net/sourceforge/pmd/rules/CloseResource.java +++ b/pmd/src/net/sourceforge/pmd/rules/CloseResource.java @@ -51,7 +51,7 @@ public class CloseResource extends AbstractRule { private static final Map propertyDescriptorsByName = asFixedMap(new PropertyDescriptor[] { typesDescriptor, closeTargetsDescriptor }); - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } diff --git a/pmd/src/net/sourceforge/pmd/rules/CouplingBetweenObjects.java b/pmd/src/net/sourceforge/pmd/rules/CouplingBetweenObjects.java index 86327fc6b2..46656ed562 100644 --- a/pmd/src/net/sourceforge/pmd/rules/CouplingBetweenObjects.java +++ b/pmd/src/net/sourceforge/pmd/rules/CouplingBetweenObjects.java @@ -41,7 +41,7 @@ public class CouplingBetweenObjects extends AbstractRule { "threshold", "Coupling threshold value", 2, 1.0f ); - private static final Map propertyDescriptorsByName = asFixedMap(thresholdDescriptor); + private static final Map propertyDescriptorsByName = asFixedMap(thresholdDescriptor); public Object visit(ASTCompilationUnit cu, Object data) { @@ -160,7 +160,7 @@ public class CouplingBetweenObjects extends AbstractRule { /** * @return Map */ - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } } diff --git a/pmd/src/net/sourceforge/pmd/rules/VariableNamingConventions.java b/pmd/src/net/sourceforge/pmd/rules/VariableNamingConventions.java index 9156a8a555..a108688e3e 100644 --- a/pmd/src/net/sourceforge/pmd/rules/VariableNamingConventions.java +++ b/pmd/src/net/sourceforge/pmd/rules/VariableNamingConventions.java @@ -48,7 +48,7 @@ public class VariableNamingConventions extends AbstractRule { /** * @return Map */ - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } diff --git a/pmd/src/net/sourceforge/pmd/rules/design/NonThreadSafeSingleton.java b/pmd/src/net/sourceforge/pmd/rules/design/NonThreadSafeSingleton.java index f6afe27838..d7849d1a49 100644 --- a/pmd/src/net/sourceforge/pmd/rules/design/NonThreadSafeSingleton.java +++ b/pmd/src/net/sourceforge/pmd/rules/design/NonThreadSafeSingleton.java @@ -114,7 +114,7 @@ public class NonThreadSafeSingleton extends AbstractRule { /** * @return Map */ - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } } diff --git a/pmd/src/net/sourceforge/pmd/rules/design/TooManyFields.java b/pmd/src/net/sourceforge/pmd/rules/design/TooManyFields.java index e189c12715..ee415d7e79 100644 --- a/pmd/src/net/sourceforge/pmd/rules/design/TooManyFields.java +++ b/pmd/src/net/sourceforge/pmd/rules/design/TooManyFields.java @@ -33,7 +33,7 @@ public class TooManyFields extends AbstractRule { 1.0f ); - private static final Map propertyDescriptorsByName = asFixedMap(maxFieldsDescriptor); + private static final Map propertyDescriptorsByName = asFixedMap(maxFieldsDescriptor); public Object visit(ASTCompilationUnit node, Object data) { @@ -77,7 +77,7 @@ public class TooManyFields extends AbstractRule { /** * @return Map */ - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } } diff --git a/pmd/src/net/sourceforge/pmd/rules/strings/ConsecutiveLiteralAppends.java b/pmd/src/net/sourceforge/pmd/rules/strings/ConsecutiveLiteralAppends.java index 133e65a548..c26c598853 100644 --- a/pmd/src/net/sourceforge/pmd/rules/strings/ConsecutiveLiteralAppends.java +++ b/pmd/src/net/sourceforge/pmd/rules/strings/ConsecutiveLiteralAppends.java @@ -74,7 +74,7 @@ public class ConsecutiveLiteralAppends extends AbstractRule { 1.0f ); - private static final Map propertyDescriptorsByName = asFixedMap(thresholdDescriptor); + private static final Map propertyDescriptorsByName = asFixedMap(thresholdDescriptor); private int threshold = 1; @@ -315,7 +315,7 @@ public class ConsecutiveLiteralAppends extends AbstractRule { return "StringBuffer".equals(((SimpleNode) nn.jjtGetChild(0)).getImage()); } - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } } \ No newline at end of file diff --git a/pmd/src/net/sourceforge/pmd/stat/StatisticalRule.java b/pmd/src/net/sourceforge/pmd/stat/StatisticalRule.java index 298f1b1e6b..4a2c986207 100644 --- a/pmd/src/net/sourceforge/pmd/stat/StatisticalRule.java +++ b/pmd/src/net/sourceforge/pmd/stat/StatisticalRule.java @@ -141,7 +141,7 @@ public abstract class StatisticalRule extends AbstractRule { } } - protected Map propertiesByName() { + protected Map propertiesByName() { return propertyDescriptorsByName; } }