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

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

March 14, 2012

Author: echatellier Date: 2012-03-14 14:12:33 +0100 (Wed, 14 Mar 2012) New Revision: 2822 Url: http://chorem.org/repositories/revision/jtimer/2822 Log: #484 : Exception sometime :( Caused by: java.lang.StackOverflowError Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2012-03-12 08:58:08 UTC (rev 2821) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2012-03-14 13:12:33 UTC (rev 2822) @@ -123,7 +123,6 @@ // don't make reference on other parent // windows, cause idle to unlock some task // if parent window is hidden by systray - super(); // init resources map this.application = application; @@ -131,7 +130,12 @@ ResourceManager mgr = ctxt.getResourceManager(); resourceMap = mgr.getResourceMap(IdleDialog.class); - setName("idleFrame"); + // 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 + setTitle(resourceMap.getString("idleTitle")); setResizable(false); setModal(true);

1 0

r2821 - trunk/src/main/assembly
by echatellier＠users.chorem.org March 12, 2012

March 12, 2012

Author: echatellier Date: 2012-03-12 09:58:08 +0100 (Mon, 12 Mar 2012) New Revision: 2821 Url: http://chorem.org/repositories/revision/jtimer/2821 Log: Don't include project artifact twice (change from assembly plugin 2.2+) Modified: trunk/src/main/assembly/bin.xml Modified: trunk/src/main/assembly/bin.xml =================================================================== --- trunk/src/main/assembly/bin.xml 2012-03-09 17:47:06 UTC (rev 2820) +++ trunk/src/main/assembly/bin.xml 2012-03-12 08:58:08 UTC (rev 2821) @@ -34,6 +34,7 @@ <dependencySet> <outputDirectory>lib</outputDirectory> <scope>runtime</scope> + <useProjectArtifact>false</useProjectArtifact> </dependencySet> </dependencySets> <files>

1 0

r2820 - trunk/src/test/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org March 9, 2012

March 9, 2012

Author: echatellier Date: 2012-03-09 18:47:06 +0100 (Fri, 09 Mar 2012) New Revision: 2820 Url: http://chorem.org/repositories/revision/jtimer/2820 Log: Remove failing tests (now equality only works with uuid) Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java 2012-03-09 17:46:41 UTC (rev 2819) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java 2012-03-09 17:47:06 UTC (rev 2820) @@ -80,22 +80,4 @@ Assert.assertEquals("name1", project2.getName()); Assert.assertEquals(project, project2); } - - /** - * Test project clone(). - * - * Test que une fois le clone modifier, - * les objets ne sont plus egaux. - */ - @Test - public void testClone2() { - - TimerProject project = new TimerProject(); - project.setName("name1"); - - TimerProject project2 = project.clone(); - project.setName("name2"); - - Assert.assertFalse(project.equals(project2)); - } } Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2012-03-09 17:46:41 UTC (rev 2819) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2012-03-09 17:47:06 UTC (rev 2820) @@ -60,45 +60,6 @@ * Test task clone(); */ @Test - public void testClone() { - - TimerTask task = new TimerTask(); - task.setName("test"); - - TimerTask clonedTask = task.clone(); - Assert.assertEquals("test", clonedTask.getName()); - - clonedTask.setName("name2"); - Assert.assertFalse(clonedTask.equals(task)); - } - - /** - * Test task clone(); - */ - @Test - public void testClone3() { - - Calendar now = Calendar.getInstance(); - - TimerTask task = new TimerTask(); - task.setName("test"); - task.setCreationDate(new Date()); - task.setClosed(true); - task.setTime(now.getTime(), 10l); - task.addAnnotation(now.getTime(), "blah"); - - TimerTask clonedTask = task.clone(); - Assert.assertEquals(clonedTask, task); - - now.add(Calendar.DAY_OF_YEAR, 1); - clonedTask.addAnnotation(now.getTime(), "blah2"); - Assert.assertFalse(clonedTask.equals(task)); - } - - /** - * Test task clone(); - */ - @Test public void testCloneDailyMap() { TimerTask task = new TimerTask();

1 0

r2819 - trunk/src/main/resources/ftl
by echatellier＠users.chorem.org March 9, 2012

March 9, 2012

