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 af8bae33a37f2fb97a7283038b120a2b8884a410 Author: servantie <servantie.c@gmail.com> Date: Fri Jul 15 15:22:20 2016 +0200 revert of the syncAtStartUp --- .../org/chorem/jtimer/data/DataEventListener.java | 16 +++++----- .../java/org/chorem/jtimer/data/TimerCore.java | 30 ------------------- .../org/chorem/jtimer/data/TimerDataManager.java | 34 +++++++++------------- .../java/org/chorem/jtimer/entities/SyncInfo.java | 18 ------------ .../java/org/chorem/jtimer/entities/TimerTask.java | 31 -------------------- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 10 ------- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 29 ------------------ .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 1 - 8 files changed, 22 insertions(+), 147 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/data/DataEventListener.java b/src/main/java/org/chorem/jtimer/data/DataEventListener.java index 0c42b9f..a14f25f 100644 --- a/src/main/java/org/chorem/jtimer/data/DataEventListener.java +++ b/src/main/java/org/chorem/jtimer/data/DataEventListener.java @@ -206,13 +206,13 @@ public interface DataEventListener extends EventListener { */ default void syncInfoDeleted(TimerTask task, SyncInfo syncInfo) { } - /** - * Task synchronized - * @param task TimerTask - * @param syncInfo SyncInfo - */ - default void taskSynchronized(TimerTask task, SyncInfo syncInfo) { - - } +// /** +// * Task synchronized +// * @param task TimerTask +// * @param syncInfo SyncInfo +// */ +// default void taskSynchronized(TimerTask task, SyncInfo syncInfo) { +// +// } } diff --git a/src/main/java/org/chorem/jtimer/data/TimerCore.java b/src/main/java/org/chorem/jtimer/data/TimerCore.java index 02297c1..c6be19f 100644 --- a/src/main/java/org/chorem/jtimer/data/TimerCore.java +++ b/src/main/java/org/chorem/jtimer/data/TimerCore.java @@ -28,15 +28,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; - import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; import org.chorem.jtimer.JTimerFactory; -import org.chorem.jtimer.entities.SyncInfo; import org.chorem.jtimer.entities.TimerProject; -import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.io.DataLockingException; import org.chorem.jtimer.io.Saver; import org.chorem.jtimer.io.TimerTaskSynchronizer; @@ -191,33 +188,6 @@ public class TimerCore { Collections.sort(projectsList); data.addAllProjects(projectsList); - - - // add the tasks that haven't been synced before to the synchronizer - if (log.isDebugEnabled()) { - log.debug("Adding tasks that were not synchronized at last jTimer exit"); - } - for (TimerTask project : data.getProjectsList()) { - project.getSubTasks().forEach(this::addTaskToSync); - } - } - - - /** - * Add tasks that haven't been synchronized at - * the last exit to the synchronizer tasks - */ - - protected void addTaskToSync(TimerTask task) { - if (log.isDebugEnabled()) { - log.debug("Adding task " + task.getName() + " to the synchronizer"); - } - for (SyncInfo sync : task.getSynchronizingInfoList()) { - if (sync.getIsToSyncAtStartUp()) { - synchronizer.addTask(task); - } - } - task.getSubTasks().forEach(this::addTaskToSync); } /** diff --git a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java index fe9125b..f459fff 100644 --- a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java +++ b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java @@ -645,10 +645,6 @@ public class TimerDataManager { public void syncInfoChanged(TimerTask task, SyncInfo info) { task.addSyncInfo(info); - //the syncInfo is added to the syncs at startup only if it is active - if (info.getIsActiveSync()) { - task.setSyncAtStartUp(true, info.getSyncURL()); - } for (DataEventListener dataEventListener : dataEventListeners) { dataEventListener.syncInfoChanged(task, info); @@ -674,20 +670,18 @@ public class TimerDataManager { log.debug("SyncInfo deleted: " + info.getSyncURL()); } } - - /** - * When a task is synced - * @param task - * @param syncInfo - */ - public void taskSynchronized(TimerTask task, SyncInfo syncInfo) { - task.setSyncAtStartUp(false, syncInfo.getSyncURL()); - - for (DataEventListener dataEventListener: dataEventListeners) { - dataEventListener.taskSynchronized(task, syncInfo); - } - if (log.isDebugEnabled()) { - log.debug("Task " + task.getName() + " synced at " + syncInfo.getSyncURL()); - } - } +// +// /** +// * When a task is synced +// * @param task +// * @param syncInfo +// */ +// public void taskSynchronized(TimerTask task, SyncInfo syncInfo) { +// for (DataEventListener dataEventListener: dataEventListeners) { +// dataEventListener.taskSynchronized(task, syncInfo); +// } +// if (log.isDebugEnabled()) { +// log.debug("Task " + task.getName() + " synced at " + syncInfo.getSyncURL()); +// } +// } } diff --git a/src/main/java/org/chorem/jtimer/entities/SyncInfo.java b/src/main/java/org/chorem/jtimer/entities/SyncInfo.java index ac04854..904c5b4 100644 --- a/src/main/java/org/chorem/jtimer/entities/SyncInfo.java +++ b/src/main/java/org/chorem/jtimer/entities/SyncInfo.java @@ -22,9 +22,6 @@ public class SyncInfo { /** true if annotations included */ protected boolean isWithAnnotations; - /** true if the synchronization needs to be done at next start */ - protected boolean isToSyncAtStartUp; - /** * constructor with all parameters * @param syncURL the url to sync to @@ -37,7 +34,6 @@ public class SyncInfo { this.lastSync = lastSync; this.isActiveSync = isActiveSync; this.isWithAnnotations = isWithAnnotations; - this.isToSyncAtStartUp = true; } /** @@ -50,7 +46,6 @@ public class SyncInfo { this.isActiveSync = true; this.isWithAnnotations = false; this.lastSync = new Date(0); - this.isToSyncAtStartUp = true; } /** @@ -115,19 +110,6 @@ public class SyncInfo { } /** - * Gets the isToSyncAtStartUp - * @return a boolean - */ - public boolean getIsToSyncAtStartUp() {return isToSyncAtStartUp; } - - /** - * Sets the isToSyncAtStartUp - * @param isToSyncAtStartUp a boolean - */ - public void setIsToSyncAtStartUp(boolean isToSyncAtStartUp) { this.isToSyncAtStartUp = isToSyncAtStartUp; } - - - /** * Overrides the toString() method to return the url (for combobox) */ @Override diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTask.java b/src/main/java/org/chorem/jtimer/entities/TimerTask.java index a8015e5..8213f47 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTask.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTask.java @@ -374,37 +374,6 @@ public class TimerTask implements Cloneable, } /** - * Sets the sync at startup - * @param syncAtStart boolean - * @param url the url of the syncInfo - */ - public void setSyncAtStartUp(boolean syncAtStart, String url) { - if(!synchronisingInfoList.isEmpty()) { - for (SyncInfo sync : synchronisingInfoList) { - if (sync.syncURL.equals(url)) { - sync.setIsToSyncAtStartUp(syncAtStart); - } - } - } - } - - /** - * Get the sync at startup - * @return boolean - */ - public boolean getIsSyncAtStartUp(String url) { - boolean syncsAtStart = false; - if(!synchronisingInfoList.isEmpty()) { - for (SyncInfo sync : synchronisingInfoList) { - if (sync.syncURL.equals(url)) { - syncsAtStart = sync.getIsToSyncAtStartUp(); - } - } - } - return syncsAtStart; - } - - /** * Add task's subtask. * * Also add parent reference. diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index a204740..4b4abf9 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -1506,16 +1506,6 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, } /** - * When a task is synced - * @param task - * @param info - */ - @Override - public void taskSynchronized(TimerTask task, SyncInfo info) { - saveSynchronizationInfo(task); - } - - /** * When a syncInfo is modified * @param task TimerTask * @param info diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java index 9157890..d7350ac 100644 --- a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -141,8 +141,6 @@ public class TimerTaskSynchronizer implements DataEventListener { } Calendar cal = Calendar.getInstance(); task.setLastSync(cal.getTime(), syncURL); - //it doesn't have to be synced at startup sync it succeeded - task.setSyncAtStartUp(false, syncURL); } } } @@ -213,10 +211,6 @@ public class TimerTaskSynchronizer implements DataEventListener { tasksToSync.add(task); } } - //set the syncAtStartup to true for all syncInfo - for (SyncInfo info : task.getSynchronizingInfoList()) { - info.setIsToSyncAtStartUp(true); - } } /** @@ -245,10 +239,6 @@ public class TimerTaskSynchronizer implements DataEventListener { } } - //set the syncAtStartup to true for all syncInfo - for (SyncInfo info : task.getSynchronizingInfoList()) { - info.setIsToSyncAtStartUp(true); - } } /** @@ -263,10 +253,6 @@ public class TimerTaskSynchronizer implements DataEventListener { tasksToSync.add(task); } } - //set the syncAtStartup to true for all syncInfo - for (SyncInfo info : task.getSynchronizingInfoList()) { - info.setIsToSyncAtStartUp(true); - } } /** @@ -281,10 +267,6 @@ public class TimerTaskSynchronizer implements DataEventListener { tasksToSync.add(task); } } - //set the syncAtStartup to true for all syncInfo - for (SyncInfo info : task.getSynchronizingInfoList()) { - info.setIsToSyncAtStartUp(true); - } } /** @@ -300,16 +282,5 @@ public class TimerTaskSynchronizer implements DataEventListener { tasksToSync.add(task); } } - task.setSyncAtStartUp(true, info.getSyncURL()); - } - - /** - * When the synchronization happens, set the syncAtStartUp to false - * @param task the task that was synchronized - * @param info SyncInfo - */ - @Override - public void taskSynchronized(TimerTask task, SyncInfo info) { - task.setSyncAtStartUp(false, info.getSyncURL()); } } diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java index da1a341..45128ef 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java @@ -400,7 +400,6 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener infoBox(getResourceMap().getString("testSyncSuccessMessage"), getResourceMap().getString("testSyncSuccessTitle")); Calendar cal = Calendar.getInstance(); infoToUse.setLastSync(cal.getTime()); - core.getData().taskSynchronized(task, infoToUse); //update the last synctime displayed lastUpdate.setVisible(true); lastSyncDateLabel.setVisible(true); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.