Update for CustomDeclarationOrderCheck. Issue 73.

baratali · Jan 14, 2014 · 7281138 · 7281138
1 parent c82e729
commit 7281138
Show file tree

Hide file tree

Showing 9 changed files with 1,591 additions and 190 deletions.
diff --git a/...vntu-plugin/src/com/github/sevntu/checkstyle/checks/coding/checkstyle-metadata.properties b/...vntu-plugin/src/com/github/sevntu/checkstyle/checks/coding/checkstyle-metadata.properties
@@ -20,6 +20,8 @@ AvoidModifiersForTypes.forbiddenClassesRegexpVolatile = The regexp defines the n
 
 CustomDeclarationOrder.name = Custom Declaration Order
 CustomDeclarationOrder.desc = Checks the class for a custom oder of declarations
+CustomDeclarationOrder.ignoreInnerClassesInMethods = Ignore inner classes in methods
+CustomDeclarationOrder.fieldPrefix = Prefix of field's name
 
 ConfusingConditionCheck.name = Confusing Condition Check
 ConfusingConditionCheck.desc = This check prevents negation within an "if" expression if "else" is present.<br>For example, rephrase: <br> if (x != y) smth1();<br> else smth2(); <br>as:<br> if (x == y) smth2(); <br>else smth1();

diff --git a/...secs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/coding/checkstyle-metadata.xml b/...secs-sevntu-plugin/src/com/github/sevntu/checkstyle/checks/coding/checkstyle-metadata.xml
@@ -62,12 +62,18 @@
         <rule-metadata name="%CustomDeclarationOrder.name" internal-name="CustomDeclarationOrder" parent="TreeWalker">
             <alternative-name internal-name="com.puppycrawl.tools.checkstyle.checks.coding.CustomDeclarationOrderCheck"/>
             <description>%CustomDeclarationOrder.desc</description>
-            <property-metadata name="customDeclarationOrder" datatype="Regex" default-value="Field(public) ### Field(protected) ### Field(private) ### CTOR(.*) ### Method(.*)### InnerClass()">
+            <property-metadata name="customDeclarationOrder" datatype="Regex" default-value="Field(.*public.*) ### Field(.*protected.*) ### Field(.*private.*) ### CTOR(.*) ### MainMethod(.*) ### GetterSetter(.*) ### Method(.*) ### InnerClass(.*) ### InnerInterface(.*) ### InnerEnum(.*)">
                 <description>%CustomDeclarationOrder.customDeclarationOrder</description>
             </property-metadata>
             <property-metadata name="ignoreRegExCase" datatype="Boolean" default-value="false">
                 <description>%CustomDeclarationOrder.ignoreRegExCase</description>
             </property-metadata>
+            <property-metadata name="ignoreInnerClassesInMethods" datatype="Boolean" default-value="true">
+                <description>%CustomDeclarationOrder.ignoreInnerClassesInMethods</description>
+            </property-metadata>
+            <property-metadata name="fieldPrefix" datatype="String" default-value="">
+                <description>%CustomDeclarationOrder.fieldPrefix</description>
+            </property-metadata>
             <message-key key="custom.declaration.order.field"/>
             <message-key key="custom.declaration.order.method"/>
             <message-key key="custom.declaration.order.constructor"/>