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 c7745ed439e8018c6360abb1c1c488ee41f0c349 Author: servantie <servantie.c@gmail.com> Date: Mon Jun 20 11:44:32 2016 +0200 removed an unused field (lastSync) in TimerTask, clarified some documentations --- src/main/java/org/chorem/jtimer/entities/TimerTask.java | 11 ++++------- src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTask.java b/src/main/java/org/chorem/jtimer/entities/TimerTask.java index 34a1675..962842f 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTask.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTask.java @@ -90,11 +90,6 @@ public class TimerTask implements Cloneable, protected List<TimerAlert> alerts; /** - * Last synchronisation date - */ - protected LocalDateTime lastSync; - - /** * Synchronisation Info */ protected List<SyncInfo> synchronisingInfoList; @@ -304,7 +299,7 @@ public class TimerTask implements Cloneable, } /** - * Adds a new synchronization info if the url isn't already present + * Adds a new synchronization info if the url isn't already present in the list * @param url a string * @param time a LocalDateTime * @param isActive a boolean for activity (true to sync auto) @@ -334,7 +329,7 @@ public class TimerTask implements Cloneable, } /** - * Returns all the synchronization info + * Returns all the synchronization info as a List * @return a list of TimerTask.SyncInfo */ public List<SyncInfo> getSynchronizingInfoList() { @@ -344,7 +339,9 @@ public class TimerTask implements Cloneable, /** * Returns the sync info matching a url + * (if the url is not in the list, returns a SyncInfo with an "error" string as url) * @param urlString + * @return a SyncInfo matching the url */ public SyncInfo getSynchronizingInfo(String urlString) { for (SyncInfo sync : synchronisingInfoList) { diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index e6f821d..b2270b0 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -336,8 +336,9 @@ public class TimerTaskHelper { } /** - * Returns a String in JSON format (cf schema (simplified) + * Returns a list of JSONObject (1/SyncURL) (follows the schema) * with all times and annotations of a task (without subtasks) + * with annotations if enabled * @param task the task to make a JSON from * @param withAnnotations true if annotations included * @param timezone represents the timezone -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.