Author: echatellier Date: 2012-03-09 18:46:41 +0100 (Fri, 09 Mar 2012) New Revision: 2819 Url: http://chorem.org/repositories/revision/jtimer/2819 Log: Fix report format (too much blank line a top of report) Modified: trunk/src/main/resources/ftl/reportByProject.ftl trunk/src/main/resources/ftl/reportByProject_fr.ftl Modified: trunk/src/main/resources/ftl/reportByProject.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-09 17:20:13 UTC (rev 2818) +++ trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-09 17:46:41 UTC (rev 2819) @@ -25,7 +25,6 @@ Report by project ================= -<#assign periods=utils.getDailyDates(begin?date,end?date)/> <#macro displaySubtaskReport task identation=0> <#local ident=identation + 1/> <#list utils.getSubTaskOrdered(task) as subtask> @@ -54,6 +53,7 @@ </#list> </#macro> +<#assign periods=utils.getDailyDates(begin?date,end?date)/> <#list projects as project> <#assign periodTotalTime=0/> <#list periods as period> Modified: trunk/src/main/resources/ftl/reportByProject_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-09 17:20:13 UTC (rev 2818) +++ trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-09 17:46:41 UTC (rev 2819) @@ -25,7 +25,6 @@ Rapport par projet ================== -<#assign periods=utils.getDailyDates(begin?date,end?date)/> <#macro displaySubtaskReport task identation=0> <#local ident=identation + 1/> <#list utils.getSubTaskOrdered(task) as subtask> @@ -54,6 +53,7 @@ </#list> </#macro> +<#assign periods=utils.getDailyDates(begin?date,end?date)/> <#list projects as project> <#assign periodTotalTime=0/> <#list periods as period>

1 0

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

March 9, 2012

Author: echatellier Date: 2012-03-09 18:20:13 +0100 (Fri, 09 Mar 2012) New Revision: 2818 Url: http://chorem.org/repositories/revision/jtimer/2818 Log: Remove unused deprecated method Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2012-03-09 17:18:53 UTC (rev 2817) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2012-03-09 17:20:13 UTC (rev 2818) @@ -73,18 +73,6 @@ }; /** - * Get task's subtasks ordered alphabetically. - * - * @param task task - * @return the subTasks ordered - * @deprecated since 1.4.0 use {@link #sortTask(task.getSubTasks())} - */ - public static List<TimerTask> getSubTasksOrderedByName(TimerTask task) { - List<TimerTask> taksToSort = task.getSubTasks(); - return sortTask(taksToSort); - } - - /** * Get tasks ordered alphabetically. * * @param tasks tasks

1 0

r2817 - in trunk: . src/main/java/org/chorem/jtimer/ui/report src/main/resources/org/chorem/jtimer/ui/report/resources
by echatellier＠users.chorem.org March 9, 2012

March 9, 2012

