X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FSingleRouterConfig.java;h=4ecaad4a35d633679620f791426242f868784b35;hb=5582d07a1ba9821cc789ea63b71f246e89d13cae;hp=f0bf090d2fa1b9f49afe7352e5ce7f77e5db0ef0;hpb=6c41c1cabffcc509c5b736f73578930808f6616f;p=xmlrouter

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java
index f0bf090..4ecaad4 100644
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/SingleRouterConfig.java
@@ -22,7 +22,6 @@ import org.wamblee.xmlrouter.config.Filter;
 import org.wamblee.xmlrouter.config.RouterConfig;
 import org.wamblee.xmlrouter.config.Transformation;
 
-// TODO implement equality based on ids for the single routerconfig. 
 // TODO implement copying of routerconfig. 
 
 /**
@@ -32,10 +31,59 @@ import org.wamblee.xmlrouter.config.Transformation;
  * @author Erik Brakkee
  */
 public class SingleRouterConfig implements ExtendedRouterConfig {
+
+    public static final class DocumentConfig extends ConfigImpl<DocumentType> {
+        public DocumentConfig(Id<Config> aId) {
+            super(DocumentType.class, aId);
+        }
+
+        public DocumentConfig(DocumentConfig aConfig) {
+            super(aConfig);
+        }
+
+        @Override
+        public DocumentType wrap(String aPrefix, DocumentType aT) {
+            return new RobustDocumentType("", aT);
+        }
+    }
+
+    public static final class TransformationConfig extends
+        ConfigImpl<Transformation> {
+        public TransformationConfig(Id<Config> aId) {
+            super(Transformation.class, aId);
+        }
+
+        public TransformationConfig(TransformationConfig aConfig) {
+            super(aConfig);
+        }
+
+        @Override
+        public Transformation wrap(String aPrefix,
+            Transformation aTransformation) {
+            return new RobustTransformation("", aTransformation);
+        }
+    }
+
+    public static final class FilterConfig extends ConfigImpl<Filter> {
+        public FilterConfig(Id<Config> aId) {
+            super(Filter.class, aId);
+        }
+
+        public FilterConfig(FilterConfig aConfig) {
+            super(aConfig);
+        }
+
+        @Override
+        public Filter wrap(String aPrefix, Filter aFilter) {
+            return new RobustFilter("", aFilter);
+        }
+    }
+
     private Id<RouterConfig> id;
-    private ExtendedConfig<DocumentType> documentTypes;
-    private ExtendedConfig<Transformation> transformations;
-    private ExtendedConfig<Filter> filters;
+
+    private DocumentConfig documentTypes;
+    private TransformationConfig transformations;
+    private FilterConfig filters;
 
     /**
      * Constructs a router configuration.
@@ -45,31 +93,20 @@ public class SingleRouterConfig implements ExtendedRouterConfig {
      */
     public SingleRouterConfig(Id<RouterConfig> aId) {
         id = aId;
-        documentTypes = new ConfigImpl<DocumentType>(new Id<Config>(
-            aId.getId() + ".documenttypes")) {
-            @Override
-            public DocumentType wrap(String aPrefix, DocumentType aT) {
-                return new RobustDocumentType(aPrefix, aT);
-            }
-        };
-        transformations = new ConfigImpl<Transformation>(new Id<Config>(
-            aId.getId() + ".transformations")) {
-            @Override
-            public Transformation wrap(String aPrefix,
-                Transformation aTransformation) {
-                return new RobustTransformation(aPrefix, aTransformation);
-            }
-        };
-        filters = new ConfigImpl<Filter>(new Id<Config>(aId.getId() +
-            ".filters")) {
-            @Override
-            public Filter wrap(String aPrefix, Filter aFilter) {
-                return new RobustFilter(aPrefix, aFilter);
-            }
-        };
+        documentTypes = new DocumentConfig(new Id<Config>(aId.getId() +
+            ".documenttypes"));
+        transformations = new TransformationConfig(new Id<Config>(aId.getId() +
+            ".transformations"));
+        filters = new FilterConfig(new Id<Config>(aId.getId() + ".filters"));
+    }
+
+    public SingleRouterConfig(SingleRouterConfig aConfig) {
+        id = aConfig.id;
+        documentTypes = new DocumentConfig(aConfig.documentTypes);
+        transformations = new TransformationConfig(aConfig.transformations);
+        filters = new FilterConfig(aConfig.filters);
     }
 
-    // TODO test getId.
     @Override
     public Id<RouterConfig> getId() {
         return id;
@@ -89,4 +126,25 @@ public class SingleRouterConfig implements ExtendedRouterConfig {
     public Config<Filter> filterConfig() {
         return filters;
     }
+
+    @Override
+    public boolean equals(Object aObj) {
+        if (aObj == null) {
+            return false;
+        }
+        if (!(aObj instanceof SingleRouterConfig)) {
+            return false;
+        }
+        SingleRouterConfig obj = (SingleRouterConfig) aObj;
+
+        return documentTypes.equals(obj.documentTypes) &&
+            transformations.equals(obj.transformations) &&
+            filters.equals(obj.filters);
+    }
+
+    @Override
+    public int hashCode() {
+        return documentTypes.hashCode() + transformations.hashCode() +
+            filters.hashCode();
+    }
 }