[Tynstep-svn] r197 - trunk/step-build/src/main/resources/eclipse
ChrisBurrell at crosswire.org
ChrisBurrell at crosswire.org
Sun Dec 19 04:28:35 MST 2010
Author: ChrisBurrell
Date: 2010-12-19 04:28:35 -0700 (Sun, 19 Dec 2010)
New Revision: 197
Modified:
trunk/step-build/src/main/resources/eclipse/.checkstyle
trunk/step-build/src/main/resources/eclipse/org.eclipse.jdt.core.prefs
trunk/step-build/src/main/resources/eclipse/pmd.xml
Log:
Modified: trunk/step-build/src/main/resources/eclipse/.checkstyle
===================================================================
--- trunk/step-build/src/main/resources/eclipse/.checkstyle 2010-12-19 11:28:17 UTC (rev 196)
+++ trunk/step-build/src/main/resources/eclipse/.checkstyle 2010-12-19 11:28:35 UTC (rev 197)
@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="true">
- <local-check-config name="checkstyle" location=".checkstyle.config.xml" type="project" description="">
- <additional-data name="protect-config-file" value="false"/>
+ <local-check-config name="checkstyle" location=".checkstyle.config.xml" type="project" description="STEP Project Checkstyle config">
+ <property name="checkstyle.header.file" value="${basedir}/.LICENSE.txt"/>
+ <additional-data name="protect-config-file" value="false"/>
</local-check-config>
+ <local-check-config name="checkstyle-test" location=".checkstyle.config.test.xml" type="project" description="STEP Project Test Checkstyle config">
+ <property name="checkstyle.header.file" value="${basedir}/.LICENSE.txt"/>
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
<fileset name="all" enabled="true" check-config-name="checkstyle" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/java" include-pattern="true"/>
</fileset>
+ <fileset name="test" enabled="true" check-config-name="checkstyle-test" local="true">
+ <file-match-pattern match-pattern="^src/test/java" include-pattern="true"/>
+ </fileset>
</fileset-config>
Modified: trunk/step-build/src/main/resources/eclipse/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/step-build/src/main/resources/eclipse/org.eclipse.jdt.core.prefs 2010-12-19 11:28:17 UTC (rev 196)
+++ trunk/step-build/src/main/resources/eclipse/org.eclipse.jdt.core.prefs 2010-12-19 11:28:35 UTC (rev 197)
@@ -15,9 +15,9 @@
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -73,7 +73,7 @@
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.line_length=110
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
@@ -266,7 +266,7 @@
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=110
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
Modified: trunk/step-build/src/main/resources/eclipse/pmd.xml
===================================================================
--- trunk/step-build/src/main/resources/eclipse/pmd.xml 2010-12-19 11:28:17 UTC (rev 196)
+++ trunk/step-build/src/main/resources/eclipse/pmd.xml 2010-12-19 11:28:35 UTC (rev 197)
@@ -232,10 +232,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>CallSuperInConstructor</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>UnnecessaryParentheses</name>
<ruleset>Controversial Rules</ruleset>
</rule>
@@ -244,10 +240,6 @@
<ruleset>Controversial Rules</ruleset>
</rule>
<rule>
- <name>DataflowAnomalyAnalysis</name>
- <ruleset>Controversial Rules</ruleset>
- </rule>
- <rule>
<name>AvoidUsingShortType</name>
<ruleset>Controversial Rules</ruleset>
</rule>
@@ -268,10 +260,6 @@
<ruleset>Coupling Rules</ruleset>
</rule>
<rule>
- <name>ExcessiveImports</name>
- <ruleset>Coupling Rules</ruleset>
- </rule>
- <rule>
<name>UseSingleton</name>
<ruleset>Design Rules</ruleset>
</rule>
@@ -496,10 +484,6 @@
<ruleset>Import Statement Rules</ruleset>
</rule>
<rule>
- <name>TooManyStaticImports</name>
- <ruleset>Import Statement Rules</ruleset>
- </rule>
- <rule>
<name>UseProperClassLoader</name>
<ruleset>J2EE Rules</ruleset>
</rule>
@@ -572,10 +556,6 @@
<ruleset>JUnit Rules</ruleset>
</rule>
<rule>
- <name>JUnitTestsShouldIncludeAssert</name>
- <ruleset>JUnit Rules</ruleset>
- </rule>
- <rule>
<name>TestClassWithoutTestCases</name>
<ruleset>JUnit Rules</ruleset>
</rule>
@@ -800,10 +780,6 @@
<ruleset>Strict Exception Rules</ruleset>
</rule>
<rule>
- <name>AvoidDuplicateLiterals</name>
- <ruleset>String and StringBuffer Rules</ruleset>
- </rule>
- <rule>
<name>StringInstantiation</name>
<ruleset>String and StringBuffer Rules</ruleset>
</rule>
More information about the Tynstep-svn
mailing list