Author: echatellier Date: 2012-03-09 18:18:53 +0100 (Fri, 09 Mar 2012) New Revision: 2817 Url: http://chorem.org/repositories/revision/jtimer/2817 Log: Add current week and previous week buttons Added: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png Modified: trunk/README.txt trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 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 Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2012-03-09 15:31:15 UTC (rev 2816) +++ trunk/README.txt 2012-03-09 17:18:53 UTC (rev 2817) @@ -24,3 +24,12 @@ jtimer (linux) jtimer.exe (windows) + + +Credits +------- + +Images "src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png" +and "src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png" +are licensed under Creative Commons Attribution (by) and available at: +http://www.famfamfam.com/ 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-09 15:31:15 UTC (rev 2816) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-09 17:18:53 UTC (rev 2817) @@ -123,9 +123,6 @@ /** Report output */ protected JTextArea reportArea; - /** Send by mail button */ - protected JButton sendMailButton; - /** Can send mail property. */ protected boolean canSendMail; @@ -167,29 +164,6 @@ JPanel mainComponent = new JPanel(new GridBagLayout()); - // init dates - Calendar calendarBegin = Calendar.getInstance(); - int firstDayOfWeek = JTimer.config.getReportFirstDayOfWeek(); - if (firstDayOfWeek < 0 || firstDayOfWeek > 6) { - 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 - // panel for options JPanel panelOption = new JPanel(new GridBagLayout()); panelOption.setBorder(BorderFactory.createTitledBorder(getResourceMap() @@ -202,9 +176,8 @@ new Insets(1, 1, 1, 1), 0, 0)); datePickerFrom = new JXDatePicker(); datePickerFrom.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); - datePickerFrom.setDate(calendarBegin.getTime()); datePickerFrom.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); - panelOption.add(datePickerFrom, new GridBagConstraints(1, 0, 3, 1, 1, + panelOption.add(datePickerFrom, new GridBagConstraints(1, 0, 2, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); @@ -215,13 +188,29 @@ new Insets(1, 1, 1, 1), 0, 0)); datePickerTo = new JXDatePicker(); datePickerTo.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); - datePickerTo.setDate(calendarEnd.getTime()); datePickerTo.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); - panelOption.add(datePickerTo, new GridBagConstraints(1, 1, 3, 1, 0, 0, + panelOption.add(datePickerTo, new GridBagConstraints(1, 1, 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); - // Option for period regroupment + // 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( @@ -246,13 +235,13 @@ 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, 1, 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, 1, 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, 1, + panelOption.add(radioByProject, new GridBagConstraints(0, 4, 4, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); @@ -260,7 +249,7 @@ checkIncludesAnnotations = new JCheckBox(getResourceMap().getString( "reportAnnotations")); panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 5, - 4, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, + 4, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); // panel form projects @@ -313,7 +302,7 @@ 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); - sendMailButton = new JButton(); + JButton sendMailButton = new JButton(); sendMailButton.setAction(getContext().getActionMap(this) .get("sendMail")); mainComponent.add(sendMailButton, new GridBagConstraints(1, 2, 1, 1, 1, @@ -334,6 +323,60 @@ } /** + * 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 > 6) { + 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 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-09 15:31:15 UTC (rev 2816) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2012-03-09 17:18:53 UTC (rev 2817) @@ -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 @@ -37,6 +37,12 @@ reportContent=Report reportProjectsList=Projects list +currentWeek.Action.icon = date_current.png +currentWeek.Action.shortDescription = Current week + +previousWeek.Action.icon = date_previous.png +previousWeek.Action.shortDescription = Previous week + 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-09 15:31:15 UTC (rev 2816) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2012-03-09 17:18:53 UTC (rev 2817) @@ -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 @@ -37,6 +37,10 @@ reportContent=Rapport reportProjectsList=Liste des projets +currentWeek.Action.shortDescription = Semaine courante + +previousWeek.Action.shortDescription = Semaine pr\u00E9c\u00E9dente + showHiddenProjects.Action.text = Afficher les cach\u00E9s showHiddenProjects.Action.shortDescription = Afficher les cach\u00E9s Added: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

r2816 - in trunk/src/main/java/org/chorem/jtimer: . ui/report
by echatellier＠users.chorem.org March 9, 2012

March 9, 2012

Author: echatellier Date: 2012-03-09 16:31:15 +0100 (Fri, 09 Mar 2012) New Revision: 2816 Url: http://chorem.org/repositories/revision/jtimer/2816 Log: #281 : Ability to save report options Modified: trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java Modified: trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2012-03-09 15:03:30 UTC (rev 2815) +++ trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2012-03-09 15:31:15 UTC (rev 2816) @@ -85,7 +85,7 @@ public Class getIOSaverClass() { return appConfig.getOptionAsClass(JTimerOption.IO_SAVER_CLASS.key); } - + public String getIOSaverDirectory() { return appConfig.getOption(JTimerOption.IO_SAVER_DIRECTORY.key); } @@ -108,6 +108,16 @@ return appConfig.getOptionAsLong(JTimerOption.UI_IDLE_TIME.key); } + /** + * Return first day of week. + * Default to {@code -1} (no preference). + * + * @return first day of week in report + */ + public int getReportFirstDayOfWeek() { + return appConfig.getOptionAsInt(JTimerOption.UI_REPORT_FIRSTDAYOFWEEK.key); + } + public enum JTimerOption { CONFIG_FILENAME(ApplicationConfig.CONFIG_FILE_NAME, "jtimer.properties"), SERVICE_CLASS("jtimer.service.class", null), @@ -116,7 +126,8 @@ IO_SAVER_CLASS("jtimer.io.saver.class", "org.chorem.jtimer.io.GTimerIncrementalSaver"), IO_SAVER_DIRECTORY("jtimer.io.saver.directory", "${user.home}/.gtimer"), IO_SAVER_AUTOSAVEDELAY("jtimer.io.saver.autosavedelay", "300"), - UI_IDLE_TIME("jtimer.ui.idletime", "300"); + UI_IDLE_TIME("jtimer.ui.idletime", "300"), + UI_REPORT_FIRSTDAYOFWEEK("jtimer.ui.report.firstdayofweek", "-1"); protected String key; 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-09 15:03:30 UTC (rev 2815) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-09 15:31:15 UTC (rev 2816) @@ -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 @@ -40,6 +40,7 @@ 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; @@ -60,6 +61,7 @@ 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; @@ -159,7 +161,7 @@ * Get main view component. * * TODO use less complicated UI (no gbl) - * @return + * @return main component */ protected JComponent getMainComponent() { @@ -167,13 +169,21 @@ // init dates Calendar calendarBegin = Calendar.getInstance(); - calendarBegin.set(Calendar.DAY_OF_WEEK, calendarBegin - .getFirstDayOfWeek()); + int firstDayOfWeek = JTimer.config.getReportFirstDayOfWeek(); + if (firstDayOfWeek < 0 || firstDayOfWeek > 6) { + 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();

