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

r2945 - trunk
by tchemit＠users.chorem.org 27 Sep '13

27 Sep '13

Author: tchemit Date: 2013-09-27 07:48:51 +0200 (Fri, 27 Sep 2013) New Revision: 2945 Url: http://chorem.org/projects/jtimer/repository/revisions/2945 Log: add some svn:ignore Modified: trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target .settings .project .classpath *.properties *testng*.xml *.ipr *.iws *.iml + target .settings .project .classpath *.properties *testng*.xml .idea *.ipr *.iws *.iml *.log

1 0

r2944 - in trunk/src/site: en/rst rst
by tchemit＠users.chorem.org 26 Sep '13

26 Sep '13

Author: tchemit Date: 2013-09-26 12:49:24 +0200 (Thu, 26 Sep 2013) New Revision: 2944 Url: http://chorem.org/projects/jtimer/repository/revisions/2944 Log: fixes #953: Add jnlp deployement mode (fix site doc) Modified: trunk/src/site/en/rst/index.rst.vm trunk/src/site/rst/index.rst.vm Modified: trunk/src/site/en/rst/index.rst.vm =================================================================== --- trunk/src/site/en/rst/index.rst.vm 2013-09-26 10:40:53 UTC (rev 2943) +++ trunk/src/site/en/rst/index.rst.vm 2013-09-26 10:49:24 UTC (rev 2944) @@ -62,5 +62,5 @@ .. _Download Java: http://java.sun.com/javase/downloads/index.jsp .. _gTimer: http://www.k5n.us/gtimer.php .. _known issue: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html -.. _Starts jTimer via webstart: ../jnlp/${project.jnlpFileName} +.. _Start jTimer via webstart: ../jnlp/${jnlpFileName} .. _jnlp documentation: jnlp-report.html \ No newline at end of file Modified: trunk/src/site/rst/index.rst.vm =================================================================== --- trunk/src/site/rst/index.rst.vm 2013-09-26 10:40:53 UTC (rev 2943) +++ trunk/src/site/rst/index.rst.vm 2013-09-26 10:49:24 UTC (rev 2944) @@ -63,5 +63,5 @@ .. _Telecharger Java: http://java.sun.com/javase/downloads/index.jsp .. _gTimer: http://www.k5n.us/gtimer.php .. _bug connu: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html -.. _Démarrer jTimer via webstart: jnlp/${project.jnlpFileName} +.. _Démarrer jTimer via webstart: jnlp/${jnlpFileName} .. _documentation jnlp: jnlp-report.html \ No newline at end of file

1 0

r2943 - in trunk: . src/site src/site/en/rst src/site/rst
by tchemit＠users.chorem.org 26 Sep '13

26 Sep '13

