This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 7d94fc17e4b0e045d4c214b3e56350d79565ff45 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Feb 24 14:25:46 2016 +0100 fixes #1030: Edition des tâches --- src/main/java/org/chorem/jtimer/data/TimerDataManager.java | 1 + src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java | 2 +- src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java | 8 +++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java index 28a645f..38b32f3 100644 --- a/src/main/java/org/chorem/jtimer/data/TimerDataManager.java +++ b/src/main/java/org/chorem/jtimer/data/TimerDataManager.java @@ -397,6 +397,7 @@ public class TimerDataManager { TimerTask newTask = task.clone(); newTask.setName(newTaskName); for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkModifyTask(newTask); vetoableDataEventListener.checkChangeClosedState(newTask); } diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index 2240d8c..905f913 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -1532,7 +1532,7 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, */ @Override public void checkModifyTask(TimerTask task) { - + checkName(task); } /* diff --git a/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java b/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java index 44b9b41..3b92513 100644 --- a/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java @@ -539,8 +539,7 @@ public class TimerTaskEditor extends JDialog implements ActionListener { try { apply(); - } - catch(DataViolationException ex) { + } catch(DataViolationException ex) { // revert changes revert(); @@ -550,15 +549,14 @@ public class TimerTaskEditor extends JDialog implements ActionListener { getRootPane().setCursor( Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - }else if ("applyAndQuit".equals(actionCommand)) { + } else if ("applyAndQuit".equals(actionCommand)) { getRootPane().setCursor( Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); try { apply(); - } - catch(DataViolationException ex) { + } catch(DataViolationException ex) { // revert changes revert(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.