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 45ddb6ed4f6a20dbfb8bb502fb5536efbdeb0c04 Author: servantie <servantie.c@gmail.com> Date: Fri Jun 3 11:15:30 2016 +0200 changed name of parseSyncURL to parseSyncInfo (clearer) --- src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java | 8 ++++---- src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java | 5 ++--- src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 7cf32c4..ffd7c99 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -376,9 +376,9 @@ public class TimerTaskHelper { 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 JsonObject periodElement = new JsonObject(); - periodElement.addProperty("id", dateString); - periodElement.addProperty("startDate", dateString + "T00:00:00.000+0100"); - periodElement.addProperty("duration", entry.getValue()); + periodElement.addProperty("periodId", dateString); + periodElement.addProperty("periodStartDate", dateString + "T00:00:00.000+0100"); + periodElement.addProperty("periodDuration", entry.getValue()); if (withAnnotations && getAnnotation(task, entry.getKey()).size() != 0 ) { String annotations = ""; for (String s : getAnnotation(task, entry.getKey())) { @@ -386,7 +386,7 @@ public class TimerTaskHelper { } //remove trailing comma annotations = annotations.substring(0, annotations.length()-1); - periodElement.addProperty("info", annotations); + periodElement.addProperty("periodInfo", annotations); } periodArray.add(periodElement); } diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index faa0f5d..fdc27e0 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -71,7 +71,6 @@ import org.chorem.jtimer.entities.TimerAlert; import org.chorem.jtimer.entities.TimerAlert.Type; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; -import org.chorem.jtimer.entities.TimerTaskHelper; /** * Charge et sauve les fichiers au format gTimer. @@ -364,7 +363,7 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, parseAnnotations(task); parseAlerts(task); - parseSyncURL(task); + parseSyncInfo(task); } } catch (NumberFormatException e) { if (log.isWarnEnabled()) { @@ -608,7 +607,7 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, * * @param task task to load sync info */ - protected void parseSyncURL(TimerTask task) throws IOException { + protected void parseSyncInfo(TimerTask task) throws IOException { int taskNumber = task.getNumber(); File syncTaskFile = new File(dataSaveDirectory + File.separator + taskNumber +"."+ GTIMER_TASK_EXTENSION +"."+ GTIMER_SYNC_EXTENSION); diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java index 95b995d..882e6af 100644 --- a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -83,6 +83,7 @@ public class TimerTaskSynchronizer implements DataEventListener { } //do the sync, store the result boolean syncDone = synchronizeSingleTask(task); + //for now doesn't deal with failure in the update, just task already updated if (remainingTasks.contains(task)) { remainingTasks.remove(task); } @@ -157,7 +158,7 @@ public class TimerTaskSynchronizer implements DataEventListener { return true; } else { - log.error("Sync error, wrong URL?"); + log.error("Sync error"); return false; } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.