1 0

r2815 - in trunk/src/main: java/org/chorem/jtimer/ui/report resources/ftl
by echatellier＠users.chorem.org March 9, 2012

March 9, 2012

Author: echatellier Date: 2012-03-09 16:03:30 +0100 (Fri, 09 Mar 2012) New Revision: 2815 Url: http://chorem.org/repositories/revision/jtimer/2815 Log: #283 : Sort task on reports Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.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 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-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-09 15:03:30 UTC (rev 2815) @@ -545,4 +545,17 @@ return result; } + + /** + * Return task subtasks ordered by name. + * + * @param task task to get subtasks + * @return subtask ordered by name + * @since 1.4.0 + */ + public List<TimerTask> getSubTaskOrdered(TimerTask task) { + List<TimerTask> subTask = new ArrayList<TimerTask>(task.getSubTasks()); + TimerTaskHelper.sortTask(subTask); + return subTask; + } } Modified: trunk/src/main/resources/ftl/reportByDay.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByDay.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getDailyTotalTaskTime(subtask, periodTime?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> Modified: trunk/src/main/resources/ftl/reportByDay_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByDay_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getDailyTotalTaskTime(subtask, periodTime?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> Modified: trunk/src/main/resources/ftl/reportByMonth.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByMonth.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getMonthlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getMonthlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByMonth_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getMonthlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getMonthlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByProject.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -28,7 +28,7 @@ <#assign periods=utils.getDailyDates(begin?date,end?date)/> <#macro displaySubtaskReport task identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=0/> <#list periods as period> <#local subtaskPeriodTotalTime=utils.getDailyTotalTaskTime(subtask, period?date)/> Modified: trunk/src/main/resources/ftl/reportByProject_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -28,7 +28,7 @@ <#assign periods=utils.getDailyDates(begin?date,end?date)/> <#macro displaySubtaskReport task identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=0/> <#list periods as period> <#local subtaskPeriodTotalTime=utils.getDailyTotalTaskTime(subtask, period?date)/> Modified: trunk/src/main/resources/ftl/reportByWeek.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByWeek.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getWeeklyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getWeeklyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByWeek_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getWeeklyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getWeeklyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByYear.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByYear.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByYear_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByYear_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/>

1 0

r2814 - in trunk/src/main/java/org/chorem/jtimer: data entities io ui ui/report/tree ui/systray ui/treetable ws/xmlrpc
by echatellier＠users.chorem.org March 9, 2012

March 9, 2012

