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 140520c03e4ecf00ab5c5907d59b12d638fe5ce7 Author: servantie <servantie.c@gmail.com> Date: Wed Jul 13 12:10:39 2016 +0200 no longer adding syncInfo if the url is empty --- .../java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 f236052..6598e2e 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java @@ -31,10 +31,8 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.List; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.DefaultComboBoxModel; @@ -86,6 +84,7 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener /** LastSync */ protected JLabel lastUpdate; + /** lastSync Label */ protected JLabel lastSyncDateLabel; @@ -295,7 +294,7 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener * add it to the url displayed, and to the syncInfo of the task */ public void itemAdded(String urlToAdd){ - if ((urlToAdd != null) && ((!task.getSynchronizingURLList().contains(urlToAdd)))) { + if ((urlToAdd != null) && (!urlToAdd.isEmpty()) && ((!task.getSynchronizingURLList().contains(urlToAdd)))) { SyncInfo infoToAdd = new SyncInfo(urlToAdd); core.getData().syncInfoChanged(task, infoToAdd); urlComboBox.addItem(infoToAdd); @@ -318,8 +317,11 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener String urlToDisplay; if (urlComboBox.getSelectedItem() instanceof String) { urlToDisplay = (String)urlComboBox.getSelectedItem(); + //trim the whitespaces + urlToDisplay = urlToDisplay.trim(); syncInfo = new SyncInfo(urlToDisplay); urlComboBox.setSelectedItem(syncInfo); + } else { syncInfo = (SyncInfo) urlComboBox.getSelectedItem(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.