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

r2872 - trunk
by maven-release＠users.chorem.org 04 Jun '12

04 Jun '12

Author: maven-release Date: 2012-06-04 09:48:30 +0200 (Mon, 04 Jun 2012) New Revision: 2872 Url: http://chorem.org/repositories/revision/jtimer/2872 Log: [maven-release-plugin] prepare release jtimer-1.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-04 07:44:15 UTC (rev 2871) +++ trunk/pom.xml 2012-06-04 07:48:30 UTC (rev 2872) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> <name>jTimer</name> <description> @@ -63,11 +63,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.1</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/jtimer/trunk + scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.1 </developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.4.1</url> </scm> <distributionManagement>

1 0

r2871 - trunk/src/main/resources
by echatellier＠users.chorem.org 04 Jun '12

04 Jun '12

Author: echatellier Date: 2012-06-04 09:44:15 +0200 (Mon, 04 Jun 2012) New Revision: 2871 Url: http://chorem.org/repositories/revision/jtimer/2871 Log: Add license header Modified: trunk/src/main/resources/jtimer.properties Modified: trunk/src/main/resources/jtimer.properties =================================================================== --- trunk/src/main/resources/jtimer.properties 2012-06-03 09:10:20 UTC (rev 2870) +++ trunk/src/main/resources/jtimer.properties 2012-06-04 07:44:15 UTC (rev 2871) @@ -1,2 +1,26 @@ +### +# #%L +# jTimer +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 CodeLutin, Chatellier Eric +# %% +# 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% +### application.version=${project.version} -application.website=${project.url} \ No newline at end of file +application.website=${project.url} +

1 0

r2870 - trunk/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org 03 Jun '12

03 Jun '12

Author: echatellier Date: 2012-06-03 11:10:20 +0200 (Sun, 03 Jun 2012) New Revision: 2870 Url: http://chorem.org/repositories/revision/jtimer/2870 Log: fixes #545 : Hibernate is still not working 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-05-29 12:12:33 UTC (rev 2869) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-06-03 09:10:20 UTC (rev 2870) @@ -210,7 +210,7 @@ long userIdleTime = Math.max(delta, idleTime); // remove delta from now - addTaskDelta(lastUserActivity.get(), -userIdleTime); + addTaskDelta(lastUserActivity.get() + delta, -userIdleTime); // display idle detected (blocking call) JTimer parentApplication = (JTimer) getApplication();

1 0