Author: echatellier Date: 2012-03-09 15:52:09 +0100 (Fri, 09 Mar 2012) New Revision: 2814 Url: http://chorem.org/repositories/revision/jtimer/2814 Log: #78 : Renaming a task break tasks tree rendering 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/entities/TimerObject.java trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.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/report/tree/CheckBoxTreeModel.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-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -70,26 +70,8 @@ * @param task modified task */ public void modifyTask(TimerTask task); - - /** - * Before delete project. - * - * TODO only usefull for UI (can't known on to delete if already deleted) - * - * @param project deleted project - */ - public void preDeleteProject(TimerProject project); /** - * Before delete task. - * - * TODO only usefull for UI (can't known on to delete if already deleted) - * - * @param task deleted task - */ - public void preDeleteTask(TimerTask task); - - /** * Delete project. * * @param project deleted project Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -243,18 +243,11 @@ vetoableDataEventListener.checkDeleteTask(task); } - // send notification (before) - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().preDeleteTask(task); - } - // task deletion task.getParent().getSubTasks().remove(task); // send notification - itDataEventListener = dataEventListeners.iterator(); + Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); while (itDataEventListener.hasNext()) { itDataEventListener.next().deleteTask(task); } @@ -272,17 +265,10 @@ vetoableDataEventListener.checkDeleteProject(project); } - // send notification (before) - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().preDeleteProject(project); - } - projectList.remove(project); // send notification - itDataEventListener = dataEventListeners.iterator(); + Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator(); while (itDataEventListener.hasNext()) { itDataEventListener.next().deleteProject(project); } Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java 2012-03-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -31,6 +31,7 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; +import java.util.UUID; import org.apache.commons.lang3.SerializationUtils; import org.chorem.jtimer.utils.DailySortedMap; @@ -64,6 +65,9 @@ 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(); + /** Task number. */ protected int number; @@ -369,23 +373,12 @@ /* * @see java.lang.Object#hashCode() - * - * TODO must be added, but cause some errors on tree cell renderer. - * + */ @Override public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((alerts == null) ? 0 : alerts.hashCode()); - result = prime * result + ((allDaysAndTimes == null) ? 0 : allDaysAndTimes.hashCode()); - result = prime * result + ((allDaysAnnotations == null) ? 0 : allDaysAnnotations.hashCode()); - result = prime * result + (closed ? 1231 : 1237); - result = prime * result + ((creationDate == null) ? 0 : creationDate.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + number; - result = prime * result + ((subTasks == null) ? 0 : subTasks.hashCode()); + int result = uuid.hashCode(); return result; - }*/ + } /* * @see java.lang.Object#equals(java.lang.Object) @@ -397,21 +390,7 @@ return false; } - TimerTask otherTask = (TimerTask) o; - - // name equals - boolean equals = name != null && name.equals(otherTask.name); - // creation date equals - equals &= creationDate == null - || creationDate.equals(otherTask.creationDate); - // subtask equals - equals &= subTasks.equals(otherTask.subTasks); - // compare times - equals &= allDaysTimes.equals(otherTask.allDaysTimes); - // compare times - equals &= allDaysAnnotations.equals(otherTask.allDaysAnnotations); - - return equals; + return uuid.equals(((TimerTask)o).uuid); } /** Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2012-03-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -55,33 +55,47 @@ } /** + * Timer task comparator. + */ + protected static Comparator<TimerTask> timerTaskComparator = new Comparator<TimerTask>() { + public int compare(TimerTask o1, TimerTask o2) { + if (o1 == null && o2 == null) { + return 0; + } + if (o1 == null) { + return 1; + } + if (o2 == null) { + return -1; + } + return o1.getName().compareTo(o2.getName()); + } + }; + + /** * Get task's subtasks ordered alphabetically. * * @param task task * @return the subTasks ordered + * @deprecated since 1.4.0 use {@link #sortTask(task.getSubTasks())} */ public static List<TimerTask> getSubTasksOrderedByName(TimerTask task) { List<TimerTask> taksToSort = task.getSubTasks(); - List<TimerTask> subTasksCopy = new ArrayList<TimerTask>(taksToSort); - Comparator<TimerTask> c = new Comparator<TimerTask>() { - public int compare(TimerTask o1, TimerTask o2) { - if (o1 == null && o2 == null) { - return 0; - } - if (o1 == null) { - return 1; - } - if (o2 == null) { - return -1; - } - return o1.getName().compareTo(o2.getName()); - } - }; - Collections.sort(subTasksCopy, c); - return subTasksCopy; + return sortTask(taksToSort); } /** + * Get tasks ordered alphabetically. + * + * @param tasks tasks + * @return {@code tasks} + */ + public static List<TimerTask> sortTask(List<TimerTask> tasks) { + Collections.sort(tasks, timerTaskComparator); + return tasks; + } + + /** * Get total task time without subtasks time. * * @param task task to get time Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2012-03-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -1214,22 +1214,6 @@ } /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteProject(org.chorem.jtimer.entities.TimerProject) - */ - @Override - public void preDeleteProject(TimerProject project) { - - } - - /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteTask(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preDeleteTask(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.data.event.DataEventListener#deleteProject(org.chorem.jtimer.entities.TimerProject) */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2012-03-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -151,22 +151,6 @@ } /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteProject(org.chorem.jtimer.entities.TimerProject) - */ - @Override - public void preDeleteProject(TimerProject project) { - - } - - /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteTask(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preDeleteTask(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.data.event.DataEventListener#deleteProject(org.chorem.jtimer.entities.TimerProject) */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2012-03-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -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 @@ -126,16 +126,12 @@ result.addAll(core.getData().getProjectsList()); } else { // not root node TimerTask task = (TimerTask) parent; - - // Since sort is not supported by the table, do a manual sorting. - //result.addAll(t.getSubTasks()); - result.addAll(TimerTaskHelper.getSubTasksOrderedByName(task)); + result.addAll(task.getSubTasks()); } // filter list, if only show closed if (!showClosed) { CollectionUtils.filter(result, new Predicate() { - @Override public boolean evaluate(Object object) { @@ -146,10 +142,12 @@ } return result; } - }); } + // Since sort is not supported by the table, do a manual sorting. + result = TimerTaskHelper.sortTask(result); + return result; } 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-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -222,22 +222,6 @@ } /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteProject(org.chorem.jtimer.entities.TimerProject) - */ - @Override - public void preDeleteProject(TimerProject project) { - - } - - /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteTask(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preDeleteTask(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.data.event.DataEventListener#deleteProject(org.chorem.jtimer.entities.TimerProject) */ @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-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -202,22 +202,6 @@ } /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteProject(org.chorem.jtimer.entities.TimerProject) - */ - @Override - public void preDeleteProject(TimerProject project) { - - } - - /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteTask(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preDeleteTask(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.data.event.DataEventListener#deleteProject(org.chorem.jtimer.entities.TimerProject) */ @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-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -28,7 +28,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.swing.SwingUtilities; import javax.swing.table.TableColumn; @@ -45,7 +47,6 @@ import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.entities.TimerTaskHelper; -import org.jdesktop.swingx.tree.TreeModelSupport; import org.jdesktop.swingx.treetable.AbstractTreeTableModel; /** @@ -54,6 +55,18 @@ * Cela permet au programme principal de manipuler la liste et d'oublier la * gestion de l'arbre... * + * Le modele de cet arbre utilise directement des TimerTask au lieu des TreeTableNode + * qui ne servent a rien et qui complique tout. Par contre, les tâches étant + * les mêmes instances que celle manipulées par le programme, il doit mettre + * en cache certains infos pour un rafraichissement correct: + * <ul> + * <li>Nom : cas de renommage avec changement d'ordre + * <li>Sous tache : pour supprimer une tache qui disparaitrait directement du modèle + * </ul> + * + * Voir cet article pour la non utilisation des TreeNode : + * http://www.javalobby.org/forums/thread.jspa?threadID=16052&tstart=0 + * * @author chatellier * @version $Revision$ * @@ -66,14 +79,14 @@ /** log */ private static Log log = LogFactory.getLog(ProjectsAndTasksModel.class); - /** Add node operation */ + /** Add node operation. */ public static final int OPERATION_ADD = 0; - /** Modify node operation */ + /** Modify node operation. */ public static final int OPERATION_MODIFY = 1; - /** Delete Node operation */ + /** Delete Node operation. */ public static final int OPERATION_DELETE = 2; - /** Tree managed by this model */ + /** Tree managed by this model. */ protected ProjectsAndTasksTable projectsAndTaskTable; /** Data. */ @@ -81,10 +94,13 @@ /** Tree column identifiers. */ protected List<String> columnIdentifiers; - + /** Show closed task property. Default to false. */ protected boolean showClosedTask; + protected Map<TimerTask, String> taskNameCache; + protected Map<Object, List<TimerTask>> subTasksCache; + /** * Constructor. * @@ -94,24 +110,17 @@ */ public ProjectsAndTasksModel(ProjectsAndTasksTable projectsAndTaskTable, TimerCore core, List<String> columnIdentifiers) { - // super with root node super(new TimerProject("root")); // remember this.projectsAndTaskTable = projectsAndTaskTable; this.dataManager = core.getData(); this.columnIdentifiers = columnIdentifiers; + + taskNameCache = new HashMap<TimerTask, String>(); + subTasksCache = new HashMap<Object, List<TimerTask>>(); } - /** - * Accessor to tree model support. - * - * @return tree model support - */ - protected TreeModelSupport getModelSupport() { - return modelSupport; - } - /* * @see org.jdesktop.swingx.treetable.TreeTableModel#getColumnCount() */ @@ -178,8 +187,8 @@ */ @Override public Object getChild(Object parent, int index) { + TimerTask t = getFiteredSubListFor(parent).get(index); - return t; } @@ -190,48 +199,69 @@ public int getChildCount(Object parent) { int childCount = getFiteredSubListFor(parent).size(); - return childCount; } /** * Recupere la sous liste: data.getProjectsList() si parent = root - * getSubTasks() sinon + * getSubTasks() sinon (cache results). * * @param parent parent to task sublist * @return filtered list */ protected List<TimerTask> getFiteredSubListFor(Object parent) { + return getFiteredSubListFor(parent, false); + } - List<TimerTask> result = new ArrayList<TimerTask>(); + /** + * Recupere la sous liste: data.getProjectsList() si parent = root + * getSubTasks() sinon. + * + * @param parent parent to task sublist + * @param noCache disable use of cached result and result caching + * @return filtered list + */ + protected List<TimerTask> getFiteredSubListFor(Object parent, boolean noCache) { - // get correct list - if (parent == root) { // case root node - result.addAll(dataManager.getProjectsList()); - } else { // not root node - TimerTask task = (TimerTask) parent; + List<TimerTask> result = subTasksCache.get(parent); + if (result == null || noCache) { + result = new ArrayList<TimerTask>(); - // Since sort is not supported by the table, do a manual sorting. - //result.addAll(t.getSubTasks()); - result.addAll(TimerTaskHelper.getSubTasksOrderedByName(task)); - } + // get correct list + if (parent == root) { // case root node + List<TimerProject> projects = dataManager.getProjectsList(); + result.addAll(projects); + } else { // not root node + TimerTask task = (TimerTask) parent; + result.addAll(task.getSubTasks()); + } - // filter list, if only show closed - if (!showClosedTask) { - CollectionUtils.filter(result, new Predicate() { + // filter list, if only show closed + if (!showClosedTask) { + CollectionUtils.filter(result, new Predicate() { + @Override + public boolean evaluate(Object object) { + boolean result = false; + if (object instanceof TimerTask) { + TimerTask task = (TimerTask) object; + result = !task.isClosed(); + } + return result; + } + }); + } - @Override - public boolean evaluate(Object object) { - - boolean result = false; - if (object instanceof TimerTask) { - TimerTask task = (TimerTask) object; - result = !task.isClosed(); - } - return result; + // Since sort is not supported by the table, do a manual sorting. + result = TimerTaskHelper.sortTask(result); + + if (!noCache) { + // cache tasks name + for (TimerTask task : result) { + taskNameCache.put(task, task.getName()); } - - }); + + subTasksCache.put(parent, result); + } } return result; @@ -244,7 +274,6 @@ public int getIndexOfChild(Object parent, Object child) { int childIndex = getFiteredSubListFor(parent).indexOf(child); - return childIndex; } @@ -265,7 +294,6 @@ protected void notifyTaskChanged(TimerTask task, int operation) { // this.modelSupport. TreePath path = new TreePath(root); - updateChildren(task, path, operation); } @@ -277,56 +305,66 @@ * @param operation operation (add, modify, delete) * @return <tt>true</tt> if children have been found and updated in current recursion */ - protected boolean updateChildren(TimerTask task, TreePath path, + protected synchronized boolean updateChildren(TimerTask task, TreePath path, int operation) { TimerTask pathLastComponent = (TimerTask) path.getLastPathComponent(); - // pour ses enfants boolean updated = false; - int childCount = getChildCount(pathLastComponent); + // get childreen without cache in case of add operation + // delete operation MUST use cached result + List<TimerTask> subTask = getFiteredSubListFor(pathLastComponent, operation == OPERATION_ADD); + int childCount = subTask.size(); for (int childIndex = 0; !updated && childIndex < childCount; ++childIndex) { - TimerTask taskUO = (TimerTask) getChild(pathLastComponent, - childIndex); + TimerTask taskUO = (TimerTask) subTask.get(childIndex); - TreePath childTreePath = path.pathByAddingChild(taskUO); - if (task.equals(taskUO)) { // this update only node, not all path... switch (operation) { - case OPERATION_ADD: - getModelSupport().fireChildAdded(path, childIndex, taskUO); + case OPERATION_ADD: { + subTasksCache.remove(pathLastComponent); // force child recache + int newIndex = getIndexOfChild(pathLastComponent, taskUO); + modelSupport.fireChildAdded(path, newIndex, taskUO); // expand path projectsAndTaskTable.expandPath(path); break; - - case OPERATION_DELETE: - getModelSupport() - .fireChildRemoved(path, childIndex, taskUO); + } + case OPERATION_DELETE: { + subTasksCache.remove(pathLastComponent); // invalidate cache + subTasksCache.remove(taskUO); // no in cache anymore + taskNameCache.remove(taskUO); // no in cache anymore + modelSupport.fireChildRemoved(path, childIndex, taskUO); break; - - case OPERATION_MODIFY: - getModelSupport() - .fireChildChanged(path, childIndex, taskUO); + } + case OPERATION_MODIFY: { + String cacheName = taskNameCache.get(taskUO); + if (cacheName.equals(task.getName())) { + // not name modification (time...) + modelSupport.fireChildChanged(path, childIndex, taskUO); + } else { + // name modification (order can change) + modelSupport.fireChildRemoved(path, childIndex, taskUO); + subTasksCache.remove(pathLastComponent); // force child recache + int newIndex = getIndexOfChild(pathLastComponent, taskUO); + modelSupport.fireChildAdded(path, newIndex, taskUO); + } break; - + } default: if (log.isErrorEnabled()) { log.error("Unknow operation : " + operation); } } - if (log.isTraceEnabled()) { - log.trace(" updated : " + childTreePath); - } updated = true; } else { + TreePath childTreePath = path.pathByAddingChild(taskUO); updated = updateChildren(task, childTreePath, operation); if (updated) { // ...and by recursion update all path - getModelSupport().firePathChanged(path); + modelSupport.firePathChanged(path); } } } @@ -362,9 +400,12 @@ tcs.add(tc); } + taskNameCache.clear(); + subTasksCache.clear(); + // works but it's not beautiful // and header are resized - getModelSupport().fireNewRoot(); + modelSupport.fireNewRoot(); // hack, restore size after SwingUtilities.invokeLater(new Runnable() { @@ -377,29 +418,12 @@ }); } - /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteProject(org.chorem.jtimer.entities.TimerProject) - */ - @Override - public void preDeleteProject(TimerProject project) { - notifyTaskChanged(project, OPERATION_DELETE); - } - - /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteTask(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preDeleteTask(TimerTask task) { - notifyTaskChanged(task, OPERATION_DELETE); - } - - /* * @see org.chorem.jtimer.data.event.DataEventListener#deleteProject(org.chorem.jtimer.entities.TimerProject) */ @Override public void deleteProject(TimerProject project) { - + notifyTaskChanged(project, OPERATION_DELETE); } /* @@ -407,7 +431,7 @@ */ @Override public void deleteTask(TimerTask task) { - + notifyTaskChanged(task, OPERATION_DELETE); } /* @@ -501,8 +525,8 @@ */ public void setShowClosed(boolean showClosedTask) { this.showClosedTask = showClosedTask; - // TODO add better diff code - getModelSupport().fireNewRoot(); + // TODO echatellier 20120309 add better diff code + dataLoaded(null); } /* 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-09 14:46:31 UTC (rev 2813) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2012-03-09 14:52:09 UTC (rev 2814) @@ -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 @@ -735,22 +735,6 @@ } /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteProject(org.chorem.jtimer.entities.TimerProject) - */ - @Override - public void preDeleteProject(TimerProject project) { - - } - - /* - * @see org.chorem.jtimer.data.DataEventListener#preDeleteTask(org.chorem.jtimer.entities.TimerTask) - */ - @Override - public void preDeleteTask(TimerTask task) { - - } - - /* * @see org.chorem.jtimer.event.DataEventListener#deleteProject(org.chorem.jtimer.entities.TimerProject) */ @Override

