September 2009 - Jtimer-commits - mailman.cloud.codelutin.com

r2669 - trunk
by echatellier＠users.chorem.org 24 Sep '09

24 Sep '09

Author: echatellier Date: 2009-09-24 11:07:15 +0200 (Thu, 24 Sep 2009) New Revision: 2669 Modified: trunk/changelog.txt Log: Fix null pointer exception Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-09-24 09:00:10 UTC (rev 2668) +++ trunk/changelog.txt 2009-09-24 09:07:15 UTC (rev 2669) @@ -1,6 +1,12 @@ Changelog ========= +jTimer (1.3.1) stable; urgency=low + + * Fix NPE related to non available systray + + -- chatellier -- jeu. sept. 24 11:04:36 CEST 2009 + jTimer (1.3.0) stable; urgency=low * Fix saving project as task problem (project was appearing in projects subtask)

1 0

r2668 - trunk/src/main/java/org/chorem/jtimer/ui/systray
by echatellier＠users.chorem.org 24 Sep '09

24 Sep '09

Author: echatellier Date: 2009-09-24 11:00:10 +0200 (Thu, 24 Sep 2009) New Revision: 2668 Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java Log: Fix NPE Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-24 08:59:09 UTC (rev 2667) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-24 09:00:10 UTC (rev 2668) @@ -296,15 +296,17 @@ * @param start start(true) or stop(false) task */ protected void startStopTask(TimerTask task, boolean start) { - // increment or decrement task - if (start) { - ++nbTasksRunning; - } else { - --nbTasksRunning; - } // display message if (trayIcon != null) { + + // increment or decrement task + if (start) { + ++nbTasksRunning; + } else { + --nbTasksRunning; + } + String message = null; if (nbTasksRunning == 0) { message = resourceMap.getString("tooltipIdleText");

1 0

r2667 - trunk/src/main/java/org/chorem/jtimer/ui/systray
by echatellier＠users.chorem.org 24 Sep '09

24 Sep '09

Author: echatellier Date: 2009-09-24 10:59:09 +0200 (Thu, 24 Sep 2009) New Revision: 2667 Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java Log: Fix NPE Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-16 07:44:32 UTC (rev 2666) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-09-24 08:59:09 UTC (rev 2667) @@ -304,21 +304,22 @@ } // display message - String message = null; - if (nbTasksRunning == 0) { - message = resourceMap.getString("tooltipIdleText"); - - trayIcon.setImage(idleImage); - } else { - trayIcon.setImage(runningImage); - if (nbTasksRunning == 1) { - message = resourceMap.getString("tooltipRunningTaskText", nbTasksRunning); + if (trayIcon != null) { + String message = null; + if (nbTasksRunning == 0) { + message = resourceMap.getString("tooltipIdleText"); + + trayIcon.setImage(idleImage); } else { - message = resourceMap.getString("tooltipRunningTasksText", nbTasksRunning); + trayIcon.setImage(runningImage); + if (nbTasksRunning == 1) { + message = resourceMap.getString("tooltipRunningTaskText", nbTasksRunning); + } else { + message = resourceMap.getString("tooltipRunningTasksText", nbTasksRunning); + } } + trayIcon.setToolTip(message); } - trayIcon.setToolTip(message); - } /**

1 0

r2666 - trunk
by echatellier＠users.chorem.org 16 Sep '09

16 Sep '09

Author: echatellier Date: 2009-09-16 09:44:32 +0200 (Wed, 16 Sep 2009) New Revision: 2666 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-16 07:44:29 UTC (rev 2665) +++ trunk/pom.xml 2009-09-16 07:44:32 UTC (rev 2666) @@ -4,7 +4,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.0</version> + <version>1.3.1-SNAPSHOT</version> <packaging>jar</packaging> <name>jTimer</name> @@ -80,9 +80,9 @@ </issueManagement> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.0</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> </scm> <ciManagement>

1 0

