[Jtimer-commits] r2832 - in trunk/src/main/java/org/chorem/jtimer: data io ui ui/systray ui/treetable ws/xmlrpc

17 Mar 2012

Author: echatellier
Date: 2012-03-17 10:58:17 +0100 (Sat, 17 Mar 2012)
New Revision: 2832

Url: http://chorem.org/repositories/revision/jtimer/2832

Log:
Remove useless pre/post change task closed state

Modified:
   trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java
   trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java
   trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java
   trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java
   trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java
   trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java
   trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java
   trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java

Modified: trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java
===================================================================

--- trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java	2012-03-17 09:44:07 UTC (rev 2831)
+++ trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java	2012-03-17 09:58:17 UTC (rev 2832)
@@ -104,20 +104,13 @@
     public void setTaskTime(TimerTask task, Date date, Long time);
 
     /**
-     * Pre change task state.
+     * Change task state.
      * 
      * @param task task
      */
-    public void preChangeClosedState(TimerTask task);
+    public void changeClosedState(TimerTask task);
 
     /**
-     * Post change task state.
-     * 
-     * @param task task
-     */
-    public void postChangeClosedState(TimerTask task);
-
-    /**
      * Pre move task.
      * 
      * @param task task

Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java
===================================================================
--- trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java	2012-03-17 09:44:07 UTC (rev 2831)
+++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java	2012-03-17 09:58:17 UTC (rev 2832)
@@ -319,19 +319,12 @@
             vetoableDataEventListener.checkChangeClosedState(task);
         }
 
-        // send notification
-        Iterator<DataEventListener> itDataEventListener = dataEventListeners
-                .iterator();
-        while (itDataEventListener.hasNext()) {
-            itDataEventListener.next().preChangeClosedState(task);
-        }
-
         task.setClosed(!task.isClosed());
 
         // send notification
-        itDataEventListener = dataEventListeners.iterator();
+        Iterator<DataEventListener> itDataEventListener = dataEventListeners.iterator();
         while (itDataEventListener.hasNext()) {
-            itDataEventListener.next().postChangeClosedState(task);
+            itDataEventListener.next().changeClosedState(task);
         }
     }
 

Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java
===================================================================
--- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java	2012-03-17 09:44:07 UTC (rev 2831)
+++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java	2012-03-17 09:58:17 UTC (rev 2832)
@@ -1344,10 +1344,10 @@
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask)
+     * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask)
      */
     @Override
-    public void postChangeClosedState(TimerTask task) {
+    public void changeClosedState(TimerTask task) {
         if (task instanceof TimerProject) {
             saveProject((TimerProject) task);
         } else {
@@ -1360,14 +1360,6 @@
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask)
-     */
-    @Override
-    public void preChangeClosedState(TimerTask task) {
-        // nothing
-    }
-
-    /*
      * @see org.chorem.jtimer.data.event.DataEventListener#preMoveTask(org.chorem.jtimer.entities.TimerTask)
      */
     @Override

Modified: trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java
===================================================================
--- trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java	2012-03-17 09:44:07 UTC (rev 2831)
+++ trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java	2012-03-17 09:58:17 UTC (rev 2832)
@@ -199,22 +199,14 @@
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask)
+     * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask)
      */
     @Override
-    public void postChangeClosedState(TimerTask task) {
+    public void changeClosedState(TimerTask task) {
 
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask)
-     */
-    @Override
-    public void preChangeClosedState(TimerTask task) {
-
-    }
-
-    /*
      * @see org.chorem.jtimer.data.event.DataEventListener#startTask(org.chorem.jtimer.entities.TimerTask)
      */
     @Override

Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java
===================================================================
--- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java	2012-03-17 09:44:07 UTC (rev 2831)
+++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java	2012-03-17 09:58:17 UTC (rev 2832)
@@ -254,22 +254,14 @@
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask)
+     * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask)
      */
     @Override
-    public void postChangeClosedState(TimerTask task) {
+    public void changeClosedState(TimerTask task) {
 
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask)
-     */
-    @Override
-    public void preChangeClosedState(TimerTask task) {
-
-    }
-
-    /*
      * @see org.chorem.jtimer.ui.systray.SystrayManager#startTask(org.chorem.jtimer.entities.TimerTask)
      */
     @Override

Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java
===================================================================
--- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java	2012-03-17 09:44:07 UTC (rev 2831)
+++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java	2012-03-17 09:58:17 UTC (rev 2832)
@@ -234,22 +234,14 @@
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask)
+     * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask)
      */
     @Override
-    public void postChangeClosedState(TimerTask task) {
+    public void changeClosedState(TimerTask task) {
 
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask)
-     */
-    @Override
-    public void preChangeClosedState(TimerTask task) {
-
-    }
-
-    /*
      * @see org.chorem.jtimer.data.event.DataEventListener#startTask(org.chorem.jtimer.entities.TimerTask)
      */
     @Override

Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java
===================================================================
--- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java	2012-03-17 09:44:07 UTC (rev 2831)
+++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java	2012-03-17 09:58:17 UTC (rev 2832)
@@ -469,26 +469,18 @@
     }
 
     /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask)
+     * @see org.chorem.jtimer.data.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask)
      */
     @Override
-    public void postChangeClosedState(TimerTask task) {
+    public void changeClosedState(TimerTask task) {
 
-    }
-
-    /*
-     * @see org.chorem.jtimer.data.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask)
-     */
-    @Override
-    public void preChangeClosedState(TimerTask task) {
-
         if (showClosedTask) {
             if (log.isDebugEnabled()) {
                 log.debug("Fire modify on state change because hidden task are shown");
             }
             notifyTaskChanged(task, OPERATION_MODIFY);
         } else {
-            if (!task.isClosed()) {
+            if (task.isClosed()) {
                 if (log.isDebugEnabled()) {
                     log.debug("Fire delete on state change because task disapear from view");
                 }

Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java
===================================================================
--- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java	2012-03-17 09:44:07 UTC (rev 2831)
+++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java	2012-03-17 09:58:17 UTC (rev 2832)
@@ -767,22 +767,14 @@
     }
 
     /*
-     * @see org.chorem.jtimer.event.DataEventListener#preChangeClosedState(org.chorem.jtimer.entities.TimerTask)
+     * @see org.chorem.jtimer.event.DataEventListener#changeClosedState(org.chorem.jtimer.entities.TimerTask)
      */
     @Override
-    public void preChangeClosedState(TimerTask task) {
+    public void changeClosedState(TimerTask task) {
 
     }
 
     /*
-     * @see org.chorem.jtimer.event.DataEventListener#postChangeClosedState(org.chorem.jtimer.entities.TimerTask)
-     */
-    @Override
-    public void postChangeClosedState(TimerTask task) {
-
-    }
-
-    /*
      * @see org.chorem.jtimer.event.DataEventListener#postMoveTask(org.chorem.jtimer.entities.TimerTask)
      */
     @Override

    

[Jtimer-commits] r2832 - in trunk/src/main/java/org/chorem/jtimer: data io ui ui/systray ui/treetable ws/xmlrpc

echatellier＠users.chorem.org