This is an automated email from the git hooks/post-receive script. New change to branch master in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from b0179f3 [jgitflow-maven-plugin]merging 'release/1.6-alpha-2' into 'master' adds 403715c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds eca589d [jgitflow-maven-plugin]merging 'master' into 'develop' adds 44599e2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds f84cd6d fixes #1366: Application freeze after computer resume from hibernate adds ff02cff Update jna again adds df7f10f Refactor time bundle code into dedicated plugin. adds 877fc29 Fix lastSyncDate after succesfull sync adds e5a7cb4 Fix imports adds 255e569 Back on 1.5.1 versions adds aaddad8 fixes #1366: Prevent to set a negative time after resume from suspend adds 883b60e Fix tests adds 6af9311 Format code and imports adds e20e86e fixes #1359 Revert modification to allow running multiple task at the same time adds e4c1d77 Fix release adds e3af9d1 Use chorempom 10.4 + tidy pom + fix Bad webstart generation on snapshot site (Fixes #1370) adds e9f9c56 refs #1359: Fix menu action name adds 0dfba41 Happy new year commit adds 7bd2a35 Update libs adds 83fc1f9 [jgitflow-maven-plugin]updating poms for branch'release/1.5.1' with non-snapshot versions adds 840906c [jgitflow-maven-plugin]merging 'release/1.5.1' into 'master' No new revisions were added by this update. Summary of changes: 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 +- .../timebundle}/resources/dialog-close.png | Bin .../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/{screenshots.rst => timebundle.rst} | 39 +- 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, 3143 insertions(+), 3740 deletions(-) delete mode 100644 src/main/config/checkstyle.xml delete mode 100644 src/main/java/org/chorem/jtimer/entities/SyncInfo.java create mode 100644 src/main/java/org/chorem/jtimer/entities/TimerSync.java copy src/main/java/org/chorem/jtimer/io/{AbstractSaver.java => BackupUtils.java} (80%) delete mode 100644 src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java create mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleHelper.java create mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaver.java create mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSynchronizer.java create mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleVetoable.java create mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncCellRenderer.java create mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncEditor.java create mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncTableModel.java delete mode 100644 src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java rename src/main/resources/org/chorem/jtimer/{ui/report/resources/TimerTaskSyncInfoEditor.properties => plugin/timebundle/resources/TimerSyncEditor.properties} (93%) rename src/main/resources/org/chorem/jtimer/{ui/report/resources/TimerTaskSyncInfoEditor_fr.properties => plugin/timebundle/resources/TimerSyncEditor_fr.properties} (93%) copy src/main/resources/org/chorem/jtimer/{ui/report => plugin/timebundle}/resources/dialog-close.png (100%) copy src/site/rst/{screenshots.rst => timebundle.rst} (56%) copy src/test/java/org/chorem/jtimer/{entities/TimerTaskHelperTest.java => plugin/timebundle/TimeBundleHelperTest.java} (56%) create mode 100644 src/test/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaverTest.java delete mode 100644 src/test/resources/testdata/41.task.sync create mode 100644 src/test/resources/testsync/41.task.sync -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.