Author: tchemit Date: 2013-09-26 12:40:53 +0200 (Thu, 26 Sep 2013) New Revision: 2943 Url: http://chorem.org/projects/jtimer/repository/revisions/2943 Log: fixes #953: Add jnlp deployement mode + improve site generation (add missing project info) Added: trunk/src/site/en/rst/index.rst.vm trunk/src/site/rst/index.rst.vm Removed: trunk/src/site/en/rst/index.rst trunk/src/site/rst/index.rst Modified: trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/pom.xml 2013-09-26 10:40:53 UTC (rev 2943) @@ -102,6 +102,9 @@  <skipPostRelease>false</skipPostRelease> +  + <jnlpFileName>jTimer.jnlp</jnlpFileName> + </properties> <build> @@ -154,6 +157,11 @@ <mainClass>${maven.jar.main.class}</mainClass> <classpathPrefix>lib/</classpathPrefix> </manifest> +  + <manifestEntries> + <Trusted-Only>true</Trusted-Only> + <Trusted-Library>true</Trusted-Library> + </manifestEntries> </archive> </configuration> </plugin> @@ -171,7 +179,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> <configuration> <libPath>lib</libPath> @@ -182,6 +189,7 @@ <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> + <outputFile>${jnlpFileName}</outputFile> </jnlp> <sign> <keystore>${keystorepath}</keystore> @@ -195,28 +203,10 @@ </keystoreConfig> </sign> <gzip>true</gzip> - <unsign>true</unsign> + <unsign>false</unsign> <canUnsign>false</canUnsign>  -  - <jnlpExtensions> -  - <jnlpExtension> - <name>jxlayer</name> - <title>Swing labs JXLayer</title> - <vendor>Swing Labs</vendor> - <includes> - <include>org.swinglabs:jxlayer</include> - </includes> - </jnlpExtension> - </jnlpExtensions> + <pack200>true</pack200> </configuration> </plugin> </plugins> @@ -250,12 +240,6 @@ <version>${coberturaPluginVersion}</version> </plugin> -  -  </plugins> </reporting> @@ -508,10 +492,37 @@ <reporting> <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> + <configuration> + <siteJnlpFile>${jnlpFileName}</siteJnlpFile> + </configuration> </plugin> </plugins> </reporting> Deleted: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/src/site/en/rst/index.rst 2013-09-26 10:40:53 UTC (rev 2943) @@ -1,54 +0,0 @@ -.. - -.. * #%L -.. * jTimer -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2007 - 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% -.. - - -Presentation -============ - -jTimer is a time tracking tool for projects activities. It also can -generate activities reports. - -Features --------- - * Time spent on projects/tasks - * Idle detection - * Reports generation - * Add notes on tasks - * Alerts setup - * Internationalization (i18n) - * gTimer file format compliant - -Environment ------------ -jTimer is Java based. You need to install JRE 6 environment to use it. - -`Download Java`_. - -Links ------ - * gTimer_. - -.. _Download Java: http://java.sun.com/javase/downloads/index.jsp -.. _gTimer: http://www.k5n.us/gtimer.php -.. _known issue: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html \ No newline at end of file Copied: trunk/src/site/en/rst/index.rst.vm (from rev 2941, trunk/src/site/en/rst/index.rst) =================================================================== --- trunk/src/site/en/rst/index.rst.vm (rev 0) +++ trunk/src/site/en/rst/index.rst.vm 2013-09-26 10:40:53 UTC (rev 2943) @@ -0,0 +1,66 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 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% +.. - + +Presentation +============ + +jTimer is a time tracking tool for projects activities. It also can +generate activities reports. + +Features +-------- + * Time spent on projects/tasks + * Idle detection + * Reports generation + * Add notes on tasks + * Alerts setup + * Internationalization (i18n) + * gTimer file format compliant + +Environment +----------- +jTimer is Java based. You need to install JRE 6 environment to use it. + +`Download Java`_. + +Start +----- + +Since version 1.4.3, you can directly use jTimer without install it by hand, +using the webstart technology. + +`Start jTimer via webstart`_. + +For more information, go to page `jnlp documentation`_. + +Links +----- + * gTimer_. + +.. _Download Java: http://java.sun.com/javase/downloads/index.jsp +.. _gTimer: http://www.k5n.us/gtimer.php +.. _known issue: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html +.. _Starts jTimer via webstart: ../jnlp/${project.jnlpFileName} +.. _jnlp documentation: jnlp-report.html \ No newline at end of file Deleted: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/src/site/rst/index.rst 2013-09-26 10:40:53 UTC (rev 2943) @@ -1,55 +0,0 @@ -.. - -.. * #%L -.. * jTimer -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2007 - 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% -.. - - -Présentation -============ - -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 ---------------- - * 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_. - -.. _Telecharger Java: http://java.sun.com/javase/downloads/index.jsp -.. _gTimer: http://www.k5n.us/gtimer.php -.. _bug connu: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html \ No newline at end of file Copied: trunk/src/site/rst/index.rst.vm (from rev 2941, trunk/src/site/rst/index.rst) =================================================================== --- trunk/src/site/rst/index.rst.vm (rev 0) +++ trunk/src/site/rst/index.rst.vm 2013-09-26 10:40:53 UTC (rev 2943) @@ -0,0 +1,67 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 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% +.. - + +Présentation +============ + +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 +--------------- + * 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`_. + +Utiliser +-------- + +Depuis la version 1.4.3, il est possible de démarrer jTimer sans avoir à +l'installer manuellement en utilisant la technologie webstart. + +`Démarrer jTimer via webstart`_. + +Pour plus d'information, aller sur la page de `documentation jnlp`_. + +Liens +----- + * gTimer_. + +.. _Telecharger Java: http://java.sun.com/javase/downloads/index.jsp +.. _gTimer: http://www.k5n.us/gtimer.php +.. _bug connu: http://list.chorem.org/pipermail/jtimer-devel/2010-October/000017.html +.. _Démarrer jTimer via webstart: jnlp/${project.jnlpFileName} +.. _documentation jnlp: jnlp-report.html \ No newline at end of file Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/src/site/site_en.xml 2013-09-26 10:40:53 UTC (rev 2943) @@ -64,12 +64,22 @@ <breadcrumbs> <item name="${project.name}" href="index.html" /> - </breadcrumbs> + </breadcrumbs> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <menu name="Users" inherit="top"> <item name="Home" href="index.html" /> <item name="Screenshots" href="screenshots.html" /> <item name="Download" href="http://www.chorem.org/projects/jtimer/files" /> + <item name="Start (using webstart)" href="../jnlp/${project.jnlpFileName}" /> <item name="Release Notes" href="changes-report.html" /> </menu> @@ -89,5 +99,19 @@ <menu ref="reports" /> + <footer> + + <div id='projectMetas' locale='en' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-09-26 09:03:49 UTC (rev 2942) +++ trunk/src/site/site_fr.xml 2013-09-26 10:40:53 UTC (rev 2943) @@ -65,11 +65,21 @@ <breadcrumbs> <item name="${project.name}" href="index.html" /> </breadcrumbs> - + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <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/jtimer/files" /> + <item name="Démarrer (via webstart)" href="./jnlp/${project.jnlpFileName}" /> <item name="Notes de version" href="changes-report.html" /> </menu> @@ -89,5 +99,19 @@ <menu ref="reports" /> + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project>

