X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FCompositeConfig.java;h=d837f1776aec4039cfe587874a05a0cece8d4694;hb=75f42f00e16ceee9ea333e598c9287de20ede1c3;hp=22052108f5dd780c5eaffc3eb23f0e90bddafca0;hpb=03a6b404471945aed9d48fc1e5b8447b4a9d9413;p=xmlrouter

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeConfig.java
index 2205210..d837f17 100644
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeConfig.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeConfig.java
@@ -24,7 +24,7 @@ import java.util.Set;
 
 import org.wamblee.xmlrouter.common.Id;
 import org.wamblee.xmlrouter.config.Config;
-import org.wamblee.xmlrouter.config.DuplicateException;
+import org.wamblee.xmlrouter.config.ConfigException;
 import org.wamblee.xmlrouter.config.Identifiable;
 
 /**
@@ -44,6 +44,7 @@ public class CompositeConfig<T extends Identifiable<T>> implements
     private List<T> values;
 
     public CompositeConfig(Id<Config> aId) {
+        notNull("aId", aId);
         ids = new HashSet<Id<Config>>();
         id = aId;
         valueIds = new ArrayList<Id<T>>();
@@ -56,12 +57,15 @@ public class CompositeConfig<T extends Identifiable<T>> implements
     }
 
     public void addConfig(Config<T> aConfig) {
+        notNull("aConfig", aConfig);
         if (ids.contains(aConfig.getId())) {
-            throw new DuplicateException(aConfig.getId().toString());
+            throw new ConfigException("duplicate id '" +
+                aConfig.getId().toString() + "'");
         }
         for (T item : aConfig.values()) {
             if (valueIds.contains(item.getId())) {
-                throw new DuplicateException(item.getId().toString());
+                throw new ConfigException("duplicate id '" +
+                    item.getId().toString() + "'");
             }
         }