r2677 - in trunk: . src/main/java/org/chorem/jtimer/data src/main/java/org/chorem/jtimer/entities
Author: echatellier Date: 2009-10-15 11:29:00 +0200 (Thu, 15 Oct 2009) New Revision: 2677 Modified: trunk/checkstyle.xml trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java Log: Switch to checkstyle 5.0 (test requested by MCHECKSTYLE-105) Modified: trunk/checkstyle.xml =================================================================== --- trunk/checkstyle.xml 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/checkstyle.xml 2009-10-15 09:29:00 UTC (rev 2677) @@ -1,164 +1,186 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> +<?xml version="1.0"?> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.2//EN" + "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> + <module name="Checker"> + <!-- + If you set the basedir property below, then all reported file + names will be relative to the specified directory. See + http://checkstyle.sourceforge.net/5.x/config.html#Checker - <!-- Checks that a package.html file exists for each package. --> - <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml --> - <!-- chatellier : use package-info.java instead - <module name="PackageHtml"/> --> + <property name="basedir" value="${basedir}"/> + --> - <!-- Checks whether files end with a new line. --> - <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile --> - <module name="NewlineAtEndOfFile"/> + <metadata name="com.atlas-sw.eclipse" value="I like Sydney"/> - <!-- Checks that property files contain the same keys. --> - <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> - <module name="Translation"/> + <property name="severity" value="error"/> + <!-- <module name="SuppressionFilter"> + <property name="file" value="checkstyle_suppression.xml"/> + </module> --> - <module name="TreeWalker"> + <module name="JavadocPackage"> + <property name="allowLegacy" value="false"/> + </module> - <property name="cacheFile" value="${checkstyle.cache.file}"/> + <!-- <module name="Translation"> + <property name="severity" value="${translation.severity}"/> + </module> --> - <!-- Checks for Javadoc comments. --> - <!-- See http://checkstyle.sf.net/config_javadoc.html --> - <module name="JavadocMethod"> - <property name="allowMissingJavadoc" value="true"/> - </module> - <module name="JavadocType"/> - <module name="JavadocVariable"/> - <module name="JavadocStyle"> - <property name="severity" value="warning"/> - </module> + <module name="FileTabCharacter"> + <property name="eachLine" value="false"/> + </module> + <module name="FileLength"> + <property name="fileExtensions" value="java"/> + </module> - <!-- Checks for Naming Conventions. --> - <!-- See http://checkstyle.sf.net/config_naming.html --> - <module name="ConstantName"/> - <module name="LocalFinalVariableName"/> - <module name="LocalVariableName"/> - <module name="MemberName"/> - <module name="MethodName"/> - <module name="PackageName"/> - <module name="ParameterName"/> - <module name="StaticVariableName"/> - <module name="TypeName"/> + <!-- <module name="Header"> + <property name="headerFile" value="checkstyle_header.xml"/> + <property name="fileExtensions" value="java"/> + <property name="id" value="header"/> + </module> --> + <module name="RegexpSingleline"> + <property name="format" value="^[^\*]*\s+$"/> + <property name="minimum" value="0"/> + <property name="maximum" value="0"/> + </module> - <!-- Checks for Headers --> - <!-- See http://checkstyle.sf.net/config_header.html --> - <!-- <module name="Header"> --> - <!-- The follow property value demonstrates the ability --> - <!-- to have access to ANT properties. In this case it uses --> - <!-- the ${basedir} property to allow Checkstyle to be run --> - <!-- from any directory within a project. See property --> - <!-- expansion, --> - <!-- http://checkstyle.sf.net/config.html#properties --> - <!-- <property --> - <!-- name="headerFile" --> - <!-- value="${basedir}/java.header"/> --> - <!-- </module> --> + <module name="TreeWalker"> + <property name="tabWidth" value="4" /> - <!-- Following interprets the header file as regular expressions. --> - <!-- <module name="RegexpHeader"/> --> + <module name="AvoidStarImport"/> + <module name="ConstantName"/> + <module name="EmptyBlock"/> + <module name="EmptyForIteratorPad"/> + <module name="EqualsHashCode"/> + <!-- module name="IllegalCatch"/ + <module name="ImportControl"> + <property name="file" value="checkstyle_import.xml"/> + </module> --> + <module name="IllegalImport"/> + <module name="IllegalInstantiation"/> + <module name="IllegalThrows"/> + <module name="InnerAssignment"/> + <module name="JavadocType"> + <property name="authorFormat" value="\S"/> + </module> + <module name="JavadocMethod"> + <property name="allowUndeclaredRTE" value="true"/> + <property name="allowThrowsTagsForSubclasses" value="true"/> + </module> + <module name="JavadocVariable"/> + <module name="JavadocStyle"> + <property name="scope" value="public"/> + </module> - <!-- Checks for imports --> - <!-- See http://checkstyle.sf.net/config_import.html --> - <module name="AvoidStarImport"/> - <module name="IllegalImport"/> <!-- defaults to sun.* packages --> - <module name="RedundantImport"/> - <module name="UnusedImports"/> + <module name="LeftCurly"> + <property name="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/> + <property name="option" value="eol"/> + </module> + <module name="LeftCurly"> + <property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/> + <property name="option" value="eol"/> + </module> + <module name="OuterTypeNumber"/> + <module name="LineLength"> + <property name="severity" value="warning" /> + <property name="ignorePattern" value="^ *\* *[^ ]+$"/> + </module> - <!-- Checks for Size Violations. --> - <!-- See http://checkstyle.sf.net/config_sizes.html --> - <module name="FileLength"/> - <module name="LineLength"> - <property name="severity" value="warning"/> - </module> - <module name="MethodLength"/> - <module name="ParameterNumber"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"> + <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> + </module> + <module name="MethodLength"/> + <module name="MethodName"/> + <module name="MethodParamPad"/> + <module name="ModifierOrder"/> + <module name="NeedBraces"/> + <module name="NoWhitespaceAfter"> + <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" /> + </module> + <module name="NoWhitespaceBefore"/> + <module name="NoWhitespaceBefore"> + <property name="tokens" value="DOT"/> + <property name="allowLineBreaks" value="true"/> + </module> - <!-- Checks for whitespace --> - <!-- See http://checkstyle.sf.net/config_whitespace.html --> - <module name="EmptyForIteratorPad"/> - <module name="MethodParamPad"/> - <module name="NoWhitespaceAfter"/> - <module name="NoWhitespaceBefore"/> - <module name="OperatorWrap"/> - <module name="ParenPad"/> - <module name="TypecastParenPad"/> - <module name="TabCharacter"/> - <module name="WhitespaceAfter"/> - <module name="WhitespaceAround"/> + <module name="OperatorWrap"/> + <module name="OperatorWrap"> + <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/> + <property name="option" value="eol"/> + </module> + <module name="PackageName"/> + <module name="ParameterName"> + <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> + </module> + <module name="ParameterNumber"> + <property name="id" value="paramNum"/> + </module> + <module name="ParenPad"/> + <module name="TypecastParenPad"/> + <module name="RedundantImport"/> + <module name="RedundantModifier"> + <property name="severity" value="warning" /> + </module> + <module name="RightCurly"> + <property name="option" value="same"/> + </module> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + <module name="StaticVariableName"> + <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> + </module> + <module name="TypeName"/> + <module name="UnusedImports"/> + <module name="UpperEll"/> + <module name="VisibilityModifier"> + <property name="protectedAllowed" value="true"/> + </module> + <module name="WhitespaceAfter"> + <property name="tokens" value="COMMA, SEMI"/> + </module> + <module name="WhitespaceAround"/> + <module name="GenericWhitespace"/> + <module name="FinalClass"/> + <module name="MissingSwitchDefault"/> + <module name="MagicNumber"> + <property name="severity" value="warning" /> + <property name="ignoreNumbers" value="-1,0,1, 1"/> + </module> + <module name="Indentation"> + <property name="severity" value="warning" /> + <property name="basicOffset" value="4"/> + <property name="braceAdjustment" value="0"/> + <property name="caseIndent" value="0"/> + </module> + <module name="ArrayTrailingComma"/> + <!--<module name="FinalLocalVariable"/> --> + <module name="EqualsAvoidNull"/> + <!-- Generates quite a few errors --> + <module name="CyclomaticComplexity"> + <property name="severity" value="ignore"/> + </module> - <!-- Modifier Checks --> - <!-- See http://checkstyle.sf.net/config_modifiers.html --> - <module name="ModifierOrder"/> - <!-- chatellier : dont wheck it for interfaces - <module name="RedundantModifier"/> --> - - - <!-- 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="NeedBraces"/> - <module name="RightCurly"/> - - - <!-- Checks for common coding problems --> - <!-- See http://checkstyle.sf.net/config_coding.html --> - <module name="AvoidInlineConditionals"/> - <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE --> - <module name="EmptyStatement"/> - <module name="EqualsHashCode"/> - <module name="HiddenField"> - <property name="ignoreConstructorParameter" value="true"/> - <property name="ignoreSetter" value="true"/> - </module> - <module name="IllegalInstantiation"/> - <module name="InnerAssignment"/> - <module name="MagicNumber"> - <property name="ignoreNumbers" value="-60,-30,-5,-1,0,1,2,5,24,30,60,1000"/> - <property name="severity" value="warning"/> - </module> - <module name="MissingSwitchDefault"/> - <module name="RedundantThrows"/> - <module name="SimplifyBooleanExpression"/> - <module name="SimplifyBooleanReturn"/> - - <!-- Checks for class design --> - <!-- See http://checkstyle.sf.net/config_design.html --> - <!-- chatellier : complains about protected - <module name="DesignForExtension"/> --> - <module name="FinalClass"/> - <module name="HideUtilityClassConstructor"/> - <module name="InterfaceIsType"/> - <!-- chatellier : add protected allowed --> - <module name="VisibilityModifier"> - <property name="protectedAllowed" value="true"/> - </module> - - - <!-- Miscellaneous other checks. --> - <!-- See http://checkstyle.sf.net/config_misc.html --> - <module name="ArrayTypeStyle"/> - <!-- chatellier : not check final parameters - <module name="FinalParameters"/> --> - - <module name="GenericIllegalRegexp"> - <property name="format" value="\s+$"/> - <property name="message" value="Line has trailing spaces."/> - <property name="ignoreComments" value="true"/> - </module> - <module name="TodoComment"/> - <module name="UpperEll"/> - + <module name="NestedIfDepth"> + <property name="max" value="3"/> </module> - + <module name="NestedTryDepth"/> + <module name="ExplicitInitialization"/> + <module name="AnnotationUseStyle"/> + <module name="MissingDeprecated"/> + <module name="MissingOverride"> + <property name="javaFiveCompatibility" value="true"/> + </module> + <module name="PackageAnnotation"/> + <module name="SuppressWarnings"/> + </module> </module> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/pom.xml 2009-10-15 09:29:00 UTC (rev 2677) @@ -211,13 +211,14 @@ <reporting> <plugins> - <plugin> + <!-- <plugin> <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.4</version> <configuration> <configLocation>checkstyle.xml</configLocation> - <excludes>**/package-info.java,**/Xss.java,**/X11.java</excludes> + <excludes>**/Xss.java,**/X11.java</excludes> </configuration> - </plugin> + </plugin> --> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <!-- fix french characters --> @@ -243,6 +244,7 @@ </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> <configuration> <links> <link>http://java.sun.com/javase/6/docs/api/</link> @@ -463,10 +465,6 @@ <id>nuiton.release</id> <url>http://maven.nuiton.org/release</url> </repository> - <!--repository> - <id>nuiton.snapshot</id> - <url>http://maven.nuiton.org/snapshot</url> - </repository--> </repositories> <pluginRepositories> @@ -474,9 +472,9 @@ <id>nuiton.release</id> <url>http://maven.nuiton.org/release</url> </pluginRepository> - <!--pluginRepository> - <id>nuiton.snapshot</id> - <url>http://maven.nuiton.org/snapshot</url> - </pluginRepository--> + <!-- <pluginRepository> + <id>apache.snapshot</id> + <url>http://repository.apache.org/snapshots</url> + </pluginRepository> --> </pluginRepositories> </project> Modified: trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java 2009-10-15 09:29:00 UTC (rev 2677) @@ -229,7 +229,7 @@ MERGE_INVALID_TYPES_VIOLATION); } } - + // mais pas une combinaison des deux } } Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2009-10-15 09:29:00 UTC (rev 2677) @@ -41,20 +41,20 @@ REACH_DAILY_TIME, REACH_TOTAL_TIME } - + /** Alert type. */ protected Type type; - + /** Alert duration. (in seconds) */ protected long duration; - + /** * Constructor. */ public TimerAlert() { } - + /** * Constructor. * Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2009-10-15 09:29:00 UTC (rev 2677) @@ -64,7 +64,7 @@ * More convenient */ protected TimerTask parent; - + /** * Map calendar of day -> time. * (ordered on keys) @@ -80,7 +80,7 @@ * Sub tasks. */ protected List<TimerTask> subTasks; - + /** * Task alerts. */ @@ -95,7 +95,7 @@ allDaysAnnotations = new TreeMap<Date, String>(); subTasks = new ArrayList<TimerTask>(); alerts = new ArrayList<TimerAlert>(); - + // wrong value to detect bug number = -1; } @@ -199,12 +199,12 @@ * @param parent the parent to set */ protected void setParent(TimerTask parent) { - + // will cause an infinite loop if (parent == this) { throw new IllegalArgumentException("Parent can't be current task"); } - + this.parent = parent; }
participants (1)
-
echatellier＠users.chorem.org