apex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From david...@apache.org
Subject [1/2] incubator-apex-core git commit: APEX-227 #resolve #comment left curly brace on next line for anonymous class
Date Tue, 17 Nov 2015 21:20:32 GMT
Repository: incubator-apex-core
Updated Branches:
  refs/heads/devel-3 5b8a4d502 -> 3befce7ec


APEX-227 #resolve #comment left curly brace on next line for anonymous class


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/cb5e8a2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/cb5e8a2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/cb5e8a2d

Branch: refs/heads/devel-3
Commit: cb5e8a2dd8b9f443ab8e6e0078bce348820c7d6f
Parents: 93bdf2d
Author: Chandni Singh <csingh@apache.org>
Authored: Mon Nov 16 18:17:16 2015 -0800
Committer: Chandni Singh <csingh@apache.org>
Committed: Mon Nov 16 18:17:16 2015 -0800

----------------------------------------------------------------------
 .idea/codeStyleSettings.xml |  6 ++++--
 apex_checks.xml             | 12 +++++++-----
 engine/pom.xml              |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/cb5e8a2d/.idea/codeStyleSettings.xml
----------------------------------------------------------------------
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index d436e44..4ac0d16 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -36,6 +36,7 @@
             <package name="" withSubpackages="true" static="true" />
           </value>
         </option>
+        <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
         <option name="JD_P_AT_EMPTY_LINES" value="false" />
         <JSON>
           <option name="ARRAY_WRAPPING" value="0" />
@@ -45,6 +46,7 @@
         </JavaCodeStyleSettings>
         <XML>
           <option name="XML_TEXT_WRAP" value="0" />
+          <option name="XML_ALIGN_ATTRIBUTES" value="false" />
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
         <codeStyleSettings language="Groovy">
@@ -96,7 +98,7 @@
           <option name="RIGHT_MARGIN" value="120" />
           <indentOptions>
             <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
             <option name="TAB_SIZE" value="2" />
           </indentOptions>
         </codeStyleSettings>
@@ -104,4 +106,4 @@
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
-</project>
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/cb5e8a2d/apex_checks.xml
----------------------------------------------------------------------
diff --git a/apex_checks.xml b/apex_checks.xml
index 7701858..7474e67 100644
--- a/apex_checks.xml
+++ b/apex_checks.xml
@@ -46,7 +46,7 @@
     <module name="EmptyBlock">
       <property name="option" value="TEXT"/>
       <property name="tokens"
-                value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
LITERAL_SWITCH"/>
+          value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
     </module>
     <!-- checks for braces around code blocks -->
     <module name="NeedBraces"/>
@@ -54,13 +54,15 @@
     <module name="LeftCurly">
       <property name="option" value="eol"/>
       <property name="tokens"
-                value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
+          value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
LITERAL_SWITCH,
+          LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
     </module>
 
     <module name="LeftCurly">
       <property name="option" value="nl"/>
       <property name="tokens"
-                value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF,
INTERFACE_DEF, METHOD_DEF"/>
+          value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, ENUM_CONSTANT_DEF, INTERFACE_DEF,
METHOD_DEF,
+          OBJBLOCK"/>
     </module>
 
     <module name="RightCurly">
@@ -71,12 +73,12 @@
     <module name="RightCurly">
       <property name="option" value="alone"/>
       <property name="tokens"
-                value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO,
STATIC_INIT, INSTANCE_INIT"/>
+          value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO,
STATIC_INIT, INSTANCE_INIT"/>
     </module>
 
     <module name="NoWhitespaceAfter">
       <property name="tokens"
-                value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, TYPECAST,
ARRAY_DECLARATOR"/>
+          value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, TYPECAST,
ARRAY_DECLARATOR"/>
     </module>
 
     <module name="NoWhitespaceBefore">

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/cb5e8a2d/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index f55a563..0fbf927 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -145,7 +145,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <maxAllowedViolations>2942</maxAllowedViolations>
+          <maxAllowedViolations>2759</maxAllowedViolations>
         </configuration>
       </plugin>
       <plugin>


Mime
View raw message