January 2010 - Jtimer-commits - mailman.cloud.codelutin.com

r2725 - trunk
by tchemit＠users.chorem.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 22:08:38 +0100 (Tue, 26 Jan 2010) New Revision: 2725 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-25 14:40:35 UTC (rev 2724) +++ trunk/pom.xml 2010-01-26 21:08:38 UTC (rev 2725) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r2724 - trunk/src/site
by tchemit＠users.chorem.org 25 Jan '10

25 Jan '10

Author: tchemit Date: 2010-01-25 15:40:35 +0100 (Mon, 25 Jan 2010) New Revision: 2724 Added: trunk/src/site/site_fr.xml Removed: trunk/src/site/site.xml Modified: trunk/src/site/site_en.xml Log: make site compatible with mavenpom Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-01-25 08:58:01 UTC (rev 2723) +++ trunk/src/site/site.xml 2010-01-25 14:40:35 UTC (rev 2724) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="${project.name}"> - - <publishDate format="dd/MM/yyyy" /> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - - <bannerLeft> - <src alt="jTimer logo">images/jtimer-logo-orange-little.jpg</src> - <href>/</href> - </bannerLeft> - - <bannerRight> - <src alt="CodeLutin logo">http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png" /> - <logo href="http://www.nuiton.org/projects/show/jrst" name="JRst" img="images/jrst-logo.png" /> - </poweredBy> - - <body> - <links> - <item name="Chorem" href="http://www.chorem.org/" /> - <item name="Nuiton" href="http://www.nuiton.org/" /> - <item name="Code Lutin" href="http://www.codelutin.com/" /> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> - </links> - - <menu name="Utilisateurs" inherit="top"> - <item name="Accueil" href="index.html" /> - <item name="Copies d'écran" href="screenshots.html" /> - <item name="Téléchargement" href="http://www.chorem.org/projects/list_files/jtimer" /> - <item name="Configuration" href="configuration.html" /> - <item name="Notes de version" href="releasenotes.html" /> - </menu> - - <menu name="Contribuer" inherit="top"> - <item name="Bug tracker" href="http://www.chorem.org/projects/jtimer/issues" /> - <item name="I18N" href="contribute/i18n.html" /> - </menu> - - <menu name="Développeur" inherit="top"> - <item name="Roadmap" href="devel/roadmap.html" /> - <item name="Fonctionnement" href="devel/index.html"> -  - <item name="Framework swing" href="devel/saf.html" /> -  -  - <item name="Packaging" href="devel/packaging.html" /> - <item name="Format de fichier" href="devel/fileformat.html" /> - </item> - </menu> - - <menu ref="reports" /> - - </body> -</project> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-25 08:58:01 UTC (rev 2723) +++ trunk/src/site/site_en.xml 2010-01-25 14:40:35 UTC (rev 2724) @@ -7,19 +7,14 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> + <version>${skin.version}</version> </skin> <bannerLeft> <src alt="jTimer logo">../images/jtimer-logo-orange-little.jpg</src> - <href>/</href> + <href>/index.html</href> </bannerLeft> - <bannerRight> - <src alt="CodeLutin logo">http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png" /> <logo href="http://www.nuiton.org/projects/show/jrst" name="JRst" img="images/jrst-logo.png" /> @@ -27,14 +22,14 @@ <body> <links> - <item name="Chorem" href="http://www.chorem.org/" /> - <item name="Nuiton" href="http://www.nuiton.org/" /> - <item name="Code Lutin" href="http://www.codelutin.com/" /> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> <item name="[fr" href="../index.html" /> <item name="en]" href="index.html" /> </links> - + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + <menu name="Users" inherit="top"> <item name="Home" href="index.html" /> <item name="Screenshots" href="screenshots.html" /> Copied: trunk/src/site/site_fr.xml (from rev 2721, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2010-01-25 14:40:35 UTC (rev 2724) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <skin> + <groupId>org.nuiton</groupId> + <artifactId>maven-nuiton-skin</artifactId> + <version>${skin.version}</version> + </skin> + + <bannerLeft> + <src alt="jTimer logo">images/jtimer-logo-orange-little.jpg</src> + <href>/index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png" /> + <logo href="http://www.nuiton.org/projects/show/jrst" name="JRst" img="images/jrst-logo.png" /> + </poweredBy> + + <body> + <links> + <item name="[fr" href="index.html" /> + <item name="en]" href="en/index.html" /> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu name="Utilisateurs" inherit="top"> + <item name="Accueil" href="index.html" /> + <item name="Copies d'écran" href="screenshots.html" /> + <item name="Téléchargement" href="http://www.chorem.org/projects/list_files/jtimer" /> + <item name="Configuration" href="configuration.html" /> + <item name="Notes de version" href="releasenotes.html" /> + </menu> + + <menu name="Contribuer" inherit="top"> + <item name="Bug tracker" href="http://www.chorem.org/projects/jtimer/issues" /> + <item name="I18N" href="contribute/i18n.html" /> + </menu> + + <menu name="Développeur" inherit="top"> + <item name="Roadmap" href="devel/roadmap.html" /> + <item name="Fonctionnement" href="devel/index.html"> +  + <item name="Framework swing" href="devel/saf.html" /> +  +  + <item name="Packaging" href="devel/packaging.html" /> + <item name="Format de fichier" href="devel/fileformat.html" /> + </item> + </menu> + + <menu ref="reports" /> + + </body> +</project> Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:mergeinfo +

