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 e30532c90c7bb6b10d08655f685aa1b966ea7833 Merge: a6f2b93 b2c7bad Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:28 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.6-alpha-1' into 'master' pom.xml | 27 +- src/main/java/org/chorem/jtimer/JTimer.java | 59 +-- src/main/java/org/chorem/jtimer/JTimerConfig.java | 28 ++ src/main/java/org/chorem/jtimer/JTimerFactory.java | 45 +- .../org/chorem/jtimer/data/CommonVetoable.java | 141 ++----- .../org/chorem/jtimer/data/DataEventListener.java | 132 ++++-- .../java/org/chorem/jtimer/data/TimerCore.java | 17 +- .../org/chorem/jtimer/data/TimerDataManager.java | 40 +- .../jtimer/data/VetoableDataEventListener.java | 81 ++-- .../java/org/chorem/jtimer/entities/SyncInfo.java | 187 +++++++++ .../org/chorem/jtimer/entities/TimerAlert.java | 13 +- .../java/org/chorem/jtimer/entities/TimerTask.java | 238 +++++++++-- .../chorem/jtimer/entities/TimerTaskHelper.java | 175 ++++++-- .../java/org/chorem/jtimer/io/AbstractSaver.java | 43 +- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 438 +++++++++----------- .../java/org/chorem/jtimer/io/GTimerTimeUtil.java | 13 +- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 309 ++++++++++++++ .../chorem/jtimer/{ui => }/system/SystemInfo.java | 9 +- .../jtimer/{ui => }/system/SystemInfoFactory.java | 23 +- .../{ui => }/system/macos/ApplicationServices.java | 20 +- .../{ui => }/system/macos/MacOSSystemInfo.java | 14 +- .../jtimer/{ui => }/system/macos/package-info.java | 4 +- .../jtimer/{ui => }/system/package-info.java | 4 +- .../{ui => }/system/unix/UnixSystemInfo.java | 35 +- .../chorem/jtimer/{ui => }/system/unix/X11.java | 2 +- .../chorem/jtimer/{ui => }/system/unix/Xss.java | 4 +- .../jtimer/{ui => }/system/unix/package-info.java | 4 +- .../jtimer/{ui => }/system/win32/Kernel32.java | 2 +- .../jtimer/{ui => }/system/win32/User32.java | 2 +- .../{ui => }/system/win32/Win32SystemInfo.java | 12 +- .../jtimer/{ui => }/system/win32/package-info.java | 4 +- src/main/java/org/chorem/jtimer/ui/HelpFrame.java | 4 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 2 +- src/main/java/org/chorem/jtimer/ui/StatusBar.java | 94 +---- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 25 +- .../chorem/jtimer/ui/alert/AlertCellEditor.java | 20 +- .../chorem/jtimer/ui/alert/AlertCellRenderer.java | 3 - .../org/chorem/jtimer/ui/alert/AlertEditor.java | 11 +- .../chorem/jtimer/ui/alert/AlertTableModel.java | 20 +- .../org/chorem/jtimer/ui/report/ReportUtils.java | 60 +-- .../org/chorem/jtimer/ui/report/ReportView.java | 35 +- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 452 +++++++++++++++++++++ .../ui/system/UnsupportedSystemInfoException.java | 66 --- .../chorem/jtimer/ui/systray/SystrayManager.java | 204 +--------- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 7 +- .../chorem/jtimer/ui/tasks/RefreshTreeTask.java | 6 +- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 59 ++- .../jtimer/ui/tree/CheckBoxTreeCellEditor.java | 10 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 101 +---- .../ProjectsAndTasksRunningCellRenderer.java | 123 ------ .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 2 - .../ui/treetable/dnd/TimerTaskTranferable.java | 13 +- .../chorem/jtimer/ui/widget/DurationEditor.java | 6 +- .../chorem/jtimer/ui/widget/JPopupTrayIcon.java | 39 +- .../org/chorem/jtimer/resources/JTimer.properties | 5 + .../chorem/jtimer/resources/JTimer_fr.properties | 8 +- .../resources/TimerTaskSyncInfoEditor.properties | 46 +++ .../TimerTaskSyncInfoEditor_fr.properties | 47 +++ .../jtimer/ui/resources/TimerTaskEditor.properties | 2 + .../ui/resources/TimerTaskEditor_fr.properties | 2 + .../jtimer/entities/TimerTaskHelperTest.java | 49 ++- .../org/chorem/jtimer/entities/TimerTaskTest.java | 42 ++ .../org/chorem/jtimer/io/AbstractSaverTest.java | 13 +- .../jtimer/io/GTimerIncrementalSaverTest.java | 100 ++++- .../{ui => }/system/SystemInfoFactoryTest.java | 22 +- .../chorem/jtimer/utils/DailySortedMapTest.java | 6 +- src/test/resources/testdata/0.task | 1 + src/test/resources/testdata/41.task | 8 + src/test/resources/testdata/41.task.sync | 8 + 69 files changed, 2378 insertions(+), 1468 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.