This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit e8bb063f5a7919793b7d994d393ba3ef33ae56b8 Merge: 840906c bec20b2 Author: Éric <chatellier@codelutin.com> Date: Fri May 25 15:26:08 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.5.2' into 'master' .gitignore | 17 +- .gitlab-ci.yml | 21 +++ pom.xml | 203 ++++----------------- src/main/assembly/bin.xml | 7 +- src/main/java/org/chorem/jtimer/JTimer.java | 2 +- src/main/java/org/chorem/jtimer/JTimerActions.java | 2 +- src/main/java/org/chorem/jtimer/JTimerConfig.java | 2 +- src/main/java/org/chorem/jtimer/JTimerFactory.java | 2 +- .../org/chorem/jtimer/data/CommonVetoable.java | 2 +- .../org/chorem/jtimer/data/DataEventListener.java | 2 +- .../chorem/jtimer/data/DataViolationException.java | 2 +- .../java/org/chorem/jtimer/data/TimerCore.java | 2 +- .../org/chorem/jtimer/data/TimerDataManager.java | 2 +- .../jtimer/data/VetoableDataEventListener.java | 2 +- .../java/org/chorem/jtimer/data/package-info.java | 2 +- .../org/chorem/jtimer/entities/TimerAlert.java | 2 +- .../org/chorem/jtimer/entities/TimerProject.java | 2 +- .../java/org/chorem/jtimer/entities/TimerTask.java | 2 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 2 +- .../org/chorem/jtimer/entities/package-info.java | 2 +- .../java/org/chorem/jtimer/io/AbstractSaver.java | 2 +- .../org/chorem/jtimer/io/DataLockingException.java | 2 +- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 2 +- .../java/org/chorem/jtimer/io/GTimerTimeUtil.java | 2 +- src/main/java/org/chorem/jtimer/io/Saver.java | 2 +- .../java/org/chorem/jtimer/io/package-info.java | 2 +- src/main/java/org/chorem/jtimer/package-info.java | 2 +- .../jtimer/plugin/timebundle/TimeBundleHelper.java | 2 +- .../jtimer/plugin/timebundle/TimeBundleSaver.java | 2 +- .../plugin/timebundle/TimeBundleSynchronizer.java | 2 +- .../plugin/timebundle/TimeBundleVetoable.java | 2 +- .../plugin/timebundle/TimerSyncCellRenderer.java | 2 +- .../jtimer/plugin/timebundle/TimerSyncEditor.java | 2 +- .../plugin/timebundle/TimerSyncTableModel.java | 2 +- .../java/org/chorem/jtimer/system/SystemInfo.java | 2 +- .../chorem/jtimer/system/SystemInfoFactory.java | 2 +- .../jtimer/system/macos/ApplicationServices.java | 2 +- .../jtimer/system/macos/MacOSSystemInfo.java | 2 +- .../chorem/jtimer/system/macos/package-info.java | 2 +- .../org/chorem/jtimer/system/package-info.java | 2 +- .../chorem/jtimer/system/unix/UnixSystemInfo.java | 2 +- .../java/org/chorem/jtimer/system/unix/Xss.java | 5 +- .../chorem/jtimer/system/unix/package-info.java | 2 +- .../org/chorem/jtimer/system/win32/Kernel32.java | 2 +- .../org/chorem/jtimer/system/win32/User32.java | 4 +- .../jtimer/system/win32/Win32SystemInfo.java | 2 +- .../chorem/jtimer/system/win32/package-info.java | 2 +- src/main/java/org/chorem/jtimer/ui/HelpFrame.java | 2 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 2 +- src/main/java/org/chorem/jtimer/ui/StatusBar.java | 2 +- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 2 +- .../chorem/jtimer/ui/alert/AlertCellEditor.java | 2 +- .../chorem/jtimer/ui/alert/AlertCellRenderer.java | 2 +- .../org/chorem/jtimer/ui/alert/AlertEditor.java | 2 +- .../chorem/jtimer/ui/alert/AlertTableModel.java | 2 +- .../java/org/chorem/jtimer/ui/package-info.java | 2 +- .../chorem/jtimer/ui/report/ReportGenerator.java | 2 +- .../org/chorem/jtimer/ui/report/ReportUtils.java | 2 +- .../org/chorem/jtimer/ui/report/ReportView.java | 2 +- .../org/chorem/jtimer/ui/report/package-info.java | 2 +- .../chorem/jtimer/ui/systray/SystrayManager.java | 2 +- .../org/chorem/jtimer/ui/systray/package-info.java | 2 +- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 2 +- .../chorem/jtimer/ui/tasks/RefreshTreeTask.java | 2 +- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 2 +- .../org/chorem/jtimer/ui/tasks/package-info.java | 2 +- .../jtimer/ui/tree/CheckBoxTreeCellComponent.java | 2 +- .../jtimer/ui/tree/CheckBoxTreeCellEditor.java | 2 +- .../jtimer/ui/tree/CheckBoxTreeCellRenderer.java | 2 +- .../jtimer/ui/tree/ProjectsAndTasksTree.java | 2 +- .../org/chorem/jtimer/ui/tree/TaskTreeModel.java | 2 +- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 2 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 2 +- .../ProjectsAndTasksRunningCellRenderer.java | 2 +- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 2 +- .../ui/treetable/dnd/TimerTaskTranferable.java | 2 +- .../ui/treetable/dnd/TimerTaskTransferHandler.java | 2 +- .../jtimer/ui/treetable/dnd/package-info.java | 2 +- .../chorem/jtimer/ui/treetable/package-info.java | 2 +- .../org/chorem/jtimer/ui/widget/DialogView.java | 2 +- .../chorem/jtimer/ui/widget/DurationEditor.java | 2 +- .../chorem/jtimer/ui/widget/JPopupTrayIcon.java | 2 +- .../chorem/jtimer/ui/widget/WindowProperty2.java | 2 +- .../org/chorem/jtimer/utils/DailySortedMap.java | 2 +- .../java/org/chorem/jtimer/utils/package-info.java | 2 +- src/main/resources/ftl/reportByDay.ftl | 2 +- src/main/resources/ftl/reportByDay_fr.ftl | 2 +- src/main/resources/ftl/reportByMonth.ftl | 2 +- src/main/resources/ftl/reportByMonth_fr.ftl | 2 +- src/main/resources/ftl/reportByProject.ftl | 2 +- src/main/resources/ftl/reportByProject_fr.ftl | 2 +- src/main/resources/ftl/reportByWeek.ftl | 2 +- src/main/resources/ftl/reportByWeek_fr.ftl | 2 +- src/main/resources/ftl/reportByYear.ftl | 2 +- src/main/resources/ftl/reportByYear_fr.ftl | 2 +- src/main/resources/jtimer.properties | 2 +- src/main/resources/log4j2.xml | 2 +- .../resources/TimerSyncEditor.properties | 2 +- .../resources/TimerSyncEditor_fr.properties | 2 +- .../org/chorem/jtimer/resources/JTimer.properties | 2 +- .../chorem/jtimer/resources/JTimer_fr.properties | 2 +- .../ui/alert/resources/AlertEditor.properties | 2 +- .../ui/alert/resources/AlertEditor_fr.properties | 2 +- .../ui/report/resources/ReportView.properties | 2 +- .../ui/report/resources/ReportView_fr.properties | 2 +- .../jtimer/ui/resources/HelpFrame.properties | 4 +- .../jtimer/ui/resources/HelpFrame_fr.properties | 4 +- .../jtimer/ui/resources/NewTaskView.properties | 2 +- .../jtimer/ui/resources/NewTaskView_fr.properties | 2 +- .../jtimer/ui/resources/StatusBar.properties | 2 +- .../jtimer/ui/resources/StatusBar_fr.properties | 2 +- .../jtimer/ui/resources/TimerTaskEditor.properties | 2 +- .../ui/resources/TimerTaskEditor_fr.properties | 2 +- .../ui/systray/resources/SystrayManager.properties | 2 +- .../systray/resources/SystrayManager_fr.properties | 2 +- .../ui/tasks/resources/IdleDialog.properties | 2 +- .../ui/tasks/resources/IdleDialog_fr.properties | 2 +- .../ui/tasks/resources/RunTaskJob.properties | 2 +- .../ui/tasks/resources/RunTaskJob_fr.properties | 2 +- .../resources/TimerTaskTransferHandler.properties | 2 +- .../TimerTaskTransferHandler_fr.properties | 2 +- .../resources/ProjectsAndTasksTable.properties | 2 +- .../resources/ProjectsAndTasksTable_fr.properties | 2 +- src/site/rst/configuration.rst | 2 +- src/site/rst/contribute/i18n.rst | 2 +- src/site/rst/devel/fileformat.rst | 2 +- src/site/rst/devel/index.rst | 2 +- src/site/rst/devel/roadmap.rst | 2 +- src/site/rst/devel/saf.rst | 2 +- src/site/rst/index.rst.vm | 2 +- src/site/rst/screenshots.rst | 2 +- src/site/rst/timebundle.rst | 2 +- src/site/site.xml | 31 +--- .../java/org/chorem/jtimer/AbstractJTimerTest.java | 2 +- .../java/org/chorem/jtimer/JTimerFactoryTest.java | 2 +- .../org/chorem/jtimer/data/CommonVetoableTest.java | 2 +- .../chorem/jtimer/data/TimerDataManagerTest.java | 2 +- .../org/chorem/jtimer/entities/TimerAlertTest.java | 2 +- .../chorem/jtimer/entities/TimerProjectTest.java | 2 +- .../jtimer/entities/TimerTaskHelperTest.java | 2 +- .../org/chorem/jtimer/entities/TimerTaskTest.java | 2 +- .../org/chorem/jtimer/io/AbstractSaverTest.java | 2 +- .../jtimer/io/GTimerIncrementalSaverTest.java | 2 +- .../plugin/timebundle/TimeBundleHelperTest.java | 2 +- .../jtimer/system/SystemInfoFactoryTest.java | 2 +- .../jtimer/ui/report/ReportGeneratorTest.java | 2 +- .../chorem/jtimer/ui/report/ReportUtilsTest.java | 2 +- .../jtimer/ui/widget/DurationEditorTest.java | 2 +- .../chorem/jtimer/utils/DailySortedMapTest.java | 2 +- src/test/resources/jtimertest.properties | 2 +- 150 files changed, 220 insertions(+), 358 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.