1 0

r2723 - trunk
by tchemit＠users.chorem.org 25 Jan '10

25 Jan '10

Author: tchemit Date: 2010-01-25 09:58:01 +0100 (Mon, 25 Jan 2010) New Revision: 2723 Modified: trunk/pom.xml Log: clean pom + make site compatible with mavenpom4redmine 2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-25 08:13:19 UTC (rev 2722) +++ trunk/pom.xml 2010-01-25 08:58:01 UTC (rev 2723) @@ -25,46 +25,7 @@ <distribution>local</distribution> </license> </licenses> - -  - <developers> <developer> <name>Eric Chatellier</name> @@ -98,37 +59,12 @@ </developer> </developers> -  - <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> -  - -  - <properties>  @@ -141,7 +77,7 @@ <license.licenseName>gpl_v3</license.licenseName>  - <maven.site.locales>fr,en</maven.site.locales> + <siteLocales>fr,en</siteLocales>  <redmine.releaseFiles> @@ -152,11 +88,6 @@  <javadoc.version>2.6.1</javadoc.version> -  </properties> <build> @@ -207,10 +138,6 @@ </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> -  <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> @@ -219,11 +146,6 @@ </dependency> </dependencies> </plugin> -  </plugins> </pluginManagement> @@ -231,7 +153,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> -  <executions> <execution> <phase>validate</phase> @@ -247,25 +168,6 @@ </execution> </executions> </plugin> -  </plugins> </build> @@ -279,84 +181,13 @@ <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java, **/ApplicationServices.java</excludes> </configuration> </plugin> -  -  -  -  -  - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <version>2.3</version> </plugin> -  +  <!--plugin> <groupId>org.nuiton.thirdparty</groupId>

1 0

r2722 - trunk
by tchemit＠users.chorem.org 25 Jan '10

25 Jan '10

