ref #8470: exception handling also for groups

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java
index 591f38fc37d2d2f66d64c39b6394cc7d26bdddf6..c1c7623bc621ee76bbefa32d9345f32bf194da43 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java
@@ -17,6 +17,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
+import javax.validation.ConstraintViolationException;
+
 import eu.etaxonomy.cdm.api.service.IGroupService;
 import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
@@ -30,6 +32,8 @@ import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
 import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.GroupCreator;
 import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.GroupNameComparator;
+import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -65,7 +69,12 @@ public class GroupEditorInput extends AbstractBulkEditorInput<Group> {
 
        @Override
        public Group save(Group entity) {
-           return CdmStore.getService(IGroupService.class).merge(entity, true).getMergedEntity();
+               try {
+                       return CdmStore.getService(IGroupService.class).merge(entity, true).getMergedEntity();
+               }catch (ConstraintViolationException cve){
+                   MessagingUtils.messageDialog(Messages.GROUP_CREATOR_Name_not_accepted, getClass(), Messages.GROUP_CREATOR_Name_not_accepted_message);
+                   return null;
+               }
 
        }
 

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index a95b29deac48854abc0611ea25ddb04c82edd89d..e269b52edb03611cab0474cb41ce993021a83c74 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -16,6 +16,8 @@ public class Messages extends NLS {
 
     public static String GROUP_CREATOR_group_exists_title;
     public static String GROUP_CREATOR_group_exists;
+    public static String GROUP_CREATOR_Name_not_accepted_message;
+    public static String GROUP_CREATOR_Name_not_accepted;
     public static String BulkEditorE4_CANCEL;
     public static String BulkEditorE4_DONT_SAVE;
     public static String BulkEditorE4_SAVE_AND_SEARCH;

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index 77e8e07bdf67c86dbfa75323f5078b56a966c641..59ebf38219bd20ce07e9eb30177d0f5bd1e00b91 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -32,6 +32,9 @@ USER_CREATOR_Name_not_accepted_message=Only the following characters are allowed
 
 GROUP_CREATOR_group_exists_title=The group already exists
 GROUP_CREATOR_group_exists=The group already exists in database.
+GROUP_CREATOR_Name_not_accepted_message=Groupname not accepted
+GROUP_CREATOR_Name_not_accepted=Only the following characters are allowed for groupnames: A-Za-z0-9_.-
+
 ReferencingObjectsLabelProvider_No_description_available=No description available
 ConvertPerson2TeamHandler_warning=While reloading the data an exception occurred
 ConvertPerson2TeamHandler_lable=Convert Person to Team

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 8882a9313e2be7cdce215edf552ec814be57d41a..9c643a5290a88615915e18ab20e3d58abe099c1e 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -31,7 +31,8 @@ USER_CREATOR_Name_not_accepted=Username nicht akzeptiert
 USER_CREATOR_Name_not_accepted_message=Der Username darf nur die folgenden Zeichen enthalten: A-Za-z0-9_.-
 GROUP_CREATOR_group_exists_title=Die Gruppe existiert bereits
 GROUP_CREATOR_group_exists=Die Gruppe existiert bereits in der Datenbank.
-
+GROUP_CREATOR_Name_not_accepted_message=Gruppenname nicht akzeptiert
+GROUP_CREATOR_Name_not_accepted=Der Gruppenname darf nur die folgenden Zeichen enthalten: A-Za-z0-9_.-
 ReferencingObjectsLabelProvider_No_description_available=Keine Beschreibung verfügbar
 ConvertPerson2TeamHandler_warning=Beim Neuladen der Daten ist ein Fehler aufgetreten
 ConvertPerson2TeamHandler_lable=Wandle Person in Team um