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 a6f2b93 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' adds 6259493 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development adds fe71901 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d9d5257 [jgitflow-maven-plugin]merging 'master' into 'develop' adds c512700 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 0addfa2 Fix jnlp codebase url adds 5bc154c Fix test failing on windows adds 075995c fixes #1357: Empty time must not be add to file adds b333168 Update libs adds 8c26185 Move 'system' package outside 'ui' package to allow native system init adds a4f8192 Downgrade testng adds dd09cbd Update libs adds b8fe6a6 Code style and fix analysis adds 8a7047e Use default methods to remove a lot of empty implemented methods adds f6b06cb refs #1345: Downgrade jna to 3.5.2 for testing adds b342e9e "use of simpler json format, sends update request to url when url is changed with the json of the task." adds 9ccd774 Deletion of TaskJsonDisplayer class that was used to test the display of the json Adding an update option to the UI and an update frame (TimeTaskUpdaterView) to display the data to be sent (not finished) based on the Report UI adds ca9fd6f corrected method for getting times that was ignoring the date parameters and always sending all the times of a task adds 59ff4b7 small typo corrected with " at the wrong places or missing in the json output adds b65ba97 showing an info log when receiving a 200 OK after an update. small typo correction in properties file adds fc44c09 set up ids for times in the json output to be dates (one task at one date has only one value for duration in jtimer), minor properties change adds 5249bb5 displayed the checkbox to include annotations with the update, includes it in the update if checked. adds 34fb354 be able to pick previous month and current month for update with a button adds 8793f5b saving synchronisation time when update successful adds 3cbcd20 added an error message if the update isn't done, asking to check for url adds 62133e8 removed a useless comment adds 16cb347 added the gson library to the project to enable easier generation of json output for the updates, adapted the update functions to accomodate (removed useless prettyfier) adds 84fa2a1 changed the return of taskToJSONFormat back to String (to avoid having several toString() in the TimerTaskUpdaterView, when it can be done once in the method) adds d16f8d6 removed a duplicated try/catch in the sendUpdate() method adds 392d34d corrected update to synchronisation adds 283362d added an automatic synchronization (every min), currently synchronizes all the times of the tasks that have been modified since the last automatic sync. Sends all the times from creation date for now adds d41d0e1 minor changes (comments) adds 0ec3116 (minor) added timezone in json output (kept forgetting it) adds 09a46c6 corrected the json creation to deal with times added before the task's creation date (and be able to send them, that way) corrected the url creation in the synchronization adds 7962d8a changed name of parseSyncURL to parseSyncInfo (clearer) adds 0d8ac91 added the synchronizer to the config and started treating errors adds 12a5c2e removed useless tabs adds 8636440 minor typos corrected, set autosyncdelay to every two hours adds a1a81ad added the timezone as option in JTimerConfig, updated json creation accordingly adds 50a1fab added a check for empty tasksToSync adds 6a17f8f corrected firstdayofweek adds e068db8 removed a useless toString(), removed unused imports adds 6db4110 removed a check for empty url in synchronizeSingleTask as it is checked before the method is called (on the addition of tasks to the list to sync) adds 9a1555e changed syncURL to syncURLList, updated methods for sync accordingly adds 6cd63ea logs instead of stacktrace adds 033fa5d changed the signature of synchronizeTaskOnURL (removed TimerTask param) + documented method adds 40dcd7a corrected output of manual sync (was not sending the json at all) adds 325be32 cleaned up synchronizeTaskOnURL method adds acf7e13 removed timezone display in TimerTaskUpdaterView (useless) adds 917eba7 added a combobox in manual sync to pick which url to sync on adds 97bcca4 fix to display error message when the sync went wrong adds 4748cb8 edited to change update into synchronization adds 6f03ae4 disables send sync button when sync has been done once adds 4bf37eb added possibility to edit a url and adds it to the syncURLList of the task adds 1fd9626 added url shows up in combobox list adds 22c9fbd changed timestamp to remove milliseconds and standardized timezone to match iso adds 4663ae4 changed acceptance adds 831a2c5 corrected sent time (was sending milliseconds instead of seconds) adds cbe46a2 simplified code receiving adds cf626e7 major change: List<SyncInfo> added to TimerTask to store synchronization info adds 03be19d checking for response codes and sending error messages to user (if needed) adds ba2e1ce showing last sync associated with url picked in combobox adds 9832694 added a method to remove a sync URL, added more return codes. adds ee015fa removed the changes in the task editor (url no longer changed here) adds c7745ed removed an unused field (lastSync) in TimerTask, clarified some documentations adds 0441eec minor cleanup in methods adds 666d668 added a test for taskToJSONFormat adds bc0e7aa added a test on parseSyncInfo in GTimerIncrementalSaver adds ee8c1d3 added a checkbox for activity of url (not listening on it yet) adds 0606c67 added some logging (more to come) and added properties adds a0b0cdc corrected text on the checkbox isActiveSync adds 4d96253 added logs, made method synchronizeTaskOnURL static and returning an int adds 3f3eb51 when a url is deleted in the combobox, it's saved in the file adds df1422c deletion of url saved to sync file properly + corrected parsing of syncInfo adds 7baa9b5 surrounded log.debug to only generate if Debug is enabled adds 462d5df remove milliseconds of lastSyncTime from sync save file adds cf919e0 tests for addition/removal of SyncInfo in tasks adds 280206e checkbox for active sync showing up properly adds 4bebabf corrected a variable name adds f269eaf removed an unused method adds b799e6d adding a lastSync at the exit of jtimer adds 398309a 1488a94 modified json creation to not iterate on inactive urls, and optimized a little adds aad45ef modified the taskToJSONFormat method to include the current day adds 496b34a corrected all the imports with * adds 372caf2 corrected the title change not activating validation button in task editor adds 8dba28c New display of SyncInfo edition, with URL test button adds de218b6 adapted the combobox actions in the taskSyncInfo editor adds 0260856 corrected a double addition of urls in the synclist, edited some doc adds d2e1455 changed LocalDateTime type for last sync to Date, used YAML to save sync info adds 4c3886a display of lastSync adds c0ee777 clean up empty methods that were not necessary adds 7d0b936 documentation adds 81f6802 added a boolean to track syncAtStartUp needed adds a6cf316 added a yaml object to save syncInfos adds 702848b changed the syncatstartup boolean to be in the SyncInfo and not in the Task adds 81724c1 save of syncInfo with json instead of yaml (+ tests adapted) adds b79b74b removed useless declarations adds 140520c no longer adding syncInfo if the url is empty adds 2f92619 logs and corrected an actioncommand, removed useless null checks adds af8bae3 revert of the syncAtStartUp adds b708354 turned the jcombobox into a jtable for url edition adds 2d14fce date format in jtable display + width of cells adds d463288 included subtask times in time sent. adds 01169e7 in case of task merging with SyncInfo, added a warning message adds 4c6ab55 corrections for merge request adds dd7a312 corrected formatting and asserts adds 1c61069 removed unreachable case adds 9e7d6d2 changed component into scrollpane adds cbc3467 removed a useless line adds 51301e3 scrollpane on table and not whole frame adds e96d33f Fix layout adds 9155314 Merge branch 'feature/sync' into 'develop' adds b3d6b88 Prepare 1.6-alpha-1 release adds d2698ac Cleanup adds 20ebbf8 [jgitflow-maven-plugin]updating poms for 1.6-alpha-2-SNAPSHOT development adds 9abab07 Fix release adds b2c7bad [jgitflow-maven-plugin]updating poms for branch'release/1.6-alpha-1' with non-snapshot versions adds e30532c [jgitflow-maven-plugin]merging 'release/1.6-alpha-1' into 'master' No new revisions were added by this update. Summary of changes: 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(-) create mode 100644 src/main/java/org/chorem/jtimer/entities/SyncInfo.java create mode 100644 src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java rename src/main/java/org/chorem/jtimer/{ui => }/system/SystemInfo.java (84%) rename src/main/java/org/chorem/jtimer/{ui => }/system/SystemInfoFactory.java (74%) rename src/main/java/org/chorem/jtimer/{ui => }/system/macos/ApplicationServices.java (76%) rename src/main/java/org/chorem/jtimer/{ui => }/system/macos/MacOSSystemInfo.java (85%) rename src/main/java/org/chorem/jtimer/{ui => }/system/macos/package-info.java (88%) rename src/main/java/org/chorem/jtimer/{ui => }/system/package-info.java (89%) rename src/main/java/org/chorem/jtimer/{ui => }/system/unix/UnixSystemInfo.java (77%) rename src/main/java/org/chorem/jtimer/{ui => }/system/unix/X11.java (96%) rename src/main/java/org/chorem/jtimer/{ui => }/system/unix/Xss.java (96%) rename src/main/java/org/chorem/jtimer/{ui => }/system/unix/package-info.java (88%) rename src/main/java/org/chorem/jtimer/{ui => }/system/win32/Kernel32.java (97%) rename src/main/java/org/chorem/jtimer/{ui => }/system/win32/User32.java (97%) rename src/main/java/org/chorem/jtimer/{ui => }/system/win32/Win32SystemInfo.java (91%) rename src/main/java/org/chorem/jtimer/{ui => }/system/win32/package-info.java (88%) create mode 100644 src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java delete mode 100644 src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor.properties create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor_fr.properties rename src/test/java/org/chorem/jtimer/{ui => }/system/SystemInfoFactoryTest.java (70%) create mode 100644 src/test/resources/testdata/41.task create mode 100644 src/test/resources/testdata/41.task.sync -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.