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

r2654 - in trunk/src: main/java/org/chorem/jtimer/entities test/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org Aug. 28, 2009

Aug. 28, 2009

Author: echatellier Date: 2009-08-28 17:11:54 +0200 (Fri, 28 Aug 2009) New Revision: 2654 Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java Log: Alert was not equals with null values. Alert editor can't remove null values alerts. Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2009-08-27 14:38:07 UTC (rev 2653) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2009-08-28 15:11:54 UTC (rev 2654) @@ -139,7 +139,12 @@ TimerAlert other = (TimerAlert) obj; result = duration == other.duration; - result &= type != null && type.equals(other.type); + if (type != null) { + result &= type.equals(other.type); + } + else { + result &= other.type == null; + } } return result; } Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java 2009-08-27 14:38:07 UTC (rev 2653) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java 2009-08-28 15:11:54 UTC (rev 2654) @@ -81,8 +81,21 @@ alert.setType(Type.REACH_TOTAL_TIME); Assert.assertEquals(alert, alert2); } - + /** + * Test equals with null values. + */ + @Test + public void testEqualsNull() { + + Assert.assertEquals(new TimerAlert(), new TimerAlert()); + + TimerAlert alert1 = new TimerAlert(); + alert1.setDuration(1); + Assert.assertFalse(alert1.equals(new TimerAlert())); + } + + /** * Test list content (hash code implementation). */ @Test

1 0

r2653 - in trunk/src/site: . en/rst en/rst/devel rst/devel
by echatellier＠users.chorem.org Aug. 27, 2009

Aug. 27, 2009

Author: echatellier Date: 2009-08-27 16:38:07 +0200 (Thu, 27 Aug 2009) New Revision: 2653 Modified: trunk/src/site/en/rst/devel/fileformat.rst trunk/src/site/en/rst/index.rst trunk/src/site/rst/devel/fileformat.rst trunk/src/site/site.xml trunk/src/site/site_en.xml Log: Add documentation about alert file format. Modified: trunk/src/site/en/rst/devel/fileformat.rst =================================================================== --- trunk/src/site/en/rst/devel/fileformat.rst 2009-08-26 16:51:22 UTC (rev 2652) +++ trunk/src/site/en/rst/devel/fileformat.rst 2009-08-27 14:38:07 UTC (rev 2653) @@ -1,13 +1,14 @@ File format =========== -File format used in jTimer 1.2.0 is gTimer 1.2 file format +File format used in jTimer 1.2.0 is gTimer 1.2 file format. +Since 1.3.0, jTimer add new features that gTimer can't handle. Project ------- -**Extention :** .project +**Extension :** .project **Format :** @@ -30,7 +31,7 @@ Task ---- -**Extention :** .task +**Extension :** .task **Format :** @@ -61,7 +62,7 @@ Notes ----- -**Extention :** .ann +**Extension :** .ann **Format :** @@ -69,11 +70,33 @@ <timestamp texte> -**Note:** x.ann is linked to x.task task. +**Note:** x.ann note is linked to x.task task. **Example :** 7.ann :: 1228950001 First note - 1228950002 Second note \ No newline at end of file + 1228950002 Second note + +Alerts +------ + +**Extension :** .alert + +**Format :** + +:: + + <alert type> <duration> + +**Note:** x.alert alert is linked to x.task task. + +Alerts are not defined in 1.2 gTimer firle format. + +**Example :** 7.alert + +:: + + reachdailytime 3600 + reachtotaltime 7200 \ No newline at end of file Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2009-08-26 16:51:22 UTC (rev 2652) +++ trunk/src/site/en/rst/index.rst 2009-08-27 14:38:07 UTC (rev 2653) @@ -13,10 +13,6 @@ * Reports generation * Internationalization (i18n) -Online demo ------------ -`Launch demo`_. - Links ----- * gTimer_. Modified: trunk/src/site/rst/devel/fileformat.rst =================================================================== --- trunk/src/site/rst/devel/fileformat.rst 2009-08-26 16:51:22 UTC (rev 2652) +++ trunk/src/site/rst/devel/fileformat.rst 2009-08-27 14:38:07 UTC (rev 2653) @@ -2,8 +2,9 @@ ================= Le format de fichier dans jTimer 1.2.0 est le format 1.2 de gTimer. +Depuis jTimer 1.3.0, quelques additions de fichiers ont été effectées que +gTimer ne saura pas traiter. - Projet ------ @@ -67,13 +68,35 @@ :: - <timestamp texte> + <timestamp> <texte> -**Note:** Les notes x.ann sont associé à la tâche x.task. +**Note:** La note x.ann est associée à la tâche x.task. **Exemple :** 7.ann :: 1228950001 First note - 1228950002 Second note \ No newline at end of file + 1228950002 Second note + +Alertes +------- + +**Extension :** .alert + +**Format :** + +:: + + <alert type> <durée> + +**Note:** L'alerte x.alert est associée à la tâche x.task. + +Les alertes ne sont pas défini dans le format 1.2 de gTimer. + +**Exemple :** 7.alert + +:: + + reachdailytime 3600 + reachtotaltime 7200 \ No newline at end of file Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-26 16:51:22 UTC (rev 2652) +++ trunk/src/site/site.xml 2009-08-27 14:38:07 UTC (rev 2653) @@ -7,7 +7,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> @@ -50,7 +50,7 @@ <menu name="Développeur" inherit="top"> <item name="Roadmap" href="devel/roadmap.html" /> - <item name="Fonctionnement" href="devel/index.html" collapse="true"> + <item name="Fonctionnement" href="devel/index.html">  <item name="Framework swing" href="devel/saf.html" />  Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-08-26 16:51:22 UTC (rev 2652) +++ trunk/src/site/site_en.xml 2009-08-27 14:38:07 UTC (rev 2653) @@ -7,7 +7,7 @@ <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0-rc-1</version> + <version>1.0.0</version> </skin> <bannerLeft> @@ -50,7 +50,7 @@ <menu name="Developers" inherit="top"> <item name="Roadmap" href="devel/roadmap.html" /> - <item name="Operation" href="devel/index.html" collapse="true"> + <item name="Operation" href="devel/index.html">  <item name="Swing framework" href="devel/saf.html" />