1 0

r2942 - trunk
by tchemit＠users.chorem.org 26 Sep '13

26 Sep '13

Author: tchemit Date: 2013-09-26 11:03:49 +0200 (Thu, 26 Sep 2013) New Revision: 2942 Url: http://chorem.org/projects/jtimer/repository/revisions/2942 Log: refs #953: Add jnlp deployement mode Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-26 08:07:54 UTC (rev 2941) +++ trunk/pom.xml 2013-09-26 09:03:49 UTC (rev 2942) @@ -167,6 +167,58 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + <configuration> + + <libPath>lib</libPath> + <makeArchive>false</makeArchive> + <verbose>false</verbose> + <canUnsign>false</canUnsign> + <jnlp> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keyalias}</alias> + <keypass>${keypass}</keypass> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> + <gzip>true</gzip> + <unsign>true</unsign> + <canUnsign>false</canUnsign> +  +  + <jnlpExtensions> +  + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer</title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> + </configuration> + </plugin> </plugins> </pluginManagement> </build> @@ -389,53 +441,81 @@ </execution> </executions> </plugin> -  -  + <profile> + <id>release-jnlp-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> </plugin> + +  <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>extract-jnlp-archive</id> - <phase>site</phase> - <configuration> - <tasks> - <unzip src="${project.build.directory}/${project.build.finalName}.zip" dest="${project.reporting.outputDirectory}" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin--> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + + </profile> </profiles> </project>

1 0

r2941 - in trunk/src/main: java/org/chorem/jtimer/ui resources/org/chorem/jtimer/ui/resources
by tchemit＠users.chorem.org 26 Sep '13

26 Sep '13

