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

r2852 - trunk/src/main/java/org/chorem/jtimer/ui/treetable
by echatellier＠users.chorem.org March 29, 2012

March 29, 2012

Author: echatellier Date: 2012-03-29 14:04:56 +0200 (Thu, 29 Mar 2012) New Revision: 2852 Url: http://chorem.org/repositories/revision/jtimer/2852 Log: Fix un pb de toString() qui arrive ?\195?\160 s'afficher dans l'arbre de temps en temps Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2012-03-28 21:04:42 UTC (rev 2851) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2012-03-29 12:04:56 UTC (rev 2852) @@ -100,8 +100,7 @@ boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - super.getTreeCellRendererComponent(tree, value, - selected, expanded, leaf, row, hasFocus); + Object localValue = value; // if this is a task if (value instanceof TimerTask) { @@ -114,15 +113,29 @@ taskName = taskName .substring(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX .length()); + } + // task name should not be "null" + localValue = taskName; + } + + // le fait en 2 temps car sinon, on voit de temps en temps + // le toString() suivit du setName() + super.getTreeCellRendererComponent(tree, localValue, + selected, expanded, leaf, row, hasFocus); + + // if this is a task + if (value instanceof TimerTask) { + TimerTask task = (TimerTask) value; + + // add style in project in sync + if (task instanceof TimerProject + && ((TimerProject) task).isSynchronized()) { setFont(getFont().deriveFont(Font.ITALIC)); } else { setFont(getFont().deriveFont(Font.PLAIN)); } - // task name should not be "null" - setText(taskName); - // add icon if task is running if (runningTasks.contains(task)) { setIcon(runningIcon);

1 0

r2851 - in trunk/src/site: . en/rst en/rst/devel resources/images/screen rst rst/devel
by echatellier＠users.chorem.org March 28, 2012

March 28, 2012

Author: echatellier Date: 2012-03-28 23:04:42 +0200 (Wed, 28 Mar 2012) New Revision: 2851 Url: http://chorem.org/repositories/revision/jtimer/2851 Log: Update documentation Added: trunk/src/site/resources/images/screen/jtimeralert.jpg Removed: trunk/src/site/en/rst/configuration.rst trunk/src/site/rst/configuration.rst Modified: trunk/src/site/en/rst/devel/roadmap.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/screenshots.rst trunk/src/site/resources/images/screen/jtimer.jpg trunk/src/site/resources/images/screen/jtimeridle.jpg trunk/src/site/resources/images/screen/jtimerreport.jpg trunk/src/site/rst/devel/roadmap.rst trunk/src/site/rst/index.rst trunk/src/site/rst/screenshots.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Deleted: trunk/src/site/en/rst/configuration.rst =================================================================== --- trunk/src/site/en/rst/configuration.rst 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/en/rst/configuration.rst 2012-03-28 21:04:42 UTC (rev 2851) @@ -1,83 +0,0 @@ -.. - -.. * #%L -.. * jTimer -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2007 - 2011 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% -.. - -Configuration -============= - -JTimer.properties ------------------ - -You can overwrite default configuration by editing -property file in ``$HOME/.jtimer/JTimer.properties`` - -Sample: - -:: - - # Service class - jtimer.service.class=org.chorem.jtimer.ws.xmlrpc.ChoremXMLRPCClient - # Service resource to use for previous class - jtimer.service.resource=JTimer - # Service endpoint to use for previous class - jtimer.service.endpoint=http://localhost:8080 - - # Idle time (integer in seconds) - jtimer.ui.idletime=300 - - # jtimer io saver directory - jtimer.io.saver.class=org.chorem.jtimer.io.GTimerIncrementalSaver - # Saver directory - jtimer.io.saver.directory=$HOME/.gtimer - # Save delay - jtimer.io.saver.autosavedelay=300 - -Configuration details -~~~~~~~~~~~~~~~~~~~~~ - -Webservices -########### - -``jtimer.service.class=org.chorem.jtimer.ws.xmlrpc.ChoremXMLRPCClient`` - Implementation name to use for webservices -``jtimer.service.resource=JTimer`` - Remote resource name -``jtimer.service.endpoint`` - Service endpoint - -Inactivité -########## - -``jtimer.ui.idletime=300`` - Idle detect delay (in seconds) - -Sauvegarde -########## - -``jtimer.io.saver.class=org.chorem.jtimer.io.GTimerIncrementalSaver`` - Save manager to use. Here in GTimer file format. -``jtimer.io.saver.directory=$HOME/.gtimer`` - Save directory. $HOME variable can be used. It will be - replaced by user home directory. -``jtimer.io.saver.autosavedelay=300`` - Running task save delay (in secondes). Modified: trunk/src/site/en/rst/devel/roadmap.rst =================================================================== --- trunk/src/site/en/rst/devel/roadmap.rst 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/en/rst/devel/roadmap.rst 2012-03-28 21:04:42 UTC (rev 2851) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +.. * 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 @@ -25,11 +25,10 @@ Roadmap ======= -Version 2.0 +Version 1.4 ----------- -* *non available* -* File format change -* gTimer import/export +* Time tracking algorithm refactoring +* Switch to Better swing application framework (bsaf) Version 1.3 ----------- Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/en/rst/index.rst 2012-03-28 21:04:42 UTC (rev 2851) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +.. * 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 @@ -22,11 +22,9 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - -Home -==== - Presentation ------------- +============ + jTimer is a time tracking tool for projects activities. It also can generate activities reports. @@ -46,8 +44,6 @@ `Download Java`_. -Warning, a `known issue`_ break jTimer under OpenJDK. - Links ----- * gTimer_. Modified: trunk/src/site/en/rst/screenshots.rst =================================================================== --- trunk/src/site/en/rst/screenshots.rst 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/en/rst/screenshots.rst 2012-03-28 21:04:42 UTC (rev 2851) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +.. * 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 @@ -25,6 +25,8 @@ Screenshots =========== +jTimer main screenshots (taken from version 1.4.0). + Main view --------- @@ -40,6 +42,11 @@ .. image:: ../images/screen/jtimeridle.jpg +Alerts +------ + +.. image:: ../images/screen/jtimeralert.jpg + System tray ----------- Modified: trunk/src/site/resources/images/screen/jtimer.jpg =================================================================== (Binary files differ) Added: trunk/src/site/resources/images/screen/jtimeralert.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/screen/jtimeralert.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/resources/images/screen/jtimeridle.jpg =================================================================== (Binary files differ) Modified: trunk/src/site/resources/images/screen/jtimerreport.jpg =================================================================== (Binary files differ) Deleted: trunk/src/site/rst/configuration.rst =================================================================== --- trunk/src/site/rst/configuration.rst 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/rst/configuration.rst 2012-03-28 21:04:42 UTC (rev 2851) @@ -1,84 +0,0 @@ -.. - -.. * #%L -.. * jTimer -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2007 - 2011 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% -.. - -Configuration -============= - -JTimer.properties ------------------ - -Vous pouvez surchargez la configuration par défaut en -éditant le fichier de propriétés dans ``$HOME/.jtimer/JTimer.properties`` - -Exemple: - -:: - - # Service class - jtimer.service.class=org.chorem.jtimer.ws.xmlrpc.ChoremXMLRPCClient - # Service resource to use for previous class - jtimer.service.resource=JTimer - # Service endpoint to use for previous class - jtimer.service.endpoint=http://localhost:8080 - - # Idle time (integer in seconds) - jtimer.ui.idletime=300 - - # jtimer io saver directory - jtimer.io.saver.class=org.chorem.jtimer.io.GTimerIncrementalSaver - # Saver directory - jtimer.io.saver.directory=$HOME/.gtimer - # Save delay - jtimer.io.saver.autosavedelay=300 - -Détail de la configuration -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Webservices -########### - -``jtimer.service.class=org.chorem.jtimer.ws.xmlrpc.ChoremXMLRPCClient`` - Nom de l'implementation a utiliser pour les services web -``jtimer.service.resource=JTimer`` - Nom de la ressources distante -``jtimer.service.endpoint`` - Adresse du service - -Inactivité -########## - -``jtimer.ui.idletime=300`` - Durée de détection l'inactivité (en secondes) - -Sauvegarde -########## - -``jtimer.io.saver.class=org.chorem.jtimer.io.GTimerIncrementalSaver`` - Nom du gestionnaire de sauvegarde à utiliser. Ici sauvegarde au format GTimer. -``jtimer.io.saver.directory=$HOME/.gtimer`` - Dossier de sauvegarde utilisé. La variable $HOME peut être utilisée, elle sera - remplacée par le dossier d'accueil de l'utilisateur. -``jtimer.io.saver.autosavedelay=300`` - Interval de sauvegarde des tâches en cours seulement, les autres modifications - sont stockées en temps réel (en secondes). Modified: trunk/src/site/rst/devel/roadmap.rst =================================================================== --- trunk/src/site/rst/devel/roadmap.rst 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/rst/devel/roadmap.rst 2012-03-28 21:04:42 UTC (rev 2851) @@ -25,11 +25,10 @@ Roadmap ======= -Version 2.0 +Version 1.4 ----------- -* *non disponible* -* Modification du format de stockage. -* Import/Export gtimer. +* Modification de l'algorithme de timing des taches +* Utilisation de Better Swing Application framework (bsaf) Version 1.3 ----------- Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/rst/index.rst 2012-03-28 21:04:42 UTC (rev 2851) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +.. * 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 @@ -22,11 +22,9 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - -Accueil -======= - 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é. @@ -47,8 +45,6 @@ `Telecharger Java`_. -Attention, un `bug connu`_ empeche jTimer de fonctionner sur l'OpenJDK. - Liens ----- * gTimer_. Modified: trunk/src/site/rst/screenshots.rst =================================================================== --- trunk/src/site/rst/screenshots.rst 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/rst/screenshots.rst 2012-03-28 21:04:42 UTC (rev 2851) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +.. * 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 @@ -25,6 +25,8 @@ Copies d'écran ============== +Principales captures d'écrans de jTimer (effectuées avec jTimer 1.4.0). + Vue principale -------------- @@ -40,6 +42,11 @@ .. image:: images/screen/jtimeridle.jpg +Alertes +------- + +.. image:: images/screen/jtimeralert.jpg + Zone de notification -------------------- Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/site_en.xml 2012-03-28 21:04:42 UTC (rev 2851) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric + 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 @@ -23,8 +23,6 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - - <project name="${project.name}"> <publishDate format="MM-dd-yyyy" /> @@ -47,8 +45,8 @@ <body> <links> - <item name="[fr" href="../index.html" /> - <item name="en]" href="index.html" /> + <item name="fr" href="../index.html" /> + <item name="en" href="index.html" /> </links> <breadcrumbs> @@ -59,11 +57,11 @@ <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="Configuration" href="configuration.html" /> - <item name="Release Notes" href="http://www.chorem.org/repositories/entry/jtimer/trunk/changelog.txt" /> + <item name="Release Notes" href="changes-report.html" /> </menu> <menu name="Contibute" inherit="top"> + <item name="Forge" href="http://www.chorem.org/projects/jtimer" /> <item name="Bug tracker" href="http://www.chorem.org/projects/jtimer/issues" /> <item name="I18N" href="contribute/i18n.html" /> </menu> @@ -71,10 +69,7 @@ <menu name="Developers" inherit="top"> <item name="Roadmap" href="devel/roadmap.html" /> <item name="Operation" href="devel/index.html"> -  <item name="Swing framework" href="devel/saf.html" /> -  -  <item name="File format" href="devel/fileformat.html" /> </item> </menu> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-03-28 20:19:38 UTC (rev 2850) +++ trunk/src/site/site_fr.xml 2012-03-28 21:04:42 UTC (rev 2851) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric + 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 @@ -23,8 +23,6 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - - <project name="${project.name}"> <skin> @@ -45,8 +43,8 @@ <body> <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> + <item name="fr" href="index.html" /> + <item name="en" href="en/index.html" /> </links> <breadcrumbs> @@ -57,11 +55,11 @@ <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="Configuration" href="configuration.html" /> - <item name="Notes de version" href="http://www.chorem.org/repositories/entry/jtimer/trunk/changelog.txt" /> + <item name="Notes de version" href="changes-report.html" /> </menu> <menu name="Contribuer" inherit="top"> + <item name="Forge" href="http://www.chorem.org/projects/jtimer" /> <item name="Bug tracker" href="http://www.chorem.org/projects/jtimer/issues" /> <item name="I18N" href="contribute/i18n.html" /> </menu> @@ -69,10 +67,7 @@ <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="Format de fichier" href="devel/fileformat.html" /> </item> </menu>

1 0

r2850 - trunk/src/main/java/org/chorem/jtimer/data
by echatellier＠users.chorem.org March 28, 2012

March 28, 2012

Author: echatellier Date: 2012-03-28 22:19:38 +0200 (Wed, 28 Mar 2012) New Revision: 2850 Url: http://chorem.org/repositories/revision/jtimer/2850 Log: Remove synchronized (seams to cause application freeze) 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 2012-03-28 20:14:41 UTC (rev 2849) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-28 20:19:38 UTC (rev 2850) @@ -82,7 +82,7 @@ * * @param listener listener */ - public synchronized void addDataEventListener(DataEventListener listener) { + public void addDataEventListener(DataEventListener listener) { dataEventListeners.add(listener); } @@ -91,7 +91,7 @@ * * @param listener listener */ - public synchronized void removeDataEventListener(DataEventListener listener) { + public void removeDataEventListener(DataEventListener listener) { dataEventListeners.remove(listener); } @@ -100,7 +100,7 @@ * * @param listener listener */ - public synchronized void addVetoableDataEventListener( + public void addVetoableDataEventListener( VetoableDataEventListener listener) { vetoableDataEventListeners.add(listener); } @@ -110,7 +110,7 @@ * * @param listener listener */ - public synchronized void removeVetoableDataEventListener( + public void removeVetoableDataEventListener( VetoableDataEventListener listener) { vetoableDataEventListeners.remove(listener); } @@ -120,7 +120,7 @@ * * @param project a project */ - public synchronized void addProject(TimerProject project) { + public void addProject(TimerProject project) { // fire vetoable event for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { @@ -141,7 +141,7 @@ * @param parent parent task * @param task task to add */ - public synchronized void addTask(TimerTask parent, TimerTask task) { + public void addTask(TimerTask parent, TimerTask task) { // fire vetoable event for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { @@ -161,7 +161,7 @@ * * @param projects project collection */ - public synchronized void addAllProjects(Collection<TimerProject> projects) { + public void addAllProjects(Collection<TimerProject> projects) { if (projects != null) { projectList.clear(); projectList.addAll(projects); @@ -180,7 +180,7 @@ * * @return list of projects */ - public synchronized List<TimerProject> getProjectsList() { + public List<TimerProject> getProjectsList() { return projectList; } @@ -191,7 +191,7 @@ * @param date date to change time * @param value new time in ms */ - public synchronized void changeTaskTime(TimerTask task, Date date, + public void changeTaskTime(TimerTask task, Date date, long value) { // fire vetoable event @@ -212,7 +212,7 @@ * * @param task task to start */ - public synchronized void startTask(TimerTask task) { + public void startTask(TimerTask task) { // send notification for (DataEventListener dataEventListener : dataEventListeners) { dataEventListener.startTask(task); @@ -224,7 +224,7 @@ * * @param task task to stop */ - public synchronized void stopTask(TimerTask task) { + public void stopTask(TimerTask task) { // send notification for (DataEventListener dataEventListener : dataEventListeners) { dataEventListener.stopTask(task); @@ -236,7 +236,7 @@ * * @param task task to delete */ - public synchronized void deleteTask(TimerTask task) { + public void deleteTask(TimerTask task) { // fire vetoable event for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { @@ -258,7 +258,7 @@ * * @param project project to delete */ - public synchronized void deleteProject(TimerProject project) { + public void deleteProject(TimerProject project) { // fire vetoable event for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { @@ -279,7 +279,7 @@ * * @param project project to close */ - public synchronized void changeProjectCloseState(TimerProject project) { + public void changeProjectCloseState(TimerProject project) { // fire vetoable event //Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners @@ -312,7 +312,7 @@ * * @param task task to close */ - public synchronized void changeTaskCloseState(TimerTask task) { + public void changeTaskCloseState(TimerTask task) { // fire vetoable event for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { @@ -334,7 +334,7 @@ * @param project project to edit * @param newProjectName new project name */ - public synchronized void editProject(TimerProject project, + public void editProject(TimerProject project, String newProjectName) { // fire vetoable event @@ -358,7 +358,7 @@ * @param task task to edit * @param newTaskName new task name */ - public synchronized void editTask(TimerTask task, String newTaskName) { + public void editTask(TimerTask task, String newTaskName) { // fire vetoable event TimerTask newTask = task.clone(); @@ -381,7 +381,7 @@ * @param destination task to move to * @param tasksToMove tasks to move */ - public synchronized void moveTask(TimerTask destination, Collection<TimerTask> tasksToMove) { + public void moveTask(TimerTask destination, Collection<TimerTask> tasksToMove) { // fire vetoable event for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { @@ -416,7 +416,7 @@ * @param destinationTask task where task will be merged * @param otherTasks task to merge in first task */ - public synchronized void mergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks) { + public void mergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks) { // fire vetoable event for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { @@ -531,7 +531,7 @@ * @param date day of annotation * @param annotation annotation */ - public synchronized void addAnnotation(TimerTask task, Date date, + public void addAnnotation(TimerTask task, Date date, String annotation) { // fire vetoable event @@ -553,7 +553,7 @@ * * @param task task where alert has been modified */ - public synchronized void modifyAlert(TimerTask task) { + public void modifyAlert(TimerTask task) { // send event for (DataEventListener dataEventListener : dataEventListeners) {

1 0

r2849 - trunk/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org March 28, 2012

March 28, 2012

Author: echatellier Date: 2012-03-28 22:14:41 +0200 (Wed, 28 Mar 2012) New Revision: 2849 Url: http://chorem.org/repositories/revision/jtimer/2849 Log: Fix synchronize on boolean (spotted by sonar) 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-03-28 16:37:31 UTC (rev 2848) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-28 20:14:41 UTC (rev 2849) @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.Date; import java.util.HashSet; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import javax.swing.JOptionPane; @@ -84,7 +85,7 @@ protected AtomicLong lastUserActivity; /** Want to stop flag. */ - protected Boolean bWantToStop; + protected AtomicBoolean bWantToStop; /** * Constructor. @@ -101,7 +102,7 @@ this.parentApp = parentApp; // init with False - bWantToStop = Boolean.FALSE; + bWantToStop = new AtomicBoolean(false); // save vars this.managedTask = managedTask; @@ -240,7 +241,7 @@ // test if task want to stop synchronized (bWantToStop) { - dontWantToStop = !bWantToStop.booleanValue(); + dontWantToStop = !bWantToStop.get(); } } @@ -368,7 +369,7 @@ */ public void wantToStop() { synchronized (bWantToStop) { - bWantToStop = Boolean.TRUE; + bWantToStop.set(true); } } @@ -380,7 +381,7 @@ public boolean isStopping() { boolean stopping; synchronized (bWantToStop) { - stopping = bWantToStop.booleanValue(); + stopping = bWantToStop.get(); } return stopping; }

1 0

March 28, 2012

