You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2015/11/02 16:49:52 UTC
[05/11] incubator-apex-core git commit: APEX-226 #resolve #comment
strictly enforce wrapping indentation
APEX-226 #resolve #comment strictly enforce wrapping indentation
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/9049be71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/9049be71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/9049be71
Branch: refs/heads/feature-module
Commit: 9049be71697897fb6fa136e443cd4ffbfc089b26
Parents: ec51e8b
Author: Chandni Singh <cs...@apache.org>
Authored: Tue Oct 27 22:01:41 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Tue Oct 27 22:06:16 2015 -0700
----------------------------------------------------------------------
.idea/codeStyleSettings.xml | 6 +++++-
apex_checks.xml | 1 +
bufferserver/pom.xml | 2 +-
common/pom.xml | 2 +-
engine/pom.xml | 2 +-
misc/ide-templates/intellij/apex-style.jar | Bin 1515 -> 1459 bytes
6 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9049be71/.idea/codeStyleSettings.xml
----------------------------------------------------------------------
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index d469013..3143cfb 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -68,6 +68,9 @@
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
<option name="CLASS_BRACE_STYLE" value="2" />
<option name="METHOD_BRACE_STYLE" value="2" />
+ <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+ <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
+ <option name="ALIGN_MULTILINE_FOR" value="false" />
<option name="SPACE_AFTER_TYPE_CAST" value="false" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
@@ -99,4 +102,5 @@
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
-</project>
\ No newline at end of file
+</project>
+
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9049be71/apex_checks.xml
----------------------------------------------------------------------
diff --git a/apex_checks.xml b/apex_checks.xml
index bc17e64..81fa09d 100644
--- a/apex_checks.xml
+++ b/apex_checks.xml
@@ -141,6 +141,7 @@
<property name="throwsIndent" value="2"/>
<property name="arrayInitIndent" value="2"/>
<property name="lineWrappingIndentation" value="2"/>
+ <property name="forceStrictCondition" value="true"/>
</module>
<module name="ImportOrder">
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9049be71/bufferserver/pom.xml
----------------------------------------------------------------------
diff --git a/bufferserver/pom.xml b/bufferserver/pom.xml
index acb93c9..bb631b5 100644
--- a/bufferserver/pom.xml
+++ b/bufferserver/pom.xml
@@ -51,7 +51,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>60</maxAllowedViolations>
+ <maxAllowedViolations>83</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9049be71/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 6fb4852..9c42370 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -74,7 +74,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <maxAllowedViolations>80</maxAllowedViolations>
+ <maxAllowedViolations>84</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9049be71/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index 5545e27..a915ff2 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>2063</maxAllowedViolations>
+ <maxAllowedViolations>2159</maxAllowedViolations>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9049be71/misc/ide-templates/intellij/apex-style.jar
----------------------------------------------------------------------
diff --git a/misc/ide-templates/intellij/apex-style.jar b/misc/ide-templates/intellij/apex-style.jar
index dc71b06..23ac4a7 100644
Binary files a/misc/ide-templates/intellij/apex-style.jar and b/misc/ide-templates/intellij/apex-style.jar differ