Author: tchemit Date: 2013-09-26 10:07:54 +0200 (Thu, 26 Sep 2013) New Revision: 2941 Url: http://chorem.org/projects/jtimer/repository/revisions/2941 Log: fixes #950: Improve the task editor Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2013-09-26 08:03:59 UTC (rev 2940) +++ trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2013-09-26 08:07:54 UTC (rev 2941) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chorlet Stéphane, Chatellier Eric + * Copyright (C) 2008 - 2011 CodeLutin, Chorlet Stéphane, Chatellier Eric, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -61,6 +61,7 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; @@ -143,6 +144,11 @@ * apply button: keep reference in order to be able to call setEnabled(true or false) */ protected JButton applyButton; + + /** + * apply and quit button: keep reference in order to be able to call setEnabled(true or false) + */ + protected JButton applyAndQuitButton; /** * revert button: keep reference in order to be able to call setEnabled(true or false) */ @@ -239,23 +245,34 @@ applyButton.setActionCommand("apply"); applyButton.addActionListener(this); applyButton.setEnabled(false); + addMnemonic("apply.Action.mnemonic", applyButton); + // apply and quit button + applyAndQuitButton= new JButton(resourceMap.getString("applyAndQuit.Action.text")); + applyAndQuitButton.setActionCommand("applyAndQuit"); + applyAndQuitButton.addActionListener(this); + applyAndQuitButton.setEnabled(false); + addMnemonic("applyAndQuit.Action.mnemonic", applyAndQuitButton); + // revert button revertButton = new JButton(resourceMap.getString("revert.Action.text")); revertButton.setActionCommand("revert"); revertButton.addActionListener(this); revertButton.setEnabled(false); + addMnemonic("revert.Action.mnemonic", revertButton); // cancel button JButton cancelButton = new JButton(resourceMap .getString("cancel.Action.text")); cancelButton.setActionCommand("cancel"); cancelButton.addActionListener(this); + addMnemonic("cancel.Action.mnemonic", cancelButton); // command panel JPanel panel = new JPanel(); panel.setLayout(new FlowLayout(FlowLayout.RIGHT, 1, 0)); panel.add(applyButton); + panel.add(applyAndQuitButton); panel.add(revertButton); panel.add(cancelButton); return panel; @@ -503,10 +520,13 @@ */ @Override public void actionPerformed(ActionEvent e) { - if ("cancel".equals(e.getActionCommand())) { + String actionCommand = e.getActionCommand(); + + + if ("cancel".equals(actionCommand)) { cancel(); - } else if ("apply".equals(e.getActionCommand())) { + } else if ("apply".equals(actionCommand)) { getRootPane().setCursor( Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -524,7 +544,28 @@ getRootPane().setCursor( Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } else if ("revert".equals(e.getActionCommand())) { + }else if ("applyAndQuit".equals(actionCommand)) { + + getRootPane().setCursor( + Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + + try { + apply(); + } + catch(DataViolationException ex) { + // revert changes + revert(); + + // TODO display UI message + } + + getRootPane().setCursor( + Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + + // quit editor + cancel(); + + } else if ("revert".equals(actionCommand)) { revert(); } } @@ -656,6 +697,7 @@ dateChanged.add(getSelectedDay().getTime()); applyButton.setEnabled(true); + applyAndQuitButton.setEnabled(true); revertButton.setEnabled(true); updateFlaggedDates(); @@ -684,6 +726,7 @@ dateChanged.clear(); annotationChanged.clear(); applyButton.setEnabled(false); + applyAndQuitButton.setEnabled(false); revertButton.setEnabled(false); isTitleChanged = false; isAnnotationChanged = false; @@ -724,6 +767,7 @@ dateChanged.clear(); annotationChanged.clear(); applyButton.setEnabled(false); + applyAndQuitButton.setEnabled(false); revertButton.setEnabled(false); isTitleChanged = false; isAnnotationChanged = false; @@ -733,4 +777,18 @@ dispose(); } + /** + * To add a mnemonic from a i18n key. + * + * @param key the i18n key of the mnemonic + * @param button button where to add mnemonic + * @since 1.4.3 + */ + protected void addMnemonic(String key, JButton button) { + String string = resourceMap.getString(key); + if (StringUtils.isNotBlank(string)) { + + button.setMnemonic(string.charAt(0)); + } + } } Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties 2013-09-26 08:03:59 UTC (rev 2940) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties 2013-09-26 08:07:54 UTC (rev 2941) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric, Chemit Tony # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -25,12 +25,19 @@ editor.title = Edit task apply.Action.text = Apply +apply.Action.mnemonic = A apply.Action.shortDescription = Apply changes +applyAndQuit.Action.text = Apply And Quit +applyAndQuit.Action.mnemonic = p +applyAndQuit.Action.shortDescription = Apply changes and quit + cancel.Action.text = Quit +cancel.Action.mnemonic = Q cancel.Action.shortDescription = Revert changes and quit revert.Action.text = Revert +revert.Action.mnemonic= R revert.Action.shortDescription = Revert changes label.time.text = Time: Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties 2013-09-26 08:03:59 UTC (rev 2940) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties 2013-09-26 08:07:54 UTC (rev 2941) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric, Chemit Tony # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -25,12 +25,19 @@ editor.title = \u00C9dition de la t\u00E2che apply.Action.text = Appliquer +apply.Action.mnemonic = A apply.Action.shortDescription = Appliquer les changements +applyAndQuit.Action.text = Appliquer et quitter +applyAndQuit.Action.mnemonic = e +applyAndQuit.Action.shortDescription = Appliquer les changements et quitter + cancel.Action.text = Quitter +cancel.Action.mnemonic= Q cancel.Action.shortDescription = Annuler et quitter revert.Action.text = Annuler +revert.Action.mnemonic= n revert.Action.shortDescription = Annuler les changements label.time.text = Temps:

