Author: echatellier Date: 2011-09-05 10:12:54 +0200 (Mon, 05 Sep 2011) New Revision: 2778 Url: http://chorem.org/repositories/revision/jtimer/2778 Log: Merge license headers (dates) Added: trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java Removed: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportTemplateLoader.java Modified: trunk/src/license/THIRD-PARTY.properties trunk/src/main/assembly/bin.xml trunk/src/main/assembly/src.xml trunk/src/main/config/checkstyle.xml trunk/src/main/java/org/chorem/jtimer/JTimer.java trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java trunk/src/main/java/org/chorem/jtimer/data/DataViolationException.java trunk/src/main/java/org/chorem/jtimer/data/TimerCore.java trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java trunk/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java trunk/src/main/java/org/chorem/jtimer/data/package-info.java trunk/src/main/java/org/chorem/jtimer/entities/ConnectionData.java trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java trunk/src/main/java/org/chorem/jtimer/entities/TimerProject.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/entities/package-info.java trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java trunk/src/main/java/org/chorem/jtimer/io/DataLockingException.java trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java trunk/src/main/java/org/chorem/jtimer/io/GTimerTimeUtil.java trunk/src/main/java/org/chorem/jtimer/io/Saver.java trunk/src/main/java/org/chorem/jtimer/io/package-info.java trunk/src/main/java/org/chorem/jtimer/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.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/AlertCellEditor.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java trunk/src/main/java/org/chorem/jtimer/ui/package-info.java 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/java/org/chorem/jtimer/ui/report/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java trunk/src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/system/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java trunk/src/main/java/org/chorem/jtimer/ui/system/unix/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java trunk/src/main/java/org/chorem/jtimer/ui/systray/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/package-info.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/ui/treetable/ProjectsAndTasksTable.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java trunk/src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java trunk/src/main/java/org/chorem/jtimer/ui/ws/package-info.java trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java trunk/src/main/java/org/chorem/jtimer/utils/package-info.java trunk/src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java trunk/src/main/java/org/chorem/jtimer/ws/ProjectManagement.java trunk/src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java trunk/src/main/java/org/chorem/jtimer/ws/exception/package-info.java trunk/src/main/java/org/chorem/jtimer/ws/package-info.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java trunk/src/main/resources/JTimer.properties trunk/src/main/resources/JTimer_default.properties trunk/src/main/resources/log4j.properties trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties 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/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties trunk/src/site/en/rst/configuration.rst trunk/src/site/en/rst/contribute/i18n.rst trunk/src/site/en/rst/devel/fileformat.rst trunk/src/site/en/rst/devel/index.rst trunk/src/site/en/rst/devel/roadmap.rst trunk/src/site/en/rst/devel/saf.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/screenshots.rst trunk/src/site/rst/configuration.rst trunk/src/site/rst/contribute/i18n.rst trunk/src/site/rst/devel/fileformat.rst trunk/src/site/rst/devel/index.rst trunk/src/site/rst/devel/roadmap.rst trunk/src/site/rst/devel/saf.rst trunk/src/site/rst/index.rst trunk/src/site/rst/screenshots.rst trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java trunk/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java trunk/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java trunk/src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java trunk/src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java trunk/src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java trunk/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java trunk/src/test/resources/JTimerTestRelatif.properties Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/license/THIRD-PARTY.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -2,23 +2,21 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License +# - Apache License Version 2.0 # - Apache Software License, Version 2.0 # - BSD License # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License -# - Public Domain # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:59:24 CEST 2011 +#Mon Sep 05 10:03:28 CEST 2011 commons-codec--commons-codec--1.2=Apache Software License, Version 2.0 -net.java.dev.jna--jna--3.2.7=Lesser General Public License (LGPL v. 2.1) +net.java.dev.jna--jna--3.3.0=Lesser General Public License (LGPL v. 2.1) Modified: trunk/src/main/assembly/bin.xml =================================================================== --- trunk/src/main/assembly/bin.xml 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/assembly/bin.xml 2011-09-05 08:12:54 UTC (rev 2778) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2007 - 2010 CodeLutin + 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 @@ -33,10 +33,6 @@ <dependencySets> <dependencySet> <outputDirectory>lib</outputDirectory> - <excludes> - <exclude>junit:junit</exclude> - <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> - </excludes> <scope>runtime</scope> </dependencySet> </dependencySets> Modified: trunk/src/main/assembly/src.xml =================================================================== --- trunk/src/main/assembly/src.xml 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/assembly/src.xml 2011-09-05 08:12:54 UTC (rev 2778) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2007 - 2010 CodeLutin + 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 Modified: trunk/src/main/config/checkstyle.xml =================================================================== --- trunk/src/main/config/checkstyle.xml 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/config/checkstyle.xml 2011-09-05 08:12:54 UTC (rev 2778) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2007 - 2010 CodeLutin + 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 Modified: trunk/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimer.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/JTimer.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -48,28 +48,28 @@ * * @param project project to add */ - void addProject(TimerProject project); + public void addProject(TimerProject project); /** * Add task event. * * @param task task to add */ - void addTask(TimerTask task); + public void addTask(TimerTask task); /** * Modify project. * * @param project modified project */ - void modifyProject(TimerProject project); + public void modifyProject(TimerProject project); /** * Modify task. * * @param task modified task */ - void modifyTask(TimerTask task); + public void modifyTask(TimerTask task); /** * Before delete project. @@ -78,7 +78,7 @@ * * @param project deleted project */ - void preDeleteProject(TimerProject project); + public void preDeleteProject(TimerProject project); /** * Before delete task. @@ -87,21 +87,21 @@ * * @param task deleted task */ - void preDeleteTask(TimerTask task); + public void preDeleteTask(TimerTask task); /** * Delete project. * * @param project deleted project */ - void deleteProject(TimerProject project); + public void deleteProject(TimerProject project); /** * Delete task. * * @param task deleted task */ - void deleteTask(TimerTask task); + public void deleteTask(TimerTask task); /** * Add annotation. @@ -110,7 +110,7 @@ * @param date date * @param annotation new annotation value */ - void setAnnotation(TimerTask task, Date date, String annotation); + public void setAnnotation(TimerTask task, Date date, String annotation); /** * Set task time. @@ -119,35 +119,35 @@ * @param date date * @param time task time */ - void setTaskTime(TimerTask task, Date date, Long time); + public void setTaskTime(TimerTask task, Date date, Long time); /** * Pre change task state. * * @param task task */ - void preChangeClosedState(TimerTask task); + public void preChangeClosedState(TimerTask task); /** * Post change task state. * * @param task task */ - void postChangeClosedState(TimerTask task); + public void postChangeClosedState(TimerTask task); /** * Pre move task. * * @param task task */ - void preMoveTask(TimerTask task); + public void preMoveTask(TimerTask task); /** * Post move task. * * @param task task */ - void moveTask(TimerTask task); + public void moveTask(TimerTask task); /** * Pre merge task. @@ -155,7 +155,7 @@ * @param destinationTask task where all other task will be merged * @param otherTasks other tasks to merge */ - void preMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); + public void preMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); /** * Post merge task. @@ -163,26 +163,26 @@ * @param destinationTask task where all other task will be merged * @param otherTasks other tasks to merge */ - void postMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); + public void postMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); /** * Start task. * * @param task started task */ - void startTask(TimerTask task); + public void startTask(TimerTask task); /** * Stop task. * * @param task stoped task */ - void stopTask(TimerTask task); + public void stopTask(TimerTask task); /** * All data loaded. * * @param projects projects collection */ - void dataLoaded(Collection<TimerProject> projects); + public void dataLoaded(Collection<TimerProject> projects); } Modified: trunk/src/main/java/org/chorem/jtimer/data/DataViolationException.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/DataViolationException.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/data/DataViolationException.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerCore.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerCore.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerCore.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -70,6 +70,7 @@ * Constructor. */ public TimerCore() { + // init data data = new TimerDataManager(); Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2007 - 2010 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 @@ -254,8 +254,7 @@ task.getParent().getSubTasks().remove(task); // send notification - itDataEventListener = dataEventListeners - .iterator(); + itDataEventListener = dataEventListeners.iterator(); while (itDataEventListener.hasNext()) { itDataEventListener.next().deleteTask(task); } @@ -283,8 +282,7 @@ projectList.remove(project); // send notification - itDataEventListener = dataEventListeners - .iterator(); + itDataEventListener = dataEventListeners.iterator(); while (itDataEventListener.hasNext()) { itDataEventListener.next().deleteProject(project); } Modified: trunk/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 2010 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/data/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/data/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/entities/ConnectionData.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/ConnectionData.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/entities/ConnectionData.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -56,9 +56,9 @@ /** * Set login. * - * @param newLogin the login to set + * @param login the login to set */ - public void setLogin(String newLogin) { - login = newLogin; + public void setLogin(String login) { + this.login = login; } } Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -36,11 +36,14 @@ * Last update : $Date$ * By : $Author$ */ -public class TimerAlert implements Serializable, Cloneable { +public class TimerAlert extends TimerObject 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. */ @@ -89,7 +92,10 @@ * @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); } /** @@ -107,7 +113,10 @@ * @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); } /* @@ -115,7 +124,7 @@ */ @Override public TimerAlert clone() { - TimerAlert clone; + TimerAlert clone = null; try { clone = (TimerAlert)super.clone(); } catch (CloneNotSupportedException e) { Added: trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java (rev 0) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -0,0 +1,93 @@ +/* + * #%L + * $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.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); + } +} Property changes on: trunk/src/main/java/org/chorem/jtimer/entities/TimerObject.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerProject.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerProject.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerProject.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Added: trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java (rev 0) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -0,0 +1,72 @@ +/* + * #%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); + } +} Property changes on: trunk/src/main/java/org/chorem/jtimer/entities/TimerProjectsList.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -48,12 +48,22 @@ * * @see SerializationUtils */ -public class TimerTask implements Cloneable, Comparable<TimerTask>, - Serializable { +public class TimerTask extends TimerObject 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 number. */ protected int number; @@ -73,10 +83,9 @@ protected TimerTask parent; /** - * Map calendar of day -> time. - * (ordered on keys) + * Map calendar of day -> time. (ordered on keys) */ - protected SortedMap<Date, Long> allDaysAndTimes; + protected SortedMap<Date, Long> allDaysTimes; /** * Map date -> annotation text. @@ -97,7 +106,7 @@ * Constructor. */ public TimerTask() { - allDaysAndTimes = new DailySortedMap<Long>(); + allDaysTimes = new DailySortedMap<Long>(); // les annoation sont à la seconde pres allDaysAnnotations = new TreeMap<Date, String>(); subTasks = new ArrayList<TimerTask>(); @@ -132,7 +141,10 @@ * @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); } /** @@ -150,7 +162,10 @@ * @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); } /** @@ -168,7 +183,10 @@ * @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); } /** @@ -186,7 +204,10 @@ * @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); } /** @@ -208,11 +229,14 @@ protected void setParent(TimerTask parent) { // will cause an infinite loop - if (equals(parent)) { + 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); } /** @@ -237,7 +261,10 @@ // set parent t.setParent(this); - return subTasks.add(t); + getVetoableSupport().firePropertyChange(PROPERTY_SUB_TASKS, null, subTasks); + boolean result = subTasks.add(t); + getChangeSupport().firePropertyChange(PROPERTY_SUB_TASKS, null, this.parent); + return result; } /** @@ -249,8 +276,9 @@ * @param seconds seconds */ public void setTime(Date date, Long seconds) { - - allDaysAndTimes.put(date, seconds); + getVetoableSupport().firePropertyChange(PROPERTY_ALL_DAYS_TIMES, null, allDaysTimes); + allDaysTimes.put(date, seconds); + getChangeSupport().firePropertyChange(PROPERTY_ALL_DAYS_TIMES, null, this.allDaysTimes); } /** @@ -262,9 +290,9 @@ public long getTime(Date date) { long result = 0; - Long t = allDaysAndTimes.get(date); + Long t = allDaysTimes.get(date); if (t != null) { - result = t; + result = t.longValue(); } return result; @@ -276,7 +304,7 @@ * @return total duration of all projects */ public SortedMap<Date, Long> getAllDaysAndTimes() { - return allDaysAndTimes; + return allDaysTimes; } /** @@ -286,7 +314,9 @@ * @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); } /** @@ -304,7 +334,9 @@ * @param alert */ public void addAlert(TimerAlert alert) { + getVetoableSupport().firePropertyChange(PROPERTY_ALERTS, null, alerts); alerts.add(alert); + getChangeSupport().firePropertyChange(PROPERTY_ALERTS, null, alerts); } /** @@ -322,7 +354,9 @@ * @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); } /* @@ -373,7 +407,7 @@ // subtask equals equals &= subTasks.equals(otherTask.subTasks); // compare times - equals &= allDaysAndTimes.equals(otherTask.allDaysAndTimes); + equals &= allDaysTimes.equals(otherTask.allDaysTimes); // compare times equals &= allDaysAnnotations.equals(otherTask.allDaysAnnotations); @@ -404,8 +438,8 @@ : (Date) creationDate.clone(); // copy durations - task.allDaysAndTimes = (DailySortedMap<Long>) SerializationUtils - .clone((DailySortedMap<Long>) allDaysAndTimes); + task.allDaysTimes = (DailySortedMap<Long>) SerializationUtils + .clone((DailySortedMap<Long>) allDaysTimes); // copy notes task.allDaysAnnotations = (TreeMap<Date, String>) SerializationUtils Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -59,9 +59,7 @@ * * @param task task * @return the subTasks ordered - * @deprecated Remove when tree ordering is implemented */ - @Deprecated public static List<TimerTask> getSubTasksOrderedByName(TimerTask task) { List<TimerTask> taksToSort = task.getSubTasks(); List<TimerTask> subTasksCopy = new ArrayList<TimerTask>(taksToSort); @@ -94,7 +92,7 @@ long totalTime = 0L; for (Long t : task.getAllDaysAndTimes().values()) { - totalTime += t; + totalTime += t.longValue(); } return totalTime; @@ -111,7 +109,7 @@ long totalTime = 0L; for (Long t : task.getAllDaysAndTimes().values()) { - totalTime += t; + totalTime += t.longValue(); } // add allday subtask time @@ -130,7 +128,7 @@ * @return time in seconds */ public static long getTotalTime(TimerTask task, Date date) { - long result; + long result = 0L; // only task time result = task.getTime(date); @@ -313,7 +311,7 @@ boolean present = false; for (TimerTask oneTask : tasks) { - if (oneTask.equals(task)) { + if (task == oneTask) { present = true; } Modified: trunk/src/main/java/org/chorem/jtimer/entities/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/entities/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -84,7 +84,7 @@ * Rename backup file to original file name; * * @param backupFile backup file - * @return + * @return if backup file has been restored */ protected boolean restoreBackupFile(File backupFile) { Modified: trunk/src/main/java/org/chorem/jtimer/io/DataLockingException.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/DataLockingException.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/io/DataLockingException.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -634,8 +634,7 @@ alertTaskFile)); // skip first line : "format: 1.2" - alertIn.readLine(); - String line; + String line = alertIn.readLine(); while ((line = alertIn.readLine()) != null) { line = line.trim(); @@ -1197,7 +1196,7 @@ // init -1, ++ start with 0 int foundProjectNumber = -1; - File aGtimerFile; + File aGtimerFile = null; // en esperant que sera pas infini :) do { Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerTimeUtil.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerTimeUtil.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerTimeUtil.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -67,7 +67,7 @@ public static Date yyyyMMdd2Date(String dateAsString) { int year, mouth, day; - Date date; + Date date = null; try { String syear = dateAsString.substring(0, 4); Modified: trunk/src/main/java/org/chorem/jtimer/io/Saver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/Saver.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/io/Saver.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -47,34 +47,34 @@ * * @param directory directory */ - void setSaveDirectory(String directory); + public void setSaveDirectory(String directory); /** * Set auto save delay (in milliseconds). * * @param autoSaveDelay delay in milliseconds */ - void setAutoSaveDelay(long autoSaveDelay); + public void setAutoSaveDelay(long autoSaveDelay); /** * Try to lock current saver directory. * * @throws DataLockingException if can't obtain lock */ - void lock() throws DataLockingException; + public void lock() throws DataLockingException; /** * Try to unlock current saver directory. * * @throws DataLockingException if there is no lock */ - void unlock() throws DataLockingException; + public void unlock() throws DataLockingException; /** * Load a project list. * * @return a collection of projects */ - Collection<TimerProject> load(); + public Collection<TimerProject> load(); } Modified: trunk/src/main/java/org/chorem/jtimer/io/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/io/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -63,7 +63,7 @@ public class HelpFrame extends FrameView implements HyperlinkListener { /** serialVersionUID */ -// private static final long serialVersionUID = -8693584537185015506L; + private static final long serialVersionUID = -8693584537185015506L; /** log */ private static Log log = LogFactory.getLog(HelpFrame.class); @@ -90,6 +90,7 @@ /** * Get UI main component. + * * @return */ protected JComponent getMainComponent() { Modified: trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -75,7 +75,7 @@ /** * Reference how many tasks are running */ - protected int nbTasksRunning; + protected int nbTasksRunning = 0; /** * Constucteur. @@ -264,7 +264,7 @@ } // display message - String message; + String message = null; if (nbTasksRunning == 0) { message = resourceMap.getString("idleMessage"); } else { Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 2011 CodeLutin, Chorlet Stéphane, 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/ui/alert/AlertCellEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -97,7 +97,7 @@ case 1: DurationEditor durationEditor = new DurationEditor(9999); - long duration = (Long) value; + long duration = ((Long)value).longValue(); durationEditor.setDuration(duration); durationEditor.addPropertyChangeListener("duration", this); durationEditor.setSize(100, 30); Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -68,7 +68,7 @@ case 1: DurationEditor durationEditor = new DurationEditor(9999); - long duration = (Long) value; + long duration = ((Long)value).longValue(); durationEditor.setDuration(duration); c = durationEditor; break; Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -61,7 +61,7 @@ public class AlertEditor extends FrameView implements ListSelectionListener { /** serialVersionUID. */ -// private static final long serialVersionUID = 5606265095312928490L; + private static final long serialVersionUID = 5606265095312928490L; /** Task to manage alert on. */ protected TimerTask task; Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -129,7 +129,7 @@ break; case 1: - long duration = (Long) value; + long duration = ((Long)value).longValue(); alert.setDuration(duration); break; Modified: trunk/src/main/java/org/chorem/jtimer/ui/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -38,6 +38,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.entities.TimerProject; +import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; import freemarker.template.Template; @@ -81,7 +82,7 @@ freemarkerConfiguration.setEncoding(Locale.getDefault(), "UTF-8"); // specific template loader to get template from jars (classpath) - ReportTemplateLoader templateLoader = new ReportTemplateLoader("/ftl"); + ClassTemplateLoader templateLoader = new ClassTemplateLoader(ReportGenerator.class, "/ftl"); freemarkerConfiguration.setTemplateLoader(templateLoader); freemarkerConfiguration.setObjectWrapper(new BeansWrapper()); Deleted: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportTemplateLoader.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportTemplateLoader.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportTemplateLoader.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -1,78 +0,0 @@ -/* - * #%L - * jTimer - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2007 - 2010 CodeLutin - * %% - * 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.net.URL; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import freemarker.cache.URLTemplateLoader; - -/** - * Freemarker custom template loader. - * Load template from classpath jars. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class ReportTemplateLoader extends URLTemplateLoader { - - /** log */ - private static Log log = LogFactory.getLog(ReportTemplateLoader.class); - - /** base dir for all template */ - protected String basedir; - - /** - * Constructor. - * - * @param basedir basedir - */ - public ReportTemplateLoader(String basedir) { - this.basedir = basedir; - } - - /* - * @see freemarker.cache.URLTemplateLoader#getURL(java.lang.String) - */ - @Override - protected URL getURL(String name) { - - if (log.isDebugEnabled()) { - log.debug("Loading url template " + name); - } - - URL url = ReportTemplateLoader.class.getResource(basedir + "/" + name); - //URL url = ClassLoader.getSystemResource(basedir + "/" + name); - - return url; - } - -} Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -139,10 +139,8 @@ * @return duration in seconds */ public long getDailyTaskTime(TimerTask task, Date day) { - long result; + long result = task.getTime(day); - result = task.getTime(day); - return result; } @@ -272,10 +270,8 @@ * @return duration in seconds */ public long getDailyTotalTaskTime(TimerTask task, Date day) { - long result; + long result = TimerTaskHelper.getTotalTime(task, day); - result = TimerTaskHelper.getTotalTime(task, day); - return result; } Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -84,7 +84,7 @@ public class ReportView extends FrameView implements DocumentListener { /** serialVersionUID. */ -// private static final long serialVersionUID = 547542299371326949L; + private static final long serialVersionUID = 547542299371326949L; /** Class logger */ protected static Log log = LogFactory.getLog(ReportView.class); @@ -145,7 +145,7 @@ getFrame().setName("reportFrame"); this.core = core; - uncheckedTaskSet = new HashSet<TimerTask>(); + this.uncheckedTaskSet = new HashSet<TimerTask>(); // set title //setTitle(resourceMap.getString("reportTitle")); @@ -343,7 +343,7 @@ public void generateReport() { // Choose selected project type - Type reportType; + Type reportType = null; if (radioByDay.isSelected()) { reportType = Type.BY_DAY_REPORT; } else if (radioByMonth.isSelected()) { Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -70,7 +70,7 @@ Set<TimerTask> uncheckedTaskList) { this.core = core; this.parentTree = parentTree; - uncheckedTaskSet = uncheckedTaskList; + this.uncheckedTaskSet = uncheckedTaskList; } /** @@ -101,20 +101,20 @@ } // task name should not be "null" - setText(taskName); + this.setText(taskName); // add color if task is closed if (task.isClosed()) { - setForeground(Color.GRAY); + this.setForeground(Color.GRAY); } else { - setForeground(Color.BLACK); + this.setForeground(Color.BLACK); } // set checked ? if (uncheckedTaskSet.contains(task)) { - setSelected(false); + this.setSelected(false); } else { - setSelected(true); + this.setSelected(true); } } Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -185,7 +185,7 @@ } // special case, root node selection - if (parentTree.getModel().getRoot().equals(lastPathComponent)) { + if (parentTree.getModel().getRoot() == lastPathComponent) { for (TimerProject project : core.getData().getProjectsList()) { TreePath subTreePath = treePath.pathByAddingChild(project); updateChildreen(subTreePath, select); Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 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 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -53,7 +53,7 @@ public class CheckBoxTreeModel implements TreeModel { /** serialVersionUID. */ -// private static final long serialVersionUID = -4312274996927222628L; + private static final long serialVersionUID = -4312274996927222628L; /** Class logger. */ private static Log log = LogFactory.getLog(CheckBoxTreeModel.class); Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -41,5 +41,5 @@ * * @return system idle time in milliseconds */ - long getIdleTime(); + public long getIdleTime(); } Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -41,12 +41,6 @@ /** * Constructor. - */ - public UnsupportedSystemInfoException() { - } - - /** - * Constructor. * * @param message message * @param cause cause Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2010 - 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 @@ -22,23 +22,6 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -/* * - * Copyright (C) 2010 Code Lutin, Eric Chatellier - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - **/ package org.chorem.jtimer.ui.system.macos; @@ -78,6 +61,6 @@ * * @see <a href="http://developer.apple.com/mac/library/documentation/Carbon/Reference/QuartzEventServicesRef/Reference/reference.html#//apple_ref/c/func/CGEventSourceSecondsSinceLastEventType">Quartz API</a> */ - double CGEventSourceSecondsSinceLastEventType(int sourceStateId, + public double CGEventSourceSecondsSinceLastEventType(int sourceStateId, int eventType); } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2010 - 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 @@ -22,23 +22,6 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -/* * - * Copyright (C) 2010 Code Lutin, Eric Chatellier - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - **/ package org.chorem.jtimer.ui.system.macos; Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 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 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -65,7 +65,7 @@ @Override public long getIdleTime() { - long idleTime; + long idleTime = 0; try { idleTime = getXssIdleTime(); Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2007 - 2010 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 @@ -51,7 +51,7 @@ /** * XScreenSaverInfo struct */ - class XScreenSaverInfo extends Structure { + public static class XScreenSaverInfo extends Structure { public X11.Window window; /* screen saver window - may not exist */ public int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverDisabled */ public int kind; /* ScreenSaverBlanked, ...Internal, ...External */ @@ -71,7 +71,7 @@ * * @see IntByReference */ - boolean XScreenSaverQueryExtension(X11.Display display, + public boolean XScreenSaverQueryExtension(X11.Display display, IntByReference event_base, IntByReference error_base); /** @@ -79,7 +79,7 @@ * * @return XScreenSaverInfo instance */ - XScreenSaverInfo XScreenSaverAllocInfo(); + public XScreenSaverInfo XScreenSaverAllocInfo(); /** * XScreenSaverQueryInfo. @@ -89,6 +89,6 @@ * @param infos * @return status flag */ - int XScreenSaverQueryInfo(X11.Display display, + public int XScreenSaverQueryInfo(X11.Display display, X11.Drawable drawable, XScreenSaverInfo infos); } Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/unix/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -87,7 +87,7 @@ protected JPopupTrayIcon trayIcon; /** Reference how many tasks are running. */ - protected int nbTasksRunning; + protected int nbTasksRunning = 0; /** Non running popup menu instance. */ protected JPopupMenu popup; @@ -319,7 +319,7 @@ --nbTasksRunning; } - String message; + String message = null; if (nbTasksRunning == 0) { message = resourceMap.getString("tooltipIdleText"); Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -22,23 +22,6 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -/* *##% - * Copyright (C) 2009 Code Lutin, 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ package org.chorem.jtimer.ui.tasks; @@ -140,6 +123,7 @@ // 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; @@ -151,7 +135,7 @@ setTitle(resourceMap.getString("idleTitle")); setResizable(false); setModal(true); - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); getRootPane().setLayout(new BorderLayout(1, 1)); getRootPane().add(getMainComponent(), BorderLayout.CENTER); @@ -297,7 +281,7 @@ // only the first call must display dialog // (can happen if multiples task are running) - boolean mustShow; + boolean mustShow = false; synchronized (idleDialog) { mustShow = !idleDialog.isVisible(); } Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -345,7 +345,7 @@ // test if task want to stop synchronized (bWantToStop) { - dontWantToStop = !bWantToStop; + dontWantToStop = !bWantToStop.booleanValue(); } } @@ -446,7 +446,7 @@ public boolean isStopping() { boolean stopping; synchronized (bWantToStop) { - stopping = bWantToStop; + stopping = bWantToStop.booleanValue(); } return stopping; } Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -99,7 +99,7 @@ // remember this.projectsAndTaskTable = projectsAndTaskTable; - dataManager = core.getData(); + this.dataManager = core.getData(); this.columnIdentifiers = columnIdentifiers; } Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -29,6 +29,8 @@ import java.util.ArrayList; import java.util.List; +import javax.swing.RowSorter; +import javax.swing.table.TableModel; import javax.swing.tree.TreePath; import org.chorem.jtimer.data.TimerCore; @@ -39,6 +41,7 @@ import org.jdesktop.application.ApplicationContext; import org.jdesktop.application.ResourceManager; import org.jdesktop.application.ResourceMap; +import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.JXTreeTable; /** Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -66,7 +66,7 @@ public TimerTaskTranferable(List<TimerTask> tasks) { // save task - tasksToTransfer = tasks; + this.tasksToTransfer = tasks; // build new DataFlavor try { @@ -85,7 +85,7 @@ public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { - List<TimerTask> tasks; + List<TimerTask> tasks = null; if (flavor == null) { throw new IOException("flavor is null"); Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -90,8 +90,8 @@ @Override public boolean canImport(JComponent cp, DataFlavor[] df) { - for (DataFlavor aDf : df) { - if (aDf.equals(TimerTaskTranferable.myData)) { + for (DataFlavor dataFlavor : df) { + if (dataFlavor.equals(TimerTaskTranferable.myData)) { return true; } } @@ -181,7 +181,7 @@ log.debug("Transfert done"); } - if (type == MOVE) { + if (type == TransferHandler.MOVE) { try { ProjectsAndTasksTable treeTable = (ProjectsAndTasksTable) cp; Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -116,7 +116,7 @@ public void stateChanged(ChangeEvent e) { // clic on minute spinner - if (e.getSource().equals(minuteSpinnerModel)) { + if (e.getSource() == minuteSpinnerModel) { int value = minuteSpinnerModel.getNumber().intValue(); // up if (value >= 60) { @@ -139,7 +139,7 @@ } // clic on seconds spinner - else if (e.getSource().equals(secondSpinnerModel)) { + else if (e.getSource() == secondSpinnerModel) { int value = secondSpinnerModel.getNumber().intValue(); // up if (value >= 60) { Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 Modified: trunk/src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -185,7 +185,7 @@ ProjectManagement managementService) { // try to get file information - ConnectionData data; + ConnectionData data = null; try { data = (ConnectionData) localStorage .load(getStorageName(managementService.getResourceName())); Modified: trunk/src/main/java/org/chorem/jtimer/ui/ws/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/ws/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ui/ws/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -34,10 +34,9 @@ import java.util.TreeMap; /** - * SortedMap that return a unique value - * for all date for a day. + * SortedMap that return a unique value for all date for a day. * - * @see SortedMap + * @see java.util.SortedMap * @param <T> values type * * @author chatellier @@ -88,7 +87,7 @@ super(m); } - /* + /** * {@inheritDoc} */ @Override @@ -99,7 +98,7 @@ } - /* + /** * {@inheritDoc} */ @Override @@ -110,7 +109,7 @@ } - /* + /** * {@inheritDoc} */ @Override @@ -125,7 +124,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -135,7 +134,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -145,7 +144,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -160,7 +159,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -170,7 +169,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -180,7 +179,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -190,7 +189,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -200,7 +199,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -210,7 +209,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -220,7 +219,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -231,7 +230,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -241,7 +240,7 @@ } } - /* + /** * {@inheritDoc} */ @Override @@ -254,7 +253,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -265,7 +264,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override @@ -275,7 +274,7 @@ return result; } - /* + /** * {@inheritDoc} */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/utils/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/utils/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/utils/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -46,6 +46,6 @@ * @param managementService interface to remote service * @return connection data */ - ConnectionData getConnectionInformation( + public ConnectionData getConnectionInformation( ProjectManagement managementService); } Modified: trunk/src/main/java/org/chorem/jtimer/ws/ProjectManagement.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/ProjectManagement.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/ProjectManagement.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -52,42 +52,42 @@ * * @param endpoint service endpoint */ - void setEndpoint(String endpoint); + public void setEndpoint(String endpoint); /** * Set service endpoint. * * @return service endpoint */ - String getEndpoint(); + public String getEndpoint(); /** * Set service resource name. * * @param name service resource name */ - void setResourceName(String name); + public void setResourceName(String name); /** * Get service resource name. * * @return service resource name */ - String getResourceName(); + public String getResourceName(); /** * Set data manager. * * @param dataManager data manager */ - void setDataManager(TimerDataManager dataManager); + public void setDataManager(TimerDataManager dataManager); /** * Set connection handler. * * @param connectionDataHandler connection handler */ - void setConnectionDataHandler(ConnectionDataHandler connectionDataHandler); + public void setConnectionDataHandler(ConnectionDataHandler connectionDataHandler); /** * Get id/login map available on remote services. @@ -95,7 +95,7 @@ * @throws WebServiceException when call fail * @return all id/login couple */ - Map<String, String> getIdAndLoginsMap() throws WebServiceException; + public Map<String, String> getIdAndLoginsMap() throws WebServiceException; /** * Do login operation @@ -105,7 +105,7 @@ * @throws WebServiceException when call fail * @return user id */ - String login(String user, String password) + public String login(String user, String password) throws WebServiceException; /** @@ -117,7 +117,7 @@ * @return list of project * @see org.chorem.jtimer.entities.TimerProject */ - List<TimerProject> getUserProjects(String userId) + public List<TimerProject> getUserProjects(String userId) throws WebServiceException; /** @@ -127,7 +127,7 @@ * @param projects project list to synchronize * @throws WebServiceException when call fail */ - void synchronize(String userId, List<TimerProject> projects) + public void synchronize(String userId, List<TimerProject> projects) throws WebServiceException; /** @@ -139,6 +139,6 @@ * @param timeOfDay time in seconds * @throws WebServiceException when call fail */ - void syncTask(String userId, TimerTask task, Date dateOfDay, + public void syncTask(String userId, TimerTask task, Date dateOfDay, long timeOfDay) throws WebServiceException; } Modified: trunk/src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/main/java/org/chorem/jtimer/ws/exception/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/exception/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/exception/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ws/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 @@ -136,7 +136,7 @@ */ protected Object get(String serviceName, Object... args) throws XmlRpcException { - Object result; + Object result = null; try { result = super.get(resourceName + "." + serviceName, args); } catch (XmlRpcException e) { Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * 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 Modified: trunk/src/main/resources/JTimer.properties =================================================================== --- trunk/src/main/resources/JTimer.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/JTimer.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/JTimer_default.properties =================================================================== --- trunk/src/main/resources/JTimer_default.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/JTimer_default.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/log4j.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 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 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 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 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 @@ -22,13 +22,13 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#�About common +# About common aboutIcon = jtimer-logo-orange.jpg -#�About i18n +# About i18n aboutTitle = About ${Application.title} aboutHtmlTitle = About ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2011, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> aboutLicenseTitle = License aboutLicense = You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ${Application.title}. All rights reserved. No guarantees are provided for use of this program. Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 @@ -22,10 +22,10 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#�About i18n +# About i18n aboutTitle = \u00C0 propos de ${Application.title} aboutHtmlTitle = \u00C0 propos de ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2011, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> aboutLicenseTitle = Licence aboutLicense = Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec ${Application.title}. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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 Modified: trunk/src/site/en/rst/configuration.rst =================================================================== --- trunk/src/site/en/rst/configuration.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/en/rst/configuration.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/en/rst/contribute/i18n.rst =================================================================== --- trunk/src/site/en/rst/contribute/i18n.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/en/rst/contribute/i18n.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/en/rst/devel/fileformat.rst =================================================================== --- trunk/src/site/en/rst/devel/fileformat.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/en/rst/devel/fileformat.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/en/rst/devel/index.rst =================================================================== --- trunk/src/site/en/rst/devel/index.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/en/rst/devel/index.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/en/rst/devel/roadmap.rst =================================================================== --- trunk/src/site/en/rst/devel/roadmap.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/en/rst/devel/roadmap.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/en/rst/devel/saf.rst =================================================================== --- trunk/src/site/en/rst/devel/saf.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/en/rst/devel/saf.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/en/rst/index.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/en/rst/screenshots.rst =================================================================== --- trunk/src/site/en/rst/screenshots.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/en/rst/screenshots.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/rst/configuration.rst =================================================================== --- trunk/src/site/rst/configuration.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/rst/configuration.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/rst/contribute/i18n.rst =================================================================== --- trunk/src/site/rst/contribute/i18n.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/rst/contribute/i18n.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/rst/devel/fileformat.rst =================================================================== --- trunk/src/site/rst/devel/fileformat.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/rst/devel/fileformat.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/rst/devel/index.rst =================================================================== --- trunk/src/site/rst/devel/index.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/rst/devel/index.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/rst/devel/roadmap.rst =================================================================== --- trunk/src/site/rst/devel/roadmap.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/rst/devel/roadmap.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/rst/devel/saf.rst =================================================================== --- trunk/src/site/rst/devel/saf.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/rst/devel/saf.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/rst/index.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/site/rst/screenshots.rst =================================================================== --- trunk/src/site/rst/screenshots.rst 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/site/rst/screenshots.rst 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2010 CodeLutin +.. * 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 Modified: trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -81,6 +81,7 @@ /** * Redefinit les proprietes utilisées pour les tests. + * * @throws IOException */ protected void initDataDirectory() throws IOException { Modified: trunk/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -26,6 +26,7 @@ package org.chorem.jtimer.entities; import org.chorem.jtimer.AbstractJTimerTest; +import org.chorem.jtimer.entities.ConnectionData; import org.testng.Assert; import org.testng.annotations.Test; Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -106,7 +106,7 @@ TimerTask clonedTask = task.clone(); - Assert.assertTrue(clonedTask.allDaysAndTimes instanceof DailySortedMap<?>, "Clone put invalid type for map"); + Assert.assertTrue(clonedTask.allDaysTimes instanceof DailySortedMap<?>, "Clone put invalid type for map"); Assert.assertFalse(clonedTask.allDaysAnnotations instanceof DailySortedMap<?>, "Clone put invalid type for map"); } Modified: trunk/src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 @@ -198,7 +198,7 @@ long totalTime = 0; for (Long time : task.getAllDaysAndTimes().values()) { - totalTime += time; + totalTime += time.longValue(); } Assert.assertEquals(11391, totalTime); Modified: trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 @@ -29,6 +29,9 @@ import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.AbstractJTimerTest; import org.chorem.jtimer.ui.report.ReportGeneratorTest; +import org.chorem.jtimer.ui.system.SystemInfo; +import org.chorem.jtimer.ui.system.SystemInfoFactory; +import org.chorem.jtimer.ui.system.UnsupportedSystemInfoException; import org.testng.Assert; import org.testng.annotations.Test; Modified: trunk/src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2009 - 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 Modified: trunk/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2007 - 2010 CodeLutin + * Copyright (C) 2008 - 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 Modified: trunk/src/test/resources/JTimerTestRelatif.properties =================================================================== --- trunk/src/test/resources/JTimerTestRelatif.properties 2011-09-05 07:55:57 UTC (rev 2777) +++ trunk/src/test/resources/JTimerTestRelatif.properties 2011-09-05 08:12:54 UTC (rev 2778) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2010 CodeLutin +# 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