cleanup and rename RegistrationValidationException to TypeDesignationSetException...

diff --git a/src/main/java/eu/etaxonomy/cdm/service/IRegistrationWorkflowService.java b/src/main/java/eu/etaxonomy/cdm/service/IRegistrationWorkflowService.java
index edcee7f8198eb8734a1d08c3d41bbf5207bf837c..c2017903b942c58af44503e462cddc3ae913fa33 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/service/IRegistrationWorkflowService.java
+++ b/src/main/java/eu/etaxonomy/cdm/service/IRegistrationWorkflowService.java
@@ -14,7 +14,7 @@ import java.util.UUID;
 import org.springframework.transaction.annotation.Transactional;
 
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
-import eu.etaxonomy.cdm.api.service.exception.RegistrationValidationException;
+import eu.etaxonomy.cdm.api.service.exception.TypeDesignationSetException;
 import eu.etaxonomy.cdm.model.name.Registration;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 
@@ -34,7 +34,7 @@ public interface IRegistrationWorkflowService {
     Registration createRegistration(TaxonName taxonName, List<Registration> relatedBlockingRegistrations);
 
     @Transactional
-    boolean createRegistrationforExistingName(RegistrationWorkingSet workingset, TaxonName typifiedName) throws RegistrationValidationException;
+    boolean createRegistrationforExistingName(RegistrationWorkingSet workingset, TaxonName typifiedName) throws TypeDesignationSetException;
 
     @Transactional(readOnly=true)
     Registration reloadRegistration(Registration registration);

diff --git a/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java b/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java
index 9fc624a2864f86a58c6ece3f000533bcf7588643..07ec22b1a47c24e09649eedf3adf45a352c2fed1 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java
+++ b/src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkflowService.java
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
 import eu.etaxonomy.cdm.api.application.CdmRepository;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
-import eu.etaxonomy.cdm.api.service.exception.RegistrationValidationException;
+import eu.etaxonomy.cdm.api.service.exception.TypeDesignationSetException;
 import eu.etaxonomy.cdm.api.service.idminter.RegistrationIdentifierMinter;
 import eu.etaxonomy.cdm.model.name.Registration;
 import eu.etaxonomy.cdm.model.name.TaxonName;
@@ -71,7 +71,7 @@ public class RegistrationWorkflowService implements IRegistrationWorkflowService
 
 
     @Override
-    public boolean createRegistrationforExistingName(RegistrationWorkingSet workingset, TaxonName typifiedName) throws RegistrationValidationException {
+    public boolean createRegistrationforExistingName(RegistrationWorkingSet workingset, TaxonName typifiedName) throws TypeDesignationSetException {
 
         boolean doReloadWorkingSet = false;
         Reference citation = getRepo().getReferenceService().load(workingset.getCitationUuid(), Arrays.asList("authorship.$", "inReference.authorship.$"));

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 0a47462aba734b0434d7eeba3d2c6fcfa9bd1758..b5c3148a3ceee001cafbf8136df2bcbf2a08e9fa 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
@@ -40,7 +40,7 @@ import com.vaadin.ui.Window;
 import eu.etaxonomy.cdm.api.service.config.RegistrationStatusTransitions;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
-import eu.etaxonomy.cdm.api.service.exception.RegistrationValidationException;
+import eu.etaxonomy.cdm.api.service.exception.TypeDesignationSetException;
 import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet.TypeDesignationSetType;
 import eu.etaxonomy.cdm.api.service.registration.IRegistrationWorkingSetService;
 import eu.etaxonomy.cdm.api.util.UserHelper;
@@ -186,7 +186,7 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
                     // only add if the regDtoUnpersisted has not been persisted meanwhile
                     try {
                         workingset.add(regDtoUnpersisted);
-                    } catch (RegistrationValidationException e) {
+                    } catch (TypeDesignationSetException e) {
                         // would never happen here //
                     }
                 }
@@ -263,7 +263,7 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
 
         try {
             workingset = getWorkingSetService().loadWorkingSetByReferenceUuid(referenceUuid, true);
-        } catch (RegistrationValidationException error) {
+        } catch (TypeDesignationSetException error) {
             logger.error(error);
             showErrorDialog("Validation Error", error.getMessage());
         }
@@ -437,11 +437,11 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
      * See also {@link #onTaxonNameEditorActionAdd(TaxonNameEditorAction)}).
      *
      * @param event
-     * @throws RegistrationValidationException
+     * @throws TypeDesignationSetException
      *      passes on the Exception which may come from onRegistrationWorkflowEventActionStart()
      */
     @EventBusListenerMethod
-    public void onDoneWithTaxonnameEditor(DoneWithPopupEvent event) throws RegistrationValidationException {
+    public void onDoneWithTaxonnameEditor(DoneWithPopupEvent event) throws TypeDesignationSetException {
 
         if(!isFromOwnView(event)){
             return;
@@ -514,10 +514,10 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
      * Creates a new Registration for an exiting (previously published) name.
      *
      * @param event
-     * @throws RegistrationValidationException
+     * @throws TypeDesignationSetException
      */
     @EventBusListenerMethod
-    public void onRegistrationWorkflowEventActionStart(RegistrationWorkingsetAction event) throws RegistrationValidationException {
+    public void onRegistrationWorkflowEventActionStart(RegistrationWorkingsetAction event) throws TypeDesignationSetException {
 
         if(!event.isStart()){
             return;
@@ -657,7 +657,7 @@ public class RegistrationWorkingsetPresenter extends AbstractPresenter<Registrat
      *
      *
      * @param event
-     * @throws RegistrationValidationException
+     * @throws TypeDesignationSetException
      */
     @EventBusListenerMethod
     public void onDoneWithTypeDesignationEditor(DoneWithPopupEvent event) {

diff --git a/src/test/java/eu/etaxonomy/cdm/vaadin/model/RegistrationWorkingSetTest.java b/src/test/java/eu/etaxonomy/cdm/vaadin/model/RegistrationWorkingSetTest.java
index bd457d354d17ad2ce476b5429639f7d02037b6c2..ea3d93b094c2578c21db6f16c901d4d9362a09e4 100644 (file)
--- a/src/test/java/eu/etaxonomy/cdm/vaadin/model/RegistrationWorkingSetTest.java
+++ b/src/test/java/eu/etaxonomy/cdm/vaadin/model/RegistrationWorkingSetTest.java
@@ -18,7 +18,7 @@ import org.junit.Test;
 
 import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
-import eu.etaxonomy.cdm.api.service.exception.RegistrationValidationException;
+import eu.etaxonomy.cdm.api.service.exception.TypeDesignationSetException;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.Registration;
@@ -38,7 +38,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 public class RegistrationWorkingSetTest {
 
     @Test
-    public void test_2_names() throws RegistrationValidationException {
+    public void test_2_names() throws TypeDesignationSetException {
 
         Reference article = ReferenceFactory.newArticle();
         article.setTitleCache("Article", true);
@@ -65,7 +65,7 @@ public class RegistrationWorkingSetTest {
 
 
     @Test
-    public void test_name_and_type() throws RegistrationValidationException {
+    public void test_name_and_type() throws TypeDesignationSetException {
 
         Reference article = ReferenceFactory.newArticle();
         article.setTitleCache("Article", true);