Author: echatellier Date: 2012-03-28 18:37:31 +0200 (Wed, 28 Mar 2012) New Revision: 2848 Url: http://chorem.org/repositories/revision/jtimer/2848 Log: Merge branche for new time tracking algorithm. closes #13: Time tacking incorrect after system resume closes #282: Daily time not counted correctly when crossing midnight closes #492: Hibernate is not managed as user idleness Modified: trunk/ trunk/src/main/java/org/chorem/jtimer/JTimer.java trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/1.4.0-ttalgo:2840-2847 Modified: trunk/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -718,7 +718,7 @@ RunTaskJob job = null; TaskMonitor tm = getContext().getTaskMonitor(); - for (Task<Void, Long> t : tm.getTasks()) { + for (Task t : tm.getTasks()) { TimerTask localtask = ((RunTaskJob) t).getTask(); if (task.equals(localtask)) { job = (RunTaskJob) t; @@ -770,7 +770,7 @@ public void stopAllTasks() { TaskMonitor tm = getContext().getTaskMonitor(); - for (Task<Void, Long> t : tm.getTasks()) { + for (Task t : tm.getTasks()) { // task TimerTask ttask = ((RunTaskJob) t).getTask(); stopTask(ttask); @@ -937,7 +937,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void increment5Task() { - incrementTaskTime(5 * 60); + incrementTaskTime(5 * 60000); } /** @@ -945,7 +945,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void increment30Task() { - incrementTaskTime(30 * 60); + incrementTaskTime(30 * 60000); } /** @@ -953,7 +953,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void decrement1Task() { - incrementTaskTime(-60); + incrementTaskTime(-60000); } /** @@ -961,7 +961,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void decrement5Task() { - incrementTaskTime(-5 * 60); + incrementTaskTime(-5 * 60000); } /** @@ -969,7 +969,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void decrement30Task() { - incrementTaskTime(-30 * 60); + incrementTaskTime(-30 * 60000); } /** @@ -977,7 +977,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void increment1Task() { - incrementTaskTime(60); + incrementTaskTime(60000); } /** @@ -985,37 +985,29 @@ * * To decrement, set negative increment:) * - * @param increment increment in seconds + * @param increment increment in ms */ protected void incrementTaskTime(long increment) { TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() .get(0); - // check if task is running - RunTaskJob job = getJobForRunningTask(selectedTask); - if (job != null) { - // task is running - // increment is in seconds !!! - job.incrementTaskTime(increment * 1000); - } else { - // task is not running - Date now = new Date(); - long todayTime = selectedTask.getTime(now); + // task is not running + Date now = new Date(); + long todayTime = selectedTask.getTime(now); - long newTodayTime = todayTime + increment; + long newTodayTime = todayTime + increment; - try { - // check if + negative increment still positive - if (newTodayTime > 0) { - core.getData().changeTaskTime(selectedTask, now, - newTodayTime); - } else { - // force to 0 - core.getData().changeTaskTime(selectedTask, now, 0L); - } - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); + try { + // check if + negative increment still positive + if (newTodayTime > 0) { + core.getData().changeTaskTime(selectedTask, now, + newTodayTime); + } else { + // force to 0 + core.getData().changeTaskTime(selectedTask, now, 0L); } + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); } } Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -189,7 +189,7 @@ * * @param task the task to change time * @param date date to change time - * @param value new time in seconds + * @param value new time in ms */ public synchronized void changeTaskTime(TimerTask task, Date date, long value) { @@ -429,18 +429,18 @@ while (itDataEventListener.hasNext()) { itDataEventListener.next().preMergeTasks(destinationTask, otherTasks); } - + for (TimerTask otherTask : otherTasks) { mergeTwoTasks(destinationTask, otherTask); } - + // send post notification itDataEventListener = dataEventListeners.iterator(); while (itDataEventListener.hasNext()) { itDataEventListener.next().postMergeTasks(destinationTask, otherTasks); } } - + /** * Merge two task together. * @@ -454,7 +454,7 @@ } // task is modified during merge, deep clone it - + // make sub task list copy (concurrency) Collection<TimerTask> otherTaskSubTasks = new ArrayList<TimerTask>(otherTask.getSubTasks()); for (TimerTask otherTaskSubTask : otherTaskSubTasks) { @@ -467,7 +467,7 @@ sameTaskNameTask = destSubTask; } } - + // no similar task found if (sameTaskNameTask == null) { if (log.isDebugEnabled()) { @@ -488,14 +488,14 @@ // TODO possible bug here, task times may not be saved } } - + // copy otherTask times to current task for (Entry<Date, Long> times : otherTask.getAllDaysAndTimes().entrySet()) { Long currentDuration = destinationTask.getTime(times.getKey()); currentDuration += times.getValue(); destinationTask.setTime(times.getKey(), currentDuration); } - + // copy annotations for (Entry<Date, String> note : otherTask.getAllDaysAnnotations().entrySet()) { Date noteKey = note.getKey(); @@ -513,17 +513,17 @@ } destinationTask.addAnnotation(noteKey, note.getValue()); } - + // copy alerts for (TimerAlert alert : otherTask.getAlerts()) { destinationTask.addAlert(alert); } - + // finally otherTask still exist // empty, but still exist deleteTask(otherTask); } - + /** * Add annotation on task for specified calendar, and send event. * Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -52,7 +52,7 @@ /** Alert type. */ protected Type type; - /** Alert duration. (in seconds) */ + /** Alert duration. (in ms) */ protected long duration; /** @@ -66,7 +66,7 @@ * Constructor. * * @param type type - * @param duration duration + * @param duration duration (ms) */ public TimerAlert(Type type, long duration) { this(); Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -72,7 +72,7 @@ protected TimerTask parent; /** - * Map calendar of day -> time. (ordered on keys) + * Map calendar of day -> time (ms). (ordered on keys) */ protected SortedMap<Date, Long> allDaysTimes; @@ -240,20 +240,18 @@ /** * Add time. * - * Calendar will be forced to 0h00:00.000 - * * @param date date - * @param seconds seconds + * @param time time in ms */ - public void setTime(Date date, Long seconds) { - allDaysTimes.put(date, seconds); + public void setTime(Date date, Long time) { + allDaysTimes.put(date, time); } /** * Get time at date. * * @param date date - * @return time at specified date + * @return time at specified date in ms */ public long getTime(Date date) { long result = 0; Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -512,7 +512,7 @@ try { Date keyDate = GTimerTimeUtil.yyyyMMdd2Date(sKey); String timeString = (String) prop.get(sKey); - t.setTime(keyDate, Long.valueOf(timeString)); + t.setTime(keyDate, Long.valueOf(timeString) * 1000); } catch (NumberFormatException e) { if (log.isErrorEnabled()) { log.error("Can't convert " + prop.get(sKey) @@ -642,12 +642,12 @@ try { if ("reachtotaltime".equals(alertType)) { - Long duration = Long.parseLong(alertDuration); + Long duration = Long.parseLong(alertDuration) * 1000; TimerAlert alert = new TimerAlert( TimerAlert.Type.REACH_TOTAL_TIME, duration); task.addAlert(alert); } else if ("reachdailytime".equals(alertType)) { - Long duration = Long.parseLong(alertDuration); + Long duration = Long.parseLong(alertDuration) * 1000; TimerAlert alert = new TimerAlert( TimerAlert.Type.REACH_DAILY_TIME, duration); task.addAlert(alert); @@ -1004,9 +1004,9 @@ for (Entry<Date, Long> entry : task.getAllDaysAndTimes().entrySet()) { Date date = entry.getKey(); + long value = entry.getValue() / 1000; String gtimerDate = GTimerTimeUtil.date2yyyyMMdd(date); - - out.write(gtimerDate + " " + entry.getValue() + "\n"); + out.write(gtimerDate + " " + value + "\n"); } out.close(); @@ -1104,7 +1104,7 @@ for (TimerAlert alert : task.getAlerts()) { Type type = alert.getType(); - long duration = alert.getDuration(); + long duration = alert.getDuration() / 1000; switch (type) { case REACH_DAILY_TIME: Modified: trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -118,7 +118,7 @@ } lblTime.setText(resourceMap .getString("todayTotalMessage", DurationFormatUtils - .formatDuration(duration * 1000, "HH:mm:ss"))); + .formatDuration(duration, "HH:mm:ss"))); } /* Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -574,7 +574,7 @@ long time = cloneTask.getTime(date); Calendar cal = Calendar.getInstance(); // FIXME me, not use a calendar here ! - cal.setTimeInMillis(time * 1000 - cal.get(Calendar.ZONE_OFFSET)); + cal.setTimeInMillis(time - cal.get(Calendar.ZONE_OFFSET)); spinnerH.setValue(cal.get(Calendar.HOUR_OF_DAY)); spinnerM.setValue(cal.get(Calendar.MINUTE)); @@ -629,7 +629,7 @@ long seconds = ((Integer) spinnerH.getValue() * 60 * 60) + ((Integer) spinnerM.getValue() * 60) + ((Integer) spinnerS.getValue()); - cloneTask.setTime(getSelectedDay().getTime(), seconds); + cloneTask.setTime(getSelectedDay().getTime(), seconds * 1000); // annotation if (isAnnotationChanged) { Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -105,7 +105,7 @@ break; case 1: - result = alert.getDuration(); + result = alert.getDuration() / 1000; break; default: @@ -130,7 +130,7 @@ case 1: long duration = ((Long)value).longValue(); - alert.setDuration(duration); + alert.setDuration(duration * 1000); break; default: Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -402,8 +402,7 @@ * @return formated duration */ public String formatDuration(long duration) { - String result = DurationFormatUtils.formatDuration(duration * 1000, - "HH:mm:ss"); + String result = DurationFormatUtils.formatDuration(duration, "HH:mm:ss"); return result; } Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -29,20 +29,21 @@ import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.List; +import java.util.concurrent.atomic.AtomicLong; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; import org.chorem.jtimer.data.TimerDataManager; import org.chorem.jtimer.entities.TimerAlert; +import org.chorem.jtimer.entities.TimerAlert.Type; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.entities.TimerTaskHelper; -import org.chorem.jtimer.entities.TimerAlert.Type; import org.chorem.jtimer.ui.system.SystemInfo; import org.chorem.jtimer.ui.system.SystemInfoFactory; import org.chorem.jtimer.ui.system.UnsupportedSystemInfoException; @@ -59,7 +60,7 @@ * Last update : $Date$ * By : $Author$ */ -public class RunTaskJob extends Task<Void, Long> { +public class RunTaskJob extends Task<Void, Void> { /** Class logger. */ private static Log log = LogFactory.getLog(RunTaskJob.class); @@ -79,19 +80,8 @@ /** Already thrown alert. */ protected Collection<TimerAlert> alreadyTrownAlerts; - /** Calendar instance when timing start. */ - protected Calendar taskStartCalendar; - - /** - * Offset to adjust time for current day. - * Include : - * - Task idle time (task was running but time not counted) - * - Manual user incremented time - */ - protected long offsetTimeInMs; - /** Last publish time to detect hibernate. */ - protected long lastPublishTimestamp; + protected AtomicLong lastUserActivity; /** Want to stop flag. */ protected Boolean bWantToStop; @@ -146,10 +136,12 @@ // check alert to be fired for (TimerAlert alert : task.getAlerts()) { if (alert.getType().equals(Type.REACH_DAILY_TIME) - && TimerTaskHelper.getTotalTime(task, now) > alert.getDuration()) { + && TimerTaskHelper.getTotalTime(task, now) > alert + .getDuration()) { alreadyTrownAlerts.add(alert.clone()); } else if (alert.getType().equals(Type.REACH_TOTAL_TIME) - && TimerTaskHelper.getAllTotalTime(task) > alert.getDuration()) { + && TimerTaskHelper.getAllTotalTime(task) > alert + .getDuration()) { alreadyTrownAlerts.add(alert.clone()); } } @@ -171,62 +163,6 @@ return managedTask; } - /** - * Method to increment time while task is running (in ms). - * - * @param increment increment, can be negative - */ - public void incrementTaskTime(long increment) { - - long nowTimestamp = Calendar.getInstance().getTimeInMillis(); - - // new var, to not modify parameter - long localIncrement = increment; - - // do go over 0 - if (nowTimestamp - taskStartCalendar.getTimeInMillis() - + offsetTimeInMs + increment < 0) { - localIncrement = -(nowTimestamp - taskStartCalendar.getTimeInMillis() - + offsetTimeInMs); - } - - offsetTimeInMs += localIncrement; - } - - /** - * Reset timing. - * - * For example if task goes over 0h00, need to reset... - */ - public void resetTiming() { - - taskStartCalendar = Calendar.getInstance(); - lastPublishTimestamp = taskStartCalendar.getTimeInMillis(); - // need to be this for hibernate in same day - offsetTimeInMs = managedTask.getTime(new Date()) * 1000; - } - - /** - * Check if task need to be reset. - * - * Test if today number if different of taskStartCalendar day number - */ - protected void checkReset() { - - Calendar nowCalendar = Calendar.getInstance(); - - // si les jours actuel et jours de debut de start ne sont - // pas identiques : reset - if (nowCalendar.get(Calendar.DAY_OF_YEAR) != taskStartCalendar - .get(Calendar.DAY_OF_YEAR)) { - if (log.isInfoEnabled()) { - log.info("Day change detected, reset timing"); - } - resetTiming(); - } - - } - /* * @see org.jdesktop.swingworker.SwingWorker#doInBackground() */ @@ -237,28 +173,27 @@ // notify ui parentApp.startedTask(managedTask); - // reset on start just for init - resetTiming(); + // init + lastUserActivity = new AtomicLong(System.currentTimeMillis()); // get idle time long configIdleTime = JTimer.config.getIdleTime() * 1000; boolean dontWantToStop = true; while (dontWantToStop) { - long currentTime = Calendar.getInstance().getTimeInMillis(); - // try to detect hibernate idle time - if (currentTime - lastPublishTimestamp >= configIdleTime) { - // hibernate detected - // update time without idle time for specified day - if (log.isInfoEnabled()) { - log.info("Hibernate detected, reseting timing"); - } - resetTiming(); - } + // this algorithm is based on this atomic operation + // that ensure hibernate won't break time tracking + long oldUserActivity = lastUserActivity.getAndSet(System.currentTimeMillis()); - lastPublishTimestamp = currentTime; + // check for idleness with last user activity (real idle and hibernate) + long delta = lastUserActivity.get() - oldUserActivity; + // time have to be published, even if idle is detected + // because time adjustment will remove more time than published + // one if done after + addTaskDelta(lastUserActivity.get(), delta); + // check user idle time long idleTime = 0; if (systemInfo != null) { // idle time available @@ -269,65 +204,36 @@ } } - // check reset before publish (day change) - checkReset(); + if (delta >= configIdleTime || idleTime >= configIdleTime) { - // if long idleTime is unavailable, if is always false - if (idleTime >= configIdleTime) { + long userIdleTime = Math.max(delta, idleTime); - // to not display negative time near midnight - long idleTimeOffset = Math.min(idleTime, currentTime - taskStartCalendar.getTimeInMillis()); + // remove delta from now + addTaskDelta(lastUserActivity.get(), -userIdleTime); - // idle detected - // update time without idle time - // math.min > for idle detected at 0:00 - offsetTimeInMs -= idleTimeOffset; - publish(currentTime - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); - - // send idle detect event - JTimer parentApplication = (JTimer)getApplication(); + // display idle detected (blocking call) + JTimer parentApplication = (JTimer) getApplication(); parentApplication.preIdleDetect(); - // ask user what to do (long blocking call) - int option = IdleDialog.showIdleDialog(currentTime - idleTime); - // send idle detect event + int option = IdleDialog.showIdleDialog(lastUserActivity.get() - userIdleTime); parentApplication.postIdleDetect(); - // day can have changed during idle - checkReset(); + // restart timing from current time after idle + // mandadory call, otherwise, next iteration will display idle + // dialog again + oldUserActivity = lastUserActivity.getAndSet(System.currentTimeMillis()); + delta = lastUserActivity.get() - oldUserActivity; - // get time after user idle - long afterIdleTime = Calendar.getInstance().getTimeInMillis(); - lastPublishTimestamp = afterIdleTime; - switch (option) { - case IdleDialog.REVERT: // just stop the task ((JTimer) getApplication()).stopTask(managedTask); break; case IdleDialog.CONTINUE: - // refresh time - // remove idle time previously added - offsetTimeInMs += idleTimeOffset; - publish(afterIdleTime - taskStartCalendar.getTimeInMillis() - + offsetTimeInMs); + // readd delta since oldUserActivity + addTaskDelta(lastUserActivity.get() - userIdleTime, delta + userIdleTime); break; - - default: // RESUME - - // resume = increment idle time - offsetTimeInMs -= afterIdleTime - currentTime; - // update time - publish(afterIdleTime - taskStartCalendar.getTimeInMillis() - + offsetTimeInMs); - break; - } - } else { - // pas de idle, met a jour le temps - publish(currentTime - taskStartCalendar.getTimeInMillis() + - offsetTimeInMs); } Thread.sleep(1000); // 1s @@ -341,20 +247,52 @@ return null; } - /* - * @see application.Task#process(java.util.List) + /** + * Add task delta. + * + * @param oldUserActivity time when delta was notified + * @param delta delta to add */ - @Override - protected void process(List<Long> durations) { + protected void addTaskDelta(long from, long delta) { - // take last notification - // can be notified of many result - // for example, if UI lag... - long currentDuration = durations.get(durations.size() - 1); + long localDelta = delta; - dataManager.changeTaskTime(managedTask, new Date(), - currentDuration / 1000); + if (log.isDebugEnabled()) { + log.debug("Adding delta to task : " + delta); + } + // remove time + if (localDelta < 0) { + Date currentDate = new Date(from); + while (localDelta < 0) { + Date todayMidnight = DateUtils.truncate(currentDate, Calendar.DAY_OF_MONTH); + long msToMidnight = currentDate.getTime() - todayMidnight.getTime(); + long toRemove = Math.min(-localDelta, msToMidnight); + dataManager.changeTaskTime(managedTask, currentDate, managedTask.getTime(currentDate) - toRemove); + if (log.isDebugEnabled()) { + log.debug(" remove delta to task on " + currentDate + " : " + toRemove); + } + localDelta += toRemove; + currentDate = DateUtils.addMilliseconds(todayMidnight, -1); + } + } else { + // add time + Date currentDate = new Date(from); + while (localDelta > 0) { + Date today235959 = DateUtils.truncate(currentDate, Calendar.DAY_OF_MONTH); + today235959 = DateUtils.addDays(today235959, 1); + today235959 = DateUtils.addMilliseconds(today235959, -1); + long msToMidnight = today235959.getTime() - currentDate.getTime(); + long toAdd = Math.min(localDelta, msToMidnight); + dataManager.changeTaskTime(managedTask, currentDate, managedTask.getTime(currentDate) + toAdd); + if (log.isDebugEnabled()) { + log.debug(" adding delta to task on " + currentDate + " : " + toAdd); + } + localDelta -= toAdd; + currentDate = DateUtils.addMilliseconds(today235959, 1); + } + } + checkTaskAlerts(managedTask); } @@ -370,12 +308,16 @@ for (TimerAlert alert : task.getAlerts()) { if (!alreadyTrownAlerts.contains(alert)) { if (alert.getType().equals(Type.REACH_DAILY_TIME) - && TimerTaskHelper.getTotalTime(task, now) >= alert.getDuration()) { - displayAlert(task, Type.REACH_DAILY_TIME, alert.getDuration()); + && TimerTaskHelper.getTotalTime(task, now) >= alert + .getDuration()) { + displayAlert(task, Type.REACH_DAILY_TIME, + alert.getDuration()); alreadyTrownAlerts.add(alert.clone()); } else if (alert.getType().equals(Type.REACH_TOTAL_TIME) - && TimerTaskHelper.getAllTotalTime(task) >= alert.getDuration()) { - displayAlert(task, Type.REACH_TOTAL_TIME, alert.getDuration()); + && TimerTaskHelper.getAllTotalTime(task) >= alert + .getDuration()) { + displayAlert(task, Type.REACH_TOTAL_TIME, + alert.getDuration()); alreadyTrownAlerts.add(alert.clone()); } } @@ -401,13 +343,16 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { String alertMessage = null; - String formattedTime = DurationFormatUtils.formatDuration(alertDuration * 1000, "HH:mm:ss"); + String formattedTime = DurationFormatUtils.formatDuration( + alertDuration, "HH:mm:ss"); if (Type.REACH_DAILY_TIME.equals(alertType)) { alertMessage = getResourceMap().getString( - "alert.dailyAlertMessage", task.getName(), formattedTime); + "alert.dailyAlertMessage", task.getName(), + formattedTime); } else if (Type.REACH_TOTAL_TIME.equals(alertType)) { alertMessage = getResourceMap().getString( - "alert.totalAlertMessage", task.getName(), formattedTime); + "alert.totalAlertMessage", task.getName(), + formattedTime); } JOptionPane.showMessageDialog(null, alertMessage, Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -155,11 +155,11 @@ break; case 1: value = DurationFormatUtils.formatDuration(TimerTaskHelper - .getTotalTime(task, new Date()) * 1000, "HH:mm:ss"); + .getTotalTime(task, new Date()), "HH:mm:ss"); break; case 2: value = DurationFormatUtils.formatDuration(TimerTaskHelper - .getAllTotalTime(task) * 1000, "HH:mm:ss"); + .getAllTotalTime(task), "HH:mm:ss"); break; } } else { Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -68,7 +68,7 @@ /** Second spinner model. */ protected SpinnerNumberModel secondSpinnerModel; - /** Duration. */ + /** Duration (in ms). */ protected long duration; /** Property changes on: trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -423,8 +423,8 @@ Assert.assertEquals(task2.getSubTasks().size(), 2); Assert.assertEquals(getRecursiveAnnotationsCount(Collections.singleton(task2)), 2); Assert.assertEquals(task3.getSubTasks().size(), 4); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035000); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602000); // merge tasks dataManager.mergeTasks(task1, Collections.singletonList(task2)); @@ -445,7 +445,7 @@ Assert.assertEquals(task1a.getSubTasks().size(), 4); Assert.assertEquals(getRecursiveAnnotationsCount(Collections.singleton(task1a)), 5 + 2); Assert.assertEquals(task3a.getSubTasks().size(), 3); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), 55035 + 65602); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), 55035000 + 65602000); } /** @@ -468,15 +468,15 @@ // add THE conflict task name TimerTask tTreeTests = new TimerTask("Tree tests"); tTreeTests.setCreationDate(new Date()); - tTreeTests.setTime(new Date(), 200l); + tTreeTests.setTime(new Date(), Long.valueOf(200000)); dataManager.addTask(task1, tTreeTests); Assert.assertEquals(task1.getSubTasks().size(), 3); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035 + 200); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035000 + 200000); TimerTask task2 = findTask(projectsBefore, "jTimer/Unit tests/UI tests"); Assert.assertEquals(task2.getSubTasks().size(), 2); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602000); // merge tasks dataManager.mergeTasks(task1, Collections.singletonList(task2)); @@ -495,7 +495,7 @@ // 4 = conflict resolved Assert.assertEquals(task1a.getSubTasks().size(), 4); Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), - 55035 + 65602 + 200); + 55035000 + 65602000 + 200000); } /** @@ -521,9 +521,9 @@ .singleton(task1)), 0); // add new project - TimerAlert alert1 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 3600); - TimerAlert alert2 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 7200); - TimerAlert alert3 = new TimerAlert(TimerAlert.Type.REACH_TOTAL_TIME, 10800); + TimerAlert alert1 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 3600000); + TimerAlert alert2 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 7200000); + TimerAlert alert3 = new TimerAlert(TimerAlert.Type.REACH_TOTAL_TIME, 10800000); task1.addAlert(alert1); task1.addAlert(alert2); task1.addAlert(alert3); @@ -546,13 +546,13 @@ boolean alert2found = false; boolean alert3found = false; for (TimerAlert alert : task1a.getAlerts()) { - if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 3600) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 3600000) { alert1found = true; } - if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 7200) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 7200000) { alert2found = true; } - if (alert.getType().equals(Type.REACH_TOTAL_TIME) && alert.getDuration() == 10800) { + if (alert.getType().equals(Type.REACH_TOTAL_TIME) && alert.getDuration() == 10800000) { alert3found = true; } } Modified: trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2012-03-27 20:54:44 UTC (rev 2847) +++ trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2012-03-28 16:37:31 UTC (rev 2848) @@ -195,7 +195,7 @@ for (Long time : task.getAllDaysAndTimes().values()) { totalTime += time.longValue(); } - Assert.assertEquals(11391, totalTime); + Assert.assertEquals(totalTime, 11391000); // test 20080909 9000 @@ -203,25 +203,25 @@ calendar.set(Calendar.YEAR, 2008); calendar.set(Calendar.MONTH, 8); calendar.set(Calendar.DAY_OF_MONTH, 9); - Assert.assertEquals(task.getTime(calendar.getTime()), 9000); + Assert.assertEquals(task.getTime(calendar.getTime()), 9000000); // 20080922 13 calendar.set(Calendar.YEAR, 2008); calendar.set(Calendar.MONTH, 8); calendar.set(Calendar.DAY_OF_MONTH, 22); - Assert.assertEquals(task.getTime(calendar.getTime()), 13); + Assert.assertEquals(task.getTime(calendar.getTime()), 13000); // 20080930 2332 calendar.set(Calendar.YEAR, 2008); calendar.set(Calendar.MONTH, 8); calendar.set(Calendar.DAY_OF_MONTH, 30); - Assert.assertEquals(2332, task.getTime(calendar.getTime())); + Assert.assertEquals(task.getTime(calendar.getTime()), 2332000); // 20081011 46 calendar.set(Calendar.YEAR, 2008); calendar.set(Calendar.MONTH, 9); calendar.set(Calendar.DAY_OF_MONTH, 11); - Assert.assertEquals(46, task.getTime(calendar.getTime())); + Assert.assertEquals(task.getTime(calendar.getTime()), 46000); /*FIXME saver.unlock(); } catch (DataLockingException e) { @@ -303,11 +303,11 @@ // first alert Assert.assertEquals(task.getAlerts().get(0).getType(), TimerAlert.Type.REACH_DAILY_TIME); - Assert.assertEquals(task.getAlerts().get(0).getDuration(), 3600); + Assert.assertEquals(task.getAlerts().get(0).getDuration(), 3600000); // second alert Assert.assertEquals(task.getAlerts().get(1).getType(), TimerAlert.Type.REACH_TOTAL_TIME); - Assert.assertEquals(task.getAlerts().get(1).getDuration(), 25000); + Assert.assertEquals(task.getAlerts().get(1).getDuration(), 25000000); /*FIXME saver.unlock(); } catch (DataLockingException e) { @@ -339,7 +339,7 @@ TimerTask task1 = findTask(projects, "No project/Test no parent project"); Assert.assertNotNull(task1); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 9644); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 9644000); /*FIXME testSaver.unlock(); } catch (DataLockingException e) {

1 0

r2847 - branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org March 27, 2012

March 27, 2012

Author: echatellier Date: 2012-03-27 22:54:44 +0200 (Tue, 27 Mar 2012) New Revision: 2847 Url: http://chorem.org/repositories/revision/jtimer/2847 Log: Fix continue option Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 19:25:50 UTC (rev 2846) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 20:54:44 UTC (rev 2847) @@ -178,7 +178,6 @@ // get idle time long configIdleTime = JTimer.config.getIdleTime() * 1000; - long idleTime = 0; boolean dontWantToStop = true; while (dontWantToStop) { @@ -187,7 +186,16 @@ // that ensure hibernate won't break time tracking long oldUserActivity = lastUserActivity.getAndSet(System.currentTimeMillis()); + // check for idleness with last user activity (real idle and hibernate) + long delta = lastUserActivity.get() - oldUserActivity; + + // time have to be published, even if idle is detected + // because time adjustment will remove more time than published + // one if done after + addTaskDelta(lastUserActivity.get(), delta); + // check user idle time + long idleTime = 0; if (systemInfo != null) { // idle time available idleTime = systemInfo.getIdleTime(); @@ -196,14 +204,6 @@ } } - // check for idleness with last user activity (real idle and hibernate) - long delta = lastUserActivity.get() - oldUserActivity; - - // time have to be published, even if idle is detected - // because time adjustment will remove more time than published - // one if done after - addTaskDelta(lastUserActivity.get(), delta); - if (delta >= configIdleTime || idleTime >= configIdleTime) { long userIdleTime = Math.max(delta, idleTime); @@ -217,6 +217,12 @@ int option = IdleDialog.showIdleDialog(lastUserActivity.get() - userIdleTime); parentApplication.postIdleDetect(); + // restart timing from current time after idle + // mandadory call, otherwise, next iteration will display idle + // dialog again + oldUserActivity = lastUserActivity.getAndSet(System.currentTimeMillis()); + delta = lastUserActivity.get() - oldUserActivity; + switch (option) { case IdleDialog.REVERT: // just stop the task @@ -225,13 +231,9 @@ case IdleDialog.CONTINUE: // readd delta since oldUserActivity - addTaskDelta(lastUserActivity.get() - userIdleTime, userIdleTime); + addTaskDelta(lastUserActivity.get() - userIdleTime, delta + userIdleTime); break; - } - - // need to fix last user activity - lastUserActivity.set(System.currentTimeMillis()); } Thread.sleep(1000); // 1s

1 0

r2846 - branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org March 27, 2012

March 27, 2012

Author: echatellier Date: 2012-03-27 21:25:50 +0200 (Tue, 27 Mar 2012) New Revision: 2846 Url: http://chorem.org/repositories/revision/jtimer/2846 Log: Fix reached alert time format Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 15:59:10 UTC (rev 2845) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 19:25:50 UTC (rev 2846) @@ -342,7 +342,7 @@ public void run() { String alertMessage = null; String formattedTime = DurationFormatUtils.formatDuration( - alertDuration * 1000, "HH:mm:ss"); + alertDuration, "HH:mm:ss"); if (Type.REACH_DAILY_TIME.equals(alertType)) { alertMessage = getResourceMap().getString( "alert.dailyAlertMessage", task.getName(),

1 0

r2845 - branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org March 27, 2012

March 27, 2012

Author: echatellier Date: 2012-03-27 17:59:10 +0200 (Tue, 27 Mar 2012) New Revision: 2845 Url: http://chorem.org/repositories/revision/jtimer/2845 Log: Add new algorithm based on atomic long Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 10:59:05 UTC (rev 2844) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 15:59:10 UTC (rev 2845) @@ -198,15 +198,23 @@ // check for idleness with last user activity (real idle and hibernate) long delta = lastUserActivity.get() - oldUserActivity; - if (delta + idleTime >= configIdleTime) { + // time have to be published, even if idle is detected + // because time adjustment will remove more time than published + // one if done after + addTaskDelta(lastUserActivity.get(), delta); + + if (delta >= configIdleTime || idleTime >= configIdleTime) { + + long userIdleTime = Math.max(delta, idleTime); + // remove delta from now - addTaskDelta(lastUserActivity.get(), -(delta + idleTime)); + addTaskDelta(lastUserActivity.get(), -userIdleTime); // display idle detected (blocking call) JTimer parentApplication = (JTimer) getApplication(); parentApplication.preIdleDetect(); - int option = IdleDialog.showIdleDialog(delta); + int option = IdleDialog.showIdleDialog(lastUserActivity.get() - userIdleTime); parentApplication.postIdleDetect(); switch (option) { @@ -217,14 +225,13 @@ case IdleDialog.CONTINUE: // readd delta since oldUserActivity - addTaskDelta(oldUserActivity, delta + idleTime); + addTaskDelta(lastUserActivity.get() - userIdleTime, userIdleTime); break; } - } else { - // update new time - addTaskDelta(oldUserActivity, delta); + // need to fix last user activity + lastUserActivity.set(System.currentTimeMillis()); } Thread.sleep(1000); // 1s @@ -248,6 +255,10 @@ long localDelta = delta; + if (log.isDebugEnabled()) { + log.debug("Adding delta to task : " + delta); + } + // remove time if (localDelta < 0) { Date currentDate = new Date(from); @@ -256,6 +267,9 @@ long msToMidnight = currentDate.getTime() - todayMidnight.getTime(); long toRemove = Math.min(-localDelta, msToMidnight); dataManager.changeTaskTime(managedTask, currentDate, managedTask.getTime(currentDate) - toRemove); + if (log.isDebugEnabled()) { + log.debug(" remove delta to task on " + currentDate + " : " + toRemove); + } localDelta += toRemove; currentDate = DateUtils.addMilliseconds(todayMidnight, -1); } @@ -269,6 +283,9 @@ long msToMidnight = today235959.getTime() - currentDate.getTime(); long toAdd = Math.min(localDelta, msToMidnight); dataManager.changeTaskTime(managedTask, currentDate, managedTask.getTime(currentDate) + toAdd); + if (log.isDebugEnabled()) { + log.debug(" adding delta to task on " + currentDate + " : " + toAdd); + } localDelta -= toAdd; currentDate = DateUtils.addMilliseconds(today235959, 1); }

1 0

r2844 - in branches/1.4.0-ttalgo/src: main/java/org/chorem/jtimer/entities test/java/org/chorem/jtimer/data test/java/org/chorem/jtimer/io
by echatellier＠users.chorem.org March 27, 2012

March 27, 2012

Author: echatellier Date: 2012-03-27 12:59:05 +0200 (Tue, 27 Mar 2012) New Revision: 2844 Url: http://chorem.org/repositories/revision/jtimer/2844 Log: Fix unit tests Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2012-03-27 10:47:23 UTC (rev 2843) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2012-03-27 10:59:05 UTC (rev 2844) @@ -66,7 +66,7 @@ * Constructor. * * @param type type - * @param duration duration + * @param duration duration (ms) */ public TimerAlert(Type type, long duration) { this(); Modified: branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2012-03-27 10:47:23 UTC (rev 2843) +++ branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2012-03-27 10:59:05 UTC (rev 2844) @@ -423,8 +423,8 @@ Assert.assertEquals(task2.getSubTasks().size(), 2); Assert.assertEquals(getRecursiveAnnotationsCount(Collections.singleton(task2)), 2); Assert.assertEquals(task3.getSubTasks().size(), 4); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035000); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602000); // merge tasks dataManager.mergeTasks(task1, Collections.singletonList(task2)); @@ -445,7 +445,7 @@ Assert.assertEquals(task1a.getSubTasks().size(), 4); Assert.assertEquals(getRecursiveAnnotationsCount(Collections.singleton(task1a)), 5 + 2); Assert.assertEquals(task3a.getSubTasks().size(), 3); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), 55035 + 65602); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), 55035000 + 65602000); } /** @@ -468,15 +468,15 @@ // add THE conflict task name TimerTask tTreeTests = new TimerTask("Tree tests"); tTreeTests.setCreationDate(new Date()); - tTreeTests.setTime(new Date(), 200l); + tTreeTests.setTime(new Date(), Long.valueOf(200000)); dataManager.addTask(task1, tTreeTests); Assert.assertEquals(task1.getSubTasks().size(), 3); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035 + 200); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 55035000 + 200000); TimerTask task2 = findTask(projectsBefore, "jTimer/Unit tests/UI tests"); Assert.assertEquals(task2.getSubTasks().size(), 2); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task2), 65602000); // merge tasks dataManager.mergeTasks(task1, Collections.singletonList(task2)); @@ -495,7 +495,7 @@ // 4 = conflict resolved Assert.assertEquals(task1a.getSubTasks().size(), 4); Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), - 55035 + 65602 + 200); + 55035000 + 65602000 + 200000); } /** @@ -521,9 +521,9 @@ .singleton(task1)), 0); // add new project - TimerAlert alert1 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 3600); - TimerAlert alert2 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 7200); - TimerAlert alert3 = new TimerAlert(TimerAlert.Type.REACH_TOTAL_TIME, 10800); + TimerAlert alert1 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 3600000); + TimerAlert alert2 = new TimerAlert(TimerAlert.Type.REACH_DAILY_TIME, 7200000); + TimerAlert alert3 = new TimerAlert(TimerAlert.Type.REACH_TOTAL_TIME, 10800000); task1.addAlert(alert1); task1.addAlert(alert2); task1.addAlert(alert3); @@ -546,13 +546,13 @@ boolean alert2found = false; boolean alert3found = false; for (TimerAlert alert : task1a.getAlerts()) { - if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 3600) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 3600000) { alert1found = true; } - if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 7200) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 7200000) { alert2found = true; } - if (alert.getType().equals(Type.REACH_TOTAL_TIME) && alert.getDuration() == 10800) { + if (alert.getType().equals(Type.REACH_TOTAL_TIME) && alert.getDuration() == 10800000) { alert3found = true; } } Modified: branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java =================================================================== --- branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2012-03-27 10:47:23 UTC (rev 2843) +++ branches/1.4.0-ttalgo/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2012-03-27 10:59:05 UTC (rev 2844) @@ -195,7 +195,7 @@ for (Long time : task.getAllDaysAndTimes().values()) { totalTime += time.longValue(); } - Assert.assertEquals(11391, totalTime); + Assert.assertEquals(totalTime, 11391000); // test 20080909 9000 @@ -203,25 +203,25 @@ calendar.set(Calendar.YEAR, 2008); calendar.set(Calendar.MONTH, 8); calendar.set(Calendar.DAY_OF_MONTH, 9); - Assert.assertEquals(task.getTime(calendar.getTime()), 9000); + Assert.assertEquals(task.getTime(calendar.getTime()), 9000000); // 20080922 13 calendar.set(Calendar.YEAR, 2008); calendar.set(Calendar.MONTH, 8); calendar.set(Calendar.DAY_OF_MONTH, 22); - Assert.assertEquals(task.getTime(calendar.getTime()), 13); + Assert.assertEquals(task.getTime(calendar.getTime()), 13000); // 20080930 2332 calendar.set(Calendar.YEAR, 2008); calendar.set(Calendar.MONTH, 8); calendar.set(Calendar.DAY_OF_MONTH, 30); - Assert.assertEquals(2332, task.getTime(calendar.getTime())); + Assert.assertEquals(task.getTime(calendar.getTime()), 2332000); // 20081011 46 calendar.set(Calendar.YEAR, 2008); calendar.set(Calendar.MONTH, 9); calendar.set(Calendar.DAY_OF_MONTH, 11); - Assert.assertEquals(46, task.getTime(calendar.getTime())); + Assert.assertEquals(task.getTime(calendar.getTime()), 46000); /*FIXME saver.unlock(); } catch (DataLockingException e) { @@ -303,11 +303,11 @@ // first alert Assert.assertEquals(task.getAlerts().get(0).getType(), TimerAlert.Type.REACH_DAILY_TIME); - Assert.assertEquals(task.getAlerts().get(0).getDuration(), 3600); + Assert.assertEquals(task.getAlerts().get(0).getDuration(), 3600000); // second alert Assert.assertEquals(task.getAlerts().get(1).getType(), TimerAlert.Type.REACH_TOTAL_TIME); - Assert.assertEquals(task.getAlerts().get(1).getDuration(), 25000); + Assert.assertEquals(task.getAlerts().get(1).getDuration(), 25000000); /*FIXME saver.unlock(); } catch (DataLockingException e) { @@ -339,7 +339,7 @@ TimerTask task1 = findTask(projects, "No project/Test no parent project"); Assert.assertNotNull(task1); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 9644); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 9644000); /*FIXME testSaver.unlock(); } catch (DataLockingException e) {

1 0

r2843 - branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org March 27, 2012

March 27, 2012