1 0

r2940 - trunk/src/main/java/org/chorem/jtimer/data
by tchemit＠users.chorem.org 26 Sep '13

26 Sep '13

Author: tchemit Date: 2013-09-26 10:03:59 +0200 (Thu, 26 Sep 2013) New Revision: 2940 Url: http://chorem.org/projects/jtimer/repository/revisions/2940 Log: fix javadoc typo + improve code Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2013-09-24 07:37:24 UTC (rev 2939) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2013-09-26 08:03:59 UTC (rev 2940) @@ -40,7 +40,6 @@ import org.chorem.jtimer.entities.TimerAlert; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; -import org.nuiton.util.ArrayUtil; /** * Gere les donnees. Des objets peuvent s'enregistrer pour etre notifies des @@ -201,7 +200,7 @@ vetoableDataEventListener.checkSetTaskTime(task, date, value); } - task.setTime(date, Long.valueOf(value)); + task.setTime(date, value); // send notification for (DataEventListener dataEventListener : dataEventListeners) { @@ -249,9 +248,8 @@ task.getParent().getSubTasks().remove(task); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().deleteTask(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.deleteTask(task); } } @@ -270,9 +268,8 @@ projectList.remove(project); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().deleteProject(project); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.deleteProject(project); } } @@ -324,9 +321,8 @@ task.setClosed(!task.isClosed()); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().changeClosedState(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.changeClosedState(task); } } @@ -565,17 +561,17 @@ } /** - * Find corresponding task for path. + * Return the corresponding task for path. * - * @param taskPath - * @return + * @param taskPath task path to find + * @return corresponding task for path */ public TimerTask getTaskForPath(String taskPath) { String[] paths = taskPath.split("/"); // make sure can't select only project - if (paths == null || paths.length <= 1) { + if (paths.length <= 1) { throw new IllegalArgumentException("Can't parse argument '" + taskPath + "' as task"); }

1 0

r2939 - trunk/src
by tchemit＠users.chorem.org 24 Sep '13

24 Sep '13

