July 2016 - Jtimer-commits - mailman.cloud.codelutin.com

branch feature/sync updated (2f92619 -> 2d14fce)
by chorem.org scm 20 Jul '16

20 Jul '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 2f92619 logs and corrected an actioncommand, removed useless null checks new af8bae3 revert of the syncAtStartUp new b708354 turned the jcombobox into a jtable for url edition new 2d14fce date format in jtable display + width of cells The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2d14fcefe71c28ec733b4a2ce396c7afa54890b9 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jul 20 10:13:26 2016 +0200 date format in jtable display + width of cells commit b7083543390046a16354a2038ef2df26498fd00c Author: servantie <servantie.c(a)gmail.com> Date: Tue Jul 19 17:09:52 2016 +0200 turned the jcombobox into a jtable for url edition commit af8bae33a37f2fb97a7283038b120a2b8884a410 Author: servantie <servantie.c(a)gmail.com> Date: Fri Jul 15 15:22:20 2016 +0200 revert of the syncAtStartUp Summary of changes: .../org/chorem/jtimer/data/DataEventListener.java | 16 +- .../java/org/chorem/jtimer/data/TimerCore.java | 30 -- .../org/chorem/jtimer/data/TimerDataManager.java | 20 - .../java/org/chorem/jtimer/entities/SyncInfo.java | 18 - .../java/org/chorem/jtimer/entities/TimerTask.java | 33 +- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 10 - .../chorem/jtimer/io/TimerTaskSynchronizer.java | 29 -- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 475 +++++++++++---------- .../resources/TimerTaskSyncInfoEditor.properties | 12 +- .../TimerTaskSyncInfoEditor_fr.properties | 15 +- 10 files changed, 269 insertions(+), 389 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch feature/sync updated (81724c1 -> 2f92619)
by chorem.org scm 15 Jul '16

15 Jul '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 81724c1 save of syncInfo with json instead of yaml (+ tests adapted) new b79b74b removed useless declarations new 140520c no longer adding syncInfo if the url is empty new 2f92619 logs and corrected an actioncommand, removed useless null checks The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2f926190b295b680ae3f05cca5e80279e02bd42c Author: servantie <servantie.c(a)gmail.com> Date: Fri Jul 15 10:03:51 2016 +0200 logs and corrected an actioncommand, removed useless null checks commit 140520c03e4ecf00ab5c5907d59b12d638fe5ce7 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jul 13 12:10:39 2016 +0200 no longer adding syncInfo if the url is empty commit b79b74bde56cbfc4c3e25efb95ed47da07c64f59 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jul 13 11:50:09 2016 +0200 removed useless declarations Summary of changes: .../java/org/chorem/jtimer/data/TimerCore.java | 5 +++- .../java/org/chorem/jtimer/entities/SyncInfo.java | 6 ---- .../java/org/chorem/jtimer/entities/TimerTask.java | 9 +++--- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 1 - .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 33 ++++++++++++---------- 5 files changed, 26 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

branch feature/sync updated (4c3886a -> 81724c1)
by chorem.org scm 13 Jul '16

13 Jul '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 4c3886a display of lastSync new c0ee777 clean up empty methods that were not necessary new 7d0b936 documentation new 81f6802 added a boolean to track syncAtStartUp needed new a6cf316 added a yaml object to save syncInfos new 702848b changed the syncatstartup boolean to be in the SyncInfo and not in the Task new 81724c1 save of syncInfo with json instead of yaml (+ tests adapted) The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 81724c16cfc5a7d15bd6283d96fa0aac9dce176f Author: servantie <servantie.c(a)gmail.com> Date: Tue Jul 12 14:07:47 2016 +0200 save of syncInfo with json instead of yaml (+ tests adapted) corrected some mistakes (not listening to the checkboxes properly, information wasn't saved unless some other change was made) commit 702848b51ef0a38618eaee2a49ce893f6d5c8e0e Author: servantie <servantie.c(a)gmail.com> Date: Mon Jul 11 12:04:33 2016 +0200 changed the syncatstartup boolean to be in the SyncInfo and not in the Task commit a6cf316d920379d6d3d2027c23d008f73b1ebb16 Author: servantie <servantie.c(a)gmail.com> Date: Mon Jul 11 11:14:08 2016 +0200 added a yaml object to save syncInfos commit 81f68029dfa606e0e0fd7c715cb4f7eca6bc7708 Author: servantie <servantie.c(a)gmail.com> Date: Fri Jul 8 11:55:11 2016 +0200 added a boolean to track syncAtStartUp needed commit 7d0b9363ca46e955fae4f4523e8b8a5ff81a7a7b Author: servantie <servantie.c(a)gmail.com> Date: Fri Jul 8 10:21:29 2016 +0200 documentation commit c0ee777e7d3a9508ca886b1f5afb3d630abcfc7a Author: servantie <servantie.c(a)gmail.com> Date: Fri Jul 8 09:51:18 2016 +0200 clean up empty methods that were not necessary Summary of changes: .../org/chorem/jtimer/data/CommonVetoable.java | 8 - .../org/chorem/jtimer/data/DataEventListener.java | 17 +- .../java/org/chorem/jtimer/data/TimerCore.java | 26 +++ .../org/chorem/jtimer/data/TimerDataManager.java | 27 ++- .../jtimer/data/VetoableDataEventListener.java | 9 - .../java/org/chorem/jtimer/entities/SyncInfo.java | 18 ++ .../java/org/chorem/jtimer/entities/TimerTask.java | 32 +++- .../chorem/jtimer/entities/TimerTaskHelper.java | 26 ++- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 75 +++++--- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 188 +++++++++------------ src/main/java/org/chorem/jtimer/ui/StatusBar.java | 3 - .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 17 +- .../jtimer/entities/TimerTaskHelperTest.java | 8 +- .../jtimer/io/GTimerIncrementalSaverTest.java | 3 +- src/test/resources/testdata/41.task.sync | 15 +- 15 files changed, 295 insertions(+), 177 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 6

branch feature/sync updated (31ba1e9 -> 4c3886a)
by chorem.org scm 07 Jul '16

