no longer deleting registration when typedesignation editors are canceled

[cdm-vaadin.git] / src / main / java / eu / etaxonomy / cdm / vaadin / view / registration / RegistrationWorkingsetPresenter.java

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
index 86fb7a44e08352b7cb66916a3a95b6c671ffe406..c5550933197e1d5d546f736568dafd0b7e1fbbea 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
@@ -507,12 +507,8 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
             if(event.getReason().equals(Reason.SAVE)){
                 refreshView(true);
             } else if(event.getReason().equals(Reason.CANCEL)){
-                // clean up
-                if(newRegistrationDTOWithExistingName != null){
-                    getRegistrationStore().deleteBean(newRegistrationDTOWithExistingName.registration(), (AbstractView) getView());
-                }
+                // noting to do
             }
-            // set newRegistrationDTOWithExistingName NULL in any case
             newRegistrationDTOWithExistingName = null;
         } else if(event.getPopup() instanceof NameTypeDesignationPopupEditor){
             if(event.getReason().equals(Reason.SAVE)){
@@ -529,11 +525,11 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
                 txstate.commit();
                 session.close();
 
-                newNameTypeDesignationTarget = null;
                 refreshView(true);
             } else if(event.getReason().equals(Reason.CANCEL)){
                 // noting to do
             }
+            newNameTypeDesignationTarget = null;
         }
         // ignore other editors
     }