Author: echatellier Date: 2012-03-27 12:47:23 +0200 (Tue, 27 Mar 2012) New Revision: 2843 Url: http://chorem.org/repositories/revision/jtimer/2843 Log: Add new algorithm based on atomic long Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 09:35:07 UTC (rev 2842) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 10:47:23 UTC (rev 2843) @@ -29,7 +29,7 @@ import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.List; +import java.util.concurrent.atomic.AtomicLong; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; @@ -41,9 +41,9 @@ import org.chorem.jtimer.JTimer; import org.chorem.jtimer.data.TimerDataManager; import org.chorem.jtimer.entities.TimerAlert; +import org.chorem.jtimer.entities.TimerAlert.Type; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.entities.TimerTaskHelper; -import org.chorem.jtimer.entities.TimerAlert.Type; import org.chorem.jtimer.ui.system.SystemInfo; import org.chorem.jtimer.ui.system.SystemInfoFactory; import org.chorem.jtimer.ui.system.UnsupportedSystemInfoException; @@ -80,21 +80,9 @@ /** Already thrown alert. */ protected Collection<TimerAlert> alreadyTrownAlerts; - /** Timestamp when timing start. */ - protected long taskStartTimestamp; - /** Last publish time to detect hibernate. */ - protected long lastUserActivity; + protected AtomicLong lastUserActivity; - /** - * Offset to adjust time for current day (last activity day). - * Include : - * - Task initial time - * - Task idle time (task was running but time not counted) - * - Manual user incremented time - */ - protected long offsetTimeInMs; - /** Want to stop flag. */ protected Boolean bWantToStop; @@ -175,37 +163,6 @@ return managedTask; } - /** - * Method to increment time while task is running (in ms). - * - * @param increment increment, can be negative - */ - public void incrementTaskTime(long increment) { - - long nowTimestamp = Calendar.getInstance().getTimeInMillis(); - - // new var, to not modify parameter - long localIncrement = increment; - - // do go over 0 - if (nowTimestamp - taskStartTimestamp + offsetTimeInMs + increment < 0) { - localIncrement = -(nowTimestamp - taskStartTimestamp + offsetTimeInMs); - } - - offsetTimeInMs += localIncrement; - } - - /** - * Reset timing. - * - * For example if task goes over 0h00, need to reset... - */ - public void resetTiming() { - taskStartTimestamp = System.currentTimeMillis(); - lastUserActivity = taskStartTimestamp; - offsetTimeInMs = managedTask.getTime(new Date()) * 1000; - } - /* * @see org.jdesktop.swingworker.SwingWorker#doInBackground() */ @@ -216,8 +173,8 @@ // notify ui parentApp.startedTask(managedTask); - // init timing - resetTiming(); + // init + lastUserActivity = new AtomicLong(System.currentTimeMillis()); // get idle time long configIdleTime = JTimer.config.getIdleTime() * 1000; @@ -226,7 +183,9 @@ boolean dontWantToStop = true; while (dontWantToStop) { - long currentTime = System.currentTimeMillis(); + // this algorithm is based on this atomic operation + // that ensure hibernate won't break time tracking + long oldUserActivity = lastUserActivity.getAndSet(System.currentTimeMillis()); // check user idle time if (systemInfo != null) { // idle time available @@ -237,76 +196,35 @@ } } - // if long idleTime is unavailable, if is always false - if (idleTime >= configIdleTime) { - lastUserActivity -= idleTime; - } - // check for idleness with last user activity (real idle and hibernate) - if (currentTime - lastUserActivity >= configIdleTime) { + long delta = lastUserActivity.get() - oldUserActivity; + if (delta + idleTime >= configIdleTime) { - // update idle to publish time without counting idle - offsetTimeInMs -= currentTime - lastUserActivity; - publish(); + // remove delta from now + addTaskDelta(lastUserActivity.get(), -(delta + idleTime)); // display idle detected (blocking call) JTimer parentApplication = (JTimer) getApplication(); parentApplication.preIdleDetect(); - int option = IdleDialog.showIdleDialog(currentTime - idleTime); + int option = IdleDialog.showIdleDialog(delta); parentApplication.postIdleDetect(); - // manage tracking resume after idle - currentTime = System.currentTimeMillis(); - lastUserActivity = currentTime; - switch (option) { case IdleDialog.REVERT: // just stop the task ((JTimer) getApplication()).stopTask(managedTask); break; - + case IdleDialog.CONTINUE: - // refresh time - // remove idle time previously added - //offsetTimeInMs += idleTimeOffset; - //publish(taskTimingBeforeStartInMs + afterIdleTime - // - taskStartCalendar.getTimeInMillis() - // + offsetTimeInMs); - + // readd delta since oldUserActivity + addTaskDelta(oldUserActivity, delta + idleTime); break; - - case IdleDialog.RESUME: - // resume = increment idle time - offsetTimeInMs += currentTime - lastUserActivity; - // check day change (after offset) - Calendar nowCalendar = Calendar.getInstance(); - Calendar startCalendar = Calendar.getInstance(); - startCalendar.setTimeInMillis(taskStartTimestamp); - if (!DateUtils.isSameDay(startCalendar, nowCalendar)) { - resetTiming(); - } - - // update time - publish(); - break; } } else { - - // no idle detected - lastUserActivity = currentTime; - - // check day change - Calendar nowCalendar = Calendar.getInstance(); - Calendar startCalendar = Calendar.getInstance(); - startCalendar.setTimeInMillis(taskStartTimestamp); - if (!DateUtils.isSameDay(startCalendar, nowCalendar)) { - resetTiming(); - } - // update new time - publish(); + addTaskDelta(oldUserActivity, delta); } Thread.sleep(1000); // 1s @@ -320,26 +238,42 @@ return null; } - /* - * @see application.Task#process(java.util.List) + /** + * Add task delta. + * + * @param oldUserActivity time when delta was notified + * @param delta delta to add */ - @Override - protected void process(List<Void> nothing) { + protected void addTaskDelta(long from, long delta) { - // take last notification - // can be notified of many result - // for example, if UI lag... - long currentTime = System.currentTimeMillis(); - long currentDuration = currentTime - taskStartTimestamp + offsetTimeInMs; + long localDelta = delta; - // time can be negative due to adjust caused by idle or hibernate - // just publish 0 in this case - if (currentDuration < 0) { - currentDuration = 0; + // remove time + if (localDelta < 0) { + Date currentDate = new Date(from); + while (localDelta < 0) { + Date todayMidnight = DateUtils.truncate(currentDate, Calendar.DAY_OF_MONTH); + long msToMidnight = currentDate.getTime() - todayMidnight.getTime(); + long toRemove = Math.min(-localDelta, msToMidnight); + dataManager.changeTaskTime(managedTask, currentDate, managedTask.getTime(currentDate) - toRemove); + localDelta += toRemove; + currentDate = DateUtils.addMilliseconds(todayMidnight, -1); + } + } else { + // add time + Date currentDate = new Date(from); + while (localDelta > 0) { + Date today235959 = DateUtils.truncate(currentDate, Calendar.DAY_OF_MONTH); + today235959 = DateUtils.addDays(today235959, 1); + today235959 = DateUtils.addMilliseconds(today235959, -1); + long msToMidnight = today235959.getTime() - currentDate.getTime(); + long toAdd = Math.min(localDelta, msToMidnight); + dataManager.changeTaskTime(managedTask, currentDate, managedTask.getTime(currentDate) + toAdd); + localDelta -= toAdd; + currentDate = DateUtils.addMilliseconds(today235959, 1); + } } - dataManager.changeTaskTime(managedTask, new Date(), currentDuration); - checkTaskAlerts(managedTask); }

1 0

r2842 - in branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer: . data entities io ui ui/alert ui/report ui/tasks ui/treetable ui/widget
by echatellier＠users.chorem.org March 27, 2012

March 27, 2012

Author: echatellier Date: 2012-03-27 11:35:07 +0200 (Tue, 27 Mar 2012) New Revision: 2842 Url: http://chorem.org/repositories/revision/jtimer/2842 Log: Move internal task storage from seconds to milli-seconds for new time tracking algorithm Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/data/TimerDataManager.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerTask.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/StatusBar.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -937,7 +937,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void increment5Task() { - incrementTaskTime(5 * 60); + incrementTaskTime(5 * 60000); } /** @@ -945,7 +945,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void increment30Task() { - incrementTaskTime(30 * 60); + incrementTaskTime(30 * 60000); } /** @@ -953,7 +953,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void decrement1Task() { - incrementTaskTime(-60); + incrementTaskTime(-60000); } /** @@ -961,7 +961,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void decrement5Task() { - incrementTaskTime(-5 * 60); + incrementTaskTime(-5 * 60000); } /** @@ -969,7 +969,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void decrement30Task() { - incrementTaskTime(-30 * 60); + incrementTaskTime(-30 * 60000); } /** @@ -977,7 +977,7 @@ */ @Action(enabledProperty = "selectedSingleTask") public void increment1Task() { - incrementTaskTime(60); + incrementTaskTime(60000); } /** @@ -985,37 +985,29 @@ * * To decrement, set negative increment:) * - * @param increment increment in seconds + * @param increment increment in ms */ protected void incrementTaskTime(long increment) { TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() .get(0); - // check if task is running - RunTaskJob job = getJobForRunningTask(selectedTask); - if (job != null) { - // task is running - // increment is in seconds !!! - job.incrementTaskTime(increment * 1000); - } else { - // task is not running - Date now = new Date(); - long todayTime = selectedTask.getTime(now); + // task is not running + Date now = new Date(); + long todayTime = selectedTask.getTime(now); - long newTodayTime = todayTime + increment; + long newTodayTime = todayTime + increment; - try { - // check if + negative increment still positive - if (newTodayTime > 0) { - core.getData().changeTaskTime(selectedTask, now, - newTodayTime); - } else { - // force to 0 - core.getData().changeTaskTime(selectedTask, now, 0L); - } - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); + try { + // check if + negative increment still positive + if (newTodayTime > 0) { + core.getData().changeTaskTime(selectedTask, now, + newTodayTime); + } else { + // force to 0 + core.getData().changeTaskTime(selectedTask, now, 0L); } + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); } } Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/data/TimerDataManager.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -189,7 +189,7 @@ * * @param task the task to change time * @param date date to change time - * @param value new time in seconds + * @param value new time in ms */ public synchronized void changeTaskTime(TimerTask task, Date date, long value) { @@ -429,18 +429,18 @@ while (itDataEventListener.hasNext()) { itDataEventListener.next().preMergeTasks(destinationTask, otherTasks); } - + for (TimerTask otherTask : otherTasks) { mergeTwoTasks(destinationTask, otherTask); } - + // send post notification itDataEventListener = dataEventListeners.iterator(); while (itDataEventListener.hasNext()) { itDataEventListener.next().postMergeTasks(destinationTask, otherTasks); } } - + /** * Merge two task together. * @@ -454,7 +454,7 @@ } // task is modified during merge, deep clone it - + // make sub task list copy (concurrency) Collection<TimerTask> otherTaskSubTasks = new ArrayList<TimerTask>(otherTask.getSubTasks()); for (TimerTask otherTaskSubTask : otherTaskSubTasks) { @@ -467,7 +467,7 @@ sameTaskNameTask = destSubTask; } } - + // no similar task found if (sameTaskNameTask == null) { if (log.isDebugEnabled()) { @@ -488,14 +488,14 @@ // TODO possible bug here, task times may not be saved } } - + // copy otherTask times to current task for (Entry<Date, Long> times : otherTask.getAllDaysAndTimes().entrySet()) { Long currentDuration = destinationTask.getTime(times.getKey()); currentDuration += times.getValue(); destinationTask.setTime(times.getKey(), currentDuration); } - + // copy annotations for (Entry<Date, String> note : otherTask.getAllDaysAnnotations().entrySet()) { Date noteKey = note.getKey(); @@ -513,17 +513,17 @@ } destinationTask.addAnnotation(noteKey, note.getValue()); } - + // copy alerts for (TimerAlert alert : otherTask.getAlerts()) { destinationTask.addAlert(alert); } - + // finally otherTask still exist // empty, but still exist deleteTask(otherTask); } - + /** * Add annotation on task for specified calendar, and send event. * Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -52,7 +52,7 @@ /** Alert type. */ protected Type type; - /** Alert duration. (in seconds) */ + /** Alert duration. (in ms) */ protected long duration; /** Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -72,7 +72,7 @@ protected TimerTask parent; /** - * Map calendar of day -> time. (ordered on keys) + * Map calendar of day -> time (ms). (ordered on keys) */ protected SortedMap<Date, Long> allDaysTimes; @@ -240,20 +240,18 @@ /** * Add time. * - * Calendar will be forced to 0h00:00.000 - * * @param date date - * @param seconds seconds + * @param time time in ms */ - public void setTime(Date date, Long seconds) { - allDaysTimes.put(date, seconds); + public void setTime(Date date, Long time) { + allDaysTimes.put(date, time); } /** * Get time at date. * * @param date date - * @return time at specified date + * @return time at specified date in ms */ public long getTime(Date date) { long result = 0; Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -512,7 +512,7 @@ try { Date keyDate = GTimerTimeUtil.yyyyMMdd2Date(sKey); String timeString = (String) prop.get(sKey); - t.setTime(keyDate, Long.valueOf(timeString)); + t.setTime(keyDate, Long.valueOf(timeString) * 1000); } catch (NumberFormatException e) { if (log.isErrorEnabled()) { log.error("Can't convert " + prop.get(sKey) @@ -642,12 +642,12 @@ try { if ("reachtotaltime".equals(alertType)) { - Long duration = Long.parseLong(alertDuration); + Long duration = Long.parseLong(alertDuration) * 1000; TimerAlert alert = new TimerAlert( TimerAlert.Type.REACH_TOTAL_TIME, duration); task.addAlert(alert); } else if ("reachdailytime".equals(alertType)) { - Long duration = Long.parseLong(alertDuration); + Long duration = Long.parseLong(alertDuration) * 1000; TimerAlert alert = new TimerAlert( TimerAlert.Type.REACH_DAILY_TIME, duration); task.addAlert(alert); @@ -1004,9 +1004,9 @@ for (Entry<Date, Long> entry : task.getAllDaysAndTimes().entrySet()) { Date date = entry.getKey(); + long value = entry.getValue() / 1000; String gtimerDate = GTimerTimeUtil.date2yyyyMMdd(date); - - out.write(gtimerDate + " " + entry.getValue() + "\n"); + out.write(gtimerDate + " " + value + "\n"); } out.close(); @@ -1104,7 +1104,7 @@ for (TimerAlert alert : task.getAlerts()) { Type type = alert.getType(); - long duration = alert.getDuration(); + long duration = alert.getDuration() / 1000; switch (type) { case REACH_DAILY_TIME: Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/StatusBar.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -118,7 +118,7 @@ } lblTime.setText(resourceMap .getString("todayTotalMessage", DurationFormatUtils - .formatDuration(duration * 1000, "HH:mm:ss"))); + .formatDuration(duration, "HH:mm:ss"))); } /* Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -574,7 +574,7 @@ long time = cloneTask.getTime(date); Calendar cal = Calendar.getInstance(); // FIXME me, not use a calendar here ! - cal.setTimeInMillis(time * 1000 - cal.get(Calendar.ZONE_OFFSET)); + cal.setTimeInMillis(time - cal.get(Calendar.ZONE_OFFSET)); spinnerH.setValue(cal.get(Calendar.HOUR_OF_DAY)); spinnerM.setValue(cal.get(Calendar.MINUTE)); @@ -629,7 +629,7 @@ long seconds = ((Integer) spinnerH.getValue() * 60 * 60) + ((Integer) spinnerM.getValue() * 60) + ((Integer) spinnerS.getValue()); - cloneTask.setTime(getSelectedDay().getTime(), seconds); + cloneTask.setTime(getSelectedDay().getTime(), seconds * 1000); // annotation if (isAnnotationChanged) { Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -105,7 +105,7 @@ break; case 1: - result = alert.getDuration(); + result = alert.getDuration() / 1000; break; default: @@ -130,7 +130,7 @@ case 1: long duration = ((Long)value).longValue(); - alert.setDuration(duration); + alert.setDuration(duration * 1000); break; default: Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -402,8 +402,7 @@ * @return formated duration */ public String formatDuration(long duration) { - String result = DurationFormatUtils.formatDuration(duration * 1000, - "HH:mm:ss"); + String result = DurationFormatUtils.formatDuration(duration, "HH:mm:ss"); return result; } Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -338,8 +338,7 @@ currentDuration = 0; } - dataManager.changeTaskTime(managedTask, new Date(), - currentDuration / 1000); + dataManager.changeTaskTime(managedTask, new Date(), currentDuration); checkTaskAlerts(managedTask); } Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -155,11 +155,11 @@ break; case 1: value = DurationFormatUtils.formatDuration(TimerTaskHelper - .getTotalTime(task, new Date()) * 1000, "HH:mm:ss"); + .getTotalTime(task, new Date()), "HH:mm:ss"); break; case 2: value = DurationFormatUtils.formatDuration(TimerTaskHelper - .getAllTotalTime(task) * 1000, "HH:mm:ss"); + .getAllTotalTime(task), "HH:mm:ss"); break; } } else { Modified: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2012-03-26 13:00:47 UTC (rev 2841) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2012-03-27 09:35:07 UTC (rev 2842) @@ -68,7 +68,7 @@ /** Second spinner model. */ protected SpinnerNumberModel secondSpinnerModel; - /** Duration. */ + /** Duration (in ms). */ protected long duration; /**

1 0

r2841 - trunk
by fdesbois＠users.chorem.org March 26, 2012

March 26, 2012

Author: fdesbois Date: 2012-03-26 15:00:47 +0200 (Mon, 26 Mar 2012) New Revision: 2841 Url: http://chorem.org/repositories/revision/jtimer/2841 Log: Use last mavenpom version 3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-25 21:15:46 UTC (rev 2840) +++ trunk/pom.xml 2012-03-26 13:00:47 UTC (rev 2841) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.1</version> + <version>3.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r2840 - in branches: . 1.4.0-ttalgo/src/main/java/org/chorem/jtimer 1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report 1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org March 25, 2012

March 25, 2012

