cdm event listeners seem to work!

diff --git a/cdmlibrary/editCdm.spring.cfg.xml b/cdmlibrary/editCdm.spring.cfg.xml
index 4dc8e7c7f8bf3f32edc33803b0ad5806a58a408a..877800529ca95855432df25b8230ff916b1daee9 100644 (file)
--- a/cdmlibrary/editCdm.spring.cfg.xml
+++ b/cdmlibrary/editCdm.spring.cfg.xml
@@ -66,8 +66,10 @@
         <property name="eventListeners">
                        <map>
                        <!-- entry keys can be: load, save, update, delete -->
-                               <entry key="post-load"><ref local="loadListener" /></entry>
-                               <entry key="post-insert"><ref local="insertListener" /></entry>
+                       <!--
+                               <entry key="post-load"><ref local="loadListener" /></entry>
+                        -->
+                               <entry key="post-insert"><ref local="insertListener" /></entry>
                                <entry key="post-update"><ref local="updateListener" /></entry>
                                <entry key="post-delete"><ref local="deleteListener" /></entry>
                        </map>
@@ -100,8 +102,10 @@
     </bean>\r
 \r
        <!-- Hibernate Event Listener Beans -->
+<!--   
        <bean id="loadListener" class="eu.etaxonomy.cdm.event.PersistenceLoadListener" />
-       <bean id="insertListener" class="eu.etaxonomy.cdm.event.PersistenceInsertListener" />
+ -->   
+       <bean id="insertListener" class="eu.etaxonomy.cdm.event.PersistenceInsertListener" />
        <bean id="updateListener" class="eu.etaxonomy.cdm.event.PersistenceUpdateListener" />
        <bean id="deleteListener" class="eu.etaxonomy.cdm.event.PersistenceDeleteListener" />
        

diff --git a/cdmlibrary/src/eu/etaxonomy/cdm/event/CdmEventListenerSupport.java b/cdmlibrary/src/eu/etaxonomy/cdm/event/CdmEventListenerSupport.java
index e2731821905b873f7ca3a0acf323d15b526b8ea9..65323b919420fe11832316c144c83633c0f3004e 100644 (file)
--- a/cdmlibrary/src/eu/etaxonomy/cdm/event/CdmEventListenerSupport.java
+++ b/cdmlibrary/src/eu/etaxonomy/cdm/event/CdmEventListenerSupport.java
@@ -26,11 +26,7 @@ public abstract class CdmEventListenerSupport implements ICdmEventListenerRegist
        }
        
        public ICdmEventListener[] getCdmEventListener(){
-               if (listener.isEmpty()){
-                       return new ICdmEventListener[0];                        
-               }else{                  
-                       return (ICdmEventListener[]) listener.toArray();
-               }
+               return listener.toArray(new ICdmEventListener[0]);
        }
        
 //******* END CDM Event Support  ******//

diff --git a/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceDeleteListener.java b/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceDeleteListener.java
index 509201a47d9ddc25228d1ebd4f6c4f34cc6ec3ca..045172457a7b571d85a6c53c4ea2dbc872c02cf2 100644 (file)
--- a/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceDeleteListener.java
+++ b/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceDeleteListener.java
@@ -21,7 +21,7 @@ import org.hibernate.event.def.DefaultDeleteEventListener;
  * @version 0.1
  */
 public class PersistenceDeleteListener extends DefaultDeleteEventListener implements PostDeleteEventListener{
-       static Logger logger = Logger.getLogger(PersistenceChangeListener.class);
+       static Logger logger = Logger.getLogger(PersistenceDeleteListener.class);
     
        public void onPostDelete(PostDeleteEvent event) {
                

diff --git a/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceInsertListener.java b/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceInsertListener.java
index ed5d2dce0b041c6ee2d0ba63bd738cf629537cca..5653ade902f6d469ce76844635dc59ffb428a0ec 100644 (file)
--- a/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceInsertListener.java
+++ b/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceInsertListener.java
@@ -21,7 +21,7 @@ import org.hibernate.event.def.DefaultSaveEventListener;
  * @version 0.1
  */
 public class PersistenceInsertListener extends DefaultSaveEventListener implements PostInsertEventListener{
-       static Logger logger = Logger.getLogger(PersistenceChangeListener.class);
+       static Logger logger = Logger.getLogger(PersistenceInsertListener.class);
     
        public void onPostInsert(PostInsertEvent event) {
                ICdmEventListenerRegistration cdmObj = (ICdmEventListenerRegistration) event.getEntity();

diff --git a/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceUpdateListener.java b/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceUpdateListener.java
index 859d073715931fad324aca00ba8f5e7705d9b4dd..823b454ed2be24c66400404aac10dc909b658776 100644 (file)
--- a/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceUpdateListener.java
+++ b/cdmlibrary/src/eu/etaxonomy/cdm/event/PersistenceUpdateListener.java
@@ -21,7 +21,7 @@ import org.hibernate.event.def.DefaultUpdateEventListener;
  * @version 0.1
  */
 public class PersistenceUpdateListener extends DefaultUpdateEventListener implements PostUpdateEventListener{
-       static Logger logger = Logger.getLogger(PersistenceChangeListener.class);
+       static Logger logger = Logger.getLogger(PersistenceUpdateListener.class);
     
        public void onPostUpdate(PostUpdateEvent event) {
                

diff --git a/cdmlibrary/test/eu/etaxonomy/cdm/functiontest/SpringControl.java b/cdmlibrary/test/eu/etaxonomy/cdm/functiontest/SpringControl.java
index 0cb2bb11902f7fca4ceda110c42572e571a98690..c372d8b12d9b15db836d2ca58de45b7c1b948564 100644 (file)
--- a/cdmlibrary/test/eu/etaxonomy/cdm/functiontest/SpringControl.java
+++ b/cdmlibrary/test/eu/etaxonomy/cdm/functiontest/SpringControl.java
@@ -59,7 +59,7 @@ public class SpringControl {
                TaxonName tn3 = appCtr.getNameService().createTaxonName(Rank.SPECIES);\r
                \r
                \r
-               logger.info("Test CDM event listeners...");\r
+               logger.info("Create Listeners for CDM persistence ...");\r
                // this is what the GUI would be doing. add change listeners to the model\r
                ICdmEventListener listener = new ListenerTest();\r
                tn.addCdmEventListener(listener);\r
@@ -74,6 +74,7 @@ public class SpringControl {
                team.setShortName("AuthorTeam1");\r
                tn.setAuthorTeam(team);\r
                \r
+               logger.info("Save objects ...");\r
                appCtr.getAgentService().saveTeam(team);\r
                appCtr.getNameService().saveTaxonName(tn);\r
 \r