1 0

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

March 9, 2012

Author: echatellier Date: 2012-03-09 15:46:31 +0100 (Fri, 09 Mar 2012) New Revision: 2813 Url: http://chorem.org/repositories/revision/jtimer/2813 Log: #483 : Delete running task still tacking time 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-07 17:24:20 UTC (rev 2812) +++ trunk/src/main/java/org/chorem/jtimer/JTimer.java 2012-03-09 14:46:31 UTC (rev 2813) @@ -680,6 +680,7 @@ * Stop a task. * * Delegate method. Called by idle detect ? + * Called by delete method too. * * @param task task to stop */ @@ -687,13 +688,14 @@ RunTaskJob rtt = getJobForRunningTask(task); // test if task is already running - // should never be call if null !!! - rtt.wantToStop(); - core.getData().stopTask(task); - - // re-enable/disable buttons - setSelectedSingleRunningTask(false); - setSelectedSingleStoppedTask(true); + if (rtt != null) { + rtt.wantToStop(); + core.getData().stopTask(task); + + // re-enable/disable buttons + setSelectedSingleRunningTask(false); + setSelectedSingleStoppedTask(true); + } } /** @@ -774,6 +776,7 @@ if (confirm == JOptionPane.YES_OPTION) { // approved try { + stopTask(task); core.getData().deleteTask(task); } catch (DataViolationException e) { displayErrorMessage(e.getExceptionKey());

1 0