Author: echatellier Date: 2012-03-25 23:15:46 +0200 (Sun, 25 Mar 2012) New Revision: 2840 Url: http://chorem.org/repositories/revision/jtimer/2840 Log: Add branche for new time tracking algorithm. refs #13, #282, #492 Added: branches/1.4.0-ttalgo/ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportView.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Removed: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportView.java branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Deleted: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-23 15:11:54 UTC (rev 2836) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-25 21:15:46 UTC (rev 2840) @@ -1,1458 +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% - */ - -package org.chorem.jtimer; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.io.File; -import java.io.IOException; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Timer; - -import javax.swing.ButtonGroup; -import javax.swing.InputMap; -import javax.swing.JButton; -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JRadioButtonMenuItem; -import javax.swing.JScrollPane; -import javax.swing.JSeparator; -import javax.swing.JToolBar; -import javax.swing.KeyStroke; -import javax.swing.ListSelectionModel; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.TreePath; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.jtimer.data.DataViolationException; -import org.chorem.jtimer.data.TimerCore; -import org.chorem.jtimer.entities.TimerProject; -import org.chorem.jtimer.entities.TimerTask; -import org.chorem.jtimer.ui.HelpFrame; -import org.chorem.jtimer.ui.StatusBar; -import org.chorem.jtimer.ui.TimerTaskEditor; -import org.chorem.jtimer.ui.alert.AlertEditor; -import org.chorem.jtimer.ui.report.ReportView; -import org.chorem.jtimer.ui.systray.SystrayManager; -import org.chorem.jtimer.ui.tasks.IdleDialog; -import org.chorem.jtimer.ui.tasks.RefreshTreeTask; -import org.chorem.jtimer.ui.tasks.RunTaskJob; -import org.chorem.jtimer.ui.treetable.ProjectsAndTasksTable; -import org.chorem.jtimer.ui.widget.WindowProperty2; -import org.chorem.jtimer.ui.ws.SwingConnectionInformationHandler; -import org.chorem.jtimer.ws.ConnectionDataHandler; -import org.chorem.jtimer.ws.ProjectManagement; -import org.jdesktop.application.Action; -import org.jdesktop.application.Application; -import org.jdesktop.application.ApplicationContext; -import org.jdesktop.application.ResourceMap; -import org.jdesktop.application.SingleFrameApplication; -import org.jdesktop.application.Task; -import org.jdesktop.application.TaskMonitor; - -/** - * Main jTimer application window. - * - * Respect JSR-296 - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class JTimer extends SingleFrameApplication implements - TreeSelectionListener, MouseListener { - - /** log. */ - private static Log log = LogFactory.getLog(JTimer.class); - - /** Timer core controller. */ - protected TimerCore core; - - /** Tree structure. */ - protected ProjectsAndTasksTable projectsAndTasksTable; - - /** Systray manager. */ - protected SystrayManager systrayManager; - - /** I18n resources map. */ - protected ResourceMap resourceMap; - - /** Jtimer application config. */ - public static JTimerConfig config; - - /** Single project selection property. */ - protected boolean selectedSingleProject; - - /** Single task selection property. */ - protected boolean selectedSingleTask; - - /** Single task or project selection. */ - protected boolean selectedSingleElement; - - /** Single running task selection. */ - protected boolean selectedSingleRunningTask; - - /** Single non running task selection. */ - protected boolean selectedSingleStoppedTask; - - /** Multiples projects selection. */ - protected boolean selectedMultiplesProjects; - - /** Multiples tasks selection. */ - protected boolean selectedMultiplesTasks; - - /** Multiples elements selection. */ - protected boolean selectedMultiplesElements; - - /** - * Main. launch UI - * - * @param args args - */ - public static void main(String[] args) { - - if (log.isInfoEnabled()) { - log.info("Starting " + JTimer.class.getSimpleName() + " at " - + new Date()); - } - launch(JTimer.class, args); - } - - /** - * Initialize application. Called before UI build. - * - * @param args args - * @see Application#initialize(String[]) - */ - @Override - protected void initialize(String[] args) { - - // super, but does nothing - super.initialize(args); - - // load configuration - loadConfiguration(args); - - // init resources map - ApplicationContext ctxt = getContext(); - resourceMap = ctxt.getResourceMap(); - - // fix start in iconified mode - ctxt.getSessionStorage().putProperty(JFrame.class, new WindowProperty2()); - - // init timercore - core = new TimerCore(); - - // handler - ConnectionDataHandler handler = new SwingConnectionInformationHandler( - this); - ProjectManagement managementService = JTimerFactory - .getProjectManagementService(); - if (managementService != null) { - managementService.setConnectionDataHandler(handler); - } - - // Systray mgr - systrayManager = new SystrayManager(this); - core.getData().addDataEventListener(systrayManager); - - IdleDialog.init(this); - } - - /** - * Load configuration. - * - * @param args args to parse command line options - */ - protected void loadConfiguration(String[] args) { - - config = new JTimerConfig(); - - // add file migration for configuration file created before version 1.4 - File homeDir = new File(System.getProperty("user.home"), ".jtimer"); - File oldFile = new File(homeDir, "JTimer.properties"); - File newFile = new File(config.appConfig.getUserConfigDirectory(), config.appConfig.getConfigFileName()); - if (oldFile.isFile() && !newFile.isFile()) { - if (log.isInfoEnabled()) { - log.info("Migration configuration file location"); - } - try { - FileUtils.copyFile(oldFile, newFile); - } catch (IOException ex) { - if (log.isErrorEnabled()) { - log.error("Can't copy config file to new location", ex); - } - } - } - - // parse after file migration - config.parse(args); - } - - /** - * startup. - * - * Create frame menu bar. Create main component. - * - * @see Application#startup() - */ - @Override - protected void startup() { - - // set Menu Bar - getMainFrame().setJMenuBar(createMenuBar()); - - // show main panel components - show(createMainComponent()); - - } - - /** - * Create main component. - * - * Toolbar on top. Tree middle. Status bar on bottom. - * - * @return The component - */ - protected JComponent createMainComponent() { - - // panel = main component - JPanel panel = new JPanel(new BorderLayout()); - - // toolbar on top (north) - panel.add(createToolBar(), BorderLayout.NORTH); - - // tree middle (center-top) - ProjectsAndTasksTable projectTreeTable = createTreeTable(); - JScrollPane scrollPaneProjectTreeTable = new JScrollPane( - projectTreeTable); - panel.add(scrollPaneProjectTreeTable, BorderLayout.CENTER); - - // status bar bottom - StatusBar sb = new StatusBar(this, core.getData()); - // status bar ui will be notified from events - core.getData().addDataEventListener(sb); - panel.add(sb, BorderLayout.SOUTH); - - // taille par defaut au premier lancement de l'application - // sera ecrasee par la restauration de la session - panel.setPreferredSize(new Dimension(640, 480)); - - return panel; - } - - /** - * Create complex tree table. - * - * @return ProjectsAndTaskTable instance - */ - protected ProjectsAndTasksTable createTreeTable() { - - projectsAndTasksTable = new ProjectsAndTasksTable(this, core); - - // name used in properties files - projectsAndTasksTable.setName("projectslist"); - projectsAndTasksTable.addTreeSelectionListener(this); - projectsAndTasksTable.addMouseListener(this); - projectsAndTasksTable.setShowClosed(config.isShowClosed()); - - // since merge option, selection can be multiple - projectsAndTasksTable - .setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - - // remove F2 KeyStroke from table - KeyStroke keyToRemove = KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0); - InputMap imap = projectsAndTasksTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - while (imap != null) { - imap.remove(keyToRemove); - imap = imap.getParent(); - } - - return projectsAndTasksTable; - } - - /** - * Create toolbar. - * - * @return tool bar builded - */ - protected JComponent createToolBar() { - String[] toolbarActionNames = { "startTask", "stopTask", "newProject", - "newTask", "---", "addAnnotation", "editAlert" }; - JToolBar toolBar = new JToolBar(); - toolBar.setFloatable(false); - for (String actionName : toolbarActionNames) { - - if (actionName.equals("---")) { - toolBar.add(new JToolBar.Separator()); - } else { - JButton button = new JButton(); - button.setAction(getAction(actionName)); - - // hide text - // button.setVerticalTextPosition(JButton.BOTTOM); - // button.setHorizontalTextPosition(JButton.CENTER); - button.setHideActionText(true); - - button.setFocusable(false); - toolBar.add(button); - } - } - return toolBar; - } - - /** - * Create application menu bar. - * - * @return menu bar - */ - protected JMenuBar createMenuBar() { - - JMenuBar menuBar = new JMenuBar(); - String[] fileMenuActionNames = { "quit" }; - menuBar.add(createMenu("fileMenu", fileMenuActionNames)); - - String[] projectMenuActionNames = { "newProject", "editProject", - "closeProject", "deleteProject" }; - menuBar.add(createMenu("projectMenu", projectMenuActionNames)); - - String[] taskMenuActionNames = { "newTask", "editTask", "closeTask", - "deleteTask", "---", "startTask", "stopTask", "---", - "addAnnotation", "editAlert", "increment1Task", - "increment5Task", "increment30Task", "decrement1Task", - "decrement5Task", "decrement30Task", "setToZero", "mergeTasks" }; - menuBar.add(createMenu("taskMenu", taskMenuActionNames)); - - String[] reportMenuActionNames = { "makeReport" }; - menuBar.add(createMenu("reportMenu", reportMenuActionNames)); - - JMenu optionmMenu = createOptionMenu(); - menuBar.add(optionmMenu); - - String[] helpMenuActionNames = { "about" }; - menuBar.add(createMenu("helpMenu", helpMenuActionNames)); - - return menuBar; - } - - /** - * Create option dynamic menu. - * - * @return option menu - */ - protected JMenu createOptionMenu() { - JMenu menu = new JMenu(); - menu.setName("optionMenu"); - - // show closed - JMenuItem showClosedItem = new JCheckBoxMenuItem(); - showClosedItem.setAction(getAction("isShowClosed")); - showClosedItem.setSelected(config.isShowClosed()); - showClosedItem.setIcon(null); - menu.add(showClosedItem); - - // close to systray - JMenuItem closeToSysItem = new JCheckBoxMenuItem(); - closeToSysItem.setAction(getAction("isCloseToSystray")); - closeToSysItem.setSelected(config.isCloseToSystray()); - closeToSysItem.setIcon(null); - menu.add(closeToSysItem); - - // report first day of week - JMenu reportFDoW = new JMenu(); - reportFDoW.setName("optionReportFirstDayMenu"); - Calendar calendar = Calendar.getInstance(); - ButtonGroup bg = new ButtonGroup(); - // affiche la liste des jours dans l'ordre de la locale utilisateur - for (int day = calendar.getFirstDayOfWeek() ; day < calendar.getFirstDayOfWeek() + 7 ; day++) { - int realDay = (day - 1) % 7 + 1; - JRadioButtonMenuItem fdowItem = new JRadioButtonMenuItem(); - fdowItem.setAction(getAction("isReportFirstDayOfWeek" + realDay)); - fdowItem.setSelected(realDay == JTimer.config.getReportFirstDayOfWeek()); - fdowItem.setIcon(null); - reportFDoW.add(fdowItem); - bg.add(fdowItem); - } - menu.add(reportFDoW); - - return menu; - } - - /** - * Create single menu. - * - * @param menuName menu name - * @param actionNames associated actions - * @return menu - */ - protected JMenu createMenu(String menuName, String[] actionNames) { - JMenu menu = new JMenu(); - menu.setName(menuName); - addActionToMenu(menu, actionNames); - return menu; - } - - /** - * Add saf action to an existing menu. - * - * Menu have to be a JMenu or JPopupMenu. - * - * @param menu parent menu - * @param actionNames action names - */ - protected void addActionToMenu(JComponent menu, String[] actionNames) { - for (String actionName : actionNames) { - if (actionName.equals("---")) { - menu.add(new JSeparator()); - } else if (actionName.startsWith("is")) { - // if action name start by is - // display it as CheckBox - JMenuItem menuItem = new JCheckBoxMenuItem(); - // link to an @Action - menuItem.setAction(getAction(actionName)); - menuItem.setIcon(null); - menu.add(menuItem); - } else { - JMenuItem menuItem = new JMenuItem(); - // link to an @Action - menuItem.setAction(getAction(actionName)); - menuItem.setIcon(null); - menu.add(menuItem); - } - } - } - - /** - * Ready. Called when UI is ready and displayed. - * - * @see Application#ready() - */ - @Override - protected void ready() { - - // init core, load list, synchronization, etc... - boolean init = core.init(); - - if (init) { - // schedule tree refresh at midnight - scheduleTreeRefresh(); - - // install icon (do it at last action) - systrayManager.install(); - } else { - String failTitle = resourceMap.getString("startFail.title"); - String failMessage = resourceMap.getString("startFail.message"); - JOptionPane.showMessageDialog(getMainFrame(), failMessage, - failTitle, JOptionPane.ERROR_MESSAGE); - exit(); - } - } - - /** - * Called on application shutdown. - * - * Save context. - * - * @see SingleFrameApplication#shutdown() - */ - @Override - protected void shutdown() { - log.debug("Shutdown called"); - core.exit(); - - // save context - // super, sauve le context des fenetres, etc... - super.shutdown(); - } - - /** - * Refresh tree at midnight. - */ - protected void scheduleTreeRefresh() { - - // task used to refresh tree - java.util.TimerTask refreshTreeTask = new RefreshTreeTask(core); - - Timer timer = new Timer(); - - Calendar date = Calendar.getInstance(); - date.setTimeInMillis(System.currentTimeMillis()); - date.set(Calendar.HOUR_OF_DAY, 0); - date.set(Calendar.MINUTE, 0); - date.set(Calendar.SECOND, 0); - date.set(Calendar.MILLISECOND, 0); - date.add(Calendar.DAY_OF_YEAR, 1); // run only next day - - // Schedule to run every day in midnight - // task,firstTime,period - timer.schedule(refreshTreeTask, date.getTime(), // at date - 1000 * 60 * 60 * 24 // every day - ); - } - - /** - * Display a popup error message. - * - * @param errorMessageKey saf error message key - */ - protected void displayErrorMessage(String errorMessageKey) { - String title = resourceMap.getString("action.invalidActionTitle"); - String message = resourceMap.getString(errorMessageKey); - - // check untranslated string - if (StringUtils.isEmpty(message)) { - message = resourceMap.getString("action.missingErrorMessage", - errorMessageKey); - } - - JOptionPane.showMessageDialog(getMainFrame(), message, title, - JOptionPane.ERROR_MESSAGE); - } - - /** - * New project action. - * - * Ask user for project name - */ - @Action - public void newProject() { - - String projectName = JOptionPane.showInputDialog(getMainFrame(), - resourceMap.getString("input.newProjectMessage"), resourceMap - .getString("input.newProjectTitle"), - JOptionPane.QUESTION_MESSAGE); - - if (projectName != null) { - - // remove unneeded spaces - projectName = projectName.trim(); - - TimerProject p = new TimerProject(projectName); - - // add creation date - p.setCreationDate(new Date()); - - try { - core.getData().addProject(p); - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); - } - } - } - - /** - * Edit project - * - * Enabled when a project is selected - */ - @Action(enabledProperty = "selectedSingleProject") - public void editProject() { - TimerProject project = projectsAndTasksTable.getSelectedProjects().get( - 0); - - String newProjectName = (String) JOptionPane.showInputDialog(getMainFrame(), resourceMap - .getString("input.editProjectMessage"), resourceMap - .getString("input.editProjectTitle"), - JOptionPane.INFORMATION_MESSAGE, null, null, project.getName()); - - if (newProjectName != null) { - - // remove unneeded spaces - newProjectName = newProjectName.trim(); - - try { - core.getData().editProject(project, newProjectName); - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); - } - } - } - - /** - * Create new task action. - * - * Enabled when a project or a task is selected - */ - @Action(enabledProperty = "selectedSingleElement") - public void newTask() { - - // select task to add new task - TimerTask selectedTask = projectsAndTasksTable.getSelectedElements() - .get(0); - - String taskName = JOptionPane.showInputDialog(getMainFrame(), - resourceMap.getString("input.newTaskMessage", selectedTask - .getName()), resourceMap - .getString("input.newTaskTitle"), - JOptionPane.QUESTION_MESSAGE); - - if (taskName != null) { - - // remove unneeded spaces - taskName = taskName.trim(); - - TimerTask t = new TimerTask(taskName); - - // Fix creation date - t.setCreationDate(new Date()); - - try { - core.getData().addTask(selectedTask, t); - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); - } - } - - } - - /** - * Edit task. - * - * Enabled when a task is selected - */ - @Action(enabledProperty = "selectedSingleTask") - public void editTask() { - - TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); - - TimerTaskEditor editor = new TimerTaskEditor(this, task, core); - editor.setLocationByPlatform(true); - editor.setVisible(true); - } - - /** - * Start selected task in tree. - * - * If it not already been running - * - * @return TimerTask scheduled for start - * @see Task - */ - @Action(enabledProperty = "selectedSingleStoppedTask") - public Task<?, ?> startTask() { - - // search for selected task in tree - // can't be null - TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); - - RunTaskJob jobToRun = new RunTaskJob(this, task, core.getData()); - core.getData().startTask(task); - - return jobToRun; - } - - /** - * Called by task job manager when task as been started. - * - * @param task started task - */ - public void startedTask(TimerTask task) { - setSelectedSingleRunningTask(true); - setSelectedSingleStoppedTask(false); - } - - /** - * Return job that manage running task. - * - * @param task timer task to get job - * @return job or null - */ - protected RunTaskJob getJobForRunningTask(TimerTask task) { - RunTaskJob job = null; - - TaskMonitor tm = getContext().getTaskMonitor(); - for (Task<Void, Long> t : tm.getTasks()) { - TimerTask localtask = ((RunTaskJob) t).getTask(); - if (task.equals(localtask)) { - job = (RunTaskJob) t; - } - } - - return job; - } - - /** - * Stop selected task in tree. - * - * Verify if it has been started - */ - @Action(enabledProperty = "selectedSingleRunningTask") - public void stopTask() { - - // task can't be null - TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); - stopTask(task); - - } - - /** - * Stop a task. - * - * Delegate method. Called by idle detect ? - * Called by delete method too. - * - * @param task task to stop - */ - public void stopTask(TimerTask task) { - - RunTaskJob rtt = getJobForRunningTask(task); - // test if task is already running - if (rtt != null) { - rtt.wantToStop(); - core.getData().stopTask(task); - - // re-enable/disable buttons - setSelectedSingleRunningTask(false); - setSelectedSingleStoppedTask(true); - } - } - - /** - * Stop all running tasks. - */ - public void stopAllTasks() { - - TaskMonitor tm = getContext().getTaskMonitor(); - for (Task<Void, Long> t : tm.getTasks()) { - // task - TimerTask ttask = ((RunTaskJob) t).getTask(); - stopTask(ttask); - } - } - - /** - * Close project. - */ - @Action(enabledProperty = "selectedSingleProject") - public void closeProject() { - TimerProject project = projectsAndTasksTable.getSelectedProjects().get(0); - - core.getData().changeProjectCloseState(project); - } - - /** - * Close task. - */ - @Action(enabledProperty = "selectedSingleTask") - public void closeTask() { - TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); - - core.getData().changeTaskCloseState(task); - } - - /** - * Delete project. - */ - @Action(enabledProperty = "selectedSingleProject") - public void deleteProject() { - - TimerProject project = projectsAndTasksTable.getSelectedProjects().get( - 0); - - if (project != null) { - int confirm = JOptionPane.showConfirmDialog(getMainFrame(), - resourceMap.getString("input.deleteProjectMessage", project - .getName()), resourceMap - .getString("input.deleteProjectTitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - - if (confirm == JOptionPane.YES_OPTION) { // approved - try { - core.getData().deleteProject(project); - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); - } - } - - } - - } - - /** - * Delete task. - */ - @Action(enabledProperty = "selectedSingleTask") - public void deleteTask() { - - TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); - - if (task != null) { - int confirm = JOptionPane.showConfirmDialog(getMainFrame(), - resourceMap.getString("input.deleteTaskMessage", task - .getName()), resourceMap - .getString("input.deleteTaskTitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - - if (confirm == JOptionPane.YES_OPTION) { // approved - try { - stopTask(task); - core.getData().deleteTask(task); - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); - } - } - } - } - - /** - * Change show closed option. - * - * @param event action event - */ - @Action - public void isShowClosed(ActionEvent event) { - JCheckBoxMenuItem source = (JCheckBoxMenuItem) event.getSource(); - boolean showClosed = source.isSelected(); - projectsAndTasksTable.setShowClosed(showClosed); - config.setShowClosed(showClosed); - } - - /** - * Change close to systray option. - * - * @param event action event - */ - @Action - public void isCloseToSystray(ActionEvent event) { - JCheckBoxMenuItem source = (JCheckBoxMenuItem) event.getSource(); - boolean closeToSystray = source.isSelected(); - config.setCloseToSystray(closeToSystray); - } - - /** - * Change report first day of week. - */ - @Action - public void isReportFirstDayOfWeek1() { - config.setReportFirstDayOfWeek(1); - } - - /** - * Change report first day of week. - */ - @Action - public void isReportFirstDayOfWeek2() { - config.setReportFirstDayOfWeek(2); - } - - /** - * Change report first day of week. - */ - @Action - public void isReportFirstDayOfWeek3() { - config.setReportFirstDayOfWeek(3); - } - - /** - * Change report first day of week. - */ - @Action - public void isReportFirstDayOfWeek4() { - config.setReportFirstDayOfWeek(4); - } - - /** - * Change report first day of week. - */ - @Action - public void isReportFirstDayOfWeek5() { - config.setReportFirstDayOfWeek(5); - } - - /** - * Change report first day of week. - */ - @Action - public void isReportFirstDayOfWeek6() { - config.setReportFirstDayOfWeek(6); - } - - /** - * Change report first day of week. - */ - @Action - public void isReportFirstDayOfWeek7() { - config.setReportFirstDayOfWeek(7); - } - - /** - * Increment task time. - */ - @Action(enabledProperty = "selectedSingleTask") - public void increment5Task() { - incrementTaskTime(5 * 60); - } - - /** - * Increment task time. - */ - @Action(enabledProperty = "selectedSingleTask") - public void increment30Task() { - incrementTaskTime(30 * 60); - } - - /** - * Decrement task time. - */ - @Action(enabledProperty = "selectedSingleTask") - public void decrement1Task() { - incrementTaskTime(-60); - } - - /** - * Decrement task time. - */ - @Action(enabledProperty = "selectedSingleTask") - public void decrement5Task() { - incrementTaskTime(-5 * 60); - } - - /** - * Decrement task time. - */ - @Action(enabledProperty = "selectedSingleTask") - public void decrement30Task() { - incrementTaskTime(-30 * 60); - } - - /** - * Increment task time. - */ - @Action(enabledProperty = "selectedSingleTask") - public void increment1Task() { - incrementTaskTime(60); - } - - /** - * Increment task time. - * - * To decrement, set negative increment:) - * - * @param increment increment in seconds - */ - protected void incrementTaskTime(long increment) { - TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() - .get(0); - - // check if task is running - RunTaskJob job = getJobForRunningTask(selectedTask); - if (job != null) { - // task is running - // increment is in seconds !!! - job.incrementTaskTime(increment * 1000); - } else { - // task is not running - Date now = new Date(); - long todayTime = selectedTask.getTime(now); - - long newTodayTime = todayTime + increment; - - try { - // check if + negative increment still positive - if (newTodayTime > 0) { - core.getData().changeTaskTime(selectedTask, now, - newTodayTime); - } else { - // force to 0 - core.getData().changeTaskTime(selectedTask, now, 0L); - } - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); - } - } - } - - /** - * Reset task time to zero. - */ - @Action(enabledProperty = "selectedSingleTask") - public void setToZero() { - TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); - incrementTaskTime(-task.getTime(new Date())); - } - - /** - * Merge multiples tasks action. - */ - @Action(enabledProperty = "selectedMultiplesTasks") - public void mergeTasks() { - List<TimerTask> tasks = projectsAndTasksTable.getSelectedTasks(); - - TimerTask destinationTask = tasks.get(0); - List<TimerTask> otherTasks = tasks.subList(1, tasks.size()); - int confirm = JOptionPane.showConfirmDialog(getMainFrame(), - resourceMap.getString("input.mergeTaskMessage", tasks.size(), - destinationTask.getName()), resourceMap - .getString("input.mergeTaskTitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - if (confirm == JOptionPane.YES_OPTION) { - - try { - core.getData().mergeTasks(destinationTask, otherTasks); - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); - } - } - } - - /** - * Add annotation action. - */ - @Action(enabledProperty = "selectedSingleTask") - public void addAnnotation() { - // select task to add new annotation - TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() - .get(0); - - String annotation = JOptionPane.showInputDialog(getMainFrame(), - resourceMap.getString("input.addAnnotationMessage", - selectedTask.getName()), resourceMap - .getString("input.addAnnotationTitle"), - JOptionPane.QUESTION_MESSAGE); - - if (annotation != null) { - // remove useless spaces - annotation = annotation.trim(); - - try { - core.getData().addAnnotation(selectedTask, new Date(), - annotation); - } catch (DataViolationException e) { - displayErrorMessage(e.getExceptionKey()); - } - } - } - - /** - * Edit alert action. - */ - @Action(enabledProperty = "selectedSingleTask") - public void editAlert() { - // select task to edit alert - TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() - .get(0); - - AlertEditor alertEditor = new AlertEditor(this, core.getData(), - selectedTask); - show(alertEditor); - } - - /** - * Create report. - */ - @Action - public void makeReport() { - ReportView view = new ReportView(this, core); - show(view); - } - - /** - * Show about frame. - */ - @Action - public void about() { - HelpFrame aboutFrame = new HelpFrame(this); - show(aboutFrame); - } - - /** - * Is selected project. - * - * @return selected project property - */ - public boolean isSelectedSingleProject() { - return selectedSingleProject; - } - - /** - * Change selected project property. - * - * @param selectedSingleProject selected project property - */ - public void setSelectedSingleProject(boolean selectedSingleProject) { - boolean oldValue = this.selectedSingleProject; - this.selectedSingleProject = selectedSingleProject; - firePropertyChange("selectedSingleProject", oldValue, - selectedSingleProject); - } - - /** - * Is selected task. - * - * @return selected task property - */ - public boolean isSelectedSingleTask() { - return selectedSingleTask; - } - - /** - * Change selected task property. - * - * @param selectedSingleTask selected task property - */ - public void setSelectedSingleTask(boolean selectedSingleTask) { - boolean oldValue = this.selectedSingleTask; - this.selectedSingleTask = selectedSingleTask; - firePropertyChange("selectedSingleTask", oldValue, selectedSingleTask); - } - - /** - * Is selected task or project. - * - * @return selected task or project property - */ - public boolean isSelectedSingleElement() { - return selectedSingleElement; - } - - /** - * Change selected task or project property. - * - * @param selectedSingleElement selected task or project property - */ - public void setSelectedSingleElement(boolean selectedSingleElement) { - boolean oldValue = this.selectedSingleElement; - this.selectedSingleElement = selectedSingleElement; - firePropertyChange("selectedSingleElement", oldValue, - selectedSingleElement); - } - - /** - * Is selected running task. - * - * @return the selectedSingleRunningTask - */ - public boolean isSelectedSingleRunningTask() { - return selectedSingleRunningTask; - } - - /** - * Change selected running task property. - * - * @param selectedSingleRunningTask selected running task property - */ - public void setSelectedSingleRunningTask(boolean selectedSingleRunningTask) { - boolean oldValue = this.selectedSingleRunningTask; - this.selectedSingleRunningTask = selectedSingleRunningTask; - firePropertyChange("selectedSingleRunningTask", oldValue, - selectedSingleRunningTask); - } - - /** - * Is selected non running task. - * - * @return selected non running task - */ - public boolean isSelectedSingleStoppedTask() { - return selectedSingleStoppedTask; - } - - /** - * Change selected non running task property. - * - * @param selectedSingleStoppedTask selected non running task - */ - public void setSelectedSingleStoppedTask(boolean selectedSingleStoppedTask) { - boolean oldValue = this.selectedSingleStoppedTask; - this.selectedSingleStoppedTask = selectedSingleStoppedTask; - firePropertyChange("selectedSingleStoppedTask", oldValue, - selectedSingleStoppedTask); - } - - /** - * Is selected multiples projects. - * - * @return selected multiples projects - */ - public boolean isSelectedMultiplesProjects() { - return selectedMultiplesProjects; - } - - /** - * Change selected multiples projects property. - * - * @param selectedMultiplesProjects selected multiples projects - */ - public void setSelectedMultiplesProjects(boolean selectedMultiplesProjects) { - boolean oldValue = this.selectedMultiplesProjects; - this.selectedMultiplesProjects = selectedMultiplesProjects; - firePropertyChange("selectedMultiplesProjects", oldValue, - selectedMultiplesProjects); - } - - /** - * Is selected multiples tasks. - * - * @return selected multiples tasks - */ - public boolean isSelectedMultiplesTasks() { - return selectedMultiplesTasks; - } - - /** - * Change selected multiples tasks property. - * - * @param selectedMultiplesTasks selected multiples tasks - */ - public void setSelectedMultiplesTasks(boolean selectedMultiplesTasks) { - boolean oldValue = this.selectedMultiplesTasks; - this.selectedMultiplesTasks = selectedMultiplesTasks; - firePropertyChange("selectedMultiplesTasks", oldValue, - selectedMultiplesTasks); - } - - /** - * Is selected multiples elements. - * - * @return selected multiples elements - */ - public boolean isSelectedMultiplesElements() { - return selectedMultiplesElements; - } - - /** - * Change selected multiples elements property. - * - * @param selectedMultiplesElements selected multiples elements - */ - public void setSelectedMultiplesElements(boolean selectedMultiplesElements) { - boolean oldValue = this.selectedMultiplesElements; - this.selectedMultiplesElements = selectedMultiplesElements; - firePropertyChange("selectedMultiplesElements", oldValue, - selectedMultiplesElements); - } - - /* - * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent) - */ - @Override - public void valueChanged(TreeSelectionEvent e) { - // get selected elements - List<TimerTask> elements = projectsAndTasksTable.getSelectedElements(); - List<TimerProject> projects = projectsAndTasksTable - .getSelectedProjects(); - List<TimerTask> tasks = projectsAndTasksTable.getSelectedTasks(); - - // notify application that tree selection has changed - if (tasks.size() == 1 && projects.size() == 0) { - TimerTask task = tasks.get(0); - setSelectedSingleTask(true); - - // ask for SAF job manager if task is running - RunTaskJob job = getJobForRunningTask(task); - if (job == null || job.isStopping()) { - setSelectedSingleStoppedTask(true); - setSelectedSingleRunningTask(false); - } else { - setSelectedSingleStoppedTask(false); - setSelectedSingleRunningTask(true); - } - setSelectedMultiplesTasks(false); - setSelectedSingleProject(false); - setSelectedMultiplesProjects(false); - } else { - setSelectedSingleTask(false); - setSelectedSingleStoppedTask(false); - setSelectedSingleRunningTask(false); - - if (tasks.size() > 1) { - setSelectedMultiplesTasks(projects.size() == 0); - } else { - setSelectedSingleProject(tasks.size() == 0 - && projects.size() == 1); - setSelectedMultiplesProjects(tasks.size() == 0 - && projects.size() > 1); - } - } - setSelectedSingleElement(elements.size() == 1); - setSelectedMultiplesElements(elements.size() > 1); - } - - /** - * Get action for named component. - * - * Util method. - * - * @param actionName action name - * @return swing action - */ - protected javax.swing.Action getAction(String actionName) { - return getContext().getActionMap().get(actionName); - } - - /** - * Show window - */ - @Action - public void show() { - // TODO better code ? that use SAF methods ? - getMainFrame().setVisible(true); - getMainFrame().toFront(); - } - - /** - * Show window - */ - @Action - public void hide() { - // TODO better code ? that use SAF methods ? - getMainFrame().setVisible(false); - } - - /** - * Notified by job on pre idle detect. - */ - public void preIdleDetect() { - systrayManager.preIdleDetect(); - } - - /** - * Notified by job on post idle detect. - */ - public void postIdleDetect() { - systrayManager.postIdleDetect(); - } - - /* - * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) - */ - public void mouseClicked(MouseEvent e) { - - if (log.isDebugEnabled()) { - log.debug("Mouse clicked (" + e.getClickCount() - + " clics), source = " - + e.getSource().getClass().getName()); - } - - switch (e.getButton()) { - - // clic gauche - case MouseEvent.BUTTON1: - // clic sur l'arbre des projets - if (e.getSource() == projectsAndTasksTable) { - // demarre la tache lors d'un double clic dessus - if (e.getClickCount() == 2) { - - if (isSelectedSingleStoppedTask()) { // can only launch non running tasks - Task<?, ?> appTask = startTask(); - if (appTask != null) { - - // first, on dlb click stop all running tasks - stopAllTasks(); - - getContext().getTaskService().execute(appTask); - } - /* TODO EC-20100416 temp disable, called twice, can display - -1 task running :( - } else if (isSelectedSingleRunningTask()) { - TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); - stopTask(task); */ - } else { - if (log.isDebugEnabled()) { - log.debug("Non selected non running task to launch"); - } - } - } else { - if (log.isDebugEnabled()) { - log.debug("Single clic on tree, do nothing"); - } - } - } - break; - - // gestion du clic droit - case MouseEvent.BUTTON3: - - // force task selection on rigth clic - TreePath path = projectsAndTasksTable.getPathForLocation(e.getX(), - e.getY()); - int selectedRow = projectsAndTasksTable.getRowForPath(path); - projectsAndTasksTable.getSelectionModel().setSelectionInterval( - selectedRow, selectedRow); - - // fix item selection - JPopupMenu menu = new JPopupMenu(); - - String[] actionNames = null; - - // construct menu in function of selection - if (isSelectedSingleProject()) { - actionNames = new String[] { "newTask", "---", "newProject", - "editProject", "closeProject", "deleteProject" }; - } - - if (isSelectedSingleTask()) { - actionNames = new String[] { "startTask", "stopTask", "---", - "newTask", "editTask", "closeTask", "deleteTask", - "---", "addAnnotation", "editAlert", "increment1Task", - "increment5Task", "increment30Task", "decrement1Task", - "decrement5Task", "decrement30Task", "setToZero" }; - } - - if (isSelectedMultiplesTasks()) { - actionNames = new String[] { "mergeTasks" }; - } - - // case, right clic, but nothing selected - if (actionNames != null) { - addActionToMenu(menu, actionNames); - - menu.show(e.getComponent(), e.getX(), e.getY()); - } - } - } - - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { - } -} Copied: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java (from rev 2837, trunk/src/main/java/org/chorem/jtimer/JTimer.java) =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java (rev 0) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-25 21:15:46 UTC (rev 2840) @@ -0,0 +1,1473 @@ +/* + * #%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% + */ + +package org.chorem.jtimer; + +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.io.File; +import java.io.IOException; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Timer; + +import javax.swing.ButtonGroup; +import javax.swing.InputMap; +import javax.swing.JButton; +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JRadioButtonMenuItem; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JToolBar; +import javax.swing.KeyStroke; +import javax.swing.ListSelectionModel; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.TreePath; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.jtimer.data.DataViolationException; +import org.chorem.jtimer.data.TimerCore; +import org.chorem.jtimer.entities.TimerProject; +import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.ui.HelpFrame; +import org.chorem.jtimer.ui.StatusBar; +import org.chorem.jtimer.ui.TimerTaskEditor; +import org.chorem.jtimer.ui.alert.AlertEditor; +import org.chorem.jtimer.ui.report.ReportView; +import org.chorem.jtimer.ui.systray.SystrayManager; +import org.chorem.jtimer.ui.tasks.IdleDialog; +import org.chorem.jtimer.ui.tasks.RefreshTreeTask; +import org.chorem.jtimer.ui.tasks.RunTaskJob; +import org.chorem.jtimer.ui.treetable.ProjectsAndTasksTable; +import org.chorem.jtimer.ui.widget.WindowProperty2; +import org.chorem.jtimer.ui.ws.SwingConnectionInformationHandler; +import org.chorem.jtimer.ws.ConnectionDataHandler; +import org.chorem.jtimer.ws.ProjectManagement; +import org.jdesktop.application.Action; +import org.jdesktop.application.Application; +import org.jdesktop.application.ApplicationContext; +import org.jdesktop.application.ResourceMap; +import org.jdesktop.application.SingleFrameApplication; +import org.jdesktop.application.Task; +import org.jdesktop.application.TaskMonitor; + +/** + * Main jTimer application window. + * + * Respect JSR-296 + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class JTimer extends SingleFrameApplication implements + TreeSelectionListener, MouseListener { + + /** log. */ + private static Log log = LogFactory.getLog(JTimer.class); + + /** Timer core controller. */ + protected TimerCore core; + + /** Tree structure. */ + protected ProjectsAndTasksTable projectsAndTasksTable; + + /** Systray manager. */ + protected SystrayManager systrayManager; + + /** I18n resources map. */ + protected ResourceMap resourceMap; + + /** Jtimer application config. */ + public static JTimerConfig config; + + /** Single project selection property. */ + protected boolean selectedSingleProject; + + /** Single task selection property. */ + protected boolean selectedSingleTask; + + /** Single task or project selection. */ + protected boolean selectedSingleElement; + + /** Single running task selection. */ + protected boolean selectedSingleRunningTask; + + /** Single non running task selection. */ + protected boolean selectedSingleStoppedTask; + + /** Multiples projects selection. */ + protected boolean selectedMultiplesProjects; + + /** Multiples tasks selection. */ + protected boolean selectedMultiplesTasks; + + /** Multiples elements selection. */ + protected boolean selectedMultiplesElements; + + /** + * Main. launch UI + * + * @param args args + */ + public static void main(String[] args) { + + if (log.isInfoEnabled()) { + log.info("Starting " + JTimer.class.getSimpleName() + " at " + + new Date()); + } + launch(JTimer.class, args); + } + + /** + * Initialize application. Called before UI build. + * + * @param args args + * @see Application#initialize(String[]) + */ + @Override + protected void initialize(String[] args) { + + // super, but does nothing + super.initialize(args); + + // load configuration + loadConfiguration(args); + + // init resources map + ApplicationContext ctxt = getContext(); + resourceMap = ctxt.getResourceMap(); + + // fixme awt application name. Can be seen only with gnome-shell + // tray icon is displayed with name "org-chorem-jtimer-JTimer" instead of + // only "jTimer" with following fix : + try { + Toolkit xToolkit = Toolkit.getDefaultToolkit(); + java.lang.reflect.Field awtAppClassNameField = xToolkit.getClass().getDeclaredField("awtAppClassName"); + awtAppClassNameField.setAccessible(true); + awtAppClassNameField.set(xToolkit, resourceMap.getString("Application.title")); + } catch (Exception ex) { + if (log.isWarnEnabled()) { + log.warn("Can change awt application name", ex); + } + } + + // fix start in iconified mode + ctxt.getSessionStorage().putProperty(JFrame.class, new WindowProperty2()); + + // init timercore + core = new TimerCore(); + + // handler + ConnectionDataHandler handler = new SwingConnectionInformationHandler( + this); + ProjectManagement managementService = JTimerFactory + .getProjectManagementService(); + if (managementService != null) { + managementService.setConnectionDataHandler(handler); + } + + // Systray mgr + systrayManager = new SystrayManager(this); + core.getData().addDataEventListener(systrayManager); + + IdleDialog.init(this); + } + + /** + * Load configuration. + * + * @param args args to parse command line options + */ + protected void loadConfiguration(String[] args) { + + config = new JTimerConfig(); + + // add file migration for configuration file created before version 1.4 + File homeDir = new File(System.getProperty("user.home"), ".jtimer"); + File oldFile = new File(homeDir, "JTimer.properties"); + File newFile = new File(config.appConfig.getUserConfigDirectory(), config.appConfig.getConfigFileName()); + if (oldFile.isFile() && !newFile.isFile()) { + if (log.isInfoEnabled()) { + log.info("Migration configuration file location"); + } + try { + FileUtils.copyFile(oldFile, newFile); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't copy config file to new location", ex); + } + } + } + + // parse after file migration + config.parse(args); + } + + /** + * startup. + * + * Create frame menu bar. Create main component. + * + * @see Application#startup() + */ + @Override + protected void startup() { + + // set Menu Bar + getMainFrame().setJMenuBar(createMenuBar()); + + // show main panel components + show(createMainComponent()); + + } + + /** + * Create main component. + * + * Toolbar on top. Tree middle. Status bar on bottom. + * + * @return The component + */ + protected JComponent createMainComponent() { + + // panel = main component + JPanel panel = new JPanel(new BorderLayout()); + + // toolbar on top (north) + panel.add(createToolBar(), BorderLayout.NORTH); + + // tree middle (center-top) + ProjectsAndTasksTable projectTreeTable = createTreeTable(); + JScrollPane scrollPaneProjectTreeTable = new JScrollPane( + projectTreeTable); + panel.add(scrollPaneProjectTreeTable, BorderLayout.CENTER); + + // status bar bottom + StatusBar sb = new StatusBar(this, core.getData()); + // status bar ui will be notified from events + core.getData().addDataEventListener(sb); + panel.add(sb, BorderLayout.SOUTH); + + // taille par defaut au premier lancement de l'application + // sera ecrasee par la restauration de la session + panel.setPreferredSize(new Dimension(640, 480)); + + return panel; + } + + /** + * Create complex tree table. + * + * @return ProjectsAndTaskTable instance + */ + protected ProjectsAndTasksTable createTreeTable() { + + projectsAndTasksTable = new ProjectsAndTasksTable(this, core); + + // name used in properties files + projectsAndTasksTable.setName("projectslist"); + projectsAndTasksTable.addTreeSelectionListener(this); + projectsAndTasksTable.addMouseListener(this); + projectsAndTasksTable.setShowClosed(config.isShowClosed()); + + // since merge option, selection can be multiple + projectsAndTasksTable + .setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); + + // remove F2 KeyStroke from table + KeyStroke keyToRemove = KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0); + InputMap imap = projectsAndTasksTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + while (imap != null) { + imap.remove(keyToRemove); + imap = imap.getParent(); + } + + return projectsAndTasksTable; + } + + /** + * Create toolbar. + * + * @return tool bar builded + */ + protected JComponent createToolBar() { + String[] toolbarActionNames = { "startTask", "stopTask", "newProject", + "newTask", "---", "addAnnotation", "editAlert" }; + JToolBar toolBar = new JToolBar(); + toolBar.setFloatable(false); + for (String actionName : toolbarActionNames) { + + if (actionName.equals("---")) { + toolBar.add(new JToolBar.Separator()); + } else { + JButton button = new JButton(); + button.setAction(getAction(actionName)); + + // hide text + // button.setVerticalTextPosition(JButton.BOTTOM); + // button.setHorizontalTextPosition(JButton.CENTER); + button.setHideActionText(true); + + button.setFocusable(false); + toolBar.add(button); + } + } + return toolBar; + } + + /** + * Create application menu bar. + * + * @return menu bar + */ + protected JMenuBar createMenuBar() { + + JMenuBar menuBar = new JMenuBar(); + String[] fileMenuActionNames = { "quit" }; + menuBar.add(createMenu("fileMenu", fileMenuActionNames)); + + String[] projectMenuActionNames = { "newProject", "editProject", + "closeProject", "deleteProject" }; + menuBar.add(createMenu("projectMenu", projectMenuActionNames)); + + String[] taskMenuActionNames = { "newTask", "editTask", "closeTask", + "deleteTask", "---", "startTask", "stopTask", "---", + "addAnnotation", "editAlert", "increment1Task", + "increment5Task", "increment30Task", "decrement1Task", + "decrement5Task", "decrement30Task", "setToZero", "mergeTasks" }; + menuBar.add(createMenu("taskMenu", taskMenuActionNames)); + + String[] reportMenuActionNames = { "makeReport" }; + menuBar.add(createMenu("reportMenu", reportMenuActionNames)); + + JMenu optionmMenu = createOptionMenu(); + menuBar.add(optionmMenu); + + String[] helpMenuActionNames = { "about" }; + menuBar.add(createMenu("helpMenu", helpMenuActionNames)); + + return menuBar; + } + + /** + * Create option dynamic menu. + * + * @return option menu + */ + protected JMenu createOptionMenu() { + JMenu menu = new JMenu(); + menu.setName("optionMenu"); + + // show closed + JMenuItem showClosedItem = new JCheckBoxMenuItem(); + showClosedItem.setAction(getAction("isShowClosed")); + showClosedItem.setSelected(config.isShowClosed()); + showClosedItem.setIcon(null); + menu.add(showClosedItem); + + // close to systray + JMenuItem closeToSysItem = new JCheckBoxMenuItem(); + closeToSysItem.setAction(getAction("isCloseToSystray")); + closeToSysItem.setSelected(config.isCloseToSystray()); + closeToSysItem.setIcon(null); + menu.add(closeToSysItem); + + // report first day of week + JMenu reportFDoW = new JMenu(); + reportFDoW.setName("optionReportFirstDayMenu"); + Calendar calendar = Calendar.getInstance(); + ButtonGroup bg = new ButtonGroup(); + // affiche la liste des jours dans l'ordre de la locale utilisateur + for (int day = calendar.getFirstDayOfWeek() ; day < calendar.getFirstDayOfWeek() + 7 ; day++) { + int realDay = (day - 1) % 7 + 1; + JRadioButtonMenuItem fdowItem = new JRadioButtonMenuItem(); + fdowItem.setAction(getAction("isReportFirstDayOfWeek" + realDay)); + fdowItem.setSelected(realDay == JTimer.config.getReportFirstDayOfWeek()); + fdowItem.setIcon(null); + reportFDoW.add(fdowItem); + bg.add(fdowItem); + } + menu.add(reportFDoW); + + return menu; + } + + /** + * Create single menu. + * + * @param menuName menu name + * @param actionNames associated actions + * @return menu + */ + protected JMenu createMenu(String menuName, String[] actionNames) { + JMenu menu = new JMenu(); + menu.setName(menuName); + addActionToMenu(menu, actionNames); + return menu; + } + + /** + * Add saf action to an existing menu. + * + * Menu have to be a JMenu or JPopupMenu. + * + * @param menu parent menu + * @param actionNames action names + */ + protected void addActionToMenu(JComponent menu, String[] actionNames) { + for (String actionName : actionNames) { + if (actionName.equals("---")) { + menu.add(new JSeparator()); + } else if (actionName.startsWith("is")) { + // if action name start by is + // display it as CheckBox + JMenuItem menuItem = new JCheckBoxMenuItem(); + // link to an @Action + menuItem.setAction(getAction(actionName)); + menuItem.setIcon(null); + menu.add(menuItem); + } else { + JMenuItem menuItem = new JMenuItem(); + // link to an @Action + menuItem.setAction(getAction(actionName)); + menuItem.setIcon(null); + menu.add(menuItem); + } + } + } + + /** + * Ready. Called when UI is ready and displayed. + * + * @see Application#ready() + */ + @Override + protected void ready() { + + // init core, load list, synchronization, etc... + boolean init = core.init(); + + if (init) { + // schedule tree refresh at midnight + scheduleTreeRefresh(); + + // install icon (do it at last action) + systrayManager.install(); + } else { + String failTitle = resourceMap.getString("startFail.title"); + String failMessage = resourceMap.getString("startFail.message"); + JOptionPane.showMessageDialog(getMainFrame(), failMessage, + failTitle, JOptionPane.ERROR_MESSAGE); + exit(); + } + } + + /** + * Called on application shutdown. + * + * Save context. + * + * @see SingleFrameApplication#shutdown() + */ + @Override + protected void shutdown() { + log.debug("Shutdown called"); + core.exit(); + + // save context + // super, sauve le context des fenetres, etc... + super.shutdown(); + } + + /** + * Refresh tree at midnight. + */ + protected void scheduleTreeRefresh() { + + // task used to refresh tree + java.util.TimerTask refreshTreeTask = new RefreshTreeTask(core); + + Timer timer = new Timer(); + + Calendar date = Calendar.getInstance(); + date.setTimeInMillis(System.currentTimeMillis()); + date.set(Calendar.HOUR_OF_DAY, 0); + date.set(Calendar.MINUTE, 0); + date.set(Calendar.SECOND, 0); + date.set(Calendar.MILLISECOND, 0); + date.add(Calendar.DAY_OF_YEAR, 1); // run only next day + + // Schedule to run every day in midnight + // task,firstTime,period + timer.schedule(refreshTreeTask, date.getTime(), // at date + 1000 * 60 * 60 * 24 // every day + ); + } + + /** + * Display a popup error message. + * + * @param errorMessageKey saf error message key + */ + protected void displayErrorMessage(String errorMessageKey) { + String title = resourceMap.getString("action.invalidActionTitle"); + String message = resourceMap.getString(errorMessageKey); + + // check untranslated string + if (StringUtils.isEmpty(message)) { + message = resourceMap.getString("action.missingErrorMessage", + errorMessageKey); + } + + JOptionPane.showMessageDialog(getMainFrame(), message, title, + JOptionPane.ERROR_MESSAGE); + } + + /** + * New project action. + * + * Ask user for project name + */ + @Action + public void newProject() { + + String projectName = JOptionPane.showInputDialog(getMainFrame(), + resourceMap.getString("input.newProjectMessage"), resourceMap + .getString("input.newProjectTitle"), + JOptionPane.QUESTION_MESSAGE); + + if (projectName != null) { + + // remove unneeded spaces + projectName = projectName.trim(); + + TimerProject p = new TimerProject(projectName); + + // add creation date + p.setCreationDate(new Date()); + + try { + core.getData().addProject(p); + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); + } + } + } + + /** + * Edit project + * + * Enabled when a project is selected + */ + @Action(enabledProperty = "selectedSingleProject") + public void editProject() { + TimerProject project = projectsAndTasksTable.getSelectedProjects().get( + 0); + + String newProjectName = (String) JOptionPane.showInputDialog(getMainFrame(), resourceMap + .getString("input.editProjectMessage"), resourceMap + .getString("input.editProjectTitle"), + JOptionPane.INFORMATION_MESSAGE, null, null, project.getName()); + + if (newProjectName != null) { + + // remove unneeded spaces + newProjectName = newProjectName.trim(); + + try { + core.getData().editProject(project, newProjectName); + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); + } + } + } + + /** + * Create new task action. + * + * Enabled when a project or a task is selected + */ + @Action(enabledProperty = "selectedSingleElement") + public void newTask() { + + // select task to add new task + TimerTask selectedTask = projectsAndTasksTable.getSelectedElements() + .get(0); + + String taskName = JOptionPane.showInputDialog(getMainFrame(), + resourceMap.getString("input.newTaskMessage", selectedTask + .getName()), resourceMap + .getString("input.newTaskTitle"), + JOptionPane.QUESTION_MESSAGE); + + if (taskName != null) { + + // remove unneeded spaces + taskName = taskName.trim(); + + TimerTask t = new TimerTask(taskName); + + // Fix creation date + t.setCreationDate(new Date()); + + try { + core.getData().addTask(selectedTask, t); + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); + } + } + + } + + /** + * Edit task. + * + * Enabled when a task is selected + */ + @Action(enabledProperty = "selectedSingleTask") + public void editTask() { + + TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); + + TimerTaskEditor editor = new TimerTaskEditor(this, task, core); + editor.setLocationByPlatform(true); + editor.setVisible(true); + } + + /** + * Start selected task in tree. + * + * If it not already been running + * + * @return TimerTask scheduled for start + * @see Task + */ + @Action(enabledProperty = "selectedSingleStoppedTask") + public Task<?, ?> startTask() { + + // search for selected task in tree + // can't be null + TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); + + RunTaskJob jobToRun = new RunTaskJob(this, task, core.getData()); + core.getData().startTask(task); + + return jobToRun; + } + + /** + * Called by task job manager when task as been started. + * + * @param task started task + */ + public void startedTask(TimerTask task) { + setSelectedSingleRunningTask(true); + setSelectedSingleStoppedTask(false); + } + + /** + * Return job that manage running task. + * + * @param task timer task to get job + * @return job or null + */ + protected RunTaskJob getJobForRunningTask(TimerTask task) { + RunTaskJob job = null; + + TaskMonitor tm = getContext().getTaskMonitor(); + for (Task t : tm.getTasks()) { + TimerTask localtask = ((RunTaskJob) t).getTask(); + if (task.equals(localtask)) { + job = (RunTaskJob) t; + } + } + + return job; + } + + /** + * Stop selected task in tree. + * + * Verify if it has been started + */ + @Action(enabledProperty = "selectedSingleRunningTask") + public void stopTask() { + + // task can't be null + TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); + stopTask(task); + + } + + /** + * Stop a task. + * + * Delegate method. Called by idle detect ? + * Called by delete method too. + * + * @param task task to stop + */ + public void stopTask(TimerTask task) { + + RunTaskJob rtt = getJobForRunningTask(task); + // test if task is already running + if (rtt != null) { + rtt.wantToStop(); + core.getData().stopTask(task); + + // re-enable/disable buttons + setSelectedSingleRunningTask(false); + setSelectedSingleStoppedTask(true); + } + } + + /** + * Stop all running tasks. + */ + public void stopAllTasks() { + + TaskMonitor tm = getContext().getTaskMonitor(); + for (Task t : tm.getTasks()) { + // task + TimerTask ttask = ((RunTaskJob) t).getTask(); + stopTask(ttask); + } + } + + /** + * Close project. + */ + @Action(enabledProperty = "selectedSingleProject") + public void closeProject() { + TimerProject project = projectsAndTasksTable.getSelectedProjects().get(0); + + core.getData().changeProjectCloseState(project); + } + + /** + * Close task. + */ + @Action(enabledProperty = "selectedSingleTask") + public void closeTask() { + TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); + + core.getData().changeTaskCloseState(task); + } + + /** + * Delete project. + */ + @Action(enabledProperty = "selectedSingleProject") + public void deleteProject() { + + TimerProject project = projectsAndTasksTable.getSelectedProjects().get( + 0); + + if (project != null) { + int confirm = JOptionPane.showConfirmDialog(getMainFrame(), + resourceMap.getString("input.deleteProjectMessage", project + .getName()), resourceMap + .getString("input.deleteProjectTitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + + if (confirm == JOptionPane.YES_OPTION) { // approved + try { + core.getData().deleteProject(project); + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); + } + } + + } + + } + + /** + * Delete task. + */ + @Action(enabledProperty = "selectedSingleTask") + public void deleteTask() { + + TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); + + if (task != null) { + int confirm = JOptionPane.showConfirmDialog(getMainFrame(), + resourceMap.getString("input.deleteTaskMessage", task + .getName()), resourceMap + .getString("input.deleteTaskTitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + + if (confirm == JOptionPane.YES_OPTION) { // approved + try { + stopTask(task); + core.getData().deleteTask(task); + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); + } + } + } + } + + /** + * Change show closed option. + * + * @param event action event + */ + @Action + public void isShowClosed(ActionEvent event) { + JCheckBoxMenuItem source = (JCheckBoxMenuItem) event.getSource(); + boolean showClosed = source.isSelected(); + projectsAndTasksTable.setShowClosed(showClosed); + config.setShowClosed(showClosed); + } + + /** + * Change close to systray option. + * + * @param event action event + */ + @Action + public void isCloseToSystray(ActionEvent event) { + JCheckBoxMenuItem source = (JCheckBoxMenuItem) event.getSource(); + boolean closeToSystray = source.isSelected(); + config.setCloseToSystray(closeToSystray); + } + + /** + * Change report first day of week. + */ + @Action + public void isReportFirstDayOfWeek1() { + config.setReportFirstDayOfWeek(1); + } + + /** + * Change report first day of week. + */ + @Action + public void isReportFirstDayOfWeek2() { + config.setReportFirstDayOfWeek(2); + } + + /** + * Change report first day of week. + */ + @Action + public void isReportFirstDayOfWeek3() { + config.setReportFirstDayOfWeek(3); + } + + /** + * Change report first day of week. + */ + @Action + public void isReportFirstDayOfWeek4() { + config.setReportFirstDayOfWeek(4); + } + + /** + * Change report first day of week. + */ + @Action + public void isReportFirstDayOfWeek5() { + config.setReportFirstDayOfWeek(5); + } + + /** + * Change report first day of week. + */ + @Action + public void isReportFirstDayOfWeek6() { + config.setReportFirstDayOfWeek(6); + } + + /** + * Change report first day of week. + */ + @Action + public void isReportFirstDayOfWeek7() { + config.setReportFirstDayOfWeek(7); + } + + /** + * Increment task time. + */ + @Action(enabledProperty = "selectedSingleTask") + public void increment5Task() { + incrementTaskTime(5 * 60); + } + + /** + * Increment task time. + */ + @Action(enabledProperty = "selectedSingleTask") + public void increment30Task() { + incrementTaskTime(30 * 60); + } + + /** + * Decrement task time. + */ + @Action(enabledProperty = "selectedSingleTask") + public void decrement1Task() { + incrementTaskTime(-60); + } + + /** + * Decrement task time. + */ + @Action(enabledProperty = "selectedSingleTask") + public void decrement5Task() { + incrementTaskTime(-5 * 60); + } + + /** + * Decrement task time. + */ + @Action(enabledProperty = "selectedSingleTask") + public void decrement30Task() { + incrementTaskTime(-30 * 60); + } + + /** + * Increment task time. + */ + @Action(enabledProperty = "selectedSingleTask") + public void increment1Task() { + incrementTaskTime(60); + } + + /** + * Increment task time. + * + * To decrement, set negative increment:) + * + * @param increment increment in seconds + */ + protected void incrementTaskTime(long increment) { + TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() + .get(0); + + // check if task is running + RunTaskJob job = getJobForRunningTask(selectedTask); + if (job != null) { + // task is running + // increment is in seconds !!! + job.incrementTaskTime(increment * 1000); + } else { + // task is not running + Date now = new Date(); + long todayTime = selectedTask.getTime(now); + + long newTodayTime = todayTime + increment; + + try { + // check if + negative increment still positive + if (newTodayTime > 0) { + core.getData().changeTaskTime(selectedTask, now, + newTodayTime); + } else { + // force to 0 + core.getData().changeTaskTime(selectedTask, now, 0L); + } + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); + } + } + } + + /** + * Reset task time to zero. + */ + @Action(enabledProperty = "selectedSingleTask") + public void setToZero() { + TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); + incrementTaskTime(-task.getTime(new Date())); + } + + /** + * Merge multiples tasks action. + */ + @Action(enabledProperty = "selectedMultiplesTasks") + public void mergeTasks() { + List<TimerTask> tasks = projectsAndTasksTable.getSelectedTasks(); + + TimerTask destinationTask = tasks.get(0); + List<TimerTask> otherTasks = tasks.subList(1, tasks.size()); + int confirm = JOptionPane.showConfirmDialog(getMainFrame(), + resourceMap.getString("input.mergeTaskMessage", tasks.size(), + destinationTask.getName()), resourceMap + .getString("input.mergeTaskTitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + if (confirm == JOptionPane.YES_OPTION) { + + try { + core.getData().mergeTasks(destinationTask, otherTasks); + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); + } + } + } + + /** + * Add annotation action. + */ + @Action(enabledProperty = "selectedSingleTask") + public void addAnnotation() { + // select task to add new annotation + TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() + .get(0); + + String annotation = JOptionPane.showInputDialog(getMainFrame(), + resourceMap.getString("input.addAnnotationMessage", + selectedTask.getName()), resourceMap + .getString("input.addAnnotationTitle"), + JOptionPane.QUESTION_MESSAGE); + + if (annotation != null) { + // remove useless spaces + annotation = annotation.trim(); + + try { + core.getData().addAnnotation(selectedTask, new Date(), + annotation); + } catch (DataViolationException e) { + displayErrorMessage(e.getExceptionKey()); + } + } + } + + /** + * Edit alert action. + */ + @Action(enabledProperty = "selectedSingleTask") + public void editAlert() { + // select task to edit alert + TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() + .get(0); + + AlertEditor alertEditor = new AlertEditor(this, core.getData(), + selectedTask); + show(alertEditor); + } + + /** + * Create report. + */ + @Action + public void makeReport() { + ReportView view = new ReportView(this, core); + show(view); + } + + /** + * Show about frame. + */ + @Action + public void about() { + HelpFrame aboutFrame = new HelpFrame(this); + show(aboutFrame); + } + + /** + * Is selected project. + * + * @return selected project property + */ + public boolean isSelectedSingleProject() { + return selectedSingleProject; + } + + /** + * Change selected project property. + * + * @param selectedSingleProject selected project property + */ + public void setSelectedSingleProject(boolean selectedSingleProject) { + boolean oldValue = this.selectedSingleProject; + this.selectedSingleProject = selectedSingleProject; + firePropertyChange("selectedSingleProject", oldValue, + selectedSingleProject); + } + + /** + * Is selected task. + * + * @return selected task property + */ + public boolean isSelectedSingleTask() { + return selectedSingleTask; + } + + /** + * Change selected task property. + * + * @param selectedSingleTask selected task property + */ + public void setSelectedSingleTask(boolean selectedSingleTask) { + boolean oldValue = this.selectedSingleTask; + this.selectedSingleTask = selectedSingleTask; + firePropertyChange("selectedSingleTask", oldValue, selectedSingleTask); + } + + /** + * Is selected task or project. + * + * @return selected task or project property + */ + public boolean isSelectedSingleElement() { + return selectedSingleElement; + } + + /** + * Change selected task or project property. + * + * @param selectedSingleElement selected task or project property + */ + public void setSelectedSingleElement(boolean selectedSingleElement) { + boolean oldValue = this.selectedSingleElement; + this.selectedSingleElement = selectedSingleElement; + firePropertyChange("selectedSingleElement", oldValue, + selectedSingleElement); + } + + /** + * Is selected running task. + * + * @return the selectedSingleRunningTask + */ + public boolean isSelectedSingleRunningTask() { + return selectedSingleRunningTask; + } + + /** + * Change selected running task property. + * + * @param selectedSingleRunningTask selected running task property + */ + public void setSelectedSingleRunningTask(boolean selectedSingleRunningTask) { + boolean oldValue = this.selectedSingleRunningTask; + this.selectedSingleRunningTask = selectedSingleRunningTask; + firePropertyChange("selectedSingleRunningTask", oldValue, + selectedSingleRunningTask); + } + + /** + * Is selected non running task. + * + * @return selected non running task + */ + public boolean isSelectedSingleStoppedTask() { + return selectedSingleStoppedTask; + } + + /** + * Change selected non running task property. + * + * @param selectedSingleStoppedTask selected non running task + */ + public void setSelectedSingleStoppedTask(boolean selectedSingleStoppedTask) { + boolean oldValue = this.selectedSingleStoppedTask; + this.selectedSingleStoppedTask = selectedSingleStoppedTask; + firePropertyChange("selectedSingleStoppedTask", oldValue, + selectedSingleStoppedTask); + } + + /** + * Is selected multiples projects. + * + * @return selected multiples projects + */ + public boolean isSelectedMultiplesProjects() { + return selectedMultiplesProjects; + } + + /** + * Change selected multiples projects property. + * + * @param selectedMultiplesProjects selected multiples projects + */ + public void setSelectedMultiplesProjects(boolean selectedMultiplesProjects) { + boolean oldValue = this.selectedMultiplesProjects; + this.selectedMultiplesProjects = selectedMultiplesProjects; + firePropertyChange("selectedMultiplesProjects", oldValue, + selectedMultiplesProjects); + } + + /** + * Is selected multiples tasks. + * + * @return selected multiples tasks + */ + public boolean isSelectedMultiplesTasks() { + return selectedMultiplesTasks; + } + + /** + * Change selected multiples tasks property. + * + * @param selectedMultiplesTasks selected multiples tasks + */ + public void setSelectedMultiplesTasks(boolean selectedMultiplesTasks) { + boolean oldValue = this.selectedMultiplesTasks; + this.selectedMultiplesTasks = selectedMultiplesTasks; + firePropertyChange("selectedMultiplesTasks", oldValue, + selectedMultiplesTasks); + } + + /** + * Is selected multiples elements. + * + * @return selected multiples elements + */ + public boolean isSelectedMultiplesElements() { + return selectedMultiplesElements; + } + + /** + * Change selected multiples elements property. + * + * @param selectedMultiplesElements selected multiples elements + */ + public void setSelectedMultiplesElements(boolean selectedMultiplesElements) { + boolean oldValue = this.selectedMultiplesElements; + this.selectedMultiplesElements = selectedMultiplesElements; + firePropertyChange("selectedMultiplesElements", oldValue, + selectedMultiplesElements); + } + + /* + * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent) + */ + @Override + public void valueChanged(TreeSelectionEvent e) { + // get selected elements + List<TimerTask> elements = projectsAndTasksTable.getSelectedElements(); + List<TimerProject> projects = projectsAndTasksTable + .getSelectedProjects(); + List<TimerTask> tasks = projectsAndTasksTable.getSelectedTasks(); + + // notify application that tree selection has changed + if (tasks.size() == 1 && projects.size() == 0) { + TimerTask task = tasks.get(0); + setSelectedSingleTask(true); + + // ask for SAF job manager if task is running + RunTaskJob job = getJobForRunningTask(task); + if (job == null || job.isStopping()) { + setSelectedSingleStoppedTask(true); + setSelectedSingleRunningTask(false); + } else { + setSelectedSingleStoppedTask(false); + setSelectedSingleRunningTask(true); + } + setSelectedMultiplesTasks(false); + setSelectedSingleProject(false); + setSelectedMultiplesProjects(false); + } else { + setSelectedSingleTask(false); + setSelectedSingleStoppedTask(false); + setSelectedSingleRunningTask(false); + + if (tasks.size() > 1) { + setSelectedMultiplesTasks(projects.size() == 0); + } else { + setSelectedSingleProject(tasks.size() == 0 + && projects.size() == 1); + setSelectedMultiplesProjects(tasks.size() == 0 + && projects.size() > 1); + } + } + setSelectedSingleElement(elements.size() == 1); + setSelectedMultiplesElements(elements.size() > 1); + } + + /** + * Get action for named component. + * + * Util method. + * + * @param actionName action name + * @return swing action + */ + protected javax.swing.Action getAction(String actionName) { + return getContext().getActionMap().get(actionName); + } + + /** + * Show window + */ + @Action + public void show() { + // TODO better code ? that use SAF methods ? + getMainFrame().setVisible(true); + getMainFrame().toFront(); + } + + /** + * Show window + */ + @Action + public void hide() { + // TODO better code ? that use SAF methods ? + getMainFrame().setVisible(false); + } + + /** + * Notified by job on pre idle detect. + */ + public void preIdleDetect() { + systrayManager.preIdleDetect(); + } + + /** + * Notified by job on post idle detect. + */ + public void postIdleDetect() { + systrayManager.postIdleDetect(); + } + + /* + * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) + */ + public void mouseClicked(MouseEvent e) { + + if (log.isDebugEnabled()) { + log.debug("Mouse clicked (" + e.getClickCount() + + " clics), source = " + + e.getSource().getClass().getName()); + } + + switch (e.getButton()) { + + // clic gauche + case MouseEvent.BUTTON1: + // clic sur l'arbre des projets + if (e.getSource() == projectsAndTasksTable) { + // demarre la tache lors d'un double clic dessus + if (e.getClickCount() == 2) { + + if (isSelectedSingleStoppedTask()) { // can only launch non running tasks + Task<?, ?> appTask = startTask(); + if (appTask != null) { + + // first, on dlb click stop all running tasks + stopAllTasks(); + + getContext().getTaskService().execute(appTask); + } + /* TODO EC-20100416 temp disable, called twice, can display + -1 task running :( + } else if (isSelectedSingleRunningTask()) { + TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); + stopTask(task); */ + } else { + if (log.isDebugEnabled()) { + log.debug("Non selected non running task to launch"); + } + } + } else { + if (log.isDebugEnabled()) { + log.debug("Single clic on tree, do nothing"); + } + } + } + break; + + // gestion du clic droit + case MouseEvent.BUTTON3: + + // force task selection on rigth clic + TreePath path = projectsAndTasksTable.getPathForLocation(e.getX(), + e.getY()); + int selectedRow = projectsAndTasksTable.getRowForPath(path); + projectsAndTasksTable.getSelectionModel().setSelectionInterval( + selectedRow, selectedRow); + + // fix item selection + JPopupMenu menu = new JPopupMenu(); + + String[] actionNames = null; + + // construct menu in function of selection + if (isSelectedSingleProject()) { + actionNames = new String[] { "newTask", "---", "newProject", + "editProject", "closeProject", "deleteProject" }; + } + + if (isSelectedSingleTask()) { + actionNames = new String[] { "startTask", "stopTask", "---", + "newTask", "editTask", "closeTask", "deleteTask", + "---", "addAnnotation", "editAlert", "increment1Task", + "increment5Task", "increment30Task", "decrement1Task", + "decrement5Task", "decrement30Task", "setToZero" }; + } + + if (isSelectedMultiplesTasks()) { + actionNames = new String[] { "mergeTasks" }; + } + + // case, right clic, but nothing selected + if (actionNames != null) { + addActionToMenu(menu, actionNames); + + menu.show(e.getComponent(), e.getX(), e.getY()); + } + } + } + + public void mouseEntered(MouseEvent e) { + } + + public void mouseExited(MouseEvent e) { + } + + public void mousePressed(MouseEvent e) { + } + + public void mouseReleased(MouseEvent e) { + } +} Deleted: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-23 15:11:54 UTC (rev 2836) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-25 21:15:46 UTC (rev 2840) @@ -1,594 +0,0 @@ -/* - * #%L - * jTimer - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 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% - */ - -package org.chorem.jtimer.ui.report; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Desktop; -import java.awt.Font; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URLEncoder; -import java.text.DateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.swing.BorderFactory; -import javax.swing.ButtonGroup; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.JScrollPane; -import javax.swing.JSplitPane; -import javax.swing.JTextArea; -import javax.swing.JTree; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.jtimer.JTimer; -import org.chorem.jtimer.data.TimerCore; -import org.chorem.jtimer.entities.TimerProject; -import org.chorem.jtimer.entities.TimerTask; -import org.chorem.jtimer.ui.report.ReportGenerator.Type; -import org.chorem.jtimer.ui.report.tree.CheckBoxTreeCellEditor; -import org.chorem.jtimer.ui.report.tree.CheckBoxTreeCellRenderer; -import org.chorem.jtimer.ui.report.tree.CheckBoxTreeModel; -import org.jdesktop.application.Action; -import org.jdesktop.application.Application; -import org.jdesktop.application.FrameView; -import org.jdesktop.swingx.JXDatePicker; - -/** - * Reports UI. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class ReportView extends FrameView implements DocumentListener { - - /** Class logger */ - protected static Log log = LogFactory.getLog(ReportView.class); - - /** Timer core. */ - protected TimerCore core; - - /** Unselected task set. */ - protected Set<TimerTask> uncheckedTaskSet; - - /** Report sorting : day */ - protected JRadioButton radioByDay; - /** Report sorting : month */ - protected JRadioButton radioByMonth; - /** Report sorting : week */ - protected JRadioButton radioByWeek; - /** Report sorting : year */ - protected JRadioButton radioByYear; - /** Report sorting : project */ - protected JRadioButton radioByProject; - - /** Include annotations on reports */ - protected JCheckBox checkIncludesAnnotations; - /** Include annotations time on reports */ - protected JCheckBox checkIncludesAnnotationsTime; - - /** Date pickers, from... to */ - protected JXDatePicker datePickerFrom, datePickerTo; - - /** Project tree (with checkbox) */ - protected JTree projectsTree; - - /** Show hidden project box. */ - protected JCheckBox showHiddenProjectBox; - - /** Report process generator */ - protected ReportGenerator reportGenerator; - - /** Report output */ - protected JTextArea reportArea; - - /** Can send mail property. */ - protected boolean canSendMail; - - /** - * Reposts constructor. - * - * @param application parent reference - * @param core core reference - */ - public ReportView(Application application, TimerCore core) { - - super(application); - - // modify frame name - // otherwise, get parent frame dimention - getFrame().setName("reportFrame"); - - this.core = core; - this.uncheckedTaskSet = new HashSet<TimerTask>(); - - // set title - //setTitle(resourceMap.getString("reportTitle")); - - setComponent(getMainComponent()); - - reportGenerator = new ReportGenerator(); - - // reset selection - //uncheckedTaskSet.clear(); - } - - /** - * Get main view component. - * - * TODO use less complicated UI (no gbl) - * @return main component - */ - protected JComponent getMainComponent() { - - JPanel configComponent = new JPanel(new GridBagLayout()); - - // panel for options - JPanel panelOption = new JPanel(new GridBagLayout()); - panelOption.setBorder(BorderFactory.createTitledBorder(getResourceMap() - .getString("reportOptions"))); - - // first date picker - JLabel labelFrom = new JLabel(getResourceMap().getString("reportFrom")); - panelOption.add(labelFrom, new GridBagConstraints(0, 0, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - datePickerFrom = new JXDatePicker(); - datePickerFrom.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); - datePickerFrom.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); - panelOption.add(datePickerFrom, new GridBagConstraints(1, 0, 2, 1, 1, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - // second date picker - JLabel labelTo = new JLabel(getResourceMap().getString("reportTo")); - panelOption.add(labelTo, new GridBagConstraints(0, 1, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - datePickerTo = new JXDatePicker(); - datePickerTo.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); - datePickerTo.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); - panelOption.add(datePickerTo, new GridBagConstraints(1, 1, 2, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - // set current week by default - currentWeek(); - - // action button to show current or previous week - JButton currentWeekButton = new JButton(); - currentWeekButton.setAction(getContext().getActionMap(this).get( - "currentWeek")); - panelOption.add(currentWeekButton, new GridBagConstraints(3, 0, 1, 1, 0, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - JButton previousWeekButton = new JButton(); - previousWeekButton.setAction(getContext().getActionMap(this).get( - "previousWeek")); - panelOption.add(previousWeekButton, new GridBagConstraints(3, 1, 1, 1, 0, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - // Option for period grouping - radioByDay = new JRadioButton( - getResourceMap().getString("reportDaily"), true); - radioByMonth = new JRadioButton(getResourceMap().getString( - "reportMonthly")); - radioByWeek = new JRadioButton(getResourceMap().getString( - "reportWeekly")); - radioByYear = new JRadioButton(getResourceMap().getString( - "reportYearly")); - radioByProject = new JRadioButton(getResourceMap().getString( - "reportByProject")); - - ButtonGroup group = new ButtonGroup(); - group.add(radioByDay); - group.add(radioByMonth); - group.add(radioByWeek); - group.add(radioByYear); - group.add(radioByProject); - - panelOption.add(radioByDay, new GridBagConstraints(0, 2, 2, 1, 1, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - panelOption.add(radioByMonth, new GridBagConstraints(2, 2, 2, 1, 1, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - panelOption.add(radioByWeek, new GridBagConstraints(0, 3, 2, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - panelOption.add(radioByYear, new GridBagConstraints(2, 3, 2, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - panelOption.add(radioByProject, new GridBagConstraints(0, 4, 4, 1, 0, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - // miscellaneous - checkIncludesAnnotations = new JCheckBox(); - checkIncludesAnnotations.setAction(getContext().getActionMap(this).get( - "reportAnnotations")); - panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 5, - 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - checkIncludesAnnotationsTime = new JCheckBox(getResourceMap().getString( - "reportAnnotationsTime")); - checkIncludesAnnotationsTime.setEnabled(false); - panelOption.add(checkIncludesAnnotationsTime, new GridBagConstraints(2, 5, - 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - // panel form projects - JPanel panelProjects = new JPanel(new BorderLayout()); - panelProjects.setBorder(BorderFactory - .createTitledBorder(getResourceMap() - .getString("reportProjects"))); - - // show hidden box - showHiddenProjectBox = new JCheckBox(getContext().getActionMap(this) - .get("showHiddenProjects")); - panelProjects.add(showHiddenProjectBox, BorderLayout.NORTH); - - projectsTree = new JTree(); - projectsTree.setRootVisible(true); - projectsTree.setEditable(true); - projectsTree.setModel(new CheckBoxTreeModel(core, getResourceMap().getString("reportProjectsList") + " :")); - projectsTree.setCellEditor(new CheckBoxTreeCellEditor(core, projectsTree, - uncheckedTaskSet)); - projectsTree.setCellRenderer(new CheckBoxTreeCellRenderer(core, projectsTree, - uncheckedTaskSet)); - - JScrollPane jspTable = new JScrollPane(projectsTree); - panelProjects.add(jspTable, BorderLayout.CENTER); - - configComponent.add(panelOption, new GridBagConstraints(0, 0, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - configComponent.add(panelProjects, new GridBagConstraints(0, 1, 1, 1, 1, - 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(1, 1, 1, 1), 0, 0)); - - // panel for report text - JPanel panelReports = new JPanel(new GridBagLayout()); - panelReports.setBorder(BorderFactory.createTitledBorder(getResourceMap() - .getString("reportContent"))); - - reportArea = new JTextArea(); - reportArea.setFont(new Font("Courier", Font.PLAIN, 12)); - reportArea.getDocument().addDocumentListener(this); - JScrollPane jspReport = new JScrollPane(reportArea); - panelReports.add(jspReport, new GridBagConstraints(0, 0, 3, 1, 1, 1, - GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(1, 1, 1, 1), 0, 0)); - - // buttons - JButton generateButton = new JButton(); - generateButton.setAction(getContext().getActionMap(this).get( - "generateReport")); - panelReports.add(generateButton, new GridBagConstraints(0, 1, 1, 1, 1, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - JButton sendMailButton = new JButton(); - sendMailButton.setAction(getContext().getActionMap(this) - .get("sendMail")); - panelReports.add(sendMailButton, new GridBagConstraints(1, 1, 1, 1, 1, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - JButton closeButton = new JButton(); - closeButton.setAction(getContext().getActionMap(this).get("closeView")); - panelReports.add(closeButton, new GridBagConstraints(2, 1, 1, 1, 1, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - - JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, configComponent, panelReports); - splitPane.setOneTouchExpandable(true); - return splitPane; - } - - /** - * Select current week in date pickers. - */ - @Action - public void currentWeek() { - fillPickerDates(0); - } - - /** - * Display previous week in date pickers. - */ - @Action - public void previousWeek() { - fillPickerDates(-1); - } - - /** - * Fill picker date with predefined week selection (from current) - * and apply a delay (-1 = previous week). - * - * @param delay delay to add to current week - */ - protected void fillPickerDates(int delay) { - // init dates - Calendar calendarBegin = Calendar.getInstance(); - int firstDayOfWeek = JTimer.config.getReportFirstDayOfWeek(); - if (firstDayOfWeek <= 0 || firstDayOfWeek > 7) { - firstDayOfWeek = calendarBegin.getFirstDayOfWeek(); - } - calendarBegin.set(Calendar.DAY_OF_WEEK, firstDayOfWeek); - calendarBegin.set(Calendar.HOUR, 0); - calendarBegin.set(Calendar.MINUTE, 0); - calendarBegin.set(Calendar.SECOND, 0); - calendarBegin.set(Calendar.MILLISECOND, 0); - - // calendar must be in current week by default - if (calendarBegin.getTime().after(new Date())) { - calendarBegin.add(Calendar.WEEK_OF_YEAR, -1); - } - - // get end of week - // take calendarBegin and add a week time - Calendar calendarEnd = (Calendar) calendarBegin.clone(); - calendarEnd.add(Calendar.WEEK_OF_YEAR, 1); - calendarEnd.add(Calendar.DAY_OF_YEAR, -1); // take the day before - - // apply delai - calendarBegin.add(Calendar.WEEK_OF_YEAR, delay); - calendarEnd.add(Calendar.WEEK_OF_YEAR, delay); - - datePickerFrom.setDate(calendarBegin.getTime()); - datePickerTo.setDate(calendarEnd.getTime()); - } - - /** - * Close action. - */ - @Action - public void closeView() { - getApplication().hide(this); - } - - /** - * Show annotation checkbox checked. - */ - @Action - public void reportAnnotations() { - checkIncludesAnnotationsTime.setEnabled(checkIncludesAnnotations.isSelected()); - } - - /** - * Make report. - * - * Set content in {@link #reportArea} text area. - */ - @Action - public void generateReport() { - - // Choose selected project type - Type reportType = null; - if (radioByDay.isSelected()) { - reportType = Type.BY_DAY_REPORT; - } else if (radioByMonth.isSelected()) { - reportType = Type.BY_MONTH_REPORT; - } else if (radioByWeek.isSelected()) { - reportType = Type.BY_WEEK_REPORT; - } else if (radioByYear.isSelected()) { - reportType = Type.BY_YEAR_REPORT; - } else { - reportType = Type.BY_PROJECT_REPORT; - } - - // get filtred project list - // without non selected projet and tasks - List<TimerProject> selectedProjects = getSelectedProjects(core - .getData().getProjectsList(), uncheckedTaskSet); - - // make report - String report = reportGenerator.getReportText(reportType, - selectedProjects, datePickerFrom.getDate(), datePickerTo - .getDate(), checkIncludesAnnotations.isSelected(), - checkIncludesAnnotationsTime.isSelected()); - - if (report != null && !report.isEmpty()) { - reportArea.setText(report); - } else { - reportArea.setText(""); - } - } - - /** - * Get project list without project and task unselected in tree. - * - * @param projects original project list - * @param uncheckedTaskList unselected task list - * @return selected project list - */ - protected List<TimerProject> getSelectedProjects( - List<TimerProject> projects, Collection<TimerTask> uncheckedTaskList) { - - List<TimerProject> currentProjects = new ArrayList<TimerProject>(); - for (TimerProject project : projects) { - if (!uncheckedTaskList.contains(project)) { - TimerProject clonedProject = project.clone(); - clonedProject.getSubTasks().clear(); - clonedProject.getSubTasks().addAll( - getSelectedTasks(project.getSubTasks(), - uncheckedTaskList)); - currentProjects.add(clonedProject); - } - } - - return currentProjects; - } - - /** - * Get tasks list without tasks unselected in tree. - * - * @param tasks original project list - * @param uncheckedTaskList unselected task list - * @return selected project list - */ - protected List<TimerTask> getSelectedTasks(List<? extends TimerTask> tasks, - Collection<TimerTask> uncheckedTaskList) { - - List<TimerTask> currentTask = new ArrayList<TimerTask>(); - for (TimerTask task : tasks) { - if (!uncheckedTaskList.contains(task)) { - TimerTask clonedTask = task.clone(); - clonedTask.getSubTasks().clear(); - clonedTask.getSubTasks() - .addAll( - getSelectedTasks(task.getSubTasks(), - uncheckedTaskList)); - currentTask.add(clonedTask); - } - } - - return currentTask; - } - - /** - * Update tree, showing hidden projects or not. - */ - @Action - public void showHiddenProjects() { - CheckBoxTreeModel model = (CheckBoxTreeModel)projectsTree.getModel(); - model.setShowClosed(showHiddenProjectBox.isSelected()); - } - - /** - * Send report by mail. - */ - @Action(enabledProperty = "sendMailEnabled") - public void sendMail() { - - String report = reportArea.getText(); - - try { - String encodedReport = URLEncoder.encode(report, "UTF-8"); - - // bugfix for spaces - encodedReport = encodedReport.replaceAll("\\+", "%20"); - - URI mailtoURI = new URI("mailto:?body=" + encodedReport); - Desktop.getDesktop().mail(mailtoURI); - } catch (IOException e) { - if (log.isWarnEnabled()) { - log.warn("Cannot open link (maybe defaut browser in not configured ?)"); - } - if (log.isDebugEnabled()) { - log.debug("Error while opening link", e); - } - } catch (URISyntaxException e) { - if (log.isErrorEnabled()) { - log.error("Error while opening link", e); - } - } catch (UnsupportedOperationException e) { - if (log.isWarnEnabled()) { - log.warn("Cannot open link (maybe defaut browser in not configured ?)"); - } - if (log.isDebugEnabled()) { - log.debug("Error while opening link", e); - } - } - } - - /** - * Can send mail ? - * - * @return true if can send mail - */ - public boolean isSendMailEnabled() { - return canSendMail; - } - - /** - * Change can send mail property. - * - * @param enabled can send mail - */ - public void setSendMailEnabled(boolean enabled) { - boolean oldValue = canSendMail; - canSendMail = enabled; - firePropertyChange("sendMailEnabled", oldValue, canSendMail); - } - - /* - * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent) - */ - @Override - public void changedUpdate(DocumentEvent e) { - documentChanged(); - } - - /* - * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) - */ - @Override - public void insertUpdate(DocumentEvent e) { - documentChanged(); - } - - /* - * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) - */ - @Override - public void removeUpdate(DocumentEvent e) { - documentChanged(); - } - - /** - * Document content changed. - * - * Update can send mail property. - */ - protected void documentChanged() { - setSendMailEnabled(reportArea.getText().trim().length() > 0); - } -} Copied: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportView.java (from rev 2838, trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java) =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportView.java (rev 0) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-25 21:15:46 UTC (rev 2840) @@ -0,0 +1,613 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 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% + */ + +package org.chorem.jtimer.ui.report; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Desktop; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLEncoder; +import java.text.DateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.swing.BorderFactory; +import javax.swing.ButtonGroup; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; +import javax.swing.JTextArea; +import javax.swing.JTree; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.jtimer.JTimer; +import org.chorem.jtimer.data.TimerCore; +import org.chorem.jtimer.entities.TimerProject; +import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.ui.report.ReportGenerator.Type; +import org.chorem.jtimer.ui.report.tree.CheckBoxTreeCellEditor; +import org.chorem.jtimer.ui.report.tree.CheckBoxTreeCellRenderer; +import org.chorem.jtimer.ui.report.tree.CheckBoxTreeModel; +import org.jdesktop.application.Action; +import org.jdesktop.application.Application; +import org.jdesktop.application.FrameView; +import org.jdesktop.swingx.JXDatePicker; + +/** + * Reports UI. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ReportView extends FrameView implements DocumentListener { + + /** Class logger */ + protected static Log log = LogFactory.getLog(ReportView.class); + + /** Timer core. */ + protected TimerCore core; + + /** Unselected task set. */ + protected Set<TimerTask> uncheckedTaskSet; + + /** Report sorting : day */ + protected JRadioButton radioByDay; + /** Report sorting : month */ + protected JRadioButton radioByMonth; + /** Report sorting : week */ + protected JRadioButton radioByWeek; + /** Report sorting : year */ + protected JRadioButton radioByYear; + /** Report sorting : project */ + protected JRadioButton radioByProject; + + /** Include annotations on reports */ + protected JCheckBox checkIncludesAnnotations; + /** Include annotations time on reports */ + protected JCheckBox checkIncludesAnnotationsTime; + + /** Date pickers, from... to */ + protected JXDatePicker datePickerFrom, datePickerTo; + + /** Project tree (with checkbox) */ + protected JTree projectsTree; + + /** Show hidden project box. */ + protected JCheckBox showHiddenProjectBox; + + /** Report process generator */ + protected ReportGenerator reportGenerator; + + /** Report output */ + protected JTextArea reportArea; + + /** Can send mail property. */ + protected boolean canSendMail; + + /** + * Reposts constructor. + * + * @param application parent reference + * @param core core reference + */ + public ReportView(Application application, TimerCore core) { + + super(application); + + // modify frame name + // otherwise, get parent frame dimention + getFrame().setName("reportFrame"); + + this.core = core; + this.uncheckedTaskSet = new HashSet<TimerTask>(); + + // set title + //setTitle(resourceMap.getString("reportTitle")); + + setComponent(getMainComponent()); + + reportGenerator = new ReportGenerator(); + + // reset selection + //uncheckedTaskSet.clear(); + } + + /** + * Get main view component. + * + * TODO use less complicated UI (no gbl) + * @return main component + */ + protected JComponent getMainComponent() { + + JPanel configComponent = new JPanel(new GridBagLayout()); + + // panel for options + JPanel panelOption = new JPanel(new GridBagLayout()); + panelOption.setBorder(BorderFactory.createTitledBorder(getResourceMap() + .getString("reportOptions"))); + + // first date picker + JLabel labelFrom = new JLabel(getResourceMap().getString("reportFrom")); + panelOption.add(labelFrom, new GridBagConstraints(0, 0, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + datePickerFrom = new JXDatePicker(); + datePickerFrom.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); + datePickerFrom.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); + panelOption.add(datePickerFrom, new GridBagConstraints(1, 0, 2, 1, 1, + 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + // second date picker + JLabel labelTo = new JLabel(getResourceMap().getString("reportTo")); + panelOption.add(labelTo, new GridBagConstraints(0, 1, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + datePickerTo = new JXDatePicker(); + datePickerTo.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); + datePickerTo.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); + panelOption.add(datePickerTo, new GridBagConstraints(1, 1, 2, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + // set current week by default + currentWeek(); + + // action button to show current or previous week + JButton currentWeekButton = new JButton(); + currentWeekButton.setAction(getContext().getActionMap(this).get( + "currentWeek")); + panelOption.add(currentWeekButton, new GridBagConstraints(3, 0, 1, 1, 0, + 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + JButton previousWeekButton = new JButton(); + previousWeekButton.setAction(getContext().getActionMap(this).get( + "previousWeek")); + panelOption.add(previousWeekButton, new GridBagConstraints(3, 1, 1, 1, 0, + 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + // Option for period grouping + radioByDay = new JRadioButton( + getResourceMap().getString("reportDaily"), true); + radioByMonth = new JRadioButton(getResourceMap().getString( + "reportMonthly")); + radioByWeek = new JRadioButton(getResourceMap().getString( + "reportWeekly")); + radioByYear = new JRadioButton(getResourceMap().getString( + "reportYearly")); + radioByProject = new JRadioButton(getResourceMap().getString( + "reportByProject")); + + ButtonGroup group = new ButtonGroup(); + group.add(radioByDay); + group.add(radioByMonth); + group.add(radioByWeek); + group.add(radioByYear); + group.add(radioByProject); + + panelOption.add(radioByDay, new GridBagConstraints(0, 2, 2, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + panelOption.add(radioByMonth, new GridBagConstraints(2, 2, 2, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + panelOption.add(radioByWeek, new GridBagConstraints(0, 3, 2, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + panelOption.add(radioByYear, new GridBagConstraints(2, 3, 2, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + panelOption.add(radioByProject, new GridBagConstraints(0, 4, 4, 1, 0, + 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + // miscellaneous + checkIncludesAnnotations = new JCheckBox(); + checkIncludesAnnotations.setAction(getContext().getActionMap(this).get( + "reportAnnotations")); + panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 5, + 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + checkIncludesAnnotationsTime = new JCheckBox(getResourceMap().getString( + "reportAnnotationsTime")); + checkIncludesAnnotationsTime.setEnabled(false); + panelOption.add(checkIncludesAnnotationsTime, new GridBagConstraints(2, 5, + 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + // panel form projects + JPanel panelProjects = new JPanel(new BorderLayout()); + panelProjects.setBorder(BorderFactory + .createTitledBorder(getResourceMap() + .getString("reportProjects"))); + + // show hidden box + showHiddenProjectBox = new JCheckBox(getContext().getActionMap(this) + .get("showHiddenProjects")); + panelProjects.add(showHiddenProjectBox, BorderLayout.NORTH); + + projectsTree = new JTree(); + projectsTree.setRootVisible(true); + projectsTree.setEditable(true); + projectsTree.setModel(new CheckBoxTreeModel(core, getResourceMap().getString("reportProjectsList") + " :")); + projectsTree.setCellEditor(new CheckBoxTreeCellEditor(core, projectsTree, + uncheckedTaskSet)); + projectsTree.setCellRenderer(new CheckBoxTreeCellRenderer(core, projectsTree, + uncheckedTaskSet)); + + JScrollPane jspTable = new JScrollPane(projectsTree); + panelProjects.add(jspTable, BorderLayout.CENTER); + + configComponent.add(panelOption, new GridBagConstraints(0, 0, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + configComponent.add(panelProjects, new GridBagConstraints(0, 1, 1, 1, 1, + 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, + new Insets(1, 1, 1, 1), 0, 0)); + + // panel for report text + JPanel panelReports = new JPanel(new GridBagLayout()); + panelReports.setBorder(BorderFactory.createTitledBorder(getResourceMap() + .getString("reportContent"))); + + reportArea = new JTextArea(); + reportArea.setFont(new Font("Courier", Font.PLAIN, 12)); + reportArea.getDocument().addDocumentListener(this); + JScrollPane jspReport = new JScrollPane(reportArea); + panelReports.add(jspReport, new GridBagConstraints(0, 0, 3, 1, 1, 1, + GridBagConstraints.CENTER, GridBagConstraints.BOTH, + new Insets(1, 1, 1, 1), 0, 0)); + + // buttons + JButton generateButton = new JButton(); + generateButton.setAction(getContext().getActionMap(this).get( + "generateReport")); + panelReports.add(generateButton, new GridBagConstraints(0, 1, 1, 1, 1, + 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + JButton sendMailButton = new JButton(); + sendMailButton.setAction(getContext().getActionMap(this) + .get("sendMail")); + panelReports.add(sendMailButton, new GridBagConstraints(1, 1, 1, 1, 1, + 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + JButton closeButton = new JButton(); + closeButton.setAction(getContext().getActionMap(this).get("closeView")); + panelReports.add(closeButton, new GridBagConstraints(2, 1, 1, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); + + JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, configComponent, panelReports); + splitPane.setOneTouchExpandable(true); + return splitPane; + } + + /** + * Select current week in date pickers. + */ + @Action + public void currentWeek() { + fillPickerDates(0); + } + + /** + * Display previous week in date pickers. + */ + @Action + public void previousWeek() { + fillPickerDates(-1); + } + + /** + * Fill picker date with predefined week selection (from current) + * and apply a delay (-1 = previous week). + * + * @param delay delay to add to current week + */ + protected void fillPickerDates(int delay) { + // init dates + Calendar calendarBegin = Calendar.getInstance(); + int firstDayOfWeek = JTimer.config.getReportFirstDayOfWeek(); + if (firstDayOfWeek <= 0 || firstDayOfWeek > 7) { + firstDayOfWeek = calendarBegin.getFirstDayOfWeek(); + } + calendarBegin.set(Calendar.DAY_OF_WEEK, firstDayOfWeek); + calendarBegin.set(Calendar.HOUR, 0); + calendarBegin.set(Calendar.MINUTE, 0); + calendarBegin.set(Calendar.SECOND, 0); + calendarBegin.set(Calendar.MILLISECOND, 0); + + // calendar must be in current week by default + if (calendarBegin.getTime().after(new Date())) { + calendarBegin.add(Calendar.WEEK_OF_YEAR, -1); + } + + // get end of week + // take calendarBegin and add a week time + Calendar calendarEnd = (Calendar) calendarBegin.clone(); + calendarEnd.add(Calendar.WEEK_OF_YEAR, 1); + calendarEnd.add(Calendar.DAY_OF_YEAR, -1); // take the day before + + // apply delai + calendarBegin.add(Calendar.WEEK_OF_YEAR, delay); + calendarEnd.add(Calendar.WEEK_OF_YEAR, delay); + + datePickerFrom.setDate(calendarBegin.getTime()); + datePickerTo.setDate(calendarEnd.getTime()); + } + + /** + * Close action. + */ + @Action + public void closeView() { + getApplication().hide(this); + } + + /** + * Show annotation checkbox checked. + */ + @Action + public void reportAnnotations() { + checkIncludesAnnotationsTime.setEnabled(checkIncludesAnnotations.isSelected()); + } + + /** + * Make report. + * + * Set content in {@link #reportArea} text area. + */ + @Action + public void generateReport() { + + // Choose selected project type + Type reportType = null; + if (radioByDay.isSelected()) { + reportType = Type.BY_DAY_REPORT; + } else if (radioByMonth.isSelected()) { + reportType = Type.BY_MONTH_REPORT; + } else if (radioByWeek.isSelected()) { + reportType = Type.BY_WEEK_REPORT; + } else if (radioByYear.isSelected()) { + reportType = Type.BY_YEAR_REPORT; + } else { + reportType = Type.BY_PROJECT_REPORT; + } + + // get filtered project list + // without non selected project and tasks + List<TimerProject> selectedProjects = getSelectedProjects(core + .getData().getProjectsList(), uncheckedTaskSet); + + // make report + String report = reportGenerator.getReportText(reportType, + selectedProjects, datePickerFrom.getDate(), datePickerTo + .getDate(), checkIncludesAnnotations.isSelected(), + checkIncludesAnnotationsTime.isSelected()); + + if (report != null && !report.isEmpty()) { + reportArea.setText(report); + } else { + reportArea.setText(""); + } + } + + /** + * Get project list without project and task unselected in tree. + * + * @param projects original project list + * @param uncheckedTaskList unselected task list + * @return selected project list + */ + protected List<TimerProject> getSelectedProjects( + List<TimerProject> projects, Collection<TimerTask> uncheckedTaskList) { + + List<TimerProject> currentProjects = new ArrayList<TimerProject>(); + for (TimerProject project : projects) { + + // take care of show closed option + if (!project.isClosed() || showHiddenProjectBox.isSelected()) { + List<TimerTask> subTasks = getSelectedTasks(project.getSubTasks(), + uncheckedTaskList); + + // add current project only of at least one subtask is selected + // or current project is selected + if (!uncheckedTaskList.contains(project) || !subTasks.isEmpty()) { + TimerProject clonedProject = project.clone(); + clonedProject.getSubTasks().clear(); + clonedProject.getSubTasks().addAll(subTasks); + currentProjects.add(clonedProject); + } + } + } + + return currentProjects; + } + + /** + * Get tasks list without tasks unselected in tree. + * + * @param tasks original project list + * @param uncheckedTaskList unselected task list + * @return selected project list + */ + protected List<TimerTask> getSelectedTasks(List<? extends TimerTask> tasks, + Collection<TimerTask> uncheckedTaskList) { + + List<TimerTask> currentTask = new ArrayList<TimerTask>(); + for (TimerTask task : tasks) { + + // take care of show closed option + if (!task.isClosed() || showHiddenProjectBox.isSelected()) { + List<TimerTask> subTasks = getSelectedTasks(task.getSubTasks(), + uncheckedTaskList); + + // add current task only of at least one subtask is selected + // or current task is selected + if (!uncheckedTaskList.contains(task) || !subTasks.isEmpty()) { + TimerTask clonedTask; + if (uncheckedTaskList.contains(task)) { + // to not show time of not selected task in report + clonedTask = new TimerTask(task.getName()); + } else { + clonedTask = task.clone(); + } + clonedTask.getSubTasks().clear(); + clonedTask.getSubTasks().addAll(subTasks); + currentTask.add(clonedTask); + } + } + } + + return currentTask; + } + + /** + * Update tree, showing hidden projects or not. + */ + @Action + public void showHiddenProjects() { + CheckBoxTreeModel model = (CheckBoxTreeModel)projectsTree.getModel(); + model.setShowClosed(showHiddenProjectBox.isSelected()); + } + + /** + * Send report by mail. + */ + @Action(enabledProperty = "sendMailEnabled") + public void sendMail() { + + String report = reportArea.getText(); + + try { + String encodedReport = URLEncoder.encode(report, "UTF-8"); + + // bugfix for spaces + encodedReport = encodedReport.replaceAll("\\+", "%20"); + + URI mailtoURI = new URI("mailto:?body=" + encodedReport); + Desktop.getDesktop().mail(mailtoURI); + } catch (IOException e) { + if (log.isWarnEnabled()) { + log.warn("Cannot open link (maybe defaut browser in not configured ?)"); + } + if (log.isDebugEnabled()) { + log.debug("Error while opening link", e); + } + } catch (URISyntaxException e) { + if (log.isErrorEnabled()) { + log.error("Error while opening link", e); + } + } catch (UnsupportedOperationException e) { + if (log.isWarnEnabled()) { + log.warn("Cannot open link (maybe defaut browser in not configured ?)"); + } + if (log.isDebugEnabled()) { + log.debug("Error while opening link", e); + } + } + } + + /** + * Can send mail ? + * + * @return true if can send mail + */ + public boolean isSendMailEnabled() { + return canSendMail; + } + + /** + * Change can send mail property. + * + * @param enabled can send mail + */ + public void setSendMailEnabled(boolean enabled) { + boolean oldValue = canSendMail; + canSendMail = enabled; + firePropertyChange("sendMailEnabled", oldValue, canSendMail); + } + + /* + * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent) + */ + @Override + public void changedUpdate(DocumentEvent e) { + documentChanged(); + } + + /* + * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) + */ + @Override + public void insertUpdate(DocumentEvent e) { + documentChanged(); + } + + /* + * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) + */ + @Override + public void removeUpdate(DocumentEvent e) { + documentChanged(); + } + + /** + * Document content changed. + * + * Update can send mail property. + */ + protected void documentChanged() { + setSendMailEnabled(reportArea.getText().trim().length() > 0); + } +} Deleted: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-23 15:11:54 UTC (rev 2836) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-25 21:15:46 UTC (rev 2840) @@ -1,449 +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% - */ - -package org.chorem.jtimer.ui.tasks; - -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.List; - -import javax.swing.JOptionPane; -import javax.swing.SwingUtilities; - -import org.apache.commons.lang3.time.DurationFormatUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.jtimer.JTimer; -import org.chorem.jtimer.data.TimerDataManager; -import org.chorem.jtimer.entities.TimerAlert; -import org.chorem.jtimer.entities.TimerTask; -import org.chorem.jtimer.entities.TimerTaskHelper; -import org.chorem.jtimer.entities.TimerAlert.Type; -import org.chorem.jtimer.ui.system.SystemInfo; -import org.chorem.jtimer.ui.system.SystemInfoFactory; -import org.chorem.jtimer.ui.system.UnsupportedSystemInfoException; -import org.jdesktop.application.Task; - -/** - * RunTaskJob. - * - * Notify every second the core controler. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class RunTaskJob extends Task<Void, Long> { - - /** Class logger. */ - private static Log log = LogFactory.getLog(RunTaskJob.class); - - /** Parent app reference. */ - protected JTimer parentApp; - - /** The task to manage. */ - protected TimerTask managedTask; - - /** Data manager. */ - protected TimerDataManager dataManager; - - /** System information (idle...). */ - protected SystemInfo systemInfo; - - /** Already thrown alert. */ - protected Collection<TimerAlert> alreadyTrownAlerts; - - /** The today total task time at start time. */ - protected long taskTimingBeforeStartInMs; - - /** Calendar instance when timing start. */ - protected Calendar taskStartCalendar; - - /** - * Offset to adjust time for current day. - * Include : - * - Task idle time (task was running but time not counted) - * - Manual user incremented time - */ - protected long offsetTimeInMs; - - /** Last publish time to detect hibernate. */ - protected long lastPublishTimestamp; - - /** Want to stop flag. */ - protected Boolean bWantToStop; - - /** - * Constructor. - * - * Take the task to manage - * - * @param parentApp parent application - * @param managedTask task - * @param dataManager data - */ - public RunTaskJob(JTimer parentApp, TimerTask managedTask, - TimerDataManager dataManager) { - super(parentApp); - this.parentApp = parentApp; - - // init with False - bWantToStop = Boolean.FALSE; - - // save vars - this.managedTask = managedTask; - this.dataManager = dataManager; - - // must be init here, checkAlreadyThrownAlerts is called multiples times - alreadyTrownAlerts = new HashSet<TimerAlert>(); - checkAlreadyThrownAlerts(managedTask); - - // init system info to get idleTime - try { - systemInfo = SystemInfoFactory.getSystemInfo(); - } catch (UnsupportedSystemInfoException e) { - if (log.isErrorEnabled()) { - log.error("Can't get system info", e); - } - systemInfo = null; - } - } - - /** - * Check for already thrown alerts. - * - * Used to not fired again already fired alerts during previous - * timing. - * - * @param task current task - */ - protected void checkAlreadyThrownAlerts(TimerTask task) { - - Date now = new Date(); - // check alert to be fired - for (TimerAlert alert : task.getAlerts()) { - if (alert.getType().equals(Type.REACH_DAILY_TIME) - && TimerTaskHelper.getTotalTime(task, now) > alert.getDuration()) { - alreadyTrownAlerts.add(alert.clone()); - } else if (alert.getType().equals(Type.REACH_TOTAL_TIME) - && TimerTaskHelper.getAllTotalTime(task) > alert.getDuration()) { - alreadyTrownAlerts.add(alert.clone()); - } - } - - // se souvient aussi de alerte deja lancées - // pour les taches parentes - if (task.getParent() != null) { - checkAlreadyThrownAlerts(task.getParent()); - } - - } - - /** - * Task getter. - * - * @return managed task - */ - public TimerTask getTask() { - return managedTask; - } - - /** - * Method to increment time while task is running (in ms). - * - * @param increment increment, can be negative - */ - public void incrementTaskTime(long increment) { - - long nowTimestamp = Calendar.getInstance().getTimeInMillis(); - - // new var, to not modify parameter - long localIncrement = increment; - - // do go over 0 - if (taskTimingBeforeStartInMs + nowTimestamp - - taskStartCalendar.getTimeInMillis() + offsetTimeInMs - + increment < 0) { - localIncrement = -(taskTimingBeforeStartInMs + nowTimestamp - - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); - } - - offsetTimeInMs += localIncrement; - } - - /** - * Reset timing. - * - * For example if task goes over 0h00, need to reset... - */ - public void resetTiming() { - - taskStartCalendar = Calendar.getInstance(); - lastPublishTimestamp = taskStartCalendar.getTimeInMillis(); - // need to be this for hibernate in same day - taskTimingBeforeStartInMs = managedTask.getTime(new Date()) * 1000; - offsetTimeInMs = 0; - } - - /** - * Check if task need to be reset. - * - * Test if today number if different of taskStartCalendar day number - */ - protected void checkReset() { - - Calendar nowCalendar = Calendar.getInstance(); - - // si les jours actuel et jours de debut de start ne sont - // pas identiques : reset - if (nowCalendar.get(Calendar.DAY_OF_YEAR) != taskStartCalendar - .get(Calendar.DAY_OF_YEAR)) { - if (log.isInfoEnabled()) { - log.info("Day change detected, reset timing"); - } - resetTiming(); - } - - } - - /* - * @see org.jdesktop.swingworker.SwingWorker#doInBackground() - */ - @Override - protected Void doInBackground() throws Exception { - - // task effective start - // notify ui - parentApp.startedTask(managedTask); - - // reset on start just for init - resetTiming(); - - // get idle time - long configIdleTime = JTimer.config.getIdleTime() * 1000; - - boolean dontWantToStop = true; - while (dontWantToStop) { - long currentTime = Calendar.getInstance().getTimeInMillis(); - - // try to detect hibernate idle time - if (currentTime - lastPublishTimestamp >= configIdleTime) { - // hibernate detected - // update time without idle time for specified day - if (log.isInfoEnabled()) { - log.info("Hibernate detected, reseting timing"); - } - resetTiming(); - } - - lastPublishTimestamp = currentTime; - - // check user idle time - long idleTime = 0; - if (systemInfo != null) { // idle time available - idleTime = systemInfo.getIdleTime(); - - if (log.isDebugEnabled()) { - log.debug("User is idle since " + (idleTime / 1000) + " s"); - } - } - - // check reset before publish (day change) - checkReset(); - - // if long idleTime is unavailable, if is always false - if (idleTime >= configIdleTime) { - - // to not display negative time near midnight - long idleTimeOffset = Math.min(idleTime, currentTime - taskStartCalendar.getTimeInMillis()); - - // idle detected - // update time without idle time - // math.min > for idle detected at 0:00 - offsetTimeInMs -= idleTimeOffset; - publish(taskTimingBeforeStartInMs + currentTime - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); - - // send idle detect event - JTimer parentApplication = (JTimer)getApplication(); - parentApplication.preIdleDetect(); - // ask user what to do (long blocking call) - int option = IdleDialog.showIdleDialog(currentTime - idleTime); - // send idle detect event - parentApplication.postIdleDetect(); - - // day can have changed during idle - checkReset(); - - // get time after user idle - long afterIdleTime = Calendar.getInstance().getTimeInMillis(); - lastPublishTimestamp = afterIdleTime; - - switch (option) { - - case IdleDialog.REVERT: - // just stop the task - ((JTimer) getApplication()).stopTask(managedTask); - break; - - case IdleDialog.CONTINUE: - // refresh time - // remove idle time previously added - offsetTimeInMs += idleTimeOffset; - publish(taskTimingBeforeStartInMs + afterIdleTime - - taskStartCalendar.getTimeInMillis() - + offsetTimeInMs); - break; - - default: // RESUME - - // resume = increment idle time - offsetTimeInMs -= afterIdleTime - currentTime; - // update time - publish(taskTimingBeforeStartInMs + afterIdleTime - - taskStartCalendar.getTimeInMillis() - + offsetTimeInMs); - break; - - } - } else { - // pas de idle, met a jour le temps - publish(taskTimingBeforeStartInMs + currentTime - - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); - } - - Thread.sleep(1000); // 1s - - // test if task want to stop - synchronized (bWantToStop) { - dontWantToStop = !bWantToStop.booleanValue(); - } - } - - return null; - } - - /* - * @see application.Task#process(java.util.List) - */ - @Override - protected void process(List<Long> durations) { - - // take last notification - // can be notified of many result - // for example, if UI lag... - long currentDuration = durations.get(durations.size() - 1); - - dataManager.changeTaskTime(managedTask, new Date(), - currentDuration / 1000); - - checkTaskAlerts(managedTask); - } - - /** - * Check for alert to be fired. - * - * @param task - */ - protected void checkTaskAlerts(TimerTask task) { - Date now = new Date(); - - // check alert to be fired - for (TimerAlert alert : task.getAlerts()) { - if (!alreadyTrownAlerts.contains(alert)) { - if (alert.getType().equals(Type.REACH_DAILY_TIME) - && TimerTaskHelper.getTotalTime(task, now) >= alert.getDuration()) { - displayAlert(task, Type.REACH_DAILY_TIME, alert.getDuration()); - alreadyTrownAlerts.add(alert.clone()); - } else if (alert.getType().equals(Type.REACH_TOTAL_TIME) - && TimerTaskHelper.getAllTotalTime(task) >= alert.getDuration()) { - displayAlert(task, Type.REACH_TOTAL_TIME, alert.getDuration()); - alreadyTrownAlerts.add(alert.clone()); - } - } - } - - // lance aussi les alertes sur les taches parentes - // par exemple, si une tache passe en temps journaliers a 1h - // sont parent y passe aussi, donc les alertes doivent être levée. - if (task.getParent() != null) { - checkTaskAlerts(task.getParent()); - } - } - - /** - * Display alert message without breaking UI. - * - * @param task task - * @param alertType alert type - * @param alertDuration alert duration - */ - protected void displayAlert(final TimerTask task, final Type alertType, - final long alertDuration) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - String alertMessage = null; - String formattedTime = DurationFormatUtils.formatDuration(alertDuration * 1000, "HH:mm:ss"); - if (Type.REACH_DAILY_TIME.equals(alertType)) { - alertMessage = getResourceMap().getString( - "alert.dailyAlertMessage", task.getName(), formattedTime); - } else if (Type.REACH_TOTAL_TIME.equals(alertType)) { - alertMessage = getResourceMap().getString( - "alert.totalAlertMessage", task.getName(), formattedTime); - } - - JOptionPane.showMessageDialog(null, alertMessage, - getResourceMap().getString("alert.title"), - JOptionPane.INFORMATION_MESSAGE, getResourceMap() - .getIcon("alert.alertIcon")); - } - }); - } - - /** - * Notify that task want to stop - */ - public void wantToStop() { - synchronized (bWantToStop) { - bWantToStop = Boolean.TRUE; - } - } - - /** - * Tell if task is trying to stop. - * - * @return stopping flag - */ - public boolean isStopping() { - boolean stopping; - synchronized (bWantToStop) { - stopping = bWantToStop.booleanValue(); - } - return stopping; - } -} Copied: branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java (from rev 2839, trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java) =================================================================== --- branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java (rev 0) +++ branches/1.4.0-ttalgo/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-25 21:15:46 UTC (rev 2840) @@ -0,0 +1,435 @@ +/* + * #%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% + */ + +package org.chorem.jtimer.ui.tasks; + +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.List; + +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; + +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.jtimer.JTimer; +import org.chorem.jtimer.data.TimerDataManager; +import org.chorem.jtimer.entities.TimerAlert; +import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.entities.TimerTaskHelper; +import org.chorem.jtimer.entities.TimerAlert.Type; +import org.chorem.jtimer.ui.system.SystemInfo; +import org.chorem.jtimer.ui.system.SystemInfoFactory; +import org.chorem.jtimer.ui.system.UnsupportedSystemInfoException; +import org.jdesktop.application.Task; + +/** + * RunTaskJob. + * + * Notify every second the core controler. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class RunTaskJob extends Task<Void, Void> { + + /** Class logger. */ + private static Log log = LogFactory.getLog(RunTaskJob.class); + + /** Parent app reference. */ + protected JTimer parentApp; + + /** The task to manage. */ + protected TimerTask managedTask; + + /** Data manager. */ + protected TimerDataManager dataManager; + + /** System information (idle...). */ + protected SystemInfo systemInfo; + + /** Already thrown alert. */ + protected Collection<TimerAlert> alreadyTrownAlerts; + + /** Timestamp when timing start. */ + protected long taskStartTimestamp; + + /** Last publish time to detect hibernate. */ + protected long lastUserActivity; + + /** + * Offset to adjust time for current day (last activity day). + * Include : + * - Task initial time + * - Task idle time (task was running but time not counted) + * - Manual user incremented time + */ + protected long offsetTimeInMs; + + /** Want to stop flag. */ + protected Boolean bWantToStop; + + /** + * Constructor. + * + * Take the task to manage + * + * @param parentApp parent application + * @param managedTask task + * @param dataManager data + */ + public RunTaskJob(JTimer parentApp, TimerTask managedTask, + TimerDataManager dataManager) { + super(parentApp); + this.parentApp = parentApp; + + // init with False + bWantToStop = Boolean.FALSE; + + // save vars + this.managedTask = managedTask; + this.dataManager = dataManager; + + // must be init here, checkAlreadyThrownAlerts is called multiples times + alreadyTrownAlerts = new HashSet<TimerAlert>(); + checkAlreadyThrownAlerts(managedTask); + + // init system info to get idleTime + try { + systemInfo = SystemInfoFactory.getSystemInfo(); + } catch (UnsupportedSystemInfoException e) { + if (log.isErrorEnabled()) { + log.error("Can't get system info", e); + } + systemInfo = null; + } + } + + /** + * Check for already thrown alerts. + * + * Used to not fired again already fired alerts during previous + * timing. + * + * @param task current task + */ + protected void checkAlreadyThrownAlerts(TimerTask task) { + + Date now = new Date(); + // check alert to be fired + for (TimerAlert alert : task.getAlerts()) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) + && TimerTaskHelper.getTotalTime(task, now) > alert + .getDuration()) { + alreadyTrownAlerts.add(alert.clone()); + } else if (alert.getType().equals(Type.REACH_TOTAL_TIME) + && TimerTaskHelper.getAllTotalTime(task) > alert + .getDuration()) { + alreadyTrownAlerts.add(alert.clone()); + } + } + + // se souvient aussi de alerte deja lancées + // pour les taches parentes + if (task.getParent() != null) { + checkAlreadyThrownAlerts(task.getParent()); + } + + } + + /** + * Task getter. + * + * @return managed task + */ + public TimerTask getTask() { + return managedTask; + } + + /** + * Method to increment time while task is running (in ms). + * + * @param increment increment, can be negative + */ + public void incrementTaskTime(long increment) { + + long nowTimestamp = Calendar.getInstance().getTimeInMillis(); + + // new var, to not modify parameter + long localIncrement = increment; + + // do go over 0 + if (nowTimestamp - taskStartTimestamp + offsetTimeInMs + increment < 0) { + localIncrement = -(nowTimestamp - taskStartTimestamp + offsetTimeInMs); + } + + offsetTimeInMs += localIncrement; + } + + /** + * Reset timing. + * + * For example if task goes over 0h00, need to reset... + */ + public void resetTiming() { + taskStartTimestamp = System.currentTimeMillis(); + lastUserActivity = taskStartTimestamp; + offsetTimeInMs = managedTask.getTime(new Date()) * 1000; + } + + /* + * @see org.jdesktop.swingworker.SwingWorker#doInBackground() + */ + @Override + protected Void doInBackground() throws Exception { + + // task effective start + // notify ui + parentApp.startedTask(managedTask); + + // init timing + resetTiming(); + + // get idle time + long configIdleTime = JTimer.config.getIdleTime() * 1000; + long idleTime = 0; + + boolean dontWantToStop = true; + while (dontWantToStop) { + + long currentTime = System.currentTimeMillis(); + + // check user idle time + if (systemInfo != null) { // idle time available + idleTime = systemInfo.getIdleTime(); + + if (log.isDebugEnabled()) { + log.debug("User is idle since " + (idleTime / 1000) + " s"); + } + } + + // if long idleTime is unavailable, if is always false + if (idleTime >= configIdleTime) { + lastUserActivity -= idleTime; + } + + // check for idleness with last user activity (real idle and hibernate) + if (currentTime - lastUserActivity >= configIdleTime) { + + // update idle to publish time without counting idle + offsetTimeInMs -= currentTime - lastUserActivity; + publish(); + + // display idle detected (blocking call) + JTimer parentApplication = (JTimer) getApplication(); + parentApplication.preIdleDetect(); + int option = IdleDialog.showIdleDialog(currentTime - idleTime); + parentApplication.postIdleDetect(); + + // manage tracking resume after idle + currentTime = System.currentTimeMillis(); + lastUserActivity = currentTime; + + switch (option) { + case IdleDialog.REVERT: + // just stop the task + ((JTimer) getApplication()).stopTask(managedTask); + break; + + case IdleDialog.CONTINUE: + // refresh time + // remove idle time previously added + //offsetTimeInMs += idleTimeOffset; + //publish(taskTimingBeforeStartInMs + afterIdleTime + // - taskStartCalendar.getTimeInMillis() + // + offsetTimeInMs); + + break; + + case IdleDialog.RESUME: + // resume = increment idle time + offsetTimeInMs += currentTime - lastUserActivity; + + // check day change (after offset) + Calendar nowCalendar = Calendar.getInstance(); + Calendar startCalendar = Calendar.getInstance(); + startCalendar.setTimeInMillis(taskStartTimestamp); + if (!DateUtils.isSameDay(startCalendar, nowCalendar)) { + resetTiming(); + } + + // update time + publish(); + break; + } + + } else { + + // no idle detected + lastUserActivity = currentTime; + + // check day change + Calendar nowCalendar = Calendar.getInstance(); + Calendar startCalendar = Calendar.getInstance(); + startCalendar.setTimeInMillis(taskStartTimestamp); + if (!DateUtils.isSameDay(startCalendar, nowCalendar)) { + resetTiming(); + } + + // update new time + publish(); + } + + Thread.sleep(1000); // 1s + + // test if task want to stop + synchronized (bWantToStop) { + dontWantToStop = !bWantToStop.booleanValue(); + } + } + + return null; + } + + /* + * @see application.Task#process(java.util.List) + */ + @Override + protected void process(List<Void> nothing) { + + // take last notification + // can be notified of many result + // for example, if UI lag... + long currentTime = System.currentTimeMillis(); + long currentDuration = currentTime - taskStartTimestamp + offsetTimeInMs; + + // time can be negative due to adjust caused by idle or hibernate + // just publish 0 in this case + if (currentDuration < 0) { + currentDuration = 0; + } + + dataManager.changeTaskTime(managedTask, new Date(), + currentDuration / 1000); + + checkTaskAlerts(managedTask); + } + + /** + * Check for alert to be fired. + * + * @param task + */ + protected void checkTaskAlerts(TimerTask task) { + Date now = new Date(); + + // check alert to be fired + for (TimerAlert alert : task.getAlerts()) { + if (!alreadyTrownAlerts.contains(alert)) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) + && TimerTaskHelper.getTotalTime(task, now) >= alert + .getDuration()) { + displayAlert(task, Type.REACH_DAILY_TIME, + alert.getDuration()); + alreadyTrownAlerts.add(alert.clone()); + } else if (alert.getType().equals(Type.REACH_TOTAL_TIME) + && TimerTaskHelper.getAllTotalTime(task) >= alert + .getDuration()) { + displayAlert(task, Type.REACH_TOTAL_TIME, + alert.getDuration()); + alreadyTrownAlerts.add(alert.clone()); + } + } + } + + // lance aussi les alertes sur les taches parentes + // par exemple, si une tache passe en temps journaliers a 1h + // sont parent y passe aussi, donc les alertes doivent être levée. + if (task.getParent() != null) { + checkTaskAlerts(task.getParent()); + } + } + + /** + * Display alert message without breaking UI. + * + * @param task task + * @param alertType alert type + * @param alertDuration alert duration + */ + protected void displayAlert(final TimerTask task, final Type alertType, + final long alertDuration) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + String alertMessage = null; + String formattedTime = DurationFormatUtils.formatDuration( + alertDuration * 1000, "HH:mm:ss"); + if (Type.REACH_DAILY_TIME.equals(alertType)) { + alertMessage = getResourceMap().getString( + "alert.dailyAlertMessage", task.getName(), + formattedTime); + } else if (Type.REACH_TOTAL_TIME.equals(alertType)) { + alertMessage = getResourceMap().getString( + "alert.totalAlertMessage", task.getName(), + formattedTime); + } + + JOptionPane.showMessageDialog(null, alertMessage, + getResourceMap().getString("alert.title"), + JOptionPane.INFORMATION_MESSAGE, getResourceMap() + .getIcon("alert.alertIcon")); + } + }); + } + + /** + * Notify that task want to stop + */ + public void wantToStop() { + synchronized (bWantToStop) { + bWantToStop = Boolean.TRUE; + } + } + + /** + * Tell if task is trying to stop. + * + * @return stopping flag + */ + public boolean isStopping() { + boolean stopping; + synchronized (bWantToStop) { + stopping = bWantToStop.booleanValue(); + } + return stopping; + } +}