r2665 - in tags: . jtimer-1.3.0
by echatellier＠users.chorem.org 16 Sep '09

16 Sep '09

Author: echatellier Date: 2009-09-16 09:44:29 +0200 (Wed, 16 Sep 2009) New Revision: 2665 Added: tags/jtimer-1.3.0/ tags/jtimer-1.3.0/pom.xml Removed: tags/jtimer-1.3.0/pom.xml Log: [maven-release-plugin] copy for tag jtimer-1.3.0 Property changes on: tags/jtimer-1.3.0 ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath JTimer.properties THIRD-PARTY.txt *testng*.xml Added: svn:mergeinfo + /branches/1.3.x:2624-2628 Deleted: tags/jtimer-1.3.0/pom.xml =================================================================== --- trunk/pom.xml 2009-09-15 10:47:18 UTC (rev 2663) +++ tags/jtimer-1.3.0/pom.xml 2009-09-16 07:44:29 UTC (rev 2665) @@ -1,482 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.chorem</groupId> - <artifactId>jtimer</artifactId> - <version>1.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>jTimer</name> - <description>jTimer - Project time tracking and report generation tool.</description> - <url>http://maven-site.chorem.org/jtimer</url> - <inceptionYear>2007</inceptionYear> - - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - - <licenses> - <license> - <name>GPL</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <mailingLists> - <mailingList> - <name>jtimer-commits</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</unsubscribe> - <post>jtimer-commits(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-commits/</archive> - </mailingList> - - <mailingList> - <name>jtimer-devel</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</unsubscribe> - <post>jtimer-devel(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-devel/</archive> - </mailingList> - - <mailingList> - <name>jtimer-users</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</unsubscribe> - <post>jtimer-users(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-users/</archive> - </mailingList> - </mailingLists> - - <developers> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Stéphane Chorlet</name> - <id>schorlet</id> - <email>chorlet(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <issueManagement> - <system>redmine</system> - <url>http://www.chorem.org/projects/jtimer/issues</url> - </issueManagement> - - <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> - </scm> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.chorem.org</url> - </ciManagement> - - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/jtimer</url> - </site> - </distributionManagement> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> - <jtimer.main.class>org.chorem.jtimer.JTimer</jtimer.main.class> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> - </properties> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>${jtimer.main.class}</mainClass> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - <configuration> - <locales>fr,en</locales> - </configuration> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>assembly-bin</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - <execution> - <id>assembly-src</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>checkstyle.xml</configLocation> - <excludes>**/package-info.java,**/Xss.java,**/X11.java</excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> -  - <version>2.1.2</version> - <configuration> - <developerConnection>${project.scm.connection}</developerConnection> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>cim</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - <report>issue-tracking</report> - <report>license</report> - <report>mailing-list</report> - <report>project-team</report> - <report>scm</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - </links> - </configuration> - </plugin> - <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <configuration> - <type>range</type> - <range>365</range> - </configuration> - </plugin> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>${maven.compiler.source}</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.codehaus.sonar-plugins</groupId> - <artifactId>maven-report</artifactId> - <version>0.1</version> - <configuration> - <sonar.host.url>http://hudson.chorem.org/sonar</sonar.host.url> - </configuration> - </plugin> - </plugins> - </reporting> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.jdesktop</groupId> - <artifactId>appframework</artifactId> - <version>1.0.3</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.jdesktop</groupId> - <artifactId>swing-worker</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - <version>3.2.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.15</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.15</version> - </dependency> - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>3.1.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - </dependencies> - -  - - <repositories> - <repository> - <id>javanet.repository</id> - <url>http://download.java.net/maven/2/</url> - </repository> - <repository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </repository> -  - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </pluginRepository> -  - </pluginRepositories> -</project> Copied: tags/jtimer-1.3.0/pom.xml (from rev 2664, trunk/pom.xml) =================================================================== --- tags/jtimer-1.3.0/pom.xml (rev 0) +++ tags/jtimer-1.3.0/pom.xml 2009-09-16 07:44:29 UTC (rev 2665) @@ -0,0 +1,482 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.chorem</groupId> + <artifactId>jtimer</artifactId> + <version>1.3.0</version> + <packaging>jar</packaging> + + <name>jTimer</name> + <description>jTimer - Project time tracking and report generation tool.</description> + <url>http://maven-site.chorem.org/jtimer</url> + <inceptionYear>2007</inceptionYear> + + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> + + <licenses> + <license> + <name>GPL</name> + <url>http://www.gnu.org/licenses/gpl.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <mailingLists> + <mailingList> + <name>jtimer-commits</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</unsubscribe> + <post>jtimer-commits(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-commits/</archive> + </mailingList> + + <mailingList> + <name>jtimer-devel</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</unsubscribe> + <post>jtimer-devel(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-devel/</archive> + </mailingList> + + <mailingList> + <name>jtimer-users</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</unsubscribe> + <post>jtimer-users(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-users/</archive> + </mailingList> + </mailingLists> + + <developers> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Stéphane Chorlet</name> + <id>schorlet</id> + <email>chorlet(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + + <issueManagement> + <system>redmine</system> + <url>http://www.chorem.org/projects/jtimer/issues</url> + </issueManagement> + + <scm> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.0</url> + </scm> + + <ciManagement> + <system>hudson</system> + <url>http://hudson.chorem.org</url> + </ciManagement> + + <distributionManagement> + <repository> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/maven/release</url> + </repository> + <snapshotRepository> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/maven/snapshot</url> + </snapshotRepository> + <site> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/jtimer</url> + </site> + </distributionManagement> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> + <jtimer.main.class>org.chorem.jtimer.JTimer</jtimer.main.class> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + </properties> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>${jtimer.main.class}</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.io.tmpdir</name> + <value>${project.build.directory}/surefire-workdir</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <locales>fr,en</locales> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assembly-bin</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>assembly-src</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>checkstyle.xml</configLocation> + <excludes>**/package-info.java,**/Xss.java,**/X11.java</excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> +  + <version>2.1.2</version> + <configuration> + <developerConnection>${project.scm.connection}</developerConnection> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>cim</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + <report>issue-tracking</report> + <report>license</report> + <report>mailing-list</report> + <report>project-team</report> + <report>scm</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + </links> + </configuration> + </plugin> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <configuration> + <type>range</type> + <range>365</range> + </configuration> + </plugin> + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <targetJdk>${maven.compiler.source}</targetJdk> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.sonar-plugins</groupId> + <artifactId>maven-report</artifactId> + <version>0.1</version> + <configuration> + <sonar.host.url>http://hudson.chorem.org/sonar</sonar.host.url> + </configuration> + </plugin> + </plugins> + </reporting> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jdesktop</groupId> + <artifactId>appframework</artifactId> + <version>1.0.3</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.jdesktop</groupId> + <artifactId>swing-worker</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>3.2.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.15</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.15</version> + </dependency> + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>3.1.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>runtime</scope> + </dependency> + </dependencies> + +  + + <repositories> + <repository> + <id>javanet.repository</id> + <url>http://download.java.net/maven/2/</url> + </repository> + <repository> + <id>nuiton.release</id> + <url>http://maven.nuiton.org/release</url> + </repository> +  + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>nuiton.release</id> + <url>http://maven.nuiton.org/release</url> + </pluginRepository> +  + </pluginRepositories> +</project>

