Changeset 215 for VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/User.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/User.java (modified) (3 diffs)

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

@@ -52 +52 @@
         public void setName(String name) {
                 if (name == null) {
-                        throw new IllegalArgumentException("name == null");
+                        throw new NullPointerException("name == null");
+                }
+                name = name.trim();
+                if (name.isEmpty()) {
+                        throw new IllegalArgumentException("empty name is not allowed");
                 }
                 this.name = name;
         }
-        
+
         public String getName() {
                 return name;
@@ -67 +71 @@
         public boolean equals(Object o) {
                 if (o == null) {
-                        throw new IllegalArgumentException("o == null");
+                        throw new NullPointerException("o == null");
                 }
                 if (o instanceof User) {
@@ -78 +82 @@
         public boolean equalsPrincipal(Principal principal) {
                 if (principal == null) {
-                        throw new IllegalArgumentException("principal == null");
+                        throw new NullPointerException("principal == null");
                 }
                 return name.equals(principal.getName());