1 0

r2839 - trunk/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org March 25, 2012

March 25, 2012

Author: echatellier Date: 2012-03-25 21:28:19 +0200 (Sun, 25 Mar 2012) New Revision: 2839 Url: http://chorem.org/repositories/revision/jtimer/2839 Log: Simplify time tracking algorithm. Init offset with task initial time. 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-03-25 13:18:14 UTC (rev 2838) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2012-03-25 19:28:19 UTC (rev 2839) @@ -79,9 +79,6 @@ /** Already thrown alert. */ protected Collection<TimerAlert> alreadyTrownAlerts; - /** The today total task time at start time. */ - protected long taskTimingBeforeStartInMs; - /** Calendar instance when timing start. */ protected Calendar taskStartCalendar; @@ -187,11 +184,10 @@ long localIncrement = increment; // do go over 0 - if (taskTimingBeforeStartInMs + nowTimestamp - - taskStartCalendar.getTimeInMillis() + offsetTimeInMs - + increment < 0) { - localIncrement = -(taskTimingBeforeStartInMs + nowTimestamp - - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); + if (nowTimestamp - taskStartCalendar.getTimeInMillis() + + offsetTimeInMs + increment < 0) { + localIncrement = -(nowTimestamp - taskStartCalendar.getTimeInMillis() + + offsetTimeInMs); } offsetTimeInMs += localIncrement; @@ -207,8 +203,7 @@ taskStartCalendar = Calendar.getInstance(); lastPublishTimestamp = taskStartCalendar.getTimeInMillis(); // need to be this for hibernate in same day - taskTimingBeforeStartInMs = managedTask.getTime(new Date()) * 1000; - offsetTimeInMs = 0; + offsetTimeInMs = managedTask.getTime(new Date()) * 1000; } /** @@ -287,7 +282,7 @@ // update time without idle time // math.min > for idle detected at 0:00 offsetTimeInMs -= idleTimeOffset; - publish(taskTimingBeforeStartInMs + currentTime - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); + publish(currentTime - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); // send idle detect event JTimer parentApplication = (JTimer)getApplication(); @@ -315,8 +310,7 @@ // refresh time // remove idle time previously added offsetTimeInMs += idleTimeOffset; - publish(taskTimingBeforeStartInMs + afterIdleTime - - taskStartCalendar.getTimeInMillis() + publish(afterIdleTime - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); break; @@ -325,16 +319,15 @@ // resume = increment idle time offsetTimeInMs -= afterIdleTime - currentTime; // update time - publish(taskTimingBeforeStartInMs + afterIdleTime - - taskStartCalendar.getTimeInMillis() + publish(afterIdleTime - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); break; } } else { // pas de idle, met a jour le temps - publish(taskTimingBeforeStartInMs + currentTime - - taskStartCalendar.getTimeInMillis() + offsetTimeInMs); + publish(currentTime - taskStartCalendar.getTimeInMillis() + + offsetTimeInMs); } Thread.sleep(1000); // 1s