Author: tchemit Date: 2010-01-25 09:13:19 +0100 (Mon, 25 Jan 2010) New Revision: 2722 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 17:37:09 UTC (rev 2721) +++ trunk/pom.xml 2010-01-25 08:13:19 UTC (rev 2722) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r2721 - trunk
by tchemit＠users.chorem.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 18:37:09 +0100 (Tue, 19 Jan 2010) New Revision: 2721 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 20:25:26 UTC (rev 2720) +++ trunk/pom.xml 2010-01-19 17:37:09 UTC (rev 2721) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r2720 - trunk
by tchemit＠users.chorem.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 21:25:26 +0100 (Sun, 17 Jan 2010) New Revision: 2720 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-13 15:17:45 UTC (rev 2719) +++ trunk/pom.xml 2010-01-17 20:25:26 UTC (rev 2720) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r2719 - in trunk: . src/main/java/org/chorem/jtimer/ui/system/win32 src/main/java/org/chorem/jtimer/ui/tasks
by tchemit＠users.chorem.org 13 Jan '10

13 Jan '10

Author: tchemit Date: 2010-01-13 16:17:45 +0100 (Wed, 13 Jan 2010) New Revision: 2719 Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Log: Evolution #102: utilisation de mavenpom + fix some javadoc warnings Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/pom.xml 2010-01-13 15:17:45 UTC (rev 2719) @@ -2,6 +2,12 @@ <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> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> <version>1.3.2-SNAPSHOT</version> @@ -12,10 +18,18 @@ <url>http://maven-site.chorem.org/jtimer</url> <inceptionYear>2007</inceptionYear> - <organization> + <licenses> + <license> + <name>General Public License (GPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> + +  <developers> <developer> @@ -72,12 +86,22 @@ <role>Développeur</role> </roles> </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> </developers> - <issueManagement> +  <scm> <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> @@ -85,12 +109,12 @@ <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> </scm> - <ciManagement> +  - <distributionManagement> +  <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + +  + <platform>chorem.org</platform> + +  + <maven.jar.main.class>org.chorem.lima.Main</maven.jar.main.class> + +  + <license.licenseName>gpl_v3</license.licenseName> + +  + <maven.site.locales>fr,en</maven.site.locales> + +  + <redmine.releaseFiles> + target/${project.artifactId}-${project.version}-bin.zip, + target/${project.artifactId}-${project.version}-src.zip, + </redmine.releaseFiles> + +  + <javadoc.version>2.6.1</javadoc.version> + +  </properties> <build> <resources> +  +  <resource> <directory>src/main/resources</directory> <filtering>true</filtering> @@ -133,7 +181,7 @@ <pluginManagement> <plugins> - <plugin> +  <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemProperties> +  <property> <name>java.io.tmpdir</name> <value>${project.build.directory}/surefire-workdir</value> @@ -158,18 +207,23 @@ </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> +  <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin> +  </plugins> </pluginManagement> @@ -177,7 +231,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> +  <executions> <execution> <phase>validate</phase> @@ -193,7 +247,7 @@ </execution> </executions> </plugin> - <plugin> +  </plugins> </build> @@ -225,7 +279,7 @@ <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java, **/ApplicationServices.java</excludes> </configuration> </plugin> - <plugin> +  +  +  +  +  <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <version>2.3</version> </plugin> - <plugin> +  +  +  </plugins> </reporting> @@ -420,7 +480,28 @@ </activation> <build> <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> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> +  +  </plugins> </build> </profile> Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2010-01-13 15:17:45 UTC (rev 2719) @@ -27,7 +27,8 @@ * * @author chatellier * @version $Revision$ - * + * + * FIXME-TC2010011" : javadoc plugin says there is a missing closing tag ? * @see <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu…">Windows API</a> * * Last update : $Date$ Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2010-01-13 15:17:45 UTC (rev 2719) @@ -33,7 +33,7 @@ */ public class Win32SystemInfo implements SystemInfo { - /** User32 {@link lastInputInfo}. */ + /** {@link User32.LASTINPUTINFO}. */ protected User32.LASTINPUTINFO lastInputInfo; /** Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2010-01-13 15:17:45 UTC (rev 2719) @@ -110,7 +110,7 @@ * * Protected to force use of show static method. * - * @param parent parent application + * @param application parent application */ protected IdleDialog(SingleFrameApplication application) { // don't make reference on other parent Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2010-01-04 09:07:22 UTC (rev 2718) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2010-01-13 15:17:45 UTC (rev 2719) @@ -395,7 +395,9 @@ /** * Display alert message without breaking UI. * - * @param alertMessage alert message + * @param task + * @param alertType + * @param alertDuration */ protected void displayAlert(final TimerTask task, final Type alertType, final long alertDuration) { @@ -434,7 +436,7 @@ * @return stopping flag */ public boolean isStopping() { - boolean stopping = false; + boolean stopping; synchronized (bWantToStop) { stopping = bWantToStop.booleanValue(); }