07 Jul '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git discards 31ba1e9 New display of SyncInfo edition, with URL test button discards 4cdc4fb corrected the title change not activating validation button in task editor discards 68a6cc9 corrected all the imports with * discards 162928d modified the taskToJSONFormat method to include the current day discards ee05750 1488a94 modified json creation to not iterate on inactive urls, and optimized a little discards d8f9541 adding a lastSync at the exit of jtimer discards 065aaf9 removed an unused method discards eec2299 corrected a variable name discards c719c22 checkbox for active sync showing up properly discards b03cc9a tests for addition/removal of SyncInfo in tasks discards 4588ea2 remove milliseconds of lastSyncTime from sync save file discards 362b361 surrounded log.debug to only generate if Debug is enabled discards 09f14bd deletion of url saved to sync file properly + corrected parsing of syncInfo discards 2d9e642 when a url is deleted in the combobox, it's saved in the file discards 7d1d920 checking the isActive checkbox de/activates the sync on the url chosen discards e2106d5 added logs, made method synchronizeTaskOnURL static and returning an int discards bf43b49 corrected text on the checkbox isActiveSync discards f3431bc added some logging (more to come) and added properties discards 9db7005 added a checkbox for activity of url (not listening on it yet) discards 5506ddb added a test on parseSyncInfo in GTimerIncrementalSaver discards 7aee74f added a test for taskToJSONFormat discards 2a0e547 minor cleanup in methods discards 9d74422 removed an unused field (lastSync) in TimerTask, clarified some documentations discards 90cb72f removed the changes in the task editor (url no longer changed here) discards 995179e added a method to remove a sync URL, added more return codes. discards bb81588 showing last sync associated with url picked in combobox discards 30d6c44 checking for response codes and sending error messages to user (if needed) discards 5dbad0a major change: List<SyncInfo> added to TimerTask to store synchronization info discards 4253a46 simplified code receiving discards 2ba81c9 corrected sent time (was sending milliseconds instead of seconds) discards 7ca1419 changed acceptance discards 2524961 changed timestamp to remove milliseconds and standardized timezone to match iso discards 47ce041 added url shows up in combobox list discards d9b3a17 added possibility to edit a url and adds it to the syncURLList of the task discards 8720f1d disables send sync button when sync has been done once discards 2635e0d edited to change update into synchronization discards 3cda6fb fix to display error message when the sync went wrong discards 10eaac3 added a combobox in manual sync to pick which url to sync on discards 0a0946b removed timezone display in TimerTaskUpdaterView (useless) discards 8dd4914 cleaned up synchronizeTaskOnURL method discards a1ed187 corrected output of manual sync (was not sending the json at all) discards e644144 changed the signature of synchronizeTaskOnURL (removed TimerTask param) + documented method discards d31583a logs instead of stacktrace discards 72dbf0a changed syncURL to syncURLList, updated methods for sync accordingly discards 5bc2777 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) discards 6eae5ab removed a useless toString(), removed unused imports discards 19655c6 corrected firstdayofweek discards 62f6e70 added a check for empty tasksToSync discards 66dee36 added the timezone as option in JTimerConfig, updated json creation accordingly discards aeb5909 minor typos corrected, set autosyncdelay to every two hours discards 2c25465 removed useless tabs discards 83614a5 added the synchronizer to the config and started treating errors discards 45ddb6e changed name of parseSyncURL to parseSyncInfo (clearer) discards d6dd1a0 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 discards 140eb26 (minor) added timezone in json output (kept forgetting it) discards 62a42e9 minor changes (comments) discards f31cbed 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 discards 089074f corrected update to synchronisation discards 1a9ed28 removed a duplicated try/catch in the sendUpdate() method discards 2ec9c11 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) discards 431e815 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) discards b8e6eb5 removed a useless comment discards 49c2fb6 added an error message if the update isn't done, asking to check for url discards a774a64 saving synchronisation time when update successful discards 624a2ef be able to pick previous month and current month for update with a button discards b8b27e2 displayed the checkbox to include annotations with the update, includes it in the update if checked. discards eacb097 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 discards fbe0fc5 showing an info log when receiving a 200 OK after an update. small typo correction in properties file discards 5790868 small typo corrected with " at the wrong places or missing in the json output discards 3708b2b corrected method for getting times that was ignoring the date parameters and always sending all the times of a task discards d63c6c1 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 discards 1f186b5 "use of simpler json format, sends update request to url when url is changed with the json of the task." discards 8edf5d3 Display of a task after edition of url in prettified json format methods to jsonify and then prettify a task (small typo edit) discards 82d8d45 Added synchronisation date changes (forgotten) discards 4cea3f8 Adding a check on the parser for empty url strings discards df3c9e7 Synchronising URL and time of last synchronisation added to Timer Task Display of synchronising URL added to TimerTaskEditor +events to deal with editing of synchronising URL Parsing and saving to [taskname.task].sync file of synchronising information 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 new b342e9e "use of simpler json format, sends update request to url when url is changed with the json of the task." new 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 new ca9fd6f corrected method for getting times that was ignoring the date parameters and always sending all the times of a task new 59ff4b7 small typo corrected with " at the wrong places or missing in the json output new b65ba97 showing an info log when receiving a 200 OK after an update. small typo correction in properties file new 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 new 5249bb5 displayed the checkbox to include annotations with the update, includes it in the update if checked. new 34fb354 be able to pick previous month and current month for update with a button new 8793f5b saving synchronisation time when update successful new 3cbcd20 added an error message if the update isn't done, asking to check for url new 62133e8 removed a useless comment new 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) new 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) new d16f8d6 removed a duplicated try/catch in the sendUpdate() method new 392d34d corrected update to synchronisation new 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 new d41d0e1 minor changes (comments) new 0ec3116 (minor) added timezone in json output (kept forgetting it) new 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 new 7962d8a changed name of parseSyncURL to parseSyncInfo (clearer) new 0d8ac91 added the synchronizer to the config and started treating errors new 12a5c2e removed useless tabs new 8636440 minor typos corrected, set autosyncdelay to every two hours new a1a81ad added the timezone as option in JTimerConfig, updated json creation accordingly new 50a1fab added a check for empty tasksToSync new 6a17f8f corrected firstdayofweek new e068db8 removed a useless toString(), removed unused imports new 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) new 9a1555e changed syncURL to syncURLList, updated methods for sync accordingly new 6cd63ea logs instead of stacktrace new 033fa5d changed the signature of synchronizeTaskOnURL (removed TimerTask param) + documented method new 40dcd7a corrected output of manual sync (was not sending the json at all) new 325be32 cleaned up synchronizeTaskOnURL method new acf7e13 removed timezone display in TimerTaskUpdaterView (useless) new 917eba7 added a combobox in manual sync to pick which url to sync on new 97bcca4 fix to display error message when the sync went wrong new 4748cb8 edited to change update into synchronization new 6f03ae4 disables send sync button when sync has been done once new 4bf37eb added possibility to edit a url and adds it to the syncURLList of the task new 1fd9626 added url shows up in combobox list new 22c9fbd changed timestamp to remove milliseconds and standardized timezone to match iso new 4663ae4 changed acceptance new 831a2c5 corrected sent time (was sending milliseconds instead of seconds) new cbe46a2 simplified code receiving new cf626e7 major change: List<SyncInfo> added to TimerTask to store synchronization info new 03be19d checking for response codes and sending error messages to user (if needed) new ba2e1ce showing last sync associated with url picked in combobox new 9832694 added a method to remove a sync URL, added more return codes. new ee015fa removed the changes in the task editor (url no longer changed here) new c7745ed removed an unused field (lastSync) in TimerTask, clarified some documentations new 0441eec minor cleanup in methods new 666d668 added a test for taskToJSONFormat new bc0e7aa added a test on parseSyncInfo in GTimerIncrementalSaver new ee8c1d3 added a checkbox for activity of url (not listening on it yet) new 0606c67 added some logging (more to come) and added properties new a0b0cdc corrected text on the checkbox isActiveSync new 4d96253 added logs, made method synchronizeTaskOnURL static and returning an int new 3f3eb51 when a url is deleted in the combobox, it's saved in the file new df1422c deletion of url saved to sync file properly + corrected parsing of syncInfo new 7baa9b5 surrounded log.debug to only generate if Debug is enabled new 462d5df remove milliseconds of lastSyncTime from sync save file new cf919e0 tests for addition/removal of SyncInfo in tasks new 280206e checkbox for active sync showing up properly new 4bebabf corrected a variable name new f269eaf removed an unused method new b799e6d adding a lastSync at the exit of jtimer new 398309a 1488a94 modified json creation to not iterate on inactive urls, and optimized a little new aad45ef modified the taskToJSONFormat method to include the current day new 496b34a corrected all the imports with * new 372caf2 corrected the title change not activating validation button in task editor new 8dba28c New display of SyncInfo edition, with URL test button new de218b6 adapted the combobox actions in the taskSyncInfo editor new 0260856 corrected a double addition of urls in the synclist, edited some doc new d2e1455 changed LocalDateTime type for last sync to Date, used YAML to save sync info new 4c3886a display of lastSync This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (31ba1e9) \ N -- N -- N refs/heads/feature/sync (4c3886a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 75 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4c3886a652a9864d805fd0468ceb66020110a71f Author: servantie <servantie.c(a)gmail.com> Date: Thu Jul 7 15:43:46 2016 +0200 display of lastSync commit d2e14551e26cf9459cdb38d46cb748041253a915 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jul 7 14:23:29 2016 +0200 changed LocalDateTime type for last sync to Date, used YAML to save sync info adapted test file to comply with yaml output commit 0260856f2f650a1fd0eef4f21ec129e789d69f65 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jul 6 15:06:20 2016 +0200 corrected a double addition of urls in the synclist, edited some doc commit de218b66c1984081a9deff704f3bdb6b5b2c5ef8 Author: servantie <servantie.c(a)gmail.com> Date: Tue Jul 5 14:53:32 2016 +0200 adapted the combobox actions in the taskSyncInfo editor commit 8dba28cb1330e9c4b54f840a60935fe57b116e35 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 30 15:49:29 2016 +0200 New display of SyncInfo edition, with URL test button commit 372caf2bbb184c4332cb0cbd30239032072e4035 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 29 17:54:00 2016 +0200 corrected the title change not activating validation button in task editor commit 496b34a6a97d9e02aa352c04bc81708764a32a88 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 29 17:45:17 2016 +0200 corrected all the imports with * commit aad45effbef54c77f9b3273c234d50dcc1a2417f Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 29 16:33:33 2016 +0200 modified the taskToJSONFormat method to include the current day commit 398309a950488ca3bf0be26ae2b4c497be4ee708 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 29 15:18:59 2016 +0200 1488a94 modified json creation to not iterate on inactive urls, and optimized a little commit b799e6daa2a419de9a48c5c0ad132782c1d1c865 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 29 11:58:27 2016 +0200 adding a lastSync at the exit of jtimer (syncs the tasks that have been added to the synchronizer for one last time) commit f269eaffd16fc28512ef342572b643332b70bb0d Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 27 10:11:11 2016 +0200 removed an unused method commit 4bebabf2f4a7c1e9f6f9e8b9732817f33748a1cb Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 27 09:48:44 2016 +0200 corrected a variable name commit 280206e7b9a3fade902584cffc75ff9de4baad8e Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 24 15:14:29 2016 +0200 checkbox for active sync showing up properly commit cf919e0de7d4e901ed204570262cb1fff558550b Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 23 18:05:35 2016 +0200 tests for addition/removal of SyncInfo in tasks commit 462d5dfeece1bbf0e38fa0e4a1718431103e4786 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 23 11:42:54 2016 +0200 remove milliseconds of lastSyncTime from sync save file commit 7baa9b58b47f172775343ad51bac60eb8a5d6c5b Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 23 11:19:04 2016 +0200 surrounded log.debug to only generate if Debug is enabled commit df1422c476a44effea2069d630c5e9841549c2d3 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 22 17:52:52 2016 +0200 deletion of url saved to sync file properly + corrected parsing of syncInfo (catching a DateTimeParseException, and taking a 00:00:00 instead of 00:00:00.000 format) commit 3f3eb51b8bf0272ce35eed3cc5c324135bad9317 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 22 16:28:55 2016 +0200 when a url is deleted in the combobox, it's saved in the file commit 4d96253b49200b2696aabca6687f937a26f40e42 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 22 16:38:43 2016 +0200 added logs, made method synchronizeTaskOnURL static and returning an int (http response) commit a0b0cdcb3aa2f7ac277d306e32201b3f935285d8 Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 21 17:47:53 2016 +0200 corrected text on the checkbox isActiveSync commit 0606c67de0f8a58ccf9709c10bfffe8ad8396662 Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 21 17:27:12 2016 +0200 added some logging (more to come) and added properties commit ee8c1d395231f102526d49f5eea7f4dc11d79988 Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 21 14:49:18 2016 +0200 added a checkbox for activity of url (not listening on it yet) commit bc0e7aabbb4d8b2d6bb164af0582b0200b5ca192 Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 21 11:20:58 2016 +0200 added a test on parseSyncInfo in GTimerIncrementalSaver commit 666d668de79b3f2989a049f94dc0f7fe38fe46bd Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 21 10:27:46 2016 +0200 added a test for taskToJSONFormat commit 0441eec8a8908ff54d8200b8c801a6d90e2eb707 Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 20 16:45:26 2016 +0200 minor cleanup in methods commit c7745ed439e8018c6360abb1c1c488ee41f0c349 Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 20 11:44:32 2016 +0200 removed an unused field (lastSync) in TimerTask, clarified some documentations commit ee015fa31758ca1048beec8822cfa10e90aef1a5 Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 17 11:34:00 2016 +0200 removed the changes in the task editor (url no longer changed here) commit 983269415b8a8588d7a4e5f13a44944460518e0f Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 17 10:38:34 2016 +0200 added a method to remove a sync URL, added more return codes. commit ba2e1ce02a5e477ceb1b14ccf1bf0e3e07ffb18d Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 16 15:02:07 2016 +0200 showing last sync associated with url picked in combobox commit 03be19d38c41fb4ea7425f1eac360c417099dfc9 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 16 10:38:10 2016 +0200 checking for response codes and sending error messages to user (if needed) commit cf626e7e021add91527984f3c00b94bfb8d94e61 Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 14 12:00:08 2016 +0200 major change: List<SyncInfo> added to TimerTask to store synchronization info updated parsing/saving methods to adapt to SyncInfo commit cbe46a22bc69bc33c21ac4be743456aec0d42448 Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 14 11:43:38 2016 +0200 simplified code receiving commit 831a2c52a3c3bedb615a993511b7b73d5cab905f Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 13 14:56:37 2016 +0200 corrected sent time (was sending milliseconds instead of seconds) commit 4663ae4b32739f1006215d4b3c144d21707d62b1 Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 13 14:20:25 2016 +0200 changed acceptance commit 22c9fbd23a76c9da9a9ed111aa3562b24bc81ac7 Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 13 12:35:15 2016 +0200 changed timestamp to remove milliseconds and standardized timezone to match iso commit 1fd962667579c5ce23891a1971988a4cd3ab37dd Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 13 10:39:36 2016 +0200 added url shows up in combobox list commit 4bf37eb06dc9bf13e047a32e2df6deb142ef7dda Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 10 11:10:54 2016 +0200 added possibility to edit a url and adds it to the syncURLList of the task (not updated in the combobox yet, but saved) commit 6f03ae4e3303e666bcf7d00d64c68edd02fbc376 Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 10 10:18:24 2016 +0200 disables send sync button when sync has been done once commit 4748cb86badaa61b235589bf1a967dd1547e4cbb Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 10 09:54:08 2016 +0200 edited to change update into synchronization commit 97bcca40456cd3be1661ede9fc19105fb3973539 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 9 17:57:32 2016 +0200 fix to display error message when the sync went wrong commit 917eba7f1f90a18a858d475e3dd05eec2211d8d6 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 9 16:25:23 2016 +0200 added a combobox in manual sync to pick which url to sync on (if one sync fails, pop up shows to say so, but textarea isn't updated on "generate update" button pressing) commit acf7e13705191f57ee7f9996928f288193143645 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 9 15:15:58 2016 +0200 removed timezone display in TimerTaskUpdaterView (useless) commit 325be3227e7281d7751b1e32603767fa8ae05b39 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 9 14:43:41 2016 +0200 cleaned up synchronizeTaskOnURL method commit 40dcd7a1e432840bc3c9653f1e231ceb556619dc Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 9 12:01:13 2016 +0200 corrected output of manual sync (was not sending the json at all) commit 033fa5dac11882cea7fd021f836e0f126afe7e0e Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 9 10:59:52 2016 +0200 changed the signature of synchronizeTaskOnURL (removed TimerTask param) + documented method commit 6cd63ea15575b77ad520169f3d77a15902efb3ba Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 8 16:45:51 2016 +0200 logs instead of stacktrace commit 9a1555e0af209f6dc507f4861a1c79ac5273f2fc Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 8 15:56:18 2016 +0200 changed syncURL to syncURLList, updated methods for sync accordingly commit 6db411056180bdd1f62fc61e11c84bcac09b2fd2 Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 8 10:00:30 2016 +0200 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) commit e068db82dc6fc337cea7c94173d6dae125c0c0af Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 7 16:31:23 2016 +0200 removed a useless toString(), removed unused imports commit 6a17f8f2a2e58a9829e87ab756fafe8de8516406 Author: servantie <servantie.c(a)gmail.com> Date: Tue Jun 7 14:47:41 2016 +0200 corrected firstdayofweek commit 50a1fab1d3bfe117a10b547aef90915fc8e6d787 Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 6 13:55:14 2016 +0200 added a check for empty tasksToSync commit a1a81ad675676c9332a26266ee33bd9e1c599ca4 Author: servantie <servantie.c(a)gmail.com> Date: Mon Jun 6 11:25:44 2016 +0200 added the timezone as option in JTimerConfig, updated json creation accordingly commit 8636440c05c1d3d2fede0057a58b21582e29a0c9 Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 3 17:24:03 2016 +0200 minor typos corrected, set autosyncdelay to every two hours commit 12a5c2e37bdaae9f960e4f96da27d8515b8bbcaf Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 3 16:35:15 2016 +0200 removed useless tabs commit 0d8ac912509ed4f7394e99d03f3cc6c95b430a98 Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 3 15:19:06 2016 +0200 added the synchronizer to the config and started treating errors commit 7962d8afda634907fb7c411eda4fbe04a00b5d01 Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 3 11:15:30 2016 +0200 changed name of parseSyncURL to parseSyncInfo (clearer) commit 09a46c6a29ec59af2f0ba6ebae8b12a75354c4da Author: servantie <servantie.c(a)gmail.com> Date: Fri Jun 3 09:52:06 2016 +0200 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 commit 0ec31167fb7a38fd3a7c9f8f4bcae1dfaa39d6ce Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 2 17:47:05 2016 +0200 (minor) added timezone in json output (kept forgetting it) commit d41d0e1d706fee32c91c73f7778186bc5bb0e99a Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 2 17:44:41 2016 +0200 minor changes (comments) commit 283362d7320c98a48ff9cbc100d0730c79768bb1 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 2 17:34:13 2016 +0200 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 commit 392d34dfbd436eb04a69af8cd2017ec97b5ae8fd Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 1 14:40:52 2016 +0200 corrected update to synchronisation commit d16f8d68bd6d68659c78cb8a7da222f0ccc218fb Author: servantie <servantie.c(a)gmail.com> Date: Mon May 23 17:36:50 2016 +0200 removed a duplicated try/catch in the sendUpdate() method commit 84fa2a13c050c8c275786c79481f1749ce3d0859 Author: servantie <servantie.c(a)gmail.com> Date: Mon May 23 17:20:24 2016 +0200 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) commit 16cb34765159069459e814f84b940f3f67bcbe2b Author: servantie <servantie.c(a)gmail.com> Date: Mon May 23 17:15:04 2016 +0200 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) commit 62133e8f2ca86866586c7e6c260b6d5ccd2dc54e Author: servantie <servantie.c(a)gmail.com> Date: Fri May 20 17:47:10 2016 +0200 removed a useless comment commit 3cbcd20b9aca4e243d190e0bf46c287ed6d885ac Author: servantie <servantie.c(a)gmail.com> Date: Fri May 20 11:41:53 2016 +0200 added an error message if the update isn't done, asking to check for url commit 8793f5b2a95f894b72cc606e79aaacaeb12e6c82 Author: servantie <servantie.c(a)gmail.com> Date: Fri May 20 09:48:12 2016 +0200 saving synchronisation time when update successful commit 34fb3544605bc89d2c8dbc6b3403f64cc5920733 Author: servantie <servantie.c(a)gmail.com> Date: Thu May 19 16:06:24 2016 +0200 be able to pick previous month and current month for update with a button commit 5249bb573725847edd58afb1fe57984be0e090db Author: servantie <servantie.c(a)gmail.com> Date: Thu May 19 10:57:29 2016 +0200 displayed the checkbox to include annotations with the update, includes it in the update if checked. commit fc44c09c7adab4e5597c382998feb595a5ba090d Author: servantie <servantie.c(a)gmail.com> Date: Wed May 18 17:33:52 2016 +0200 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 commit b65ba97a8017dedafae07939811e0a66160c3978 Author: servantie <servantie.c(a)gmail.com> Date: Wed May 18 16:04:40 2016 +0200 showing an info log when receiving a 200 OK after an update. small typo correction in properties file commit 59ff4b7949e4adf25804bca9e475210e1099372c Author: servantie <servantie.c(a)gmail.com> Date: Wed May 18 10:07:43 2016 +0200 small typo corrected with " at the wrong places or missing in the json output commit ca9fd6f2f7517e72d5d0994f6d3852a6260a2be9 Author: servantie <servantie.c(a)gmail.com> Date: Wed May 18 09:53:29 2016 +0200 corrected method for getting times that was ignoring the date parameters and always sending all the times of a task commit 9ccd7748005256d715919b297623e8f1fdc8520e Author: servantie <servantie.c(a)gmail.com> Date: Tue May 17 14:27:32 2016 +0200 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 commit b342e9ef3465ea90450855941e4940344a2f03ea Author: servantie <servantie.c(a)gmail.com> Date: Tue May 10 11:30:43 2016 +0200 "use of simpler json format, sends update request to url when url is changed with the json of the task." Summary of changes: pom.xml | 12 +- src/license/THIRD-PARTY.properties | 19 + src/main/java/org/chorem/jtimer/JTimer.java | 26 +- src/main/java/org/chorem/jtimer/JTimerFactory.java | 4 +- .../org/chorem/jtimer/data/CommonVetoable.java | 147 ++----- .../org/chorem/jtimer/data/DataEventListener.java | 117 +++-- .../java/org/chorem/jtimer/data/TimerCore.java | 5 +- .../org/chorem/jtimer/data/TimerDataManager.java | 11 +- .../jtimer/data/VetoableDataEventListener.java | 90 ++-- .../java/org/chorem/jtimer/entities/SyncInfo.java | 52 ++- .../org/chorem/jtimer/entities/TimerAlert.java | 13 +- .../java/org/chorem/jtimer/entities/TimerTask.java | 25 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 53 ++- .../java/org/chorem/jtimer/io/AbstractSaver.java | 43 +- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 471 +++++---------------- .../java/org/chorem/jtimer/io/GTimerTimeUtil.java | 13 +- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 4 +- .../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 | 95 +---- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 22 +- .../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 | 109 +++-- .../ui/system/UnsupportedSystemInfoException.java | 66 --- .../chorem/jtimer/ui/systray/SystrayManager.java | 205 +-------- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 6 +- .../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 | 104 +---- .../ProjectsAndTasksRunningCellRenderer.java | 129 ------ .../ui/treetable/dnd/TimerTaskTranferable.java | 13 +- .../chorem/jtimer/ui/widget/DurationEditor.java | 6 +- .../chorem/jtimer/ui/widget/JPopupTrayIcon.java | 39 +- .../org/chorem/jtimer/io/AbstractSaverTest.java | 13 +- .../jtimer/io/GTimerIncrementalSaverTest.java | 76 +++- .../{ui => }/system/SystemInfoFactoryTest.java | 22 +- .../chorem/jtimer/utils/DailySortedMapTest.java | 6 +- src/test/resources/testdata/0.task | 1 + src/test/resources/testdata/41.task.sync | 9 +- 59 files changed, 784 insertions(+), 1611 deletions(-) create mode 100644 src/license/THIRD-PARTY.properties 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%) delete mode 100644 src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java rename src/test/java/org/chorem/jtimer/{ui => }/system/SystemInfoFactoryTest.java (70%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 61

17/75: minor changes (comments)
by chorem.org scm 07 Jul '16

07 Jul '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit d41d0e1d706fee32c91c73f7778186bc5bb0e99a Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 2 17:44:41 2016 +0200 minor changes (comments) --- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 100 ++++++++++++--------- 1 file changed, 56 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java index d254548..05e716a 100644 --- a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -28,7 +28,6 @@ public class TimerTaskSynchronizer implements DataEventListener { /** auto sync delay */ protected int autoSyncDelay = 1000 * 60; //1min for testing purposes - /** timer to schedule syncs */ protected Timer timer; @@ -38,7 +37,6 @@ public class TimerTaskSynchronizer implements DataEventListener { /** Tasks to sync */ protected Collection<TimerTask> tasksToSync; - public TimerTaskSynchronizer(TimerCore core) { timer = new Timer(); @@ -47,17 +45,24 @@ public class TimerTaskSynchronizer implements DataEventListener { this.core = core; - tasksToSync = Collections.synchronizedCollection(new ArrayList<>()); } - + /** + * Change the autosync delay + * @param autoSyncDelay + */ public void setAutoSyncDelay(int autoSyncDelay) { if (autoSyncDelay>0) { this.autoSyncDelay = autoSyncDelay; } } + + /** + * Inner Task class to make the automatic sync + */ protected class UpdateTask extends java.util.TimerTask { + public void run() { if (log.isDebugEnabled()) { log.debug("Synchronizer wake up"); @@ -65,7 +70,9 @@ public class TimerTaskSynchronizer implements DataEventListener { synchronizeTasks(); } - + /** + * synchronizes Tasks in remainingTasks + */ public void synchronizeTasks(){ synchronized (tasksToSync) { @@ -95,33 +102,33 @@ public class TimerTaskSynchronizer implements DataEventListener { * * @param task */ - public boolean synchronizeSingleTask(TimerTask task){ - String updateJsonString = TimerTaskHelper.taskToJSONFormat(task, false).toString(); - String syncURl = task.getSynchronisingURL(); - String charset = "UTF-8"; - HttpURLConnection connection = null; - URL url = null; - try { - url = new URL("http://" + syncURl); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - try { - connection = (HttpURLConnection) url.openConnection(); - } catch (IOException e) { - e.printStackTrace(); - } - connection.setUseCaches(false); - connection.setDoInput(true); - connection.setDoOutput(true); - connection.setRequestProperty("Content-Length", "" + updateJsonString.length()); - connection.setRequestProperty("Accept-Charset", charset); - connection.setRequestProperty("Content-Type", "application/json"); - try { - connection.setRequestMethod("POST"); - } catch (ProtocolException e) { - e.printStackTrace(); - } + public boolean synchronizeSingleTask(TimerTask task) { + String updateJsonString = TimerTaskHelper.taskToJSONFormat(task, false).toString(); + String syncURl = task.getSynchronisingURL(); + String charset = "UTF-8"; + HttpURLConnection connection = null; + URL url = null; + try { + url = new URL("http://" + syncURl); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + try { + connection = (HttpURLConnection) url.openConnection(); + } catch (IOException e) { + e.printStackTrace(); + } + connection.setUseCaches(false); + connection.setDoInput(true); + connection.setDoOutput(true); + connection.setRequestProperty("Content-Length", "" + updateJsonString.length()); + connection.setRequestProperty("Accept-Charset", charset); + connection.setRequestProperty("Content-Type", "application/json"); + try { + connection.setRequestMethod("POST"); + } catch (ProtocolException e) { + e.printStackTrace(); + } byte[] postDataBytes = new byte[0]; try { postDataBytes = updateJsonString.toString().getBytes("UTF-8"); @@ -133,7 +140,6 @@ public class TimerTaskSynchronizer implements DataEventListener { } catch (IOException e) { e.printStackTrace(); } - //get the header fields Map<String, List<String>> map = connection.getHeaderFields(); boolean hasUpdated = false; @@ -148,21 +154,13 @@ public class TimerTaskSynchronizer implements DataEventListener { if (hasUpdated) { task.setLastSync(LocalDateTime.now()); return true; - } else { log.error("Sync error, wrong URL?"); return false; - } - - } - - - - @Override public void addProject(TimerProject project) { @@ -177,6 +175,10 @@ public class TimerTaskSynchronizer implements DataEventListener { } + /** + * Tasks are added to synchronization list when modified + * @param task modified task + */ @Override public void modifyTask(TimerTask task) { //when a task is modified, add it to the to sync list (if it isn't already there= @@ -189,12 +191,14 @@ public class TimerTaskSynchronizer implements DataEventListener { public void deleteProject(TimerProject project) { } - + /** + * Tasks deleted are modified from synchronization list if they exist in it + * @param task modified task + */ @Override public void deleteTask(TimerTask task) { if (tasksToSync.contains(task)) { tasksToSync.remove(task); - } } @@ -235,7 +239,10 @@ public class TimerTaskSynchronizer implements DataEventListener { @Override public void startTask(TimerTask task) { } - + /** + * Tasks are added to synchronization list when stopped + * @param task modified task + */ @Override public void stopTask(TimerTask task) { if(!tasksToSync.contains(task)) { @@ -248,6 +255,11 @@ public class TimerTaskSynchronizer implements DataEventListener { } + /** + * Tasks are added to synchronization list when the URL is updated + * + * @param task modified task + */ @Override public void modifyTaskURL(TimerTask task, String newURL) { if(!tasksToSync.contains(task) && (!task.getSynchronisingURL().equals(null))) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

16/75: 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
by chorem.org scm 07 Jul '16

07 Jul '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 283362d7320c98a48ff9cbc100d0730c79768bb1 Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 2 17:34:13 2016 +0200 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 --- .../java/org/chorem/jtimer/data/TimerCore.java | 10 + .../chorem/jtimer/io/TimerTaskSynchronizer.java | 262 +++++++++++++++++++++ 2 files changed, 272 insertions(+) diff --git a/src/main/java/org/chorem/jtimer/data/TimerCore.java b/src/main/java/org/chorem/jtimer/data/TimerCore.java index da6150a..a917f93 100644 --- a/src/main/java/org/chorem/jtimer/data/TimerCore.java +++ b/src/main/java/org/chorem/jtimer/data/TimerCore.java @@ -37,6 +37,7 @@ import org.chorem.jtimer.JTimerFactory; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.io.DataLockingException; import org.chorem.jtimer.io.Saver; +import org.chorem.jtimer.io.TimerTaskSynchronizer; /** * TimerCore @@ -58,6 +59,9 @@ public class TimerCore { /** saver io controller. */ protected Saver saver; + /** sync */ + protected TimerTaskSynchronizer synchronizer; + /** * Constructor. */ @@ -86,6 +90,12 @@ public class TimerCore { data.addDataEventListener(saver); } + //init sync + synchronizer = new TimerTaskSynchronizer(this); + if (synchronizer != null) { + data.addDataEventListener(synchronizer); + } + } /** diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java new file mode 100644 index 0000000..d254548 --- /dev/null +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -0,0 +1,262 @@ +package org.chorem.jtimer.io; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.jtimer.data.DataEventListener; +import org.chorem.jtimer.data.TimerCore; +import org.chorem.jtimer.entities.TimerProject; +import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.entities.TimerTaskHelper; + +import java.io.*; +import java.net.*; +import java.time.LocalDateTime; +import java.util.*; +import java.util.Timer; + +/** + * + * Class dealing with automated synchronization of tasks + * + * Created by servantie on 01/06/16. + */ +public class TimerTaskSynchronizer implements DataEventListener { + + /** log */ + private static Log log = LogFactory.getLog(TimerTaskSynchronizer.class); + + /** auto sync delay */ + protected int autoSyncDelay = 1000 * 60; //1min for testing purposes + + + /** timer to schedule syncs */ + protected Timer timer; + + /** timer core (to retrieve tasks) */ + protected TimerCore core; + + /** Tasks to sync */ + protected Collection<TimerTask> tasksToSync; + + + public TimerTaskSynchronizer(TimerCore core) { + + timer = new Timer(); + timer.schedule(new UpdateTask(), autoSyncDelay, autoSyncDelay); + log.info("Starting synchronising thread"); + + this.core = core; + + + tasksToSync = Collections.synchronizedCollection(new ArrayList<>()); + } + + + public void setAutoSyncDelay(int autoSyncDelay) { + if (autoSyncDelay>0) { + this.autoSyncDelay = autoSyncDelay; + } + } + protected class UpdateTask extends java.util.TimerTask { + public void run() { + if (log.isDebugEnabled()) { + log.debug("Synchronizer wake up"); + } + synchronizeTasks(); + } + + + public void synchronizeTasks(){ + + synchronized (tasksToSync) { + Collection<TimerTask> remainingTasks = new ArrayList<>(tasksToSync); + for (TimerTask task : tasksToSync) { + //do the sync, store the result + boolean syncDone = synchronizeSingleTask(task); + if (remainingTasks.contains(task)) { + remainingTasks.remove(task); + } + log.info(" task synced : " + syncDone); + + + } + tasksToSync = remainingTasks; + } + } + + + + } + + + + /** + * Makes one synchronization for a task, without annotations by default + * + * @param task + */ + public boolean synchronizeSingleTask(TimerTask task){ + String updateJsonString = TimerTaskHelper.taskToJSONFormat(task, false).toString(); + String syncURl = task.getSynchronisingURL(); + String charset = "UTF-8"; + HttpURLConnection connection = null; + URL url = null; + try { + url = new URL("http://" + syncURl); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + try { + connection = (HttpURLConnection) url.openConnection(); + } catch (IOException e) { + e.printStackTrace(); + } + connection.setUseCaches(false); + connection.setDoInput(true); + connection.setDoOutput(true); + connection.setRequestProperty("Content-Length", "" + updateJsonString.length()); + connection.setRequestProperty("Accept-Charset", charset); + connection.setRequestProperty("Content-Type", "application/json"); + try { + connection.setRequestMethod("POST"); + } catch (ProtocolException e) { + e.printStackTrace(); + } + byte[] postDataBytes = new byte[0]; + try { + postDataBytes = updateJsonString.toString().getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + try { + connection.getOutputStream().write(postDataBytes); + } catch (IOException e) { + e.printStackTrace(); + } + + //get the header fields + Map<String, List<String>> map = connection.getHeaderFields(); + boolean hasUpdated = false; + //check for positive answer from server + for (Map.Entry<String, List<String>> entry : map.entrySet()) { + for (String s : entry.getValue()) { + if (s.equals("HTTP/1.1 200 OK")) { + hasUpdated = true; + } + } + } + if (hasUpdated) { + task.setLastSync(LocalDateTime.now()); + return true; + + } + else { + log.error("Sync error, wrong URL?"); + return false; + + } + + + } + + + + + + @Override + public void addProject(TimerProject project) { + + } + + @Override + public void addTask(TimerTask task) { + } + + @Override + public void modifyProject(TimerProject project) { + + } + + @Override + public void modifyTask(TimerTask task) { + //when a task is modified, add it to the to sync list (if it isn't already there= + if(!tasksToSync.contains(task)) { + tasksToSync.add(task); + } + } + + @Override + public void deleteProject(TimerProject project) { + + } + + @Override + public void deleteTask(TimerTask task) { + if (tasksToSync.contains(task)) { + tasksToSync.remove(task); + + } + } + + @Override + public void setAnnotation(TimerTask task, Date date, String annotation) { + + } + + @Override + public void setTaskTime(TimerTask task, Date date, Long time) { + } + + @Override + public void changeClosedState(TimerTask task) { + + } + + @Override + public void preMoveTask(TimerTask task) { + + } + + @Override + public void moveTask(TimerTask task) { + + } + + @Override + public void preMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks) { + + } + + @Override + public void postMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks) { + + } + + @Override + public void startTask(TimerTask task) { + } + + @Override + public void stopTask(TimerTask task) { + if(!tasksToSync.contains(task)) { + tasksToSync.add(task); + } + } + + @Override + public void dataLoaded(Collection<TimerProject> projects) { + + } + + @Override + public void modifyTaskURL(TimerTask task, String newURL) { + if(!tasksToSync.contains(task) && (!task.getSynchronisingURL().equals(null))) { + tasksToSync.add(task); + } + } + + @Override + public void modifyTaskSyncDate(TimerTask task, LocalDateTime newDate) { + + } +} -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

15/75: corrected update to synchronisation
by chorem.org scm 07 Jul '16

07 Jul '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 392d34dfbd436eb04a69af8cd2017ec97b5ae8fd Author: servantie <servantie.c(a)gmail.com> Date: Wed Jun 1 14:40:52 2016 +0200 corrected update to synchronisation --- .../ui/report/resources/TimerTaskUpdaterView.properties | 10 +++++----- .../ui/report/resources/TimerTaskUpdaterView_fr.properties | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties index 9546d72..ddeae17 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -updateTitle=${Application.title} - Update +updateTitle=${Application.title} - Synchronisation updateGeneral=General updateOptions=Options updateFrom=From : @@ -45,15 +45,15 @@ updateAnnotations.Action.shortDescription = Include annotations generateUpdate.Action.text = &Generate generateUpdate.Action.icon = applications-system.png -generateUpdate.Action.shortDescription = Generate update +generateUpdate.Action.shortDescription = Generate synchronisation sendUpdate.Action.text = &Send sendUpdate.Action.icon = mail-forward.png -sendUpdate.Action.shortDescription = Send update +sendUpdate.Action.shortDescription = Send synchronisation closeView.Action.text = &Close closeView.Action.icon = dialog-close.png closeView.Action.shortDescription = Close -action.updateError = Update failed, check URL ? -action.updateErrorTitle = Update error +action.updateError = Synchronisation failed, check URL ? +action.updateErrorTitle = Synchronisation error diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties index d5c7b71..908ccad 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties @@ -20,13 +20,13 @@ # #L% ### # update i18n -updateTitle=${Application.title} - Mise \u00E0 jour +updateTitle=${Application.title} - Synchronisation updateGeneral=G\u00E9n\u00E9ral updateOptions=Options updateFrom=De : updateTo=\u00C0 : -lastUpdateLabel=Derni\u00E8re mise \u00E0 jour : +lastUpdateLabel=Derni\u00E8re synchronisation : pickCurrentMonth.Action.text = Selectionner le mois courant @@ -45,15 +45,15 @@ isIncludingAnnotations.Action.text = Inclure les annotations generateUpdate.Action.text = &G\u00E9n\u00E9rer generateUpdate.Action.icon = applications-system.png -generateUpdate.Action.shortDescription = G\u00E9n\u00E9rer la mise \u00C0 jour +generateUpdate.Action.shortDescription = G\u00E9n\u00E9rer les données de synchronisation sendUpdate.Action.text = &Envoyer sendUpdate.Action.icon = mail-forward.png -sendUpdate.Action.shortDescription = Envoyer la mise \u00C0 jour +sendUpdate.Action.shortDescription = Envoyer les donn\u00E9es closeView.Action.text = &Fermer closeView.Action.icon = dialog-close.png closeView.Action.shortDescription = Fermer -action.updateError = Erreur de mise \u00E0 jour, v\u00E9rifier l'URL ? -action.updateErrorTitle = Erreur de mise \u00E0 jour \ No newline at end of file +action.updateError = Erreur de synchronisation, v\u00E9rifier l'URL ? +action.updateErrorTitle = Erreur de synchronisation \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

14/75: removed a duplicated try/catch in the sendUpdate() method
by chorem.org scm 07 Jul '16

07 Jul '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit d16f8d68bd6d68659c78cb8a7da222f0ccc218fb Author: servantie <servantie.c(a)gmail.com> Date: Mon May 23 17:36:50 2016 +0200 removed a duplicated try/catch in the sendUpdate() method --- src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java | 9 ++++----- .../java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java | 8 +------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 4887bc0..7adf2d4 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -341,10 +341,10 @@ public class TimerTaskHelper { * @param task the task to make a JSON from * @return result the string in JSON */ - public static String taskToJSONFormat(TimerTask task, boolean withAnnotations) { + public static JsonObject taskToJSONFormat(TimerTask task, boolean withAnnotations) { Date startDate = task.getCreationDate(); Date endDate = new Date(); - String resultingJSON = taskToJSONFormat(task, startDate, endDate, withAnnotations); + JsonObject resultingJSON = taskToJSONFormat(task, startDate, endDate, withAnnotations); return resultingJSON; } @@ -360,7 +360,7 @@ public class TimerTaskHelper { * @param withAnnotations true if annotations included * @return result the string in JSON */ - public static String taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { + public static JsonObject taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { JsonObject responseJSON = new JsonObject(); LocalDate startPeriodDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate endPeriodDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); @@ -395,8 +395,7 @@ public class TimerTaskHelper { responseJSON.addProperty("startDate", startPeriodDate.toString()); responseJSON.addProperty("endDate", endPeriodDate.toString()); responseJSON.add("periods", periodArray ); - String response = responseJSON.toString(); - return response; + return responseJSON; } } diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 20e18f9..df85ba6 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -74,7 +74,7 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener /** update output view*/ protected JTextArea updateArea; - protected String updateJson; + protected JsonObject updateJson; /** task to update */ protected TimerTask task; @@ -393,12 +393,6 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener e.printStackTrace(); } - try { - query = String.format("json=%s", URLEncoder.encode(updateJson.toString(), charset)); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - URLConnection connection = null; try { connection = new URL("http://"+ syncURl).openConnection(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

13/75: 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)
by chorem.org scm 07 Jul '16

07 Jul '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 84fa2a13c050c8c275786c79481f1749ce3d0859 Author: servantie <servantie.c(a)gmail.com> Date: Mon May 23 17:20:24 2016 +0200 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) --- src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java | 10 ++++++---- .../java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index af83918..4887bc0 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -341,10 +341,10 @@ public class TimerTaskHelper { * @param task the task to make a JSON from * @return result the string in JSON */ - public static JsonObject taskToJSONFormat(TimerTask task, boolean withAnnotations) { + public static String taskToJSONFormat(TimerTask task, boolean withAnnotations) { Date startDate = task.getCreationDate(); Date endDate = new Date(); - JsonObject resultingJSON = taskToJSONFormat(task, startDate, endDate, withAnnotations); + String resultingJSON = taskToJSONFormat(task, startDate, endDate, withAnnotations); return resultingJSON; } @@ -360,7 +360,7 @@ public class TimerTaskHelper { * @param withAnnotations true if annotations included * @return result the string in JSON */ - public static JsonObject taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { + public static String taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { JsonObject responseJSON = new JsonObject(); LocalDate startPeriodDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate endPeriodDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); @@ -395,6 +395,8 @@ public class TimerTaskHelper { responseJSON.addProperty("startDate", startPeriodDate.toString()); responseJSON.addProperty("endDate", endPeriodDate.toString()); responseJSON.add("periods", periodArray ); - return responseJSON; + String response = responseJSON.toString(); + + return response; } } diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 73936b4..20e18f9 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -74,7 +74,7 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener /** update output view*/ protected JTextArea updateArea; - protected JsonObject updateJson; + protected String updateJson; /** task to update */ protected TimerTask task; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

12/75: 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)
by chorem.org scm 07 Jul '16