1 0

r2838 - trunk/src/main/java/org/chorem/jtimer/ui/report
by echatellier＠users.chorem.org March 25, 2012

March 25, 2012

Author: echatellier Date: 2012-03-25 15:18:14 +0200 (Sun, 25 Mar 2012) New Revision: 2838 Url: http://chorem.org/repositories/revision/jtimer/2838 Log: fixes #195 : Wrong project or task selection in report view Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-25 12:40:16 UTC (rev 2837) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-25 13:18:14 UTC (rev 2838) @@ -424,8 +424,8 @@ reportType = Type.BY_PROJECT_REPORT; } - // get filtred project list - // without non selected projet and tasks + // get filtered project list + // without non selected project and tasks List<TimerProject> selectedProjects = getSelectedProjects(core .getData().getProjectsList(), uncheckedTaskSet); @@ -454,13 +454,20 @@ List<TimerProject> currentProjects = new ArrayList<TimerProject>(); for (TimerProject project : projects) { - if (!uncheckedTaskList.contains(project)) { - TimerProject clonedProject = project.clone(); - clonedProject.getSubTasks().clear(); - clonedProject.getSubTasks().addAll( - getSelectedTasks(project.getSubTasks(), - uncheckedTaskList)); - currentProjects.add(clonedProject); + + // take care of show closed option + if (!project.isClosed() || showHiddenProjectBox.isSelected()) { + List<TimerTask> subTasks = getSelectedTasks(project.getSubTasks(), + uncheckedTaskList); + + // add current project only of at least one subtask is selected + // or current project is selected + if (!uncheckedTaskList.contains(project) || !subTasks.isEmpty()) { + TimerProject clonedProject = project.clone(); + clonedProject.getSubTasks().clear(); + clonedProject.getSubTasks().addAll(subTasks); + currentProjects.add(clonedProject); + } } } @@ -479,14 +486,26 @@ List<TimerTask> currentTask = new ArrayList<TimerTask>(); for (TimerTask task : tasks) { - if (!uncheckedTaskList.contains(task)) { - TimerTask clonedTask = task.clone(); - clonedTask.getSubTasks().clear(); - clonedTask.getSubTasks() - .addAll( - getSelectedTasks(task.getSubTasks(), - uncheckedTaskList)); - currentTask.add(clonedTask); + + // take care of show closed option + if (!task.isClosed() || showHiddenProjectBox.isSelected()) { + List<TimerTask> subTasks = getSelectedTasks(task.getSubTasks(), + uncheckedTaskList); + + // add current task only of at least one subtask is selected + // or current task is selected + if (!uncheckedTaskList.contains(task) || !subTasks.isEmpty()) { + TimerTask clonedTask; + if (uncheckedTaskList.contains(task)) { + // to not show time of not selected task in report + clonedTask = new TimerTask(task.getName()); + } else { + clonedTask = task.clone(); + } + clonedTask.getSubTasks().clear(); + clonedTask.getSubTasks().addAll(subTasks); + currentTask.add(clonedTask); + } } }