1 0

r2664 - trunk
by echatellier＠users.chorem.org 16 Sep '09

16 Sep '09

Author: echatellier Date: 2009-09-16 09:44:25 +0200 (Wed, 16 Sep 2009) New Revision: 2664 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release jtimer-1.3.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-15 10:47:18 UTC (rev 2663) +++ trunk/pom.xml 2009-09-16 07:44:25 UTC (rev 2664) @@ -4,7 +4,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.0</version> <packaging>jar</packaging> <name>jTimer</name> @@ -80,9 +80,9 @@ </issueManagement> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.0</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.0</url> </scm> <ciManagement>

1 0

r2663 - trunk
by echatellier＠users.chorem.org 15 Sep '09

15 Sep '09

Author: echatellier Date: 2009-09-15 12:47:18 +0200 (Tue, 15 Sep 2009) New Revision: 2663 Modified: trunk/pom.xml Log: Modify description. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-15 10:37:41 UTC (rev 2662) +++ trunk/pom.xml 2009-09-15 10:47:18 UTC (rev 2663) @@ -8,7 +8,7 @@ <packaging>jar</packaging> <name>jTimer</name> - <description>jTimer - Project time monitor and report generation tool.</description> + <description>jTimer - Project time tracking and report generation tool.</description> <url>http://maven-site.chorem.org/jtimer</url> <inceptionYear>2007</inceptionYear>

