February 2012 - Jtimer-commits - mailman.cloud.codelutin.com

r2805 - trunk
by echatellier＠users.chorem.org 16 Feb '12

16 Feb '12

Author: echatellier Date: 2012-02-16 15:27:52 +0100 (Thu, 16 Feb 2012) New Revision: 2805 Url: http://chorem.org/repositories/revision/jtimer/2805 Log: Update next version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-16 14:24:23 UTC (rev 2804) +++ trunk/pom.xml 2012-02-16 14:27:52 UTC (rev 2805) @@ -5,12 +5,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.7</version> + <version>3.1</version> </parent> <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.3.4-SNAPSHOT</version> <name>jTimer</name> <description>

1 0

r2804 - branches
by echatellier＠users.chorem.org 16 Feb '12

16 Feb '12

Author: echatellier Date: 2012-02-16 15:24:23 +0100 (Thu, 16 Feb 2012) New Revision: 2804 Url: http://chorem.org/repositories/revision/jtimer/2804 Log: Remove now tagged branch Removed: branches/jtimer-1.3.3/

1 0

r2803 - branches/jtimer-1.3.3
by echatellier＠users.chorem.org 16 Feb '12

16 Feb '12

Author: echatellier Date: 2012-02-16 15:07:24 +0100 (Thu, 16 Feb 2012) New Revision: 2803 Url: http://chorem.org/repositories/revision/jtimer/2803 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/jtimer-1.3.3/pom.xml Modified: branches/jtimer-1.3.3/pom.xml =================================================================== --- branches/jtimer-1.3.3/pom.xml 2012-02-16 14:07:23 UTC (rev 2802) +++ branches/jtimer-1.3.3/pom.xml 2012-02-16 14:07:24 UTC (rev 2803) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.3</version> + <version>1.3.4-SNAPSHOT</version> <packaging>jar</packaging> <name>jTimer</name> @@ -60,9 +60,9 @@ </developers> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.3</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.3</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.3</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/branches/jtimer-1.3.3</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/branches/jtimer-1.3.3</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/branches/jtimer-1.3.3</url> </scm> <properties>

1 0

r2802 - in tags: . jtimer-1.3.3
by echatellier＠users.chorem.org 16 Feb '12

16 Feb '12

Author: echatellier Date: 2012-02-16 15:07:23 +0100 (Thu, 16 Feb 2012) New Revision: 2802 Url: http://chorem.org/repositories/revision/jtimer/2802 Log: [maven-release-plugin] copy for tag jtimer-1.3.3 Added: tags/jtimer-1.3.3/ Property changes on: tags/jtimer-1.3.3 ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath JTimer.properties THIRD-PARTY.txt *testng*.xml *.ipr *.iws *.iml Added: svn:mergeinfo + /branches/1.3.x:2624-2628

1 0

r2801 - branches/jtimer-1.3.3
by echatellier＠users.chorem.org 16 Feb '12

16 Feb '12

Author: echatellier Date: 2012-02-16 15:07:20 +0100 (Thu, 16 Feb 2012) New Revision: 2801 Url: http://chorem.org/repositories/revision/jtimer/2801 Log: [maven-release-plugin] prepare release jtimer-1.3.3 Modified: branches/jtimer-1.3.3/pom.xml Modified: branches/jtimer-1.3.3/pom.xml =================================================================== --- branches/jtimer-1.3.3/pom.xml 2012-02-15 17:13:34 UTC (rev 2800) +++ branches/jtimer-1.3.3/pom.xml 2012-02-16 14:07:20 UTC (rev 2801) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.3.3</version> <packaging>jar</packaging> <name>jTimer</name> @@ -60,9 +60,9 @@ </developers> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/branches/jtimer-1.3.3</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/branches/jtimer-1.3.3</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/branches/jtimer-1.3.3</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.3</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.3</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.3</url> </scm> <properties>

1 0

r2800 - in branches/jtimer-1.3.3: . src src/license src/main/resources/org/chorem/jtimer/ui/resources src/test/java/org/chorem/jtimer/data
by echatellier＠users.chorem.org 15 Feb '12

15 Feb '12