Author: tchemit Date: 2013-09-24 09:37:24 +0200 (Tue, 24 Sep 2013) New Revision: 2939 Url: http://chorem.org/projects/jtimer/repository/revisions/2939 Log: no more need of third-party file : all license are fine :) Removed: trunk/src/license/

1 0

r2938 - trunk/src/main/java/org/chorem/jtimer/ui/treetable
by tchemit＠users.chorem.org 24 Sep '13

24 Sep '13

Author: tchemit Date: 2013-09-24 09:36:39 +0200 (Tue, 24 Sep 2013) New Revision: 2938 Url: http://chorem.org/projects/jtimer/repository/revisions/2938 Log: fixes Evolution #948: Add shortcuts to navigate (expand/collapse) in the task's tree Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2013-09-24 06:54:44 UTC (rev 2937) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2013-09-24 07:36:39 UTC (rev 2938) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + * Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,9 +26,14 @@ package org.chorem.jtimer.ui.treetable; import java.awt.Color; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.List; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.KeyStroke; import javax.swing.tree.TreePath; import org.chorem.jtimer.data.TimerCore; @@ -104,6 +109,43 @@ // enable drag n drop setDragEnabled(true); setTransferHandler(new TimerTaskTransferHandler(application, core.getData())); + + { // add action to collapse (left arrow) selected node + Action action = new AbstractAction("collapseSelectedNode") { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + int selectedRow = getSelectedRow(); + if (selectedRow != -1) { + collapseRow(selectedRow); + } + } + }; + + getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( + KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), + action.getValue(Action.NAME)); + getActionMap().put(action.getValue(Action.NAME), action); + } + { // add action to expand (right arrow) selected node + Action action = new AbstractAction("expandSelectedNode") { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + int selectedRow = getSelectedRow(); + if (selectedRow != -1) { + expandRow(selectedRow); + } + } + }; + + getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( + KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), + action.getValue(Action.NAME)); + getActionMap().put(action.getValue(Action.NAME), action); + } } /**

1 0

r2937 - in trunk: . src/main/java/org/chorem/jtimer
by tchemit＠users.chorem.org 24 Sep '13

24 Sep '13

Author: tchemit Date: 2013-09-24 08:54:44 +0200 (Tue, 24 Sep 2013) New Revision: 2937 Url: http://chorem.org/projects/jtimer/repository/revisions/2937 Log: fixes #946: Updates mavenpom to 4.1 fixes #947: Migrates to nuiton-config Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/JTimerActions.java trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/pom.xml 2013-09-24 06:54:44 UTC (rev 2937) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.1</version> </parent> <groupId>org.chorem</groupId> @@ -34,7 +34,7 @@ <email>chatellier(a)codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -42,10 +42,10 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit(a)codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -99,6 +99,9 @@ target/${project.artifactId}-${project.version}-src.zip, </redmine.releaseFiles> +  + <skipPostRelease>false</skipPostRelease> + </properties> <build> @@ -182,7 +185,7 @@ <plugin> <artifactId>maven-changelog-plugin</artifactId> - <version>2.2</version> + <version>${changelogPluginVersion}</version> <configuration> <type>range</type> <range>365</range> @@ -192,7 +195,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.5.2</version> + <version>${coberturaPluginVersion}</version> </plugin>  @@ -207,8 +210,8 @@ <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>2.6.12</version> + <artifactId>nuiton-config</artifactId> + <version>3.0-alpha-1</version> <scope>compile</scope> <exclusions> <exclusion> Modified: trunk/src/main/java/org/chorem/jtimer/JTimerActions.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerActions.java 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/src/main/java/org/chorem/jtimer/JTimerActions.java 2013-09-24 06:54:44 UTC (rev 2937) @@ -26,8 +26,8 @@ package org.chorem.jtimer; import org.chorem.jtimer.JTimerConfig.JTimerAction; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ApplicationConfig.Action.Step; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ApplicationConfig.Action.Step; /** * JTimer actions class run from command line. Modified: trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2013-09-24 06:54:02 UTC (rev 2936) +++ trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2013-09-24 06:54:44 UTC (rev 2937) @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; /** * JTimer configuration.

