From: Andreas Müller <a.mueller@bgbm.org>
Date: Tue, 12 Jul 2022 21:02:39 +0000 (+0200)
Subject: cleanup and rename RegistrationValidationException to TypeDesignationSetException... 
X-Git-Tag: 5.32.0^2~22
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdm-vaadin.git/commitdiff_plain/7aa81094e0426596bf9ddc38842d339227b18af7

cleanup and rename RegistrationValidationException to TypeDesignationSetException in vaadin
---

diff --git a/src/main/java/eu/etaxonomy/cdm/service/IRegistrationWorkflowService.java b/src/main/java/eu/etaxonomy/cdm/service/IRegistrationWorkflowService.java
index edcee7f8..c2017903 100644
--- 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 9fc624a2..07ec22b1 100644
--- 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 0a47462a..b5c3148a 100644
--- 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 bd457d35..ea3d93b0 100644
--- 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);