Changeset 215 for VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollectionValidator.java

Timestamp:

03/04/10 12:11:07 (14 years ago)

Author:

oschonef

Message:

• improve error handling
• improve error messages and reporting

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollectionValidator.java (modified) (2 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollectionValidator.java

@@ -2 +2 @@
 
 import java.util.HashMap;
+
+import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryException;
+import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryUsageException;
 
 public class VirtualCollectionValidator {
@@ -9 +12 @@
                 new HashMap<String, Resource>();
         
-        public void validate(VirtualCollection vc) {
+        public void validate(VirtualCollection vc)
+                        throws VirtualCollectionRegistryException {
+                if ((vc.getName() == null) || vc.getName().trim().isEmpty()) {
+                        throw new VirtualCollectionRegistryUsageException(
+                                        "collection has an empty name");
+                }
                 for (Resource resource : vc.getResources()) {
                         int signature = resource.getSignature();
                         if (uniqueResources.containsKey(signature)) {
-                                throw new IllegalArgumentException("collection contains non-unique resources");
+                                throw new VirtualCollectionRegistryUsageException(
+                                                "collection contains non-unique resources");
                         }
                         uniqueResources.put(signature, resource);
                         String ref = resource.getRef();
                         if ((ref == null) || ref.trim().isEmpty()) {
-                                throw new IllegalArgumentException("collection contains resource with empty ResourceRef");
+                                throw new VirtualCollectionRegistryUsageException(
+                                                "collection contains resource with empty ResourceRef");
                         }
                         if (uniqueResourceRefs.containsKey(ref)) {
-                                throw new IllegalArgumentException("collection contains non-unique ResourceRefs");
+                                throw new VirtualCollectionRegistryUsageException(
+                                                "collection contains non-unique ResourceRefs");
                         }
                         uniqueResourceRefs.put(ref, resource);