1 0

r2936 - trunk/src/main/resources/org/chorem/jtimer/resources
by tchemit＠users.chorem.org 24 Sep '13

24 Sep '13

Author: tchemit Date: 2013-09-24 08:54:02 +0200 (Tue, 24 Sep 2013) New Revision: 2936 Url: http://chorem.org/projects/jtimer/repository/revisions/2936 Log: fixes #945: Add more shortcuts Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties 2013-09-11 20:34:27 UTC (rev 2935) +++ trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties 2013-09-24 06:54:02 UTC (rev 2936) @@ -40,20 +40,25 @@ # Resources for @Actions defined in jTimer newProject.Action.text = New Project newProject.Action.icon = bookmark-new.png +newProject.Action.accelerator = shift control N newProject.Action.shortDescription = Create new project editProject.Action.text = Edit project +editProject.Action.accelerator = shift F2 editProject.Action.shortDescription = Edit project deleteProject.Action.text = Delete Project deleteProject.Action.icon = process-stop.png +deleteProject.Action.accelerator = shift control DELETE deleteProject.Action.shortDescription = Delete project closeProject.Action.text = Open/Close Project +closeProject.Action.accelerator = shift control O closeProject.Action.shortDescription = Open or close project newTask.Action.text = New Task newTask.Action.icon = document-new.png +newTask.Action.accelerator = control N newTask.Action.shortDescription = Create new task editTask.Action.text = Edit Task @@ -61,6 +66,7 @@ editTask.Action.shortDescription = Edit task closeTask.Action.text = Open/Close Task +closeTask.Action.accelerator = control O closeTask.Action.shortDescription = Open or close task deleteTask.Action.text = Delete Task @@ -75,10 +81,12 @@ stopTask.Action.text = St&op stopTask.Action.icon = process-stop.png +stopTask.Action.accelerator = alt shift S stopTask.Action.shortDescription = Stop selected task addAnnotation.Action.text = Add annotation addAnnotation.Action.icon = notes.png +addAnnotation.Action.accelerator = control A addAnnotation.Action.shortDescription = Add an annotation editAlert.Action.text = Edit alerts Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties 2013-09-11 20:34:27 UTC (rev 2935) +++ trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties 2013-09-24 06:54:02 UTC (rev 2936) @@ -49,12 +49,10 @@ deleteTask.Action.text = Suppression de la t\u00E2che deleteTask.Action.icon = process-stop.png -deleteTask.Action.accelerator = DELETE deleteTask.Action.shortDescription = Suppression de la t\u00E2che startTask.Action.text = D\u00E9marrer startTask.Action.icon = go-next.png -startTask.Action.accelerator = alt S startTask.Action.shortDescription = D\u00E9marre la t\u00E2che s\u00E9lectionn\u00E9e stopTask.Action.text = Arr\u00EAter @@ -74,19 +72,15 @@ decrement1Task.Action.shortDescription = Retire 1 minute au temps de la t\u00E2che increment5Task.Action.text = Ajouter 5 minutes -increment5Task.Action.accelerator = control I increment5Task.Action.shortDescription = Ajoute 5 minutes au temps de la t\u00E2che decrement5Task.Action.text = Enlever 5 minutes -decrement5Task.Action.accelerator = control D decrement5Task.Action.shortDescription = Retire 5 minutes au temps de la t\u00E2che increment30Task.Action.text = Ajouter 30 minutes -increment30Task.Action.accelerator = control shift I increment30Task.Action.shortDescription = Ajoute 30 minute au temps de la t\u00E2che decrement30Task.Action.text = Enlever 30 minutes -decrement30Task.Action.accelerator = control shift D decrement30Task.Action.shortDescription = Retire 30 minutes au temps de la t\u00E2che setToZero.Action.text = Remettre \u00E0 Zero

1 0