Author: echatellier Date: 2012-02-15 18:13:34 +0100 (Wed, 15 Feb 2012) New Revision: 2800 Url: http://chorem.org/repositories/revision/jtimer/2800 Log: Anomalie #462: Unable to start JTimer on Ubuntu 11.10 64bits Evolution #454: Update to jna 3.4.0 Added: branches/jtimer-1.3.3/src/license/ branches/jtimer-1.3.3/src/license/THIRD-PARTY.properties Modified: branches/jtimer-1.3.3/pom.xml branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties branches/jtimer-1.3.3/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java Modified: branches/jtimer-1.3.3/pom.xml =================================================================== --- branches/jtimer-1.3.3/pom.xml 2012-02-15 15:11:59 UTC (rev 2799) +++ branches/jtimer-1.3.3/pom.xml 2012-02-15 17:13:34 UTC (rev 2800) @@ -5,12 +5,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.7</version> + <version>3.1</version> </parent> <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.2</version> + <version>1.3.3-SNAPSHOT</version> <packaging>jar</packaging> <name>jTimer</name> @@ -60,9 +60,9 @@ </developers> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.2</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.2</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.2</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/branches/jtimer-1.3.3</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/branches/jtimer-1.3.3</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/branches/jtimer-1.3.3</url> </scm> <properties> @@ -142,7 +142,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -244,7 +244,7 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.2.5</version> + <version>3.4.0</version> <scope>compile</scope> </dependency> <dependency> @@ -307,6 +307,12 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-common</artifactId> + <version>3.1.3</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.1</version> Added: branches/jtimer-1.3.3/src/license/THIRD-PARTY.properties =================================================================== --- branches/jtimer-1.3.3/src/license/THIRD-PARTY.properties (rev 0) +++ branches/jtimer-1.3.3/src/license/THIRD-PARTY.properties 2012-02-15 17:13:34 UTC (rev 2800) @@ -0,0 +1,24 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - BSD License +# - BSD style +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL, version 2.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Feb 15 17:04:45 CET 2012 +commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 +org.jdesktop--appframework--1.0.3=Lesser General Public License (LPGL) v 2.1 +org.jdesktop--swing-worker--1.1=Lesser General Public License (LPGL) v 2.1 Modified: branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties =================================================================== --- branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2012-02-15 15:11:59 UTC (rev 2799) +++ branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2012-02-15 17:13:34 UTC (rev 2800) @@ -4,7 +4,7 @@ #�About i18n aboutTitle = About ${Application.title} aboutHtmlTitle = About ${Application.title} -aboutHtml = <html>${Application.title} - ${Application.version} Copyright 2007 - 2010, Code Lutin. <a href=\"${project.url}\">${project.url}</a> Please, report any bug you can found.<html> +aboutHtml = <html>${Application.title} - ${Application.version} Copyright 2007 - 2012, Code Lutin. <a href=\"${project.url}\">${project.url}</a> Please, report any bug you can found.<html> aboutLicenseTitle = License aboutLicense = You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ${Application.title}. All rights reserved. No guarantees are provided for use of this program. Modified: branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties =================================================================== --- branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2012-02-15 15:11:59 UTC (rev 2799) +++ branches/jtimer-1.3.3/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2012-02-15 17:13:34 UTC (rev 2800) @@ -1,7 +1,7 @@ #�About i18n aboutTitle = \u00C0 propos de ${Application.title} aboutHtmlTitle = \u00C0 propos de ${Application.title} -aboutHtml = <html>${Application.title} - ${Application.version} Copyright 2007 - 2010, Code Lutin. <a href=\"${project.url}\">${project.url}</a> Merci de rapporter les bugs de ${Application.title}.<html> +aboutHtml = <html>${Application.title} - ${Application.version} Copyright 2007 - 2012, Code Lutin. <a href=\"${project.url}\">${project.url}</a> Merci de rapporter les bugs de ${Application.title}.<html> aboutLicenseTitle = Licence aboutLicense = Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec ${Application.title}. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. Modified: branches/jtimer-1.3.3/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java =================================================================== --- branches/jtimer-1.3.3/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2012-02-15 15:11:59 UTC (rev 2799) +++ branches/jtimer-1.3.3/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2012-02-15 17:13:34 UTC (rev 2800) @@ -24,11 +24,10 @@ import java.util.HashSet; import java.util.List; -import junit.framework.Assert; - import org.chorem.jtimer.AbstractJTimerTest; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; +import org.testng.Assert; import org.testng.annotations.Test; /**

1 0

r2799 - in branches: . jtimer-1.3.3
by echatellier＠users.chorem.org 15 Feb '12

15 Feb '12

