[Jtimer-commits] r2745 - in trunk: . src src/license src/main src/main/checkstyle src/main/java/org/chorem/jtimer

Author: echatellier Date: 2010-07-22 14:31:03 +0200 (Thu, 22 Jul 2010) New Revision: 2745 Url: http://chorem.org/repositories/revision/jtimer/2745 Log: Update checkstyle plugin (for sonar) Update testng, jna. Add third-party file. Added: trunk/src/license/ trunk/src/license/THIRD-PARTY.properties trunk/src/main/checkstyle/ trunk/src/main/checkstyle/checkstyle.xml Removed: trunk/checkstyle.xml Modified: trunk/changelog.txt trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-07-01 13:16:49 UTC (rev 2744) +++ trunk/changelog.txt 2010-07-22 12:31:03 UTC (rev 2745) @@ -1,6 +1,11 @@ Changelog ========= +jTimer (1.3.3) stable; urgency=low + + * #?? : Update testng to 5.12.1 + * #?? : JNA updated to 3.2.7 + jTimer (1.3.2) stable; urgency=low * #105 : Add F2 shortcut to edit task Deleted: trunk/checkstyle.xml =================================================================== --- trunk/checkstyle.xml 2010-07-01 13:16:49 UTC (rev 2744) +++ trunk/checkstyle.xml 2010-07-22 12:31:03 UTC (rev 2745) @@ -1,185 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.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/config.html#Checker - - <property name="basedir" value="${basedir}"/> - --> - - <property name="severity" value="error"/> - - <!-- <module name="SuppressionFilter"> - <property name="file" value="checkstyle_suppression.xml"/> - </module> --> - - <module name="JavadocPackage"> - <property name="allowLegacy" value="false"/> - </module> - - <!-- <module name="Translation"> - <property name="severity" value="${translation.severity}"/> - </module> --> - - <module name="FileTabCharacter"> - <property name="eachLine" value="false"/> - </module> - - <module name="FileLength"> - <property name="fileExtensions" value="java"/> - </module> - - <!-- <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="severity" value="info" /> - <property name="format" value="^[^\*]*\s+$"/> - <property name="minimum" value="0"/> - <property name="maximum" value="0"/> - </module> - - <module name="TreeWalker"> - <property name="tabWidth" value="4" /> - - <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="protected"/> - </module> - - <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="info" /> - <property name="ignorePattern" value="^ *\* *[^ ]+$"/> - </module> - - <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="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> - - <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> - - <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 2010-07-01 13:16:49 UTC (rev 2744) +++ trunk/pom.xml 2010-07-22 12:31:03 UTC (rev 2745) @@ -85,9 +85,6 @@ target/${project.artifactId}-${project.version}-src.zip, </redmine.releaseFiles> - <!-- version to use of javadoc plugin --> - <javadoc.version>2.6.1</javadoc.version> - </properties> <build> @@ -154,9 +151,9 @@ <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.4</version> + <version>2.5</version> <configuration> - <configLocation>checkstyle.xml</configLocation> + <configLocation>${maven.src.dir}/main/checkstyle/checkstyle.xml</configLocation> <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java, **/ApplicationServices.java</excludes> </configuration> </plugin> @@ -172,7 +169,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> </plugin> <!-- TODO Use this when jnlp will be ok --> @@ -188,9 +185,8 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.11</version> + <version>5.12.1</version> <scope>test</scope> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>org.jdesktop</groupId> @@ -217,7 +213,7 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.2.5</version> + <version>3.2.7</version> <scope>compile</scope> </dependency> <dependency> Added: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/src/license/THIRD-PARTY.properties 2010-07-22 12:31:03 UTC (rev 2745) @@ -0,0 +1,18 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - BSD License +# - BSD-style license +# - Lesser General Public License (LGPL) +# - The Apache Software License, Version 2.0 +# - cpl-1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Jul 22 11:01:24 CEST 2010 +commons-codec--commons-codec--1.2=Apache Software License, Version 2.0 +net.java.dev.jna--jna--3.2.7=Lesser General Public License (LGPL v. 2.1) +org.jdesktop--appframework--1.0.3=Lesser General Public License (LGPL v. 2.1) +org.jdesktop--swing-worker--1.1=Lesser General Public License (LGPL v. 2.1) Copied: trunk/src/main/checkstyle/checkstyle.xml (from rev 2733, trunk/checkstyle.xml) =================================================================== --- trunk/src/main/checkstyle/checkstyle.xml (rev 0) +++ trunk/src/main/checkstyle/checkstyle.xml 2010-07-22 12:31:03 UTC (rev 2745) @@ -0,0 +1,185 @@ +<?xml version="1.0"?> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://www.puppycrawl.com/dtds/configuration_1_3.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/config.html#Checker + + <property name="basedir" value="${basedir}"/> + --> + + <property name="severity" value="error"/> + + <!-- <module name="SuppressionFilter"> + <property name="file" value="checkstyle_suppression.xml"/> + </module> --> + + <module name="JavadocPackage"> + <property name="allowLegacy" value="false"/> + </module> + + <!-- <module name="Translation"> + <property name="severity" value="${translation.severity}"/> + </module> --> + + <module name="FileTabCharacter"> + <property name="eachLine" value="false"/> + </module> + + <module name="FileLength"> + <property name="fileExtensions" value="java"/> + </module> + + <!-- <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="severity" value="info" /> + <property name="format" value="^[^\*]*\s+$"/> + <property name="minimum" value="0"/> + <property name="maximum" value="0"/> + </module> + + <module name="TreeWalker"> + <property name="tabWidth" value="4" /> + + <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="protected"/> + </module> + + <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="info" /> + <property name="ignorePattern" value="^ *\* *[^ ]+$"/> + </module> + + <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="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> + + <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> + + <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/src/main/java/org/chorem/jtimer/JTimerFactory.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java 2010-07-01 13:16:49 UTC (rev 2744) +++ trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java 2010-07-22 12:31:03 UTC (rev 2745) @@ -93,12 +93,6 @@ URL url = JTimerFactory.class.getResource("/" + fileName); props.load(url.openStream()); - // read file in current directory - File currentDirectoryFile = new File(fileName); - if (currentDirectoryFile.canRead()) { - props.load(new FileInputStream(currentDirectoryFile)); - } - // and override by file in user home File homeUserFile = new File(getUserHomeConfigurationFilePath()); if (homeUserFile.exists()) { @@ -133,6 +127,12 @@ copyConfigurationFile(defautFileURL, homeUserFile); } + // read file in current directory + File currentDirectoryFile = new File(fileName); + if (currentDirectoryFile.canRead()) { + props.load(new FileInputStream(currentDirectoryFile)); + } + } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't read configuration file", e);