1 0

r2652 - trunk
by echatellier＠users.chorem.org Aug. 26, 2009

Aug. 26, 2009

Author: echatellier Date: 2009-08-26 18:51:22 +0200 (Wed, 26 Aug 2009) New Revision: 2652 Modified: trunk/pom.xml Log: Update testng and jrst. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-21 17:16:34 UTC (rev 2651) +++ trunk/pom.xml 2009-08-26 16:51:22 UTC (rev 2652) @@ -166,7 +166,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0-rc-3</version> + <version>1.0.0</version> </dependency> </dependencies> </plugin> @@ -298,7 +298,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.9</version> + <version>5.10</version> <scope>test</scope> <classifier>jdk15</classifier> </dependency>

1 0

r2651 - in trunk/src: main/java/org/chorem/jtimer/io test/java/org/chorem/jtimer/data
by echatellier＠users.chorem.org Aug. 21, 2009

Aug. 21, 2009

Author: echatellier Date: 2009-08-21 19:16:34 +0200 (Fri, 21 Aug 2009) New Revision: 2651 Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java Log: Fix alert type parsing (add test on it). Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2009-08-21 09:41:24 UTC (rev 2650) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2009-08-21 17:16:34 UTC (rev 2651) @@ -645,7 +645,7 @@ } else if ("reachdailytime".equals(alertType)) { Long duration = Long.parseLong(alertDuration); TimerAlert alert = new TimerAlert( - TimerAlert.Type.REACH_TOTAL_TIME, duration); + TimerAlert.Type.REACH_DAILY_TIME, duration); task.addAlert(alert); } else { if (log.isWarnEnabled()) { Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-08-21 09:41:24 UTC (rev 2650) +++ trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-08-21 17:16:34 UTC (rev 2651) @@ -28,6 +28,7 @@ import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.entities.TimerTaskHelper; +import org.chorem.jtimer.entities.TimerAlert.Type; import org.testng.Assert; import org.testng.annotations.Test; @@ -484,14 +485,13 @@ boolean alert2found = false; boolean alert3found = false; for (TimerAlert alert : task1a.getAlerts()) { - // TODO commenct on fait pour comparer des enum ? - if (/*alert.getType().equals(Type.REACH_DAILY_TIME) && */alert.getDuration() == 3600) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 3600) { alert1found = true; } - if (/*alert.getType().equals(Type.REACH_DAILY_TIME) && */alert.getDuration() == 7200) { + if (alert.getType().equals(Type.REACH_DAILY_TIME) && alert.getDuration() == 7200) { alert2found = true; } - if (/*alert.getType().equals(Type.REACH_TOTAL_TIME) && */alert.getDuration() == 10800) { + if (alert.getType().equals(Type.REACH_TOTAL_TIME) && alert.getDuration() == 10800) { alert3found = true; } }

1 0

r2650 - trunk/src/main/java/org/chorem/jtimer/io
by echatellier＠users.chorem.org Aug. 21, 2009

Aug. 21, 2009

Author: echatellier Date: 2009-08-21 11:41:24 +0200 (Fri, 21 Aug 2009) New Revision: 2650 Modified: trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java Log: Missing final keyword. Modified: trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java 2009-08-21 09:27:37 UTC (rev 2649) +++ trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java 2009-08-21 09:41:24 UTC (rev 2650) @@ -43,7 +43,7 @@ private static Log log = LogFactory.getLog(GTimerIncrementalSaver.class); /** Backup file extension. */ - public static String BACKUP_EXTENSION = ".tmp"; + public static final String BACKUP_EXTENSION = ".tmp"; /** * Make to backup of file if exists.

1 0

r2649 - in trunk/src: main/java/org/chorem/jtimer/io test/java/org/chorem/jtimer/data test/java/org/chorem/jtimer/io test/resources/testdata
by echatellier＠users.chorem.org Aug. 21, 2009

Aug. 21, 2009

Author: echatellier Date: 2009-08-21 11:27:37 +0200 (Fri, 21 Aug 2009) New Revision: 2649 Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java trunk/src/test/resources/testdata/24.alert Log: Alert file can't be loaded using Properties.load(). Key appears multiples times. Use readLines now. Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2009-08-21 08:35:37 UTC (rev 2648) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2009-08-21 09:27:37 UTC (rev 2649) @@ -19,10 +19,12 @@ package org.chorem.jtimer.io; import java.io.BufferedInputStream; +import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.RandomAccessFile; @@ -604,6 +606,9 @@ /** * Find task alert and load it. * + * This file can't be loaded by {@code Properties#load(java.io.InputStream)}. + * Constains duplicated keys. + * * @param task task to load alert * @throws IOException if can't read ann file */ @@ -618,47 +623,45 @@ log.debug("Alert found for task " + task.getName()); } - Properties prop = new Properties(); - prop.load(new BufferedInputStream( - new FileInputStream(alertTaskFile))); + BufferedReader alertIn = new BufferedReader(new FileReader( + alertTaskFile)); - // analyse des donnees (temps) - for (Object key : prop.keySet()) { - String keyName = (String) key; + // skip first line : "format: 1.2" + String line = alertIn.readLine(); + while ((line = alertIn.readLine()) != null) { - // test if key format match - if ("reachtotaltime".equals(keyName)) { - String alertInfo = prop.getProperty(keyName); + line = line.trim(); + if (!line.isEmpty()) { + String alertType = line.substring(0, line.indexOf(' ')); + String alertDuration = line.substring( + line.indexOf(' ') + 1, line.length()); + try { - long duration = Long.parseLong(alertInfo); - - TimerAlert alert = new TimerAlert( - TimerAlert.Type.REACH_TOTAL_TIME, duration); - task.addAlert(alert); - } catch (NumberFormatException e) { - if (log.isErrorEnabled()) { - log.error("Can't convert " + alertInfo - + " into long"); + if ("reachtotaltime".equals(alertType)) { + Long duration = Long.parseLong(alertDuration); + TimerAlert alert = new TimerAlert( + TimerAlert.Type.REACH_TOTAL_TIME, duration); + task.addAlert(alert); + } else if ("reachdailytime".equals(alertType)) { + Long duration = Long.parseLong(alertDuration); + TimerAlert alert = new TimerAlert( + TimerAlert.Type.REACH_TOTAL_TIME, duration); + task.addAlert(alert); + } else { + if (log.isWarnEnabled()) { + log.warn("Unknow alert type " + alertType); + } } - } - } - - if ("reachdailytime".equals(keyName)) { - String alertInfo = prop.getProperty(keyName); - try { - long duration = Long.parseLong(alertInfo); - - TimerAlert alert = new TimerAlert( - TimerAlert.Type.REACH_DAILY_TIME, duration); - task.addAlert(alert); } catch (NumberFormatException e) { if (log.isErrorEnabled()) { - log.error("Can't convert " + alertInfo + log.error("Can't convert " + alertDuration + " into long"); } } } } + + alertIn.close(); } } Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-08-21 08:35:37 UTC (rev 2648) +++ trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-08-21 09:27:37 UTC (rev 2649) @@ -24,6 +24,7 @@ import java.util.List; import org.chorem.jtimer.AbstractJTimerTest; +import org.chorem.jtimer.entities.TimerAlert; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.entities.TimerTaskHelper; @@ -215,7 +216,7 @@ Assert.assertEquals(task1a.getSubTasks().size(), 2); Assert.assertNotNull(task2a); } - + /** * Test edit task. */ @@ -384,7 +385,7 @@ Assert.assertEquals(task3a.getSubTasks().size(), 3); Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), 55035 + 65602); } - + /** * Merge two tasks together. * @@ -430,16 +431,81 @@ Assert.assertNotNull(task1a); Assert.assertNull(task2a); // 4 = conflict resolved - Assert.assertEquals(task1a.getSubTasks().size(), 4); - Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), 55035 + 65602 + 200); + Assert.assertEquals(task1a.getSubTasks().size(), 4); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1a), + 55035 + 65602 + 200); } - + /** + * Test add alert. + * + * Alert reloading was buggy when multiple alert types were defined. + * (i.e. two alert type REACH_DAILY_TIME) + */ + @Test + public void testAddAlert() { + // first load all + // and make a move operation + TimerCore core = new TimerCore(); + TimerDataManager dataManager = core.getData(); + + //core.init(); + core.load(); + List<TimerProject> projectsBefore = dataManager.getProjectsList(); + TimerTask task1 = findTask(projectsBefore, "jTimer/Refactoring"); + + Assert.assertNotNull(task1); + Assert.assertEquals(getRecursiveAlertsCount(Collections + .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); + task1.addAlert(alert1); + task1.addAlert(alert2); + task1.addAlert(alert3); + dataManager.modifyAlert(task1); + core.exit(); + + // second reload + // and test reloaded data + //core.init(); + core.load(); + List<TimerProject> projectsAfter = dataManager.getProjectsList(); + TimerTask task1a = findTask(projectsAfter, "jTimer/Refactoring"); + + Assert.assertNotNull(task1a); + Assert.assertEquals(getRecursiveAlertsCount(Collections + .singleton(task1a)), 3); + + // test correct alert loading + boolean alert1found = false; + boolean alert2found = false; + boolean alert3found = false; + for (TimerAlert alert : task1a.getAlerts()) { + // TODO commenct on fait pour comparer des enum ? + if (/*alert.getType().equals(Type.REACH_DAILY_TIME) && */alert.getDuration() == 3600) { + alert1found = true; + } + if (/*alert.getType().equals(Type.REACH_DAILY_TIME) && */alert.getDuration() == 7200) { + alert2found = true; + } + if (/*alert.getType().equals(Type.REACH_TOTAL_TIME) && */alert.getDuration() == 10800) { + alert3found = true; + } + } + Assert.assertTrue(alert1found, "Missing first alert"); + Assert.assertTrue(alert2found, "Missing second alert"); + Assert.assertTrue(alert3found, "Missing third alert"); + } + + /** * Merge two tasks (tests alerts merge). */ @Test public void testMergeTasksWithAlerts() { - // first load all + // first load all TimerCore core = new TimerCore(); TimerDataManager dataManager = core.getData(); @@ -455,7 +521,7 @@ Assert.assertNotNull(task3); Assert.assertEquals(getRecursiveAlertsCount(Collections.singleton(task1)), 1); Assert.assertEquals(getRecursiveAlertsCount(Collections.singleton(task2)), 0); - Assert.assertEquals(getRecursiveAlertsCount(Collections.singleton(task3)), 2); + Assert.assertEquals(getRecursiveAlertsCount(Collections.singleton(task3)), 3); // merge tasks List<TimerTask> othersTask = new ArrayList<TimerTask>(); @@ -476,6 +542,6 @@ Assert.assertNull(task1a); Assert.assertNotNull(task2a); Assert.assertNull(task3a); - Assert.assertEquals(getRecursiveAlertsCount(Collections.singleton(task2)), 3); + Assert.assertEquals(getRecursiveAlertsCount(Collections.singleton(task2)), 4); } } Modified: trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2009-08-21 08:35:37 UTC (rev 2648) +++ trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2009-08-21 09:27:37 UTC (rev 2649) @@ -95,7 +95,7 @@ Assert.assertEquals(getProjectsCount(projects), 5); Assert.assertEquals(getTasksCount(projects), 39); Assert.assertEquals(getAnnotationsCount(projects), 9); - Assert.assertEquals(getAlertsCount(projects), 5); + Assert.assertEquals(getAlertsCount(projects), 6); /*FIXME saver.unlock(); } catch (DataLockingException e) { Modified: trunk/src/test/resources/testdata/24.alert =================================================================== --- trunk/src/test/resources/testdata/24.alert 2009-08-21 08:35:37 UTC (rev 2648) +++ trunk/src/test/resources/testdata/24.alert 2009-08-21 09:27:37 UTC (rev 2649) @@ -1,3 +1,4 @@ Format: 1.2 reachdailytime 3600 +reachdailytime 7200 reachtotaltime 26600

1 0

r2648 - trunk/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org Aug. 21, 2009

Aug. 21, 2009

Author: echatellier Date: 2009-08-21 10:35:37 +0200 (Fri, 21 Aug 2009) New Revision: 2648 Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java Log: Throw parent alert when timing on subtask. Add alert name on alert dialog. Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2009-08-21 08:34:56 UTC (rev 2647) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2009-08-21 08:35:37 UTC (rev 2648) @@ -119,6 +119,8 @@ 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 @@ -141,8 +143,6 @@ * @param task current task */ protected void checkAlreadyThrownAlerts(TimerTask task) { - - alreadyTrownAlerts = new HashSet<TimerAlert>(); Date now = new Date(); // check alert to be fired @@ -154,6 +154,12 @@ alreadyTrownAlerts.add(alert.clone()); } } + + // se souvient aussi de alerte deja lancées + // pour les taches parentes + if (task.getParent() != null) { + checkAlreadyThrownAlerts(task.getParent()); + } } @@ -371,18 +377,24 @@ 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 has reached " + - DurationFormatUtils.formatDuration(alert.getDuration() * 1000, "HH:mm:ss") + " for current day"); + String alertMessage = "Task '%s' has reached %s for current day !"; + displayAlert(String.format(alertMessage, task.getName(), DurationFormatUtils.formatDuration(alert.getDuration() * 1000, "HH:mm:ss"))); alreadyTrownAlerts.add(alert.clone()); } else if (alert.getType().equals(Type.REACH_TOTAL_TIME) && TimerTaskHelper.getAllTotalTime(task) >= alert.getDuration()) { - displayAlert("Task has reached " + - DurationFormatUtils.formatDuration(alert.getDuration() * 1000, "HH:mm:ss") + " !"); + String alertMessage = "Task '%s' has reached %s !"; + displayAlert(String.format(alertMessage, task.getName(), DurationFormatUtils.formatDuration(alert.getDuration() * 1000, "HH:mm:ss"))); 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()); + } } /**

1 0

r2647 - trunk
by echatellier＠users.chorem.org Aug. 21, 2009

Aug. 21, 2009

Author: echatellier Date: 2009-08-21 10:34:56 +0200 (Fri, 21 Aug 2009) New Revision: 2647 Modified: trunk/pom.xml Log: Update maven-site-plugin version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-17 15:54:33 UTC (rev 2646) +++ trunk/pom.xml 2009-08-21 08:34:56 UTC (rev 2647) @@ -158,7 +158,7 @@ </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0</version> + <version>2.0.1</version> <configuration> <locales>fr,en</locales> </configuration>

1 0

r2646 - trunk
by echatellier＠users.chorem.org Aug. 17, 2009

Aug. 17, 2009

Author: echatellier Date: 2009-08-17 17:54:33 +0200 (Mon, 17 Aug 2009) New Revision: 2646 Modified: trunk/README.txt Log: Update readme Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2009-08-17 15:44:00 UTC (rev 2645) +++ trunk/README.txt 2009-08-17 15:54:33 UTC (rev 2646) @@ -18,4 +18,9 @@ Launch jtimer with following command: - java -jar jtimer.jar \ No newline at end of file + java -jar jtimer.jar + +or executable script : + + jtimer (linux) + jtimer.exe (windows)

1 0