Author: echatellier Date: 2012-02-15 16:11:59 +0100 (Wed, 15 Feb 2012) New Revision: 2799 Url: http://chorem.org/repositories/revision/jtimer/2799 Log: New branch for 1.3.3 Added: branches/jtimer-1.3.3/ Property changes on: branches/jtimer-1.3.3 ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath JTimer.properties THIRD-PARTY.txt *testng*.xml *.ipr *.iws *.iml Added: svn:mergeinfo + /branches/1.3.x:2624-2628

1 0

r2798 - trunk/src/site/en/rst/devel
by echatellier＠users.chorem.org 15 Feb '12

15 Feb '12

Author: echatellier Date: 2012-02-15 16:04:03 +0100 (Wed, 15 Feb 2012) New Revision: 2798 Url: http://chorem.org/repositories/revision/jtimer/2798 Log: Add header Modified: trunk/src/site/en/rst/devel/idledetection.rst Modified: trunk/src/site/en/rst/devel/idledetection.rst =================================================================== --- trunk/src/site/en/rst/devel/idledetection.rst 2012-02-10 17:27:42 UTC (rev 2797) +++ trunk/src/site/en/rst/devel/idledetection.rst 2012-02-15 15:04:03 UTC (rev 2798) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Idle detection ==============

1 0

r2797 - trunk/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org 10 Feb '12

10 Feb '12

Author: echatellier Date: 2012-02-10 18:27:42 +0100 (Fri, 10 Feb 2012) New Revision: 2797 Url: http://chorem.org/repositories/revision/jtimer/2797 Log: Fix day change during idle detection Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-02-10 17:27:06 UTC (rev 2796) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-02-10 17:27:42 UTC (rev 2797) @@ -248,8 +248,6 @@ // reset on start just for init resetTiming(); - // redeclare taskTimingBeforeStartInSeconds - //taskTimingBeforeStartInMs = managedTask.getTime(new Date()) * 1000; // get idle time long configIdleTime = JTimerFactory.getIdleTime(); @@ -286,24 +284,23 @@ // if long idleTime is unavailable, if is always false if (idleTime >= JTimerFactory.getIdleTime()) { - // TODO check reset, but is hard when idle is detected - // idle detected // update time without idle time offsetTimeInMs -= configIdleTime; publish(taskTimingBeforeStartInMs + loopTimestamp - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); - // parent application - JTimer parentApplication = (JTimer)getApplication(); - // send idle detect event + JTimer parentApplication = (JTimer)getApplication(); parentApplication.preIdleDetect(); - // ask user what to do + // ask user what to do (long blocking call) int option = IdleDialog.showIdleDialog(loopTimestamp - idleTime); // send idle detect event parentApplication.postIdleDetect(); - // get time after user + // day can have changed during idle + checkReset(); + + // get time after user idle long currentTime = Calendar.getInstance().getTimeInMillis(); lastPublishTimestamp = currentTime; @@ -335,7 +332,6 @@ } } else { - // pas de idle, met a jour le temps publish(taskTimingBeforeStartInMs + loopTimestamp - taskStartCalendar.getTimeInMillis() + offsetTimeInMs);

1 0

r2796 - trunk/src/site/en/rst/devel
by echatellier＠users.chorem.org 10 Feb '12

10 Feb '12

Author: echatellier Date: 2012-02-10 18:27:06 +0100 (Fri, 10 Feb 2012) New Revision: 2796 Url: http://chorem.org/repositories/revision/jtimer/2796 Log: Add doc about time tracking algorithm Added: trunk/src/site/en/rst/devel/idledetection.rst Added: trunk/src/site/en/rst/devel/idledetection.rst =================================================================== --- trunk/src/site/en/rst/devel/idledetection.rst (rev 0) +++ trunk/src/site/en/rst/devel/idledetection.rst 2012-02-10 17:27:06 UTC (rev 2796) @@ -0,0 +1,27 @@ +Idle detection +============== + +System info +----------- + +jTimer use JNA to call system native code to get user idle time since it's +not possible in pure Java. + + +Time tracking on task +--------------------- + +The time tracking algorithm is mainly based on "start task timestamp" and +"current timestamp" comparison. This comparison is adjusted with user idle time. + +So the algorithm work as it: + * init start timestamp + * loop iteration each 1000 ms until user stop task + * try to detect hibernation (previous idle tracking > 5min) + * try to detect idle (user idle time = 5min) + * publish time to listener (UI) + * display idle resume dialog (block time tracking) + * remember idle time () + * resume task + * publish current time to listener (UI) + * mark task as stopped

1 0