# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1253989181 -7200
# Node ID c62714325079f6ac72a402c3ef396d3243ce189a
# Parent  3c8ca2a1a32738da03ea8b96ac14a697cf56853f# Parent  ae8dfe45b0c90650a1cbbc6f9c05ba5d0a203f92
merge

diff -r 3c8ca2a1a327 -r c62714325079 checkstyle.xml
--- a/checkstyle.xml	Sat Sep 26 20:19:07 2009 +0200
+++ b/checkstyle.xml	Sat Sep 26 20:19:41 2009 +0200
@@ -48,11 +48,15 @@
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
+    <module name="NewlineAtEndOfFile">
+	<property name="severity" value="error"/>
+    </module>
 
     <!-- Checks that property files contain the same keys.         -->
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
+    <module name="Translation">
+	<property name="severity" value="error"/>
+    </module>
 
     <!-- Checks for Size Violations.                    -->
     <!-- See http://checkstyle.sf.net/config_sizes.html -->
@@ -73,6 +77,7 @@
 	<property name="message" value="Line has trailing spaces."/>
     </module>
 
+    <module name="StrictDuplicateCode"/>
 
     <module name="TreeWalker">
 
@@ -80,13 +85,18 @@
 	<!-- See http://checkstyle.sf.net/config_javadoc.html -->
 	<module name="JavadocMethod">
 	    <property name="allowUndeclaredRTE" value="true"/>
+	    <property name="severity" value="error"/>
 	</module>
-	<module name="JavadocType"/>
+	<module name="JavadocType">
+	    <property name="severity" value="error"/>
+	</module>
 	<module name="JavadocVariable">
 	    <property name="scope" value="package" />
+	    <property name="severity" value="error"/>
 	</module>
 	<module name="JavadocStyle">
 	    <property name="checkEmptyJavadoc" value="true"/>
+	    <property name="severity" value="error"/>
 	</module>
 
 
@@ -166,26 +176,40 @@
 
 	<!-- Modifier Checks                                    -->
 	<!-- See http://checkstyle.sf.net/config_modifiers.html -->
-	<module name="ModifierOrder"/>
-	<module name="RedundantModifier"/>
+	<module name="ModifierOrder">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="RedundantModifier">
+	    <property name="severity" value="error"/>
+	</module>
 
 
 	<!-- Checks for blocks. You know, those {}'s         -->
 	<!-- See http://checkstyle.sf.net/config_blocks.html -->
 	<module name="AvoidNestedBlocks"/>
 	<module name="EmptyBlock"/>
-	<module name="LeftCurly"/>
+	<module name="LeftCurly">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="RightCurly">
+	    <property name="severity" value="error"/>
+	</module>
 	<!--
 	  <module name="NeedBraces"/>
 	  -->
-	<module name="RightCurly"/>
 
 	<!-- Check for annotations 
 	http://checkstyle.sourceforge.net/config_annotation.html#MissingDeprecated
 	-->
-	<module name="AnnotationUseStyle"/>
-	<module name="MissingDeprecated"/>
-	    <module name="MissingOverride"/>
+	<module name="AnnotationUseStyle">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="MissingDeprecated">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="MissingOverride">
+	    <property name="severity" value="error"/>
+	</module>
 
 	<!-- Checks for common coding problems               -->
 	<!-- See http://checkstyle.sf.net/config_coding.html -->
@@ -194,25 +218,35 @@
 	<module name="InnerAssignment" />
 	<module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
 	<module name="EmptyStatement"/>
-	<module name="EqualsHashCode"/>
+	<module name="EqualsHashCode">
+	    <property name="severity" value="error"/>
+	</module>
 	<module name="HiddenField">
 	    <property name="ignoreConstructorParameter" value="true"/>
 	    <property name="ignoreAbstractMethods" value="true"/>
 	    <property name="ignoreSetter" value="true"/>
 	</module>
 	<module name="IllegalInstantiation"/>
-	<module name="InnerAssignment"/>
-	<!--
-	  <module name="MagicNumber"/>
-	  -->
-	<module name="MissingSwitchDefault"/>
+	<module name="InnerAssignment">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="MagicNumber"/>
+	<module name="MissingSwitchDefault">
+	    <property name="severity" value="error"/>
+	</module>
 	<module name="RedundantThrows"/>
-	<module name="SimplifyBooleanExpression"/>
-	<module name="SimplifyBooleanReturn"/>
-	<module name="StringLiteralEquality"/>
-	<module name="SuperFinalize"/>
+	<module name="SimplifyBooleanExpression">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="SimplifyBooleanReturn">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="StringLiteralEquality">
+	    <property name="severity" value="error"/>
+	</module>
 	<module name="IllegalCatch"/>
 	<module name="IllegalThrows"/>
+	<module name="IllegalType"/>
 	<module name="PackageDeclaration"/>
 	<module name="JUnitTestCase"/>
 	<module name="DeclarationOrder"/>
@@ -220,14 +254,25 @@
 	<module name="DefaultComesLast"/>
 	<module name="MissingCtor"/>
 	<module name="FallThrough"/>
-	<module name="MultipleStringLiterals"/>
+	<module name="MultipleStringLiterals">
+	    <property name="allowedDuplicates" value="2"/>
+	</module>
 	<module name="MultipleVariableDeclarations"/>
 	<module name="UnnecessaryParentheses"/>
 	<module name="ParameterAssignment"/>
-	<module name="SuperClone"/>
-	<module name="EqualsAvoidNull"/>
+	<module name="EqualsAvoidNull">
+	    <property name="severity" value="error"/>
+	</module>
 	<module name="NoClone"/>
 	<module name="NoFinalizer"/>
+	<module name="SuperClone"/>
+	<module name="SuperFinalize"/>
+	<module name="ModifiedControlVariable">
+	    <property name="severity" value="error"/>
+	</module>
+	<module name="ReturnCount">
+	    <property name="max" value="3"/>
+	</module>
 
 	<!-- Checks for class design                         -->
 	<!-- See http://checkstyle.sf.net/config_design.html -->
@@ -236,9 +281,14 @@
 	  -->
 	<module name="FinalClass"/>
 	<module name="HideUtilityClassConstructor"/>
+	<!-- 
 	<module name="InterfaceIsType"/>
+	-->
 	<module name="VisibilityModifier"/>
 	<module name="MutableException"/>
+	<module name="ThrowsCount">
+	    <property name="max" value="2" />
+	</module>
 
 
 	<!-- Miscellaneous other checks.                   -->
@@ -258,7 +308,5 @@
 	<module name="ArrayTypeStyle"/>
 
     </module>
-    <module name="StrictDuplicateCode"/>
-    <module name="NewlineAtEndOfFile"/>
 
 </module>