1 0

r2718 - trunk/src/main/resources/org/chorem/jtimer/ui/resources
by echatellier＠users.chorem.org 04 Jan '10

04 Jan '10

Author: echatellier Date: 2010-01-04 10:07:22 +0100 (Mon, 04 Jan 2010) New Revision: 2718 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties Log: Update dates. Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2010-01-04 09:02:46 UTC (rev 2717) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2010-01-04 09:07:22 UTC (rev 2718) @@ -4,7 +4,7 @@ #�About i18n aboutTitle = About ${Application.title} aboutHtmlTitle = About ${Application.title} -aboutHtml = <html>${Application.title} - ${Application.version} (${buildNumber}) Copyright 2007 - 2009, Code Lutin. <a href=\"${project.url}\">${project.url}</a> Please, report any bug you can found.<html> +aboutHtml = <html>${Application.title} - ${Application.version} (${buildNumber}) Copyright 2007 - 2010, 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: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2010-01-04 09:02:46 UTC (rev 2717) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2010-01-04 09:07:22 UTC (rev 2718) @@ -1,7 +1,7 @@ #�About i18n aboutTitle = \u00C0 propos de ${Application.title} aboutHtmlTitle = \u00C0 propos de ${Application.title} -aboutHtml = <html>${Application.title} - ${Application.version} (${buildNumber}) Copyright 2007 - 2009, Code Lutin. <a href=\"${project.url}\">${project.url}</a> Merci de rapporter les bugs de ${Application.title}.<html> +aboutHtml = <html>${Application.title} - ${Application.version} (${buildNumber}) Copyright 2007 - 2010, 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.

1 0

r2717 - in trunk: . src/main/java/org/chorem/jtimer/ui/system src/main/java/org/chorem/jtimer/ui/system/macos src/main/java/org/chorem/jtimer/ui/system/win32
by echatellier＠users.chorem.org 04 Jan '10

04 Jan '10