1 0

r2837 - trunk/src/main/java/org/chorem/jtimer
by echatellier＠users.chorem.org March 25, 2012

March 25, 2012

Author: echatellier Date: 2012-03-25 14:40:16 +0200 (Sun, 25 Mar 2012) New Revision: 2837 Url: http://chorem.org/repositories/revision/jtimer/2837 Log: fixes 493 : Application name is not correct under gnome-shell Modified: trunk/src/main/java/org/chorem/jtimer/JTimer.java Modified: trunk/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-23 15:11:54 UTC (rev 2836) +++ trunk/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-25 12:40:16 UTC (rev 2837) @@ -27,6 +27,7 @@ import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; @@ -179,6 +180,20 @@ ApplicationContext ctxt = getContext(); resourceMap = ctxt.getResourceMap(); + // fixme awt application name. Can be seen only with gnome-shell + // tray icon is displayed with name "org-chorem-jtimer-JTimer" instead of + // only "jTimer" with following fix : + try { + Toolkit xToolkit = Toolkit.getDefaultToolkit(); + java.lang.reflect.Field awtAppClassNameField = xToolkit.getClass().getDeclaredField("awtAppClassName"); + awtAppClassNameField.setAccessible(true); + awtAppClassNameField.set(xToolkit, resourceMap.getString("Application.title")); + } catch (Exception ex) { + if (log.isWarnEnabled()) { + log.warn("Can change awt application name", ex); + } + } + // fix start in iconified mode ctxt.getSessionStorage().putProperty(JFrame.class, new WindowProperty2());

1 0

r2836 - trunk/src/main/java/org/chorem/jtimer/ui
by echatellier＠users.chorem.org March 23, 2012

March 23, 2012

Author: echatellier Date: 2012-03-23 16:11:54 +0100 (Fri, 23 Mar 2012) New Revision: 2836 Url: http://chorem.org/repositories/revision/jtimer/2836 Log: Fix dialog positionning under openjdk Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2012-03-19 09:06:53 UTC (rev 2835) +++ trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2012-03-23 15:11:54 UTC (rev 2836) @@ -159,6 +159,12 @@ super(application.getMainFrame()); setModal(true); + // remove dialog name to this dialog, due to bug + // http://chorem.org/issues/484 and + // http://kenai.com/jira/browse/BSAF-107 + // cause infinite loop under openjdk + setName(null); // force nameExplicitlySet to true + // set color on jxmonthview unselectable days // UIManager.put("JXMonthView.unselectableDayForeground", Color.GRAY);

1 0

r2835 - trunk/src/main/java/org/chorem/jtimer/ui/widget
by echatellier＠users.chorem.org March 19, 2012

March 19, 2012

Author: echatellier Date: 2012-03-19 10:06:53 +0100 (Mon, 19 Mar 2012) New Revision: 2835 Url: http://chorem.org/repositories/revision/jtimer/2835 Log: Fix header Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java 2012-03-18 16:44:26 UTC (rev 2834) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java 2012-03-19 09:06:53 UTC (rev 2835) @@ -1,25 +1,23 @@ /* * #%L - * - * * $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 Lesser General Public License as + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */

1 0

r2834 - in trunk/src: main/java/org/chorem/jtimer/ui/report main/resources/ftl main/resources/org/chorem/jtimer/ui/report/resources test/java/org/chorem/jtimer test/java/org/chorem/jtimer/ui/report test/resources/testdata
by echatellier＠users.chorem.org March 18, 2012

March 18, 2012