1 0

r2662 - in trunk: . src/site/en/rst src/site/en/rst/contribute src/site/en/rst/devel src/site/rst src/site/rst/contribute src/site/rst/devel
by echatellier＠users.chorem.org 15 Sep '09

15 Sep '09

Author: echatellier Date: 2009-09-15 12:37:41 +0200 (Tue, 15 Sep 2009) New Revision: 2662 Modified: trunk/changelog.txt trunk/src/site/en/rst/contribute/i18n.rst trunk/src/site/en/rst/devel/fileformat.rst trunk/src/site/en/rst/devel/index.rst trunk/src/site/en/rst/devel/packaging.rst trunk/src/site/en/rst/devel/roadmap.rst trunk/src/site/en/rst/devel/saf.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/releasenotes.rst trunk/src/site/rst/contribute/i18n.rst trunk/src/site/rst/devel/roadmap.rst trunk/src/site/rst/index.rst trunk/src/site/rst/releasenotes.rst Log: Update site Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/changelog.txt 2009-09-15 10:37:41 UTC (rev 2662) @@ -11,7 +11,7 @@ * Swingx version bump : 1.0 * JNA version bump : 3.2.2 - -- chatellier -- lun. août 17 13:36:58 CEST 2009 + -- chatellier -- mar. sept. 15 12:01:47 CEST 2009 jTimer (1.2.0) stable; urgency=low Modified: trunk/src/site/en/rst/contribute/i18n.rst =================================================================== --- trunk/src/site/en/rst/contribute/i18n.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/en/rst/contribute/i18n.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -1,33 +1,35 @@ I18N ==== -Présentation +Presentation ------------ -L'internationnalisation est basé sur l'utilisation de fichiers de propriétés -utilisé par `Swing Application Framework`_. +Internationalization is build on properties files used by +`Swing Application Framework`_. -Problème --------- -Actuellement, la traduction est dispersée dans plusieurs fichiers -(un par interface) ce qui rend la contribution peut être un peut -plus difficile. +Problem +------- +Actually, translations are dispersed in multiples files (one per interface), +which can make contribution a little bit harder. -Emplacement ------------ -Les fichiers de traduction sont situés dans le dossier -``src/main/resources/org/codelutin/jtimer`` +Place +----- +Translation files are located in followinf folder : +``src/main/resources/org/chorem/jtimer`` +For example, the class ``org.chorem.jtimer.JTimer`` has two resources files : Par exemple, la classe ``org.chorem.jtimer.JTimer`` dispose des fichiers de ressources : -* ``src/main/resources/org/codelutin/jtimer/resources/Jtimer.properties`` (en) -* ``src/main/resources/org/codelutin/jtimer/resources/Jtimer_fr.properties`` (fr) +* ``src/main/resources/org/chorem/jtimer/resources/Jtimer.properties`` (en) +* ``src/main/resources/org/chorem/jtimer/resources/Jtimer_fr.properties`` (fr) * etc... -Listes ------- -La liste des fichiers à traduire est la suivante : +Complete list +------------- +Complete list of file to transalte to add another language is: * ``resources/JTimer.properties`` +* ``ui/tasks/resources/RunTaskJob.properties`` +* ``ui/alert/resources/AlertEditor.properties`` * ``ui/treetable/resources/ProjectsAndTasksTable.properties`` * ``ui/treetable/dnd/resources/TimerTaskTransferHandler.properties`` * ``ui/report/resources/ReportView.properties`` @@ -35,6 +37,6 @@ * ``ui/resources/StatusBar.properties`` * ``ui/resources/HelpFrame.properties`` * ``ui/ws/resources/SwingConnectionInformationHandler.properties`` -* ``ui/systray/resources/AWTSystray.properties`` +* ``ui/systray/resources/SystrayManager.properties`` .. _Swing Application Framework: https://appframework.dev.java.net/ \ No newline at end of file Modified: trunk/src/site/en/rst/devel/fileformat.rst =================================================================== --- trunk/src/site/en/rst/devel/fileformat.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/en/rst/devel/fileformat.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -92,7 +92,7 @@ **Note:** x.alert alert is linked to x.task task. -Alerts are not defined in 1.2 gTimer firle format. +Alerts are not defined in 1.2 gTimer file format. **Example :** 7.alert Modified: trunk/src/site/en/rst/devel/index.rst =================================================================== --- trunk/src/site/en/rst/devel/index.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/en/rst/devel/index.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -1,5 +1,5 @@ -Developpeur -=========== +Developer +========= Technologies ------------ Modified: trunk/src/site/en/rst/devel/packaging.rst =================================================================== --- trunk/src/site/en/rst/devel/packaging.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/en/rst/devel/packaging.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -4,10 +4,10 @@ Windows ------- -Le packaging "bin" contient un executable Windows qui a été réalisé avec -le plugin launch4j_. +"Bin" packaging contains a Windows executable program which has been made with +launch4j_ plugin. -En voici la configuration :: +Here is the configuration :: <plugin> <groupId>org.bluestemsoftware.open.maven.plugin</groupId> @@ -34,8 +34,8 @@ </executions> </plugin> -Cependant, ce plugin n'est pas inclut dans le pom à cause de deux bug rapporté, -mais pas encore corrigé : +Unfortunately, this plugin has not been included in pom due to two unresolved +bugs : * LAUNCHPLUGIN-3_ * LAUNCHPLUGIN-4_ Modified: trunk/src/site/en/rst/devel/roadmap.rst =================================================================== --- trunk/src/site/en/rst/devel/roadmap.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/en/rst/devel/roadmap.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -9,7 +9,6 @@ Version 1.3 ----------- -* *non available* * Add alert on tasks Version 1.2 Modified: trunk/src/site/en/rst/devel/saf.rst =================================================================== --- trunk/src/site/en/rst/devel/saf.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/en/rst/devel/saf.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -1,12 +1,12 @@ Swing application framework =========================== -Voici des exemples de codes Swing basés sur `Swing Application Framework`_. +Here are examples of Swing codes based on `Swing Application Framework`_. Actions ------- -Fichier org.chorem.jtimer.test.SafTest1.java: +File org.chorem.jtimer.test.SafTest1.java: :: @@ -35,7 +35,7 @@ } } -Fichier org/chorem/jtimer/test/resources/SafTest1.properties: +File org/chorem/jtimer/test/resources/SafTest1.properties: :: @@ -49,11 +49,10 @@ I18N ---- -Pour traduire l'exemple précédent en français par exemple, il suffit -de créer un fichier de properties suffixé par la locale contenant les -intitulé traduit. +To translate previous example, in french for example, just create a properties +file suffixed by the locale containing translated strings. -Fichier org/chorem/jtimer/test/resources/SafTest1_fr.properties: +File org/chorem/jtimer/test/resources/SafTest1_fr.properties: :: @@ -64,11 +63,10 @@ Bindings -------- -On peut aussi ajouter des propiétés d'activation des elements swings. -Ces proprietes ce renseigne sur l'action, et concernent tous les -éléments utilisant l'action. +We can how bind some properties to swing elements. This bindings have to be set +in action annotation, this properties concern all element bind on this action. -Fichier org.chorem.jtimer.test.SafTest2.java: +File org.chorem.jtimer.test.SafTest2.java: :: Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/en/rst/index.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -3,19 +3,28 @@ Presentation ------------ -jTimer is a project monitoring tool. +jTimer is a time tracking tool for projects activities. It also can +generate activities reports. Features -------- - * gTimer compatible * Time spent on projects/tasks * Idle detection * Reports generation + * Add notes on tasks + * Alerts setup * Internationalization (i18n) + * gTimer file format compliant +Environment +----------- +jTimer in Java based. You need to install JRE 6 environment to use it. + +`Download Java`_. + Links ----- * gTimer_. -.. _Launch demo: launch.jnlp +.. _Download Java: http://java.sun.com/javase/downloads/index.jsp .. _gTimer: http://www.k5n.us/gtimer.php Modified: trunk/src/site/en/rst/releasenotes.rst =================================================================== --- trunk/src/site/en/rst/releasenotes.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/en/rst/releasenotes.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -1,11 +1,9 @@ Release notes ============= -Changelog -========= - jTimer (1.3.0) stable; urgency=low + * Fix saving project as task problem (project was appearing in projects subtask) * Improve systray when jtimer is launched before systray become available * Fix data lost when disk is full * Fix menu enable/disable properties @@ -13,7 +11,7 @@ * Swingx version bump : 1.0 * JNA version bump : 3.2.2 - -- chatellier -- lun. août 17 13:36:58 CEST 2009 + -- chatellier -- mar. sept. 15 12:01:47 CEST 2009 jTimer (1.2.0) stable; urgency=low Modified: trunk/src/site/rst/contribute/i18n.rst =================================================================== --- trunk/src/site/rst/contribute/i18n.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/rst/contribute/i18n.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -15,19 +15,21 @@ Emplacement ----------- Les fichiers de traduction sont situés dans le dossier -``src/main/resources/org/codelutin/jtimer`` +``src/main/resources/org/chorem/jtimer`` Par exemple, la classe ``org.chorem.jtimer.JTimer`` dispose des fichiers de ressources : -* ``src/main/resources/org/codelutin/jtimer/resources/Jtimer.properties`` (en) -* ``src/main/resources/org/codelutin/jtimer/resources/Jtimer_fr.properties`` (fr) +* ``src/main/resources/org/chorem/jtimer/resources/Jtimer.properties`` (en) +* ``src/main/resources/org/chorem/jtimer/resources/Jtimer_fr.properties`` (fr) * etc... -Listes ------- +Liste complète +-------------- La liste des fichiers à traduire est la suivante : * ``resources/JTimer.properties`` +* ``ui/tasks/resources/RunTaskJob.properties`` +* ``ui/alert/resources/AlertEditor.properties`` * ``ui/treetable/resources/ProjectsAndTasksTable.properties`` * ``ui/treetable/dnd/resources/TimerTaskTransferHandler.properties`` * ``ui/report/resources/ReportView.properties`` @@ -35,6 +37,6 @@ * ``ui/resources/StatusBar.properties`` * ``ui/resources/HelpFrame.properties`` * ``ui/ws/resources/SwingConnectionInformationHandler.properties`` -* ``ui/systray/resources/AWTSystray.properties`` +* ``ui/systray/resources/SystrayManager.properties`` .. _Swing Application Framework: https://appframework.dev.java.net/ \ No newline at end of file Modified: trunk/src/site/rst/devel/roadmap.rst =================================================================== --- trunk/src/site/rst/devel/roadmap.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/rst/devel/roadmap.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -9,7 +9,6 @@ Version 1.3 ----------- -* *non disponible* * Ajout d'alarme sur les tâches Version 1.2 Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/rst/index.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -3,19 +3,29 @@ Présentation ------------ -jTimer est un outil de monitoring de projets. +jTimer est un outil de suivit de temps passé sur des projets. Il permet +également de générer des rapports d'activité. Fonctionnalités --------------- - * Compatibilité avec gTimer * Gestion du temps passé sur les projets/tâches * Gestion de l'inactivité * Génération de rapports + * Ajout de notes sur les tâches + * Mise en place d'alertes * Internationalisation (i18n) + * Compatibilité avec gTimer +Environnement +------------- +jTimer est developpé dans le language Java. Vous devez disposer d'un +environnement JRE 6 pour l'utiliser. + +`Telecharger Java`_. + Liens ----- * gTimer_. -.. _Lancer la démo: launch.jnlp +.. _Telecharger Java: http://java.sun.com/javase/downloads/index.jsp .. _gTimer: http://www.k5n.us/gtimer.php \ No newline at end of file Modified: trunk/src/site/rst/releasenotes.rst =================================================================== --- trunk/src/site/rst/releasenotes.rst 2009-09-14 08:49:05 UTC (rev 2661) +++ trunk/src/site/rst/releasenotes.rst 2009-09-15 10:37:41 UTC (rev 2662) @@ -3,6 +3,7 @@ jTimer (1.3.0) stable; urgency=low + * Fix saving project as task problem (project was appearing in projects subtask) * Improve systray when jtimer is launched before systray become available * Fix data lost when disk is full * Fix menu enable/disable properties @@ -10,7 +11,7 @@ * Swingx version bump : 1.0 * JNA version bump : 3.2.2 - -- chatellier -- lun. août 17 13:36:58 CEST 2009 + -- chatellier -- mar. sept. 15 12:01:47 CEST 2009 jTimer (1.2.0) stable; urgency=low

