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 4cea3f8e076494cde58e9ee6d987efbdba551294 Author: servantie <servantie.c@gmail.com> Date: Thu Apr 28 10:57:00 2016 +0200 Adding a check on the parser for empty url strings --- src/main/java/org/chorem/jtimer/data/CommonVetoable.java | 8 -------- src/main/java/org/chorem/jtimer/data/TimerDataManager.java | 10 +++++----- .../org/chorem/jtimer/data/VetoableDataEventListener.java | 6 ------ src/main/java/org/chorem/jtimer/entities/TimerTask.java | 2 +- .../java/org/chorem/jtimer/io/GTimerIncrementalSaver.java | 12 ++++-------- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/data/CommonVetoable.java b/src/main/java/org/chorem/jtimer/data/CommonVetoable.java index 493d4f5..0e6914f 100644 --- a/src/main/java/org/chorem/jtimer/data/CommonVetoable.java +++ b/src/main/java/org/chorem/jtimer/data/CommonVetoable.java @@ -265,12 +265,4 @@ public class CommonVetoable implements VetoableDataEventListener { } } - /* - * {@inheritDoc} - */ - @Override - public void checkSetTaskURL(TimerTask task, String newURL) { - - } - } diff --git a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java index ef25de9..e3364ce 100644 --- a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java +++ b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java @@ -414,11 +414,11 @@ public class TimerDataManager { */ public void editTaskURL(TimerTask task, String newURL) { - TimerTask newTask = task.clone(); - newTask.setSynchronisingURL(newURL); - for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { - vetoableDataEventListener.checkSetTaskURL(task, newURL); - } +// TimerTask newTask = task.clone(); +// newTask.setSynchronisingURL(newURL); +// for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { +// vetoableDataEventListener.checkSetTaskURL(task, newURL); +// } task.setSynchronisingURL(newURL); // send notification for (DataEventListener dataEventListener : dataEventListeners) { diff --git a/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java b/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java index 0bd7224..0f8a9da 100644 --- a/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java +++ b/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java @@ -124,10 +124,4 @@ public interface VetoableDataEventListener extends EventListener { */ void checkMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); - /** - * Check sync URL ofr a task - * @param task task to change the url - * @param newURL the new URL - */ - void checkSetTaskURL(TimerTask task, String newURL); } diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTask.java b/src/main/java/org/chorem/jtimer/entities/TimerTask.java index fe59e5c..0143445 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTask.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTask.java @@ -48,7 +48,7 @@ public class TimerTask implements Cloneable, /** serialVersionUID */ private static final long serialVersionUID = -7590755569706702695L; - /** Task uuid used to managed task equality. */s - + /** Task uuid used to managed task equality. */ protected String uuid = UUID.randomUUID().toString(); /** Task number. */ diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index 0b5e741..47c8574 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -623,7 +623,7 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, while ((line = parseIn.readLine()) != null) { line = line.trim(); - if (!line.isEmpty()) { + if ((!line.isEmpty()) && (line.contains(" "))) { String syncType = line.substring(0, line.indexOf(' ')); String syncInfo = line.substring(line.indexOf(' ') +1, line.length()); @@ -1161,9 +1161,10 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, out.write("Format: " + GTIMER_FILE_VERSION + "\n"); //save URL - String saveURL = task.getSynchronisingURL(); + if(task.getSynchronisingURL() != "" || task.getSynchronisingURL() == null) { + String saveURL = task.getSynchronisingURL(); out.write("SyncURL: " + saveURL + "\n"); - + } //save last sync (if there is one) if (task.getLastSync() !=null) { String saveLastSync = task.getLastSync().toString(); @@ -1695,10 +1696,5 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, saveSynchronisationInfo(task); } - /* - * {@inheritDoc} - */ - public void checkSetTaskURL(TimerTask task, String newURL) { - } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.