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 50a1fab1d3bfe117a10b547aef90915fc8e6d787 Author: servantie <servantie.c@gmail.com> Date: Mon Jun 6 13:55:14 2016 +0200 added a check for empty tasksToSync --- src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java | 6 ++++-- src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java | 6 ++++++ .../jtimer/ui/report/resources/TimerTaskUpdaterView.properties | 1 + .../jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java index 6a1f577..2099d68 100644 --- a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -201,10 +201,12 @@ public class TimerTaskSynchronizer implements DataEventListener { @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)) { + if(!tasksToSync.contains(task) && (!tasksToSync.isEmpty())) { //add it only if the URL is not empty if (!(task.getSynchronisingURL().isEmpty())) { - tasksToSync.add(task); + if(!(task.getSynchronisingURL().equals(null))) { + tasksToSync.add(task); + } } } } 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 66e165c..076bb88 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -193,6 +193,12 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(1, 2, 1, 1), 0, 0)); } + JLabel timezoneLabel = new JLabel(getResourceMap().getString("timezone")); + JTextField timezoneText = new JTextField(this.timezone); + panelOption.add(timezoneLabel, new GridBagConstraints(1,3,1,1,0,0, + GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(2,1,1,1),0,0)); + panelOption.add(timezoneText, new GridBagConstraints(2,3,1,1,0,0, + GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(1,2,1,1),0,0)); configComponent.add(panelGeneral); configComponent.add(panelOption); 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 ddeae17..2ab6693 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 @@ -26,6 +26,7 @@ updateFrom=From : updateTo=To : lastUpdateLabel=Last Sync at: +timezone= Timezone pickCurrentMonth.Action.text = Select current month 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 908ccad..91ed7cd 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 @@ -27,6 +27,7 @@ updateFrom=De : updateTo=\u00C0 : lastUpdateLabel=Derni\u00E8re synchronisation : +timezone= Timezone pickCurrentMonth.Action.text = Selectionner le mois courant -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.