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 840906c39228145ce68a34861b1be2ce987600f8 Merge: b0179f3 83fc1f9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 13 11:49:00 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.5.1' into 'master' pom.xml | 280 ++++++------ src/main/assembly/bin.xml | 2 +- src/main/config/checkstyle.xml | 249 ----------- src/main/java/org/chorem/jtimer/JTimer.java | 476 +++++++++++---------- src/main/java/org/chorem/jtimer/JTimerActions.java | 8 +- src/main/java/org/chorem/jtimer/JTimerConfig.java | 99 ++--- src/main/java/org/chorem/jtimer/JTimerFactory.java | 47 +- .../org/chorem/jtimer/data/CommonVetoable.java | 6 +- .../org/chorem/jtimer/data/DataEventListener.java | 29 +- .../chorem/jtimer/data/DataViolationException.java | 11 +- .../java/org/chorem/jtimer/data/TimerCore.java | 38 +- .../org/chorem/jtimer/data/TimerDataManager.java | 174 ++++---- .../jtimer/data/VetoableDataEventListener.java | 10 +- .../java/org/chorem/jtimer/entities/SyncInfo.java | 187 -------- .../org/chorem/jtimer/entities/TimerAlert.java | 21 +- .../org/chorem/jtimer/entities/TimerProject.java | 8 +- .../java/org/chorem/jtimer/entities/TimerSync.java | 151 +++++++ .../java/org/chorem/jtimer/entities/TimerTask.java | 183 +------- .../chorem/jtimer/entities/TimerTaskHelper.java | 112 +---- .../org/chorem/jtimer/entities/package-info.java | 2 +- .../java/org/chorem/jtimer/io/AbstractSaver.java | 83 ---- .../io/{AbstractSaver.java => BackupUtils.java} | 46 +- .../org/chorem/jtimer/io/DataLockingException.java | 6 +- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 181 ++------ .../java/org/chorem/jtimer/io/GTimerTimeUtil.java | 14 +- src/main/java/org/chorem/jtimer/io/Saver.java | 16 +- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 299 ------------- .../jtimer/plugin/timebundle/TimeBundleHelper.java | 136 ++++++ .../jtimer/plugin/timebundle/TimeBundleSaver.java | 219 ++++++++++ .../plugin/timebundle/TimeBundleSynchronizer.java | 171 ++++++++ .../plugin/timebundle/TimeBundleVetoable.java | 56 +++ .../plugin/timebundle/TimerSyncCellRenderer.java | 46 ++ .../jtimer/plugin/timebundle/TimerSyncEditor.java | 245 +++++++++++ .../plugin/timebundle/TimerSyncTableModel.java | 203 +++++++++ .../java/org/chorem/jtimer/system/SystemInfo.java | 6 +- .../chorem/jtimer/system/SystemInfoFactory.java | 9 +- .../jtimer/system/macos/MacOSSystemInfo.java | 6 +- .../chorem/jtimer/system/unix/UnixSystemInfo.java | 13 +- .../java/org/chorem/jtimer/system/unix/X11.java | 29 +- .../java/org/chorem/jtimer/system/unix/Xss.java | 23 +- .../org/chorem/jtimer/system/win32/Kernel32.java | 6 +- .../org/chorem/jtimer/system/win32/User32.java | 14 +- .../jtimer/system/win32/Win32SystemInfo.java | 10 +- src/main/java/org/chorem/jtimer/ui/HelpFrame.java | 50 +-- .../java/org/chorem/jtimer/ui/NewTaskView.java | 35 +- src/main/java/org/chorem/jtimer/ui/StatusBar.java | 23 +- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 154 ++++--- .../chorem/jtimer/ui/alert/AlertCellEditor.java | 69 ++- .../chorem/jtimer/ui/alert/AlertCellRenderer.java | 47 +- .../org/chorem/jtimer/ui/alert/AlertEditor.java | 64 ++- .../chorem/jtimer/ui/alert/AlertTableModel.java | 67 ++- .../chorem/jtimer/ui/report/ReportGenerator.java | 76 ++-- .../org/chorem/jtimer/ui/report/ReportUtils.java | 90 ++-- .../org/chorem/jtimer/ui/report/ReportView.java | 93 ++-- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 453 -------------------- .../chorem/jtimer/ui/systray/SystrayManager.java | 36 +- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 75 ++-- .../chorem/jtimer/ui/tasks/RefreshTreeTask.java | 14 +- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 85 ++-- .../jtimer/ui/tree/CheckBoxTreeCellComponent.java | 28 +- .../jtimer/ui/tree/CheckBoxTreeCellEditor.java | 40 +- .../jtimer/ui/tree/CheckBoxTreeCellRenderer.java | 20 +- .../jtimer/ui/tree/ProjectsAndTasksTree.java | 2 +- .../org/chorem/jtimer/ui/tree/TaskTreeModel.java | 61 +-- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 21 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 147 ++++--- .../ProjectsAndTasksRunningCellRenderer.java | 41 +- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 45 +- .../ui/treetable/dnd/TimerTaskTranferable.java | 14 +- .../ui/treetable/dnd/TimerTaskTransferHandler.java | 35 +- .../org/chorem/jtimer/ui/widget/DialogView.java | 15 +- .../chorem/jtimer/ui/widget/DurationEditor.java | 15 +- .../chorem/jtimer/ui/widget/JPopupTrayIcon.java | 15 +- .../chorem/jtimer/ui/widget/WindowProperty2.java | 10 +- .../org/chorem/jtimer/utils/DailySortedMap.java | 17 +- src/main/resources/log4j2.xml | 5 +- .../resources/TimerSyncEditor.properties} | 4 +- .../resources/TimerSyncEditor_fr.properties} | 2 +- .../plugin/timebundle/resources/dialog-close.png | Bin 0 -> 1382 bytes .../org/chorem/jtimer/resources/JTimer.properties | 16 +- .../chorem/jtimer/resources/JTimer_fr.properties | 13 +- .../jtimer/ui/resources/HelpFrame.properties | 4 +- .../jtimer/ui/resources/HelpFrame_fr.properties | 4 +- .../jtimer/ui/resources/TimerTaskEditor.properties | 2 +- .../ui/resources/TimerTaskEditor_fr.properties | 2 +- .../ui/systray/resources/SystrayManager.properties | 8 +- .../systray/resources/SystrayManager_fr.properties | 6 +- src/site/rst/timebundle.rst | 30 ++ src/site/site.xml | 5 +- .../java/org/chorem/jtimer/AbstractJTimerTest.java | 78 ++-- .../java/org/chorem/jtimer/JTimerFactoryTest.java | 10 +- .../org/chorem/jtimer/data/CommonVetoableTest.java | 28 +- .../chorem/jtimer/data/TimerDataManagerTest.java | 32 +- .../org/chorem/jtimer/entities/TimerAlertTest.java | 26 +- .../chorem/jtimer/entities/TimerProjectTest.java | 10 +- .../jtimer/entities/TimerTaskHelperTest.java | 62 +-- .../org/chorem/jtimer/entities/TimerTaskTest.java | 68 +-- .../org/chorem/jtimer/io/AbstractSaverTest.java | 55 ++- .../jtimer/io/GTimerIncrementalSaverTest.java | 74 ++-- .../timebundle/TimeBundleHelperTest.java} | 69 +-- .../plugin/timebundle/TimeBundleSaverTest.java | 66 +++ .../jtimer/system/SystemInfoFactoryTest.java | 4 +- .../jtimer/ui/report/ReportGeneratorTest.java | 114 ++--- .../chorem/jtimer/ui/report/ReportUtilsTest.java | 52 +-- .../jtimer/ui/widget/DurationEditorTest.java | 4 +- .../chorem/jtimer/utils/DailySortedMapTest.java | 118 ++--- src/test/resources/testdata/41.task.sync | 8 - src/test/resources/testsync/41.task.sync | 8 + 108 files changed, 3164 insertions(+), 3710 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.