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 82d8d45626fedb6f71832cc2a27c918ab2d2d832 Author: servantie <servantie.c@gmail.com> Date: Thu Apr 28 11:11:03 2016 +0200 Added synchronisation date changes (forgotten) --- src/main/java/org/chorem/jtimer/data/DataEventListener.java | 13 +++++++++---- src/main/java/org/chorem/jtimer/data/TimerDataManager.java | 12 ++++++++++++ .../java/org/chorem/jtimer/io/GTimerIncrementalSaver.java | 6 +++++- src/main/java/org/chorem/jtimer/ui/StatusBar.java | 8 ++++++++ .../java/org/chorem/jtimer/ui/systray/SystrayManager.java | 8 ++++++++ .../chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java | 8 ++++++++ .../ui/treetable/ProjectsAndTasksRunningCellRenderer.java | 8 ++++++++ 7 files changed, 58 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/data/DataEventListener.java b/src/main/java/org/chorem/jtimer/data/DataEventListener.java index 88a9daf..0775617 100644 --- a/src/main/java/org/chorem/jtimer/data/DataEventListener.java +++ b/src/main/java/org/chorem/jtimer/data/DataEventListener.java @@ -22,10 +22,8 @@ package org.chorem.jtimer.data; -import java.util.Collection; -import java.util.Date; -import java.util.EventListener; -import java.util.List; +import java.time.LocalDateTime; +import java.util.*; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; @@ -164,5 +162,12 @@ public interface DataEventListener extends EventListener { * @param newURL new URl to change */ void modifyTaskURL(TimerTask task, String newURL); + + /** + * Task last sync date changed + * @param task task with date change + * @param newDate new synchronisation date + */ + void modifyTaskSyncDate(TimerTask task, LocalDateTime newDate); } diff --git a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java index e3364ce..2cf430a 100644 --- a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java +++ b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java @@ -22,6 +22,7 @@ package org.chorem.jtimer.data; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; @@ -425,6 +426,17 @@ public class TimerDataManager { dataEventListener.modifyTaskURL(task, newURL); } } + + /** + * Edit Task last synchronisation date + */ + public void editTaskLastSync(TimerTask task, LocalDateTime newDate) { + task.setLastSync(newDate); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.modifyTaskSyncDate(task, newDate); + } + } + /** * Move task. * diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index 47c8574..8800b3f 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -1169,7 +1169,6 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, if (task.getLastSync() !=null) { String saveLastSync = task.getLastSync().toString(); out.write("LastSync: " + saveLastSync + "\n"); - } deleteBackupFile(backupfile); @@ -1696,5 +1695,10 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, saveSynchronisationInfo(task); } + /* + * {@inheritDoc} + */ + @Override + public void modifyTaskSyncDate(TimerTask task, LocalDateTime newDate) { saveSynchronisationInfo(task);} } diff --git a/src/main/java/org/chorem/jtimer/ui/StatusBar.java b/src/main/java/org/chorem/jtimer/ui/StatusBar.java index f1fd9ea..657316f 100644 --- a/src/main/java/org/chorem/jtimer/ui/StatusBar.java +++ b/src/main/java/org/chorem/jtimer/ui/StatusBar.java @@ -23,6 +23,7 @@ package org.chorem.jtimer.ui; import java.awt.GridLayout; +import java.time.LocalDateTime; import java.util.Collection; import java.util.Date; import java.util.List; @@ -290,4 +291,11 @@ public class StatusBar extends JPanel implements DataEventListener { public void modifyTaskURL(TimerTask task, String newURL) { } + /* + * {@inheritDoc} + */ + @Override + public void modifyTaskSyncDate(TimerTask task, LocalDateTime newDate) { + + } } diff --git a/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java b/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java index 030bc6c..3e68bd0 100644 --- a/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java +++ b/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java @@ -32,6 +32,7 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; +import java.time.LocalDateTime; import java.util.Collection; import java.util.Date; import java.util.List; @@ -560,4 +561,11 @@ public class SystrayManager implements ActionListener, DataEventListener, public void modifyTaskURL(TimerTask task, String newURL) { } + /* + * {@inheritDoc} + */ + @Override + public void modifyTaskSyncDate(TimerTask task, LocalDateTime newDate) { + + } } diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java index 668a22f..a8cd3c4 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java @@ -22,6 +22,7 @@ package org.chorem.jtimer.ui.treetable; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -555,4 +556,11 @@ public class ProjectsAndTasksModel extends AbstractTreeTableModel implements public void modifyTaskURL(TimerTask task, String newURL) { } + /* + * {@inheritDoc} + */ + @Override + public void modifyTaskSyncDate(TimerTask task, LocalDateTime newDate) { + + } } diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksRunningCellRenderer.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksRunningCellRenderer.java index 9df4a48..3586c1b 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksRunningCellRenderer.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksRunningCellRenderer.java @@ -27,6 +27,7 @@ import java.awt.Image; import java.awt.Rectangle; import java.awt.image.ImageObserver; import java.net.URL; +import java.time.LocalDateTime; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -307,4 +308,11 @@ public class ProjectsAndTasksRunningCellRenderer extends ProjectsAndTasksCellRen public void modifyTaskURL(TimerTask task, String newURL) { } + /* + * {@inheritDoc} + */ + @Override + public void modifyTaskSyncDate(TimerTask task, LocalDateTime newDate) { + + } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.