X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FCompositeRouterConfig.java;h=2b578bdf2c5a2208482b38f1c47aa2ddf3339e97;hb=3b2c669b25bfcb5a3c3f06ff9180d85143bebb2a;hp=2b40e58a2e3ca2d7558a5cf2aaac538d7df5dfb0;hpb=e52385618670b54a5c6a4f2fbfab381bef43a905;p=xmlrouter

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java
index 2b40e58..2b578bd 100644
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/CompositeRouterConfig.java
@@ -18,40 +18,34 @@ package org.wamblee.xmlrouter.impl;
 import java.util.Collection;
 
 import org.wamblee.xmlrouter.common.Id;
-import org.wamblee.xmlrouter.config.Config;
 import org.wamblee.xmlrouter.config.DocumentType;
 import org.wamblee.xmlrouter.config.Filter;
-import org.wamblee.xmlrouter.config.RouterConfig;
 import org.wamblee.xmlrouter.config.Transformation;
 
-// TODO test this class.
 public class CompositeRouterConfig implements ExtendedRouterConfig {
 
-    private Id<RouterConfig> id;
+    private static final Id<RouterConfig> ID = new Id<RouterConfig>(
+        "compositerouterconfig");
     private CompositeConfig<DocumentType> documentTypes;
     private CompositeConfig<Transformation> transformations;
     private CompositeConfig<Filter> filters;
 
     public CompositeRouterConfig(Id<RouterConfig> aId,
         Collection<RouterConfig> aConfigs) {
-        id = aId;
-        documentTypes = new CompositeConfig<DocumentType>(new Id<Config>(
-            "documentTypes"));
-        transformations = new CompositeConfig<Transformation>(new Id<Config>(
-            "transformations"));
-        filters = new CompositeConfig<Filter>(new Id<Config>("filters"));
+        documentTypes = new CompositeConfig<DocumentType>(DocumentType.class);
+        transformations = new CompositeConfig<Transformation>(
+            Transformation.class);
+        filters = new CompositeConfig<Filter>(Filter.class);
         for (RouterConfig config : aConfigs) {
-            documentTypes.add(config.documentTypeConfig());
-            transformations.add(config.transformationConfig());
-            filters.add(config.filterConfig());
+            documentTypes.addConfig(config.documentTypeConfig());
+            transformations.addConfig(config.transformationConfig());
+            filters.addConfig(config.filterConfig());
         }
     }
 
-    // TODO test id.
-
     @Override
     public Id<RouterConfig> getId() {
-        return id;
+        return ID;
     }
 
     @Override