Author: echatellier Date: 2010-01-04 10:02:46 +0100 (Mon, 04 Jan 2010) New Revision: 2717 Added: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java Modified: trunk/changelog.txt trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java Log: Add Mac OS 10.4+ idle time detection support Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-12-18 09:11:04 UTC (rev 2716) +++ trunk/changelog.txt 2010-01-04 09:02:46 UTC (rev 2717) @@ -3,6 +3,7 @@ jTimer (1.3.2) stable; urgency=low + * Add Mac OS 10.4+ idle time detection support * Allow adding notes on synchronized projects * #80 : Add parent node to select/unselect all projects on report UI * Freemarker updated to 2.3.16 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 09:11:04 UTC (rev 2716) +++ trunk/pom.xml 2010-01-04 09:02:46 UTC (rev 2717) @@ -222,7 +222,7 @@ <version>2.4</version> <configuration> <configLocation>checkstyle.xml</configLocation> - <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java</excludes> + <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java, **/ApplicationServices.java</excludes> </configuration> </plugin> <plugin> @@ -266,7 +266,7 @@ </plugin> <plugin> <artifactId>maven-changes-plugin</artifactId> - <version>2.1</version> + <version>2.3</version> <reportSets> <reportSet> <reports> Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java 2009-12-18 09:11:04 UTC (rev 2716) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java 2010-01-04 09:02:46 UTC (rev 2717) @@ -20,6 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.jtimer.ui.system.macos.MacOSSystemInfo; import org.chorem.jtimer.ui.system.unix.UnixSystemInfo; import org.chorem.jtimer.ui.system.win32.Win32SystemInfo; @@ -69,8 +70,10 @@ // try windows if (os.contains("windows")) { instance = new Win32SystemInfo(); - } else if (os.contains("linux") || os.contains("mac os")) { + } else if (os.contains("linux")) { instance = new UnixSystemInfo(); + } else if (os.contains("mac os")) { + instance = new MacOSSystemInfo(); } else { // system unknown throw new UnsupportedSystemInfoException( Added: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java (rev 0) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java 2010-01-04 09:02:46 UTC (rev 2717) @@ -0,0 +1,59 @@ +/* * + * Copyright (C) 2010 Code Lutin, Eric Chatellier + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + **/ + +package org.chorem.jtimer.ui.system.macos; + +import com.sun.jna.Library; +import com.sun.jna.Native; + +/** + * Quartz 2D API. + * + * @author chatellier + * @version $Revision$ + * @since 1.3.2 + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public interface ApplicationServices extends Library { + + ApplicationServices INSTANCE = (ApplicationServices) Native.loadLibrary( + "ApplicationServices", ApplicationServices.class); + + /** Constants that specify an input event. */ + int kCGAnyInputEventType = -1; + /** Specifies that an event source should use a private event state table. */ + int kCGEventSourceStatePrivate = -1; + /** Specifies that an event source should use the event state table that reflects the combined state of all event sources posting to the current user login session. */ + int kCGEventSourceStateCombinedSessionState = 0; + /** Specifies that an event source should use the event state table that reflects the combined state of all hardware event sources posting from the HID system. */ + int kCGEventSourceStateHIDSystemState = 1; + + /** + * Returns the elapsed time since the last event for a Quartz event source. + * + * @param sourceStateId The source state to access + * @param eventType The event type to access + * @return the time in seconds since the previous input event of the specified type + * + * @see <a href="http://developer.apple.com/mac/library/documentation/Carbon/Reference/Quart…">Quartz API</a> + */ + public double CGEventSourceSecondsSinceLastEventType(int sourceStateId, + int eventType); +} \ No newline at end of file Property changes on: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java (rev 0) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java 2010-01-04 09:02:46 UTC (rev 2717) @@ -0,0 +1,49 @@ +/* * + * Copyright (C) 2010 Code Lutin, Eric Chatellier + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + **/ + +package org.chorem.jtimer.ui.system.macos; + +import org.chorem.jtimer.ui.system.SystemInfo; + +/** + * MacOSSystemInfo + * + * Source : http://ochafik.free.fr/blog/?p=98#comment-17694 + * + * @author chatellier + * @version $Revision$ + * @since 1.3.2 + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class MacOSSystemInfo implements SystemInfo { + + /* + * @see org.chorem.jtimer.ui.system.SystemInfo#getIdleTime() + */ + @Override + public long getIdleTime() { + double idleTimeSeconds = ApplicationServices.INSTANCE + .CGEventSourceSecondsSinceLastEventType( + ApplicationServices.kCGEventSourceStateCombinedSessionState, + ApplicationServices.kCGAnyInputEventType); + return (long) (idleTimeSeconds * 1000); + } + +} Property changes on: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java (rev 0) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java 2010-01-04 09:02:46 UTC (rev 2717) @@ -0,0 +1,4 @@ +/** + * Mac OS specific system info implementation. + */ +package org.chorem.jtimer.ui.system.macos; Property changes on: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2009-12-18 09:11:04 UTC (rev 2716) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2010-01-04 09:02:46 UTC (rev 2717) @@ -28,7 +28,7 @@ * @author chatellier * @version $Revision$ * - * @see "http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu…" + * @see <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winu…">Windows API</a> * * Last update : $Date$ * By : $Author$

1 0