07 Jul '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 16cb34765159069459e814f84b940f3f67bcbe2b Author: servantie <servantie.c(a)gmail.com> Date: Mon May 23 17:15:04 2016 +0200 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) --- pom.xml | 7 +++ .../chorem/jtimer/entities/TimerTaskHelper.java | 66 +++++++++------------- .../jtimer/ui/report/TimerTaskUpdaterView.java | 63 ++++++--------------- 3 files changed, 50 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index 9f17c4b..01bc02e 100644 --- a/pom.xml +++ b/pom.xml @@ -293,6 +293,13 @@ <version>1.17</version> </dependency> +  + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.6.2</version> + </dependency> +  <dependency> diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 19643d3..af83918 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -22,6 +22,9 @@ package org.chorem.jtimer.entities; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; + import java.time.LocalDate; import java.time.ZoneId; import java.util.ArrayList; @@ -338,49 +341,33 @@ public class TimerTaskHelper { * @param task the task to make a JSON from * @return result the string in JSON */ - public static String taskToJSONFormat(TimerTask task, boolean withAnnotations) { + public static JsonObject taskToJSONFormat(TimerTask task, boolean withAnnotations) { Date startDate = task.getCreationDate(); Date endDate = new Date(); - String resultingJSON = taskToJSONFormat(task, startDate, endDate, withAnnotations); + JsonObject resultingJSON = taskToJSONFormat(task, startDate, endDate, withAnnotations); return resultingJSON; } /** - * Returns a String in JSON format (cf schema (simplified) - * with all times and annotations of a task (without subtasks) + * Returns a JSONObject (cf schema (simplified) + * with all times of a task (without subtasks) * in a given period between two dates + * with annotations if enabled * @param task the task to make a JSON from * @param startDate the beginning date * @param endDate the end date + * @param withAnnotations true if annotations included * @return result the string in JSON */ - public static String taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { - + public static JsonObject taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { + JsonObject responseJSON = new JsonObject(); LocalDate startPeriodDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate endPeriodDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - - String resultingJSON = "{\"URL\":\"" + task.getSynchronisingURL()+ "\",\"startDate\":\"" + - startPeriodDate.toString() + "\",\"endDate\":\"" + endPeriodDate.toString() + "\",\"periods\":" - + getTimesAndCommentsJSON(task, startDate, endDate, withAnnotations) +"}"; - return resultingJSON; - } - - /** - * Returns a String with the times and comments of a task as : - * [{"id":"..","startDate":"..","duration":..,"info":".."},..] - * over a defined period from startDate to endDate - * @param task : task to make a json of - * @param startDate : beginning of period to work with - * @param endDate : end of period - * @return a string in json format - */ - public static String getTimesAndCommentsJSON(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { - String result = ""; + JsonArray periodArray = new JsonArray(); SortedMap<Date, Long> dates = task.getAllDaysAndTimes().subMap(startDate, endDate); if (dates.size() != 0) { - result = result + "["; for (SortedMap.Entry<Date, Long> entry : dates.entrySet()) { //adding id, startDate and duration //converting Date to LocalDate (to ease the .toString()) @@ -388,25 +375,26 @@ public class TimerTaskHelper { LocalDate date = entry.getKey().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); String dateString = date.toString(); //as jtimer has time entries only for a day, the id of the times will be the date in yyyy-mm-dd format - result = result + "{\"id\":\""+ dateString + "\",\"startDate\":\"" + dateString + "T00:00:00" + - "\",\"duration\":" + Long.toString(entry.getValue()) + ",\"info\":\""; - //adding comments (if there are any) - if (getAnnotation(task, entry.getKey()).size() != 0 && withAnnotations ) { + JsonObject periodElement = new JsonObject(); + periodElement.addProperty("id", dateString); + periodElement.addProperty("startDate", dateString + "T00:00:00"); + periodElement.addProperty("duration", entry.getValue()); + if (withAnnotations && getAnnotation(task, entry.getKey()).size() != 0 ) { + String annotations = ""; for (String s : getAnnotation(task, entry.getKey())) { - result = result + s + ","; + annotations = annotations + s + ","; } //remove trailing comma - result = result.substring(0, result.length()-1); + annotations = annotations.substring(0, annotations.length()-1); + periodElement.addProperty("info", annotations); } - result = result + "\"},"; + periodArray.add(periodElement); } - //deleting trailing ',' because of the loop - result = result.substring(0, result.length()-1); - result = result + "]"; - } - else { - result ="[]"; } - return result; + responseJSON.addProperty("URL", task.getSynchronisingURL()); + responseJSON.addProperty("startDate", startPeriodDate.toString()); + responseJSON.addProperty("endDate", endPeriodDate.toString()); + responseJSON.add("periods", periodArray ); + return responseJSON; } } diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 606b5e8..73936b4 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -22,7 +22,9 @@ */ package org.chorem.jtimer.ui.report; -import org.apache.commons.lang3.StringUtils; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; @@ -71,8 +73,8 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener /** update output view*/ protected JTextArea updateArea; - /** update output (as json) */ - protected String updateJson; + + protected JsonObject updateJson; /** task to update */ protected TimerTask task; @@ -315,43 +317,6 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener } /** - * Prettify the JSON String to make it - * human readable - * @param jsonString : the JSON string to prettify - * @return an easier to read String - */ - public static String prettifyJSON(String jsonString) { - int indent = 0; - String prettyJson; - String prettiest = ""; - //return line after each { - prettyJson = jsonString.replace("{", "{\n\t"); - prettyJson = prettyJson.replace("}", "\n}"); - //fix { \n } (useless space} - prettyJson = prettyJson.replace("{\n\t\n}", "{}"); - // return after each , - prettyJson = prettyJson.replace(",", ",\n\t"); - //change ":" into " : " - prettyJson = prettyJson.replace("\":\"", "\" : \""); - prettyJson = prettyJson.replace("\":", "\" : "); - for (int i = 0 ; i < prettyJson.length(); ++i) { - prettiest = prettiest + prettyJson.charAt(i); - if ((indent != 0) && (prettyJson.charAt(i) == '\n')) { - for (int j = 0 ; j < indent ; ++j) { - prettiest = prettiest + "\t"; - } - } - if (prettyJson.charAt(i) == '{') { - ++indent; - } - else if (prettyJson.charAt(i) == '}') { - --indent; - } - } - return prettiest; - } - - /** * Close action. */ @org.jdesktop.application.Action @@ -367,16 +332,20 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener */ @org.jdesktop.application.Action public void generateUpdate() { - updateJson = ""; - // make String of information + + // make the JSON Object of information updateJson = taskToJSONFormat(task, datePickerFrom.getDate(), - datePickerTo.getDate(), isIncludingAnnotations()); + datePickerTo.getDate(), isIncludingAnnotations()); + //make it human readable + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + String jsonOutput = gson.toJson(updateJson); - if (updateJson != null && !updateJson.isEmpty()) { - updateArea.setText(prettifyJSON(updateJson)); + if (updateJson != null) { + updateArea.setText(jsonOutput); } else { updateArea.setText(""); } + } /** @@ -419,13 +388,13 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener String charset = "UTF-8"; String query=""; try { - query = String.format("json=%s", URLEncoder.encode(updateJson, charset)); + query = String.format("json=%s", URLEncoder.encode(updateJson.toString(), charset)); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } try { - query = String.format("json=%s", URLEncoder.encode(updateJson, charset)); + query = String.format("json=%s", URLEncoder.encode(updateJson.toString(), charset)); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0