1 0

r2661 - trunk
by echatellier＠users.chorem.org 14 Sep '09

14 Sep '09

Author: echatellier Date: 2009-09-14 10:49:05 +0200 (Mon, 14 Sep 2009) New Revision: 2661 Modified: trunk/changelog.txt Log: Update changelog Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-09-14 07:52:30 UTC (rev 2660) +++ trunk/changelog.txt 2009-09-14 08:49:05 UTC (rev 2661) @@ -3,6 +3,7 @@ jTimer (1.3.0) stable; urgency=low + * Fix saving project as task problem (project was appearing in projects subtask) * Improve systray when jtimer is launched before systray become available * Fix data lost when disk is full * Fix menu enable/disable properties

1 0

r2660 - trunk/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org 14 Sep '09

14 Sep '09

Author: echatellier Date: 2009-09-14 09:52:30 +0200 (Mon, 14 Sep 2009) New Revision: 2660 Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java Log: Fix midnight refresh task (was saving projects). Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java 2009-09-11 10:21:53 UTC (rev 2659) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java 2009-09-14 07:52:30 UTC (rev 2660) @@ -54,7 +54,7 @@ this.dataManager = core.getData(); } - /* (non-Javadoc) + /* * @see java.util.TimerTask#run() */ @Override @@ -64,7 +64,10 @@ List<TimerProject> projects = dataManager.getProjectsList(); - refreshTasks(projects); + // don't call changeTaskTime on projects + for (TimerProject project : projects) { + refreshTasks(project.getSubTasks()); + } } /** @@ -72,7 +75,7 @@ * * @param tasks tasks list */ - protected void refreshTasks(List<? extends TimerTask> tasks) { + protected void refreshTasks(List<TimerTask> tasks) { for (TimerTask task : tasks) { @@ -81,6 +84,8 @@ // fire event Date now = new Date(); + // TODO find a better way to do that ! + // Only useflull for UI listeners dataManager.changeTaskTime(task, now, task.getTime(now)); } }

1 0