Author: echatellier Date: 2012-03-18 17:44:26 +0100 (Sun, 18 Mar 2012) New Revision: 2834 Url: http://chorem.org/repositories/revision/jtimer/2834 Log: #185 : Display date (date and time) on annotations Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java trunk/src/main/resources/ftl/reportByDay.ftl trunk/src/main/resources/ftl/reportByDay_fr.ftl trunk/src/main/resources/ftl/reportByMonth.ftl trunk/src/main/resources/ftl/reportByMonth_fr.ftl trunk/src/main/resources/ftl/reportByProject.ftl trunk/src/main/resources/ftl/reportByProject_fr.ftl trunk/src/main/resources/ftl/reportByWeek.ftl trunk/src/main/resources/ftl/reportByWeek_fr.ftl trunk/src/main/resources/ftl/reportByYear.ftl trunk/src/main/resources/ftl/reportByYear_fr.ftl trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java trunk/src/test/resources/testdata/4.ann trunk/src/test/resources/testdata/5.ann Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2012-03-18 16:44:26 UTC (rev 2834) @@ -86,7 +86,6 @@ freemarkerConfiguration.setTemplateLoader(templateLoader); freemarkerConfiguration.setObjectWrapper(new BeansWrapper()); - } /** @@ -97,11 +96,12 @@ * @param begin begin date * @param end end date * @param includeAnnotate include annotations + * @param includeAnnotateTime include annotations time * * @return report text */ public String getReportText(Type reportType, List<TimerProject> projects, - Date begin, Date end, boolean includeAnnotate) { + Date begin, Date end, boolean includeAnnotate, boolean includeAnnotateTime) { Template template = null; String content = null; @@ -131,7 +131,7 @@ } content = getReportContent(template, projects, begin, end, - includeAnnotate); + includeAnnotate, includeAnnotateTime); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't get freemarker template", e); @@ -153,6 +153,7 @@ * @param end end date * @param template freemarker template to use * @param includeAnnotate include annotations + * @param includeAnnotateTime include annotations time * * @return string content * @@ -163,7 +164,7 @@ */ protected String getReportContent(Template template, List<TimerProject> projects, Date begin, Date end, - boolean includeAnnotate) throws TemplateException, IOException { + boolean includeAnnotate, boolean includeAnnotateTime) throws TemplateException, IOException { // Create the root hash Map<String, Object> root = new HashMap<String, Object>(); @@ -172,6 +173,7 @@ root.put("begin", begin); root.put("end", end); root.put("annotations", includeAnnotate); + root.put("annotationsTime", includeAnnotateTime); root.put("utils", new ReportUtils()); Writer out = new StringWriter(); Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-18 16:44:26 UTC (rev 2834) @@ -28,7 +28,9 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.lang3.time.DurationFormatUtils; import org.chorem.jtimer.entities.TimerTask; @@ -412,9 +414,9 @@ * @param day day * @return annotations of the day */ - public List<String> getDailyTaskAnnotation(TimerTask task, Date day) { + public Map<Date, String> getDailyTaskAnnotation(TimerTask task, Date day) { - List<String> result = TimerTaskHelper.getAnnotation(task, day); + Map<Date, String> result = TimerTaskHelper.getAnnotationMap(task, day); return result; } @@ -430,10 +432,10 @@ * @param toDay to day (inclusive) * @return annotations of the week */ - public List<String> getWeeklyTaskAnnotation(TimerTask task, Date week, + public Map<Date, String> getWeeklyTaskAnnotation(TimerTask task, Date week, Date fromDay, Date toDay) { - List<String> result = new ArrayList<String>(); + Map<Date, String> result = new HashMap<Date, String>(); Calendar beginPeriodDate = Calendar.getInstance(); beginPeriodDate.setTime(week); @@ -451,9 +453,9 @@ if ((fromDay == null || fromDay.compareTo(loopPeriodDate.getTime()) <= 0) && (toDay == null || toDay.compareTo(loopPeriodDate .getTime()) >= 0)) { - List<String> anns = TimerTaskHelper - .getAnnotation(task, loopPeriodDate.getTime()); - result.addAll(anns); + Map<Date, String> anns = TimerTaskHelper + .getAnnotationMap(task, loopPeriodDate.getTime()); + result.putAll(anns); } loopPeriodDate.add(Calendar.DAY_OF_YEAR, 1); @@ -473,9 +475,9 @@ * @param toDay to day (inclusive) * @return annotations of the month */ - public List<String> getMonthlyTaskAnnotation(TimerTask task, Date month, + public Map<Date, String> getMonthlyTaskAnnotation(TimerTask task, Date month, Date fromDay, Date toDay) { - List<String> result = new ArrayList<String>(); + Map<Date, String> result = new HashMap<Date, String>(); Calendar beginPeriodDate = Calendar.getInstance(); beginPeriodDate.setTime(month); @@ -492,9 +494,9 @@ if ((fromDay == null || fromDay.compareTo(loopPeriodDate.getTime()) <= 0) && (toDay == null || toDay.compareTo(loopPeriodDate .getTime()) >= 0)) { - List<String> anns = TimerTaskHelper - .getAnnotation(task, loopPeriodDate.getTime()); - result.addAll(anns); + Map<Date, String> anns = TimerTaskHelper + .getAnnotationMap(task, loopPeriodDate.getTime()); + result.putAll(anns); } loopPeriodDate.add(Calendar.DAY_OF_YEAR, 1); @@ -514,10 +516,10 @@ * @param toDay to day (inclusive) * @return annotations of the year */ - public List<String> getYearlyTaskAnnotation(TimerTask task, Date year, + public Map<Date, String> getYearlyTaskAnnotation(TimerTask task, Date year, Date fromDay, Date toDay) { - List<String> result = new ArrayList<String>(); + Map<Date, String> result = new HashMap<Date, String>(); Calendar beginPeriodDate = Calendar.getInstance(); beginPeriodDate.setTime(year); @@ -535,9 +537,9 @@ if ((fromDay == null || fromDay.compareTo(loopPeriodDate.getTime()) <= 0) && (toDay == null || toDay.compareTo(loopPeriodDate .getTime()) >= 0)) { - List<String> anns = TimerTaskHelper - .getAnnotation(task, loopPeriodDate.getTime()); - result.addAll(anns); + Map<Date, String> anns = TimerTaskHelper + .getAnnotationMap(task, loopPeriodDate.getTime()); + result.putAll(anns); } loopPeriodDate.add(Calendar.DAY_OF_YEAR, 1); Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-18 16:44:26 UTC (rev 2834) @@ -108,6 +108,8 @@ /** Include annotations on reports */ protected JCheckBox checkIncludesAnnotations; + /** Include annotations time on reports */ + protected JCheckBox checkIncludesAnnotationsTime; /** Date pickers, from... to */ protected JXDatePicker datePickerFrom, datePickerTo; @@ -247,11 +249,18 @@ new Insets(1, 1, 1, 1), 0, 0)); // miscellaneous - checkIncludesAnnotations = new JCheckBox(getResourceMap().getString( + checkIncludesAnnotations = new JCheckBox(); + checkIncludesAnnotations.setAction(getContext().getActionMap(this).get( "reportAnnotations")); panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 5, - 4, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + checkIncludesAnnotationsTime = new JCheckBox(getResourceMap().getString( + "reportAnnotationsTime")); + checkIncludesAnnotationsTime.setEnabled(false); + panelOption.add(checkIncludesAnnotationsTime, new GridBagConstraints(2, 5, + 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); // panel form projects JPanel panelProjects = new JPanel(new BorderLayout()); @@ -386,6 +395,14 @@ } /** + * Show annotation checkbox checked. + */ + @Action + public void reportAnnotations() { + checkIncludesAnnotationsTime.setEnabled(checkIncludesAnnotations.isSelected()); + } + + /** * Make report. * * Set content in {@link #reportArea} text area. @@ -415,7 +432,8 @@ // make report String report = reportGenerator.getReportText(reportType, selectedProjects, datePickerFrom.getDate(), datePickerTo - .getDate(), checkIncludesAnnotations.isSelected()); + .getDate(), checkIncludesAnnotations.isSelected(), + checkIncludesAnnotationsTime.isSelected()); if (report != null && !report.isEmpty()) { reportArea.setText(report); Modified: trunk/src/main/resources/ftl/reportByDay.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByDay.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -33,9 +33,9 @@ <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> - <#local taskAnnotations=utils.getDailyTaskAnnotation(subtask, periodTime?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, periodTime?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?time?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#if> <@displaySubtaskReport task=subtask periodTime=periodTime identation=ident/> Modified: trunk/src/main/resources/ftl/reportByDay_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay_fr.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByDay_fr.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -33,9 +33,9 @@ <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> - <#local taskAnnotations=utils.getDailyTaskAnnotation(subtask, periodTime?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, periodTime?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?time?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#if> <@displaySubtaskReport task=subtask periodTime=periodTime identation=ident/> Modified: trunk/src/main/resources/ftl/reportByMonth.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByMonth.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -33,9 +33,9 @@ <#local taskTime=utils.getMonthlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> - <#local taskAnnotations=utils.getMonthlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getMonthlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?datetime?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#if> <@displaySubtaskReport task=subtask periodTime=periodTime identation=ident/> Modified: trunk/src/main/resources/ftl/reportByMonth_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -33,9 +33,9 @@ <#local taskTime=utils.getMonthlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> - <#local taskAnnotations=utils.getMonthlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getMonthlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?datetime?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#if> <@displaySubtaskReport task=subtask periodTime=periodTime identation=ident/> Modified: trunk/src/main/resources/ftl/reportByProject.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -42,9 +42,9 @@ <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> <#list periods as period> - <#local taskAnnotations=utils.getDailyTaskAnnotation(subtask, period?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, period?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?datetime?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#list> </#if> Modified: trunk/src/main/resources/ftl/reportByProject_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -42,9 +42,9 @@ <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> <#list periods as period> - <#local taskAnnotations=utils.getDailyTaskAnnotation(subtask, period?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, period?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?datetime?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#list> </#if> Modified: trunk/src/main/resources/ftl/reportByWeek.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByWeek.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -33,9 +33,9 @@ <#local taskTime=utils.getWeeklyTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> - <#local taskAnnotations=utils.getWeeklyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getWeeklyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?datetime?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#if> <@displaySubtaskReport task=subtask periodTime=periodTime identation=ident/> Modified: trunk/src/main/resources/ftl/reportByWeek_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -33,9 +33,9 @@ <#local taskTime=utils.getWeeklyTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> - <#local taskAnnotations=utils.getWeeklyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getWeeklyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?datetime?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#if> <@displaySubtaskReport task=subtask periodTime=periodTime identation=ident/> Modified: trunk/src/main/resources/ftl/reportByYear.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByYear.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -33,9 +33,9 @@ <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> - <#local taskAnnotations=utils.getYearlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getYearlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?datetime?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#if> <@displaySubtaskReport task=subtask periodTime=periodTime identation=ident/> Modified: trunk/src/main/resources/ftl/reportByYear_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear_fr.ftl 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/ftl/reportByYear_fr.ftl 2012-03-18 16:44:26 UTC (rev 2834) @@ -33,9 +33,9 @@ <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> <#if annotations> - <#local taskAnnotations=utils.getYearlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> - <#list taskAnnotations as taskAnnotation> -<#list 1..ident as i> </#list> * ${taskAnnotation} + <#local taskAnnTimes=utils.getYearlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> + <#list taskAnnTimes.keySet() as taskAnnTime> +<#list 1..ident as i> </#list> * <#if annotationsTime>${taskAnnTime?datetime?string.short} : </#if>${taskAnnTimes.get(taskAnnTime)} </#list> </#if> <@displaySubtaskReport task=subtask periodTime=periodTime identation=ident/> Modified: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2012-03-18 16:44:26 UTC (rev 2834) @@ -32,7 +32,7 @@ reportWeekly=Weekly reportYearly=Yearly reportByProject=By project -reportAnnotations=Include annotations +reportAnnotationsTime=with time reportProjects=Projects reportContent=Report reportProjectsList=Projects list @@ -43,6 +43,8 @@ previousWeek.Action.icon = date_previous.png previousWeek.Action.shortDescription = Previous week +reportAnnotations.Action.text = Include annotations + showHiddenProjects.Action.text = Show hidden projects showHiddenProjects.Action.shortDescription = Show hidden projects Modified: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2012-03-18 16:44:26 UTC (rev 2834) @@ -32,7 +32,8 @@ reportWeekly=Par semaine reportYearly=Par ann\u00E9e reportByProject=Par projet -reportAnnotations=Inclure les annotations + +reportAnnotationsTime=avec l'heure reportProjects=Projets reportContent=Rapport reportProjectsList=Liste des projets @@ -44,6 +45,8 @@ showHiddenProjects.Action.text = Afficher les cach\u00E9s showHiddenProjects.Action.shortDescription = Afficher les cach\u00E9s +reportAnnotations.Action.text = Inclure les annotations + generateReport.Action.text = G\u00E9n\u00E9rer generateReport.Action.shortDescription = G\u00E9n\u00E9rer le report Modified: trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java 2012-03-18 16:44:26 UTC (rev 2834) @@ -29,6 +29,7 @@ import java.io.IOException; import java.net.URL; import java.util.Collection; +import java.util.Locale; import java.util.Properties; import org.apache.commons.io.FileUtils; @@ -137,6 +138,10 @@ log.debug("Set up test"); } + // jtimer code use default system locale + // test are coded in en_US + Locale.setDefault(Locale.US); + initDataDirectory(); } Modified: trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2012-03-18 16:44:26 UTC (rev 2834) @@ -57,6 +57,7 @@ /** * Test report generation. + * * @throws ParseException */ @Test @@ -70,7 +71,8 @@ List<TimerProject> projects = new ArrayList<TimerProject>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); - String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, projects, d1, d2, false); + String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, + projects, d1, d2, false, false); if (log.isDebugEnabled()) { log.debug("Daily report = " + content); @@ -103,9 +105,48 @@ } }*/ } - + /** + * Test report generation with annotation time. + * + * @throws ParseException + */ + @Test + public void getReportTextDailyAnnotationTime() throws ParseException { + + /*try { + FIXME saver.lock();*/ + + Date d1 = df.parse("November 1, 2008"); + Date d2 = df.parse("March 31, 2009"); + List<TimerProject> projects = new ArrayList<TimerProject>(); + projects.addAll(testSaver.load()); + ReportGenerator generator = new ReportGenerator(); + String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, + projects, d1, d2, true, true); + + if (log.isDebugEnabled()) { + log.debug("Daily report = " + content); + } + + Assert.assertNotNull(content); + + // with annotations and time (* is important in test) + Assert.assertTrue(content.indexOf("* 2:10 PM : Test task and subtask time") > 0); + Assert.assertTrue(content.indexOf("* 12:00 AM : Not easy work") > 0); + + /*FIXME saver.unlock(); + } catch (DataLockingException e) { + if(log.isErrorEnabled()) { + log.error("getProjectFromFileTest error", e); + Assert.fail(); + } + }*/ + } + + /** * Test report generation. + * * @throws ParseException */ @Test @@ -119,7 +160,8 @@ List<TimerProject> projects = new ArrayList<TimerProject>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); - String content = generator.getReportText(ReportGenerator.Type.BY_WEEK_REPORT, projects, d1, d2, true); + String content = generator.getReportText(ReportGenerator.Type.BY_WEEK_REPORT, + projects, d1, d2, true, false); if (log.isDebugEnabled()) { log.debug("Weekly report = " + content); @@ -136,9 +178,47 @@ Assert.assertTrue(content.indexOf("Add webservice") > 0); Assert.assertTrue(content.indexOf("Add workspace support") > 0); + // with annotations + Assert.assertTrue(content.indexOf("* Test task and subtask time") > 0); + Assert.assertTrue(content.indexOf("* Not easy work") > 0); + + /*FIXME saver.unlock(); + } catch (DataLockingException e) { + if(log.isErrorEnabled()) { + log.error("getProjectFromFileTest error", e); + Assert.fail(); + } + }*/ + } + + /** + * Test report generation with annotation time. + * + * @throws ParseException + */ + @Test + public void getReportTextMonthlyAnnotationTime() throws ParseException { + + /*try { + FIXME saver.lock();*/ + + Date d1 = df.parse("November 1, 2008"); + Date d2 = df.parse("March 31, 2009"); + List<TimerProject> projects = new ArrayList<TimerProject>(); + projects.addAll(testSaver.load()); + ReportGenerator generator = new ReportGenerator(); + String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, + projects, d1, d2, true, true); + + if (log.isDebugEnabled()) { + log.debug("Monthly report = " + content); + } + + Assert.assertNotNull(content); + // no annotations - Assert.assertTrue(content.indexOf("Test task and subtask time") > 0); - Assert.assertTrue(content.indexOf("Not easy work") > 0); + Assert.assertTrue(content.indexOf("* 2/3/09 2:10 PM : Test task and subtask time") > 0); + Assert.assertTrue(content.indexOf("* 12/11/08 12:00 AM : Not easy work") > 0); /*FIXME saver.unlock(); } catch (DataLockingException e) { @@ -164,7 +244,8 @@ List<TimerProject> projects = new ArrayList<TimerProject>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); - String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, projects, d1, d2, false); + String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, + projects, d1, d2, false, false); if (log.isDebugEnabled()) { log.debug("Monthly report = " + content); @@ -209,7 +290,8 @@ List<TimerProject> projects = new ArrayList<TimerProject>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); - String content = generator.getReportText(ReportGenerator.Type.BY_YEAR_REPORT, projects, d1, d2, false); + String content = generator.getReportText(ReportGenerator.Type.BY_YEAR_REPORT, + projects, d1, d2, false, false); if (log.isDebugEnabled()) { log.debug("Yearly report = " + content); @@ -255,7 +337,8 @@ List<TimerProject> projects = new ArrayList<TimerProject>(); projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); - String content = generator.getReportText(ReportGenerator.Type.BY_PROJECT_REPORT, projects, d1, d2, true); + String content = generator.getReportText(ReportGenerator.Type.BY_PROJECT_REPORT, + projects, d1, d2, true, false); if (log.isDebugEnabled()) { log.debug("Project report = " + content); @@ -273,9 +356,9 @@ Assert.assertTrue(content.indexOf("Add service layer") > 0); Assert.assertTrue(content.indexOf("Calendar to date") > 0); - // no annotations + // test annotations Assert.assertFalse(content.indexOf("Test task and subtask time") > 0); - Assert.assertTrue(content.indexOf("Not easy work") > 0); + Assert.assertTrue(content.indexOf("* Not easy work") > 0); /*FIXME saver.unlock(); } catch (DataLockingException e) { Modified: trunk/src/test/resources/testdata/4.ann =================================================================== --- trunk/src/test/resources/testdata/4.ann 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/test/resources/testdata/4.ann 2012-03-18 16:44:26 UTC (rev 2834) @@ -1 +1 @@ -1233615601 Test task and subtask time \ No newline at end of file +1233666601 Test task and subtask time \ No newline at end of file Modified: trunk/src/test/resources/testdata/5.ann =================================================================== --- trunk/src/test/resources/testdata/5.ann 2012-03-17 10:47:17 UTC (rev 2833) +++ trunk/src/test/resources/testdata/5.ann 2012-03-18 16:44:26 UTC (rev 2834) @@ -1 +1 @@ -1233615601 Test subtask time +1233621301 Test subtask time

1 0

r2833 - in trunk/src: main/java/org/chorem/jtimer/entities test/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org March 17, 2012

March 17, 2012

Author: echatellier Date: 2012-03-17 11:47:17 +0100 (Sat, 17 Mar 2012) New Revision: 2833 Url: http://chorem.org/repositories/revision/jtimer/2833 Log: Modify clone implementation (just soft clone now) Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-17 09:58:17 UTC (rev 2832) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-17 10:47:17 UTC (rev 2833) @@ -33,21 +33,16 @@ import java.util.TreeMap; import java.util.UUID; -import org.apache.commons.lang3.SerializationUtils; import org.chorem.jtimer.utils.DailySortedMap; /** * Represents a task. * - * This task is cloneable using SerializationUtils (commons-lang). - * * @author chatellier * @version $Revision$ * * Last update : $Date$ * By : $Author$ - * - * @see SerializationUtils */ public class TimerTask implements Cloneable, Comparable<TimerTask>, Serializable { @@ -369,27 +364,14 @@ try { task = (TimerTask) super.clone(); - // clone collections using - // commons-lang SerializationUtils - - // copy name - task.name = name; - // copy date task.creationDate = creationDate == null ? null : (Date) creationDate.clone(); - // copy durations - task.allDaysTimes = (DailySortedMap<Long>) SerializationUtils - .clone((DailySortedMap<Long>) allDaysTimes); - - // copy notes - task.allDaysAnnotations = (TreeMap<Date, String>) SerializationUtils - .clone((TreeMap<Date, String>) allDaysAnnotations); - - // copy subtasks - task.subTasks = (ArrayList<TimerTask>) SerializationUtils - .clone((ArrayList<TimerTask>) subTasks); + // make new list instance + task.allDaysTimes = new DailySortedMap<Long>(allDaysTimes); + task.allDaysAnnotations = new TreeMap<Date, String>(allDaysAnnotations); + task.subTasks = new ArrayList<TimerTask>(subTasks); } catch (CloneNotSupportedException e) { throw new RuntimeException("Can't clone", e); } Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2012-03-17 09:58:17 UTC (rev 2832) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2012-03-17 10:47:17 UTC (rev 2833) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 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 @@ -25,7 +25,6 @@ package org.chorem.jtimer.entities; -import java.util.Calendar; import java.util.Date; import org.chorem.jtimer.AbstractJTimerTest; @@ -70,7 +69,7 @@ Assert.assertTrue(clonedTask.allDaysTimes instanceof DailySortedMap<?>, "Clone put invalid type for map"); Assert.assertFalse(clonedTask.allDaysAnnotations instanceof DailySortedMap<?>, "Clone put invalid type for map"); } - + /** * Test task subtasks. */ @@ -91,7 +90,6 @@ Assert.assertEquals(1, clonedTask.getSubTasks().size()); // subtask modification - subtask.setName("bobo"); Assert.assertEquals("subtest", clonedTask.getSubTasks().get(0).getName()); // clone removal, not modify first @@ -99,4 +97,26 @@ Assert.assertEquals(0, clonedTask.getSubTasks().size()); Assert.assertEquals(1, task.getSubTasks().size()); } + + /** + * Test that clone is a soft clone (excepted for lists). + */ + @Test + public void testCloneLists() { + TimerTask task = new TimerTask(); + task.setName("test"); + + TimerTask clonedTask = task.clone(); + + task.setClosed(true); + task.addTask(new TimerTask()); + task.setName("new name"); + + Assert.assertEquals(task.getName(), "new name"); + Assert.assertEquals(clonedTask.getName(), "test"); + Assert.assertTrue(task.isClosed()); + Assert.assertFalse(clonedTask.isClosed()); + Assert.assertEquals(task.getSubTasks().size(), 1); + Assert.assertEquals(clonedTask.getSubTasks().size(), 0); + } }

1 0

r2832 - in trunk/src/main/java/org/chorem/jtimer: data io ui ui/systray ui/treetable ws/xmlrpc
by echatellier＠users.chorem.org March 17, 2012

March 17, 2012

Author: echatellier Date: 2012-03-17 10:58:17 +0100 (Sat, 17 Mar 2012) New Revision: 2832 Url: http://chorem.org/repositories/revision/jtimer/2832 Log: Remove useless pre/post change task closed state Modified: trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java Modified: trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java 2012-03-17 09:44:07 UTC (rev 2831) +++ trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java 2012-03-17 09:58:17 UTC (rev 2832) @@ -104,20 +104,13 @@ public void setTaskTime(TimerTask task, Date date, Long time); /** - * Pre change task state. + * Change task state. * * @param task task */ - public void preChangeClosedState(TimerTask task); + public void changeClosedState(TimerTask task); /** - * Post change task state. - * - * @param task task - */ - public void postChangeClosedState(TimerTask task); - - /** * Pre move task. * * @param task task Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-17 09:44:07 UTC (rev 2831) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-17 09:58:17 UTC (rev 2832) @@ -319,19 +319,12 @@ vetoableDataEventListener.checkChangeClosedState(task); } - // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().preChangeClosedState(task); - } - task.setClosed(!task.isClosed()); // send notification - itDataEventListener = dataEventListeners.iterator(); + Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); while (itDataEventListener.hasNext()) { - itDataEventListener.next().postChangeClosedState(task); + itDataEventListener.next().changeClosedState(task); } } Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2012-03-17 09:44:07 UTC (rev 2831) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2012-03-17 09:58:17 UTC (rev 2832) @@ -1344,10 +1344,10 @@ } /* - * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask) + * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask) */ @Override - public void postChangeClosedState(TimerTask task) { + public void changeClosedState(TimerTask task) { if (task instanceof TimerProject) { saveProject((TimerProject) task); } else { @@ -1360,14 +1360,6 @@ } /* - * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preChangeClosedState(TimerTask task) { - // nothing - } - - /* * @see org.chorem.jtimer.data.event.DataEventListener#preMoveTask(org.chorem.jtimer.entities.TimerTask) */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2012-03-17 09:44:07 UTC (rev 2831) +++ trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2012-03-17 09:58:17 UTC (rev 2832) @@ -199,22 +199,14 @@ } /* - * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask) + * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask) */ @Override - public void postChangeClosedState(TimerTask task) { + public void changeClosedState(TimerTask task) { } /* - * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preChangeClosedState(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.data.event.DataEventListener#startTask(org.chorem.jtimer.entities.TimerTask) */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2012-03-17 09:44:07 UTC (rev 2831) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2012-03-17 09:58:17 UTC (rev 2832) @@ -254,22 +254,14 @@ } /* - * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask) + * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask) */ @Override - public void postChangeClosedState(TimerTask task) { + public void changeClosedState(TimerTask task) { } /* - * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preChangeClosedState(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.ui.systray.SystrayManager#startTask(org.chorem.jtimer.entities.TimerTask) */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2012-03-17 09:44:07 UTC (rev 2831) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2012-03-17 09:58:17 UTC (rev 2832) @@ -234,22 +234,14 @@ } /* - * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask) + * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask) */ @Override - public void postChangeClosedState(TimerTask task) { + public void changeClosedState(TimerTask task) { } /* - * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preChangeClosedState(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.data.event.DataEventListener#startTask(org.chorem.jtimer.entities.TimerTask) */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-17 09:44:07 UTC (rev 2831) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-17 09:58:17 UTC (rev 2832) @@ -469,26 +469,18 @@ } /* - * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask) + * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask) */ @Override - public void postChangeClosedState(TimerTask task) { + public void changeClosedState(TimerTask task) { - } - - /* - * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preChangeClosedState(TimerTask task) { - if (showClosedTask) { if (log.isDebugEnabled()) { log.debug("Fire modify on state change because hidden task are shown"); } notifyTaskChanged(task, OPERATION_MODIFY); } else { - if (!task.isClosed()) { + if (task.isClosed()) { if (log.isDebugEnabled()) { log.debug("Fire delete on state change because task disapear from view"); } Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2012-03-17 09:44:07 UTC (rev 2831) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2012-03-17 09:58:17 UTC (rev 2832) @@ -767,22 +767,14 @@ } /* - * @see org.chorem.jtimer.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask) + * @see org.chorem.jtimer.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask) */ @Override - public void preChangeClosedState(TimerTask task) { + public void changeClosedState(TimerTask task) { } /* - * @see org.chorem.jtimer.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void postChangeClosedState(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.event.DataEventListener#postMoveTask(org.chorem.jtimer.entities.TimerTask) */ @Override

1 0

r2831 - trunk
by echatellier＠users.chorem.org March 17, 2012

March 17, 2012

Author: echatellier Date: 2012-03-17 10:44:07 +0100 (Sat, 17 Mar 2012) New Revision: 2831 Url: http://chorem.org/repositories/revision/jtimer/2831 Log: #481: Migration configuration to NuitonUtils's ApplicationConfig Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-16 11:02:04 UTC (rev 2830) +++ trunk/pom.xml 2012-03-17 09:44:07 UTC (rev 2831) @@ -208,7 +208,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.4.4</version> + <version>2.4.5</version> <scope>compile</scope> <exclusions> <exclusion>

1 0

r2830 - trunk/src/main/java/org/chorem/jtimer/ui/treetable
by echatellier＠users.chorem.org March 16, 2012

March 16, 2012

Author: echatellier Date: 2012-03-16 12:02:04 +0100 (Fri, 16 Mar 2012) New Revision: 2830 Url: http://chorem.org/repositories/revision/jtimer/2830 Log: Useless cast Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-16 11:01:06 UTC (rev 2829) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-16 11:02:04 UTC (rev 2830) @@ -315,7 +315,7 @@ List<TimerTask> subTask = getFiteredSubListFor(pathLastComponent, operation == OPERATION_ADD); int childCount = subTask.size(); for (int childIndex = 0; !updated && childIndex < childCount; ++childIndex) { - TimerTask taskUO = (TimerTask) subTask.get(childIndex); + TimerTask taskUO = subTask.get(childIndex); if (task.equals(taskUO)) {

1 0

r2829 - trunk/src/main/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org March 16, 2012

March 16, 2012

Author: echatellier Date: 2012-03-16 12:01:06 +0100 (Fri, 16 Mar 2012) New Revision: 2829 Url: http://chorem.org/repositories/revision/jtimer/2829 Log: Revert commit on test code (never been used) Removed: trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2012-03-16 11:00:21 UTC (rev 2828) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2012-03-16 11:01:06 UTC (rev 2829) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 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 @@ -36,14 +36,11 @@ * Last update : $Date$ * By : $Author$ */ -public class TimerAlert extends TimerObject implements Serializable, Cloneable { +public class TimerAlert implements Serializable, Cloneable { /** serialVersionUID. */ private static final long serialVersionUID = 584921087501157113L; - public static final String PROPERTY_TYPE = "type"; - public static final String PROPERTY_DURATION = "duration"; - /** * Alert type. */ @@ -92,10 +89,7 @@ * @param type the type to set */ public void setType(Type type) { - getVetoableSupport().firePropertyChange(PROPERTY_TYPE, this.type, type); - Type oldValue = this.type; this.type = type; - getChangeSupport().firePropertyChange(PROPERTY_TYPE, oldValue, this.type); } /** @@ -113,10 +107,7 @@ * @param duration the duration to set (in seconds) */ public void setDuration(long duration) { - getVetoableSupport().firePropertyChange(PROPERTY_DURATION, this.duration, duration); - long oldValue = this.duration; this.duration = duration; - getChangeSupport().firePropertyChange(PROPERTY_DURATION, oldValue, this.duration); } /* Deleted: trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java 2012-03-16 11:00:21 UTC (rev 2828) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java 2012-03-16 11:01:06 UTC (rev 2829) @@ -1,93 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 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% - */ - -package org.chorem.jtimer.entities; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; - -/** - * Timer object. - * - * Contains listener. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public abstract class TimerObject { - - /** Property change support for vetoable actions (private to use getter). */ - private transient PropertyChangeSupport vetoableSupport; - - /** Property change support for change actions (private to use getter). */ - private transient PropertyChangeSupport changeSupport; - - protected PropertyChangeSupport getVetoableSupport() { - if (vetoableSupport == null) { - vetoableSupport = new PropertyChangeSupport(this); - } - return vetoableSupport; - } - - protected PropertyChangeSupport getChangeSupport() { - if (changeSupport == null) { - changeSupport = new PropertyChangeSupport(this); - } - return changeSupport; - } - - public void addVetoableListener(PropertyChangeListener listener) { - vetoableSupport.addPropertyChangeListener(listener); - } - - public void removeVetoableListener(PropertyChangeListener listener) { - vetoableSupport.removePropertyChangeListener(listener); - } - - public void addVetoableListener(String propertyName, PropertyChangeListener listener) { - vetoableSupport.addPropertyChangeListener(propertyName, listener); - } - - public void removeVetoableListener(String propertyName, PropertyChangeListener listener) { - vetoableSupport.removePropertyChangeListener(propertyName, listener); - } - - public void addChangeListener(PropertyChangeListener listener) { - changeSupport.addPropertyChangeListener(listener); - } - - public void removeChangeListener(PropertyChangeListener listener) { - changeSupport.removePropertyChangeListener(listener); - } - - public void addChangeListener(String propertyName, PropertyChangeListener listener) { - changeSupport.addPropertyChangeListener(propertyName, listener); - } - - public void removeChangeListener(String propertyName, PropertyChangeListener listener) { - changeSupport.removePropertyChangeListener(propertyName, listener); - } -} Deleted: trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java 2012-03-16 11:00:21 UTC (rev 2828) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java 2012-03-16 11:01:06 UTC (rev 2829) @@ -1,72 +0,0 @@ -/* - * #%L - * jTimer - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 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% - */ - -package org.chorem.jtimer.entities; - -import java.util.ArrayList; -import java.util.List; - -/** - * Simply manage a project list for listener to register on that object. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class TimerProjectsList extends TimerObject { - - protected List<TimerProject> projects; - - public static final String PROPERTY_PROJECTS = "projects"; - - /** - * Constructor. - */ - public TimerProjectsList() { - projects = new ArrayList<TimerProject>(); - } - - /** - * Get project list. - * - * @return project list - */ - public List<TimerProject> getProjects() { - return projects; - } - - /** - * Add new project to project list. - * - * @param project project - */ - public void addProject(TimerProject project) { - getVetoableSupport().firePropertyChange(PROPERTY_PROJECTS, null, projects); - projects.add(project); - getChangeSupport().firePropertyChange(PROPERTY_PROJECTS, null, projects); - } -} Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-16 11:00:21 UTC (rev 2828) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-16 11:01:06 UTC (rev 2829) @@ -49,22 +49,12 @@ * * @see SerializationUtils */ -public class TimerTask extends TimerObject implements Cloneable, +public class TimerTask implements Cloneable, Comparable<TimerTask>, Serializable { /** serialVersionUID */ private static final long serialVersionUID = -7590755569706702695L; - public static final String PROPERTY_NUMBER = "number"; - public static final String PROPERTY_NAME = "name"; - public static final String PROPERTY_CREATION_DATE = "creationDate"; - public static final String PROPERTY_CLOSED = "closed"; - public static final String PROPERTY_PARENT = "parent"; - public static final String PROPERTY_ALL_DAYS_TIMES = "allDaysTimes"; - public static final String PROPERTY_ALL_DAYS_ANNOTATIONS = "allDaysAnnotations"; - public static final String PROPERTY_SUB_TASKS = "subTasks"; - public static final String PROPERTY_ALERTS = "alerts"; - /** Task uuid used to managed task equality. */ protected String uuid = UUID.randomUUID().toString(); @@ -145,10 +135,7 @@ * @param number the number to set */ public void setNumber(int number) { - getVetoableSupport().firePropertyChange(PROPERTY_NUMBER, this.number, number); - int oldValue = this.number; this.number = number; - getChangeSupport().firePropertyChange(PROPERTY_NUMBER, oldValue, this.number); } /** @@ -166,10 +153,7 @@ * @param name the name to set */ public void setName(String name) { - getVetoableSupport().firePropertyChange(PROPERTY_NAME, this.name, name); - String oldValue = this.name; this.name = name; - getChangeSupport().firePropertyChange(PROPERTY_NAME, oldValue, this.name); } /** @@ -187,10 +171,7 @@ * @param creationDate creation date */ public void setCreationDate(Date creationDate) { - getVetoableSupport().firePropertyChange(PROPERTY_CREATION_DATE, this.creationDate, creationDate); - Date oldValue = this.creationDate; this.creationDate = creationDate; - getChangeSupport().firePropertyChange(PROPERTY_CREATION_DATE, oldValue, this.creationDate); } /** @@ -208,10 +189,7 @@ * @param closed closed */ public void setClosed(boolean closed) { - getVetoableSupport().firePropertyChange(PROPERTY_CLOSED, this.closed, closed); - boolean oldValue = this.closed; this.closed = closed; - getChangeSupport().firePropertyChange(PROPERTY_CLOSED, oldValue, this.closed); } /** @@ -231,16 +209,12 @@ * @param parent the parent to set */ protected void setParent(TimerTask parent) { - // will cause an infinite loop if (parent == this) { throw new IllegalArgumentException("Parent can't be current task"); } - - getVetoableSupport().firePropertyChange(PROPERTY_PARENT, this.parent, parent); - TimerTask oldValue = this.parent; this.parent = parent; - getChangeSupport().firePropertyChange(PROPERTY_PARENT, oldValue, this.parent); + } /** @@ -264,10 +238,7 @@ // set parent t.setParent(this); - - getVetoableSupport().firePropertyChange(PROPERTY_SUB_TASKS, null, subTasks); boolean result = subTasks.add(t); - getChangeSupport().firePropertyChange(PROPERTY_SUB_TASKS, null, this.parent); return result; } @@ -280,9 +251,7 @@ * @param seconds seconds */ public void setTime(Date date, Long seconds) { - getVetoableSupport().firePropertyChange(PROPERTY_ALL_DAYS_TIMES, null, allDaysTimes); allDaysTimes.put(date, seconds); - getChangeSupport().firePropertyChange(PROPERTY_ALL_DAYS_TIMES, null, this.allDaysTimes); } /** @@ -318,9 +287,7 @@ * @param note note text */ public void addAnnotation(Date date, String note) { - getVetoableSupport().firePropertyChange(PROPERTY_ALL_DAYS_ANNOTATIONS, null, allDaysAnnotations); allDaysAnnotations.put(date, note); - getChangeSupport().firePropertyChange(PROPERTY_ALL_DAYS_ANNOTATIONS, null, this.allDaysAnnotations); } /** @@ -338,9 +305,7 @@ * @param alert */ public void addAlert(TimerAlert alert) { - getVetoableSupport().firePropertyChange(PROPERTY_ALERTS, null, alerts); alerts.add(alert); - getChangeSupport().firePropertyChange(PROPERTY_ALERTS, null, alerts); } /** @@ -358,9 +323,7 @@ * @param alerts new alerts list */ public void setAlert(List<TimerAlert> alerts) { - getVetoableSupport().firePropertyChange(PROPERTY_ALERTS, null, alerts); this.alerts = alerts; - getChangeSupport().firePropertyChange(PROPERTY_ALERTS, null, alerts); } /*

1 0

r2828 - trunk/src/main/java/org/chorem/jtimer/ui/system/unix
by echatellier＠users.chorem.org March 16, 2012

March 16, 2012

Author: echatellier Date: 2012-03-16 12:00:21 +0100 (Fri, 16 Mar 2012) New Revision: 2828 Url: http://chorem.org/repositories/revision/jtimer/2828 Log: Fix potential NPE Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java 2012-03-16 09:29:46 UTC (rev 2827) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java 2012-03-16 11:00:21 UTC (rev 2828) @@ -124,10 +124,10 @@ idleTime = screenSaverInfo.idle.longValue(); } } + + // free resources + X11.INSTANCE.XFree(screenSaverInfo.getPointer()); } - - // free resources - X11.INSTANCE.XFree(screenSaverInfo.getPointer()); } // free resources

1 0