X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxmlrouter%2Fimpl%2FConfigImpl.java;h=0e1da0be84853fb6b7690d5ddecfef1f1bd3c3ed;hb=5582d07a1ba9821cc789ea63b71f246e89d13cae;hp=e29725e8655d2be5ad4fab667d4152dca68e37e8;hpb=f70baadfd579f4d3aa2e8c9ee7d758fb37d7872f;p=xmlrouter

diff --git a/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigImpl.java b/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigImpl.java
index e29725e..0e1da0b 100644
--- a/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigImpl.java
+++ b/impl/src/main/java/org/wamblee/xmlrouter/impl/ConfigImpl.java
@@ -15,13 +15,17 @@
  */
 package org.wamblee.xmlrouter.impl;
 
+import static org.wamblee.xmlrouter.impl.MessageUtil.*;
+
+import java.util.Collection;
 import java.util.Collections;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
 
 import org.wamblee.xmlrouter.common.Id;
 import org.wamblee.xmlrouter.config.Config;
+import org.wamblee.xmlrouter.config.ConfigException;
+import org.wamblee.xmlrouter.config.Identifiable;
 
 /**
  * Default implementation of the {@link Config} interface.
@@ -30,19 +34,47 @@ import org.wamblee.xmlrouter.config.Config;
  * 
  * @param <T>
  */
-public abstract class ConfigImpl<T> implements ExtendedConfig<T> {
+public abstract class ConfigImpl<T extends Identifiable<T>> implements
+    ExtendedConfig<T> {
 
-    private boolean dirty;
-    private AtomicLong next;
+    private Class<T> type;
+    private Id<Config> id;
     private Map<Id<T>, T> registered;
 
     /**
      * Constructs the object.
      */
-    public ConfigImpl(AtomicLong aNext) {
-        dirty = false;
-        next = aNext;
-        registered = new LinkedHashMap<Id<T>, T>();
+    public ConfigImpl(Class<T> aType, Id<Config> aId) {
+        notNull("type", aType);
+        notNull("id", aId);
+        type = aType;
+        id = aId;
+        registered = new HashMap<Id<T>, T>();
+    }
+
+    @Override
+    public Class<T> getType() {
+        return type;
+    }
+
+    /**
+     * Copies the config object.
+     * 
+     * @param aConfig
+     *            Config to copy.
+     */
+    public ConfigImpl(ConfigImpl<T> aConfig) {
+        notNull("config", aConfig);
+        id = aConfig.id;
+        registered = new HashMap<Id<T>, T>();
+        for (Map.Entry<Id<T>, T> entry : aConfig.registered.entrySet()) {
+            registered.put(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @Override
+    public Id<Config> getId() {
+        return id;
     }
 
     /*
@@ -51,25 +83,22 @@ public abstract class ConfigImpl<T> implements ExtendedConfig<T> {
      * @see org.wamblee.xmlrouter.config.Config#add(T)
      */
     @Override
-    public synchronized Id<T> add(T aT) {
-        notNull(aT);
-        long seqno = next.incrementAndGet();
-        Id<T> id = new Id<T>(seqno);
-        registered.put(id, wrap(id, aT));
-        dirty = true;
-        return id;
+    public synchronized void add(T aT) {
+        notNull("aT", aT);
+        if (registered.containsKey(aT.getId())) {
+            throw new ConfigException("Duplicate id '" + aT.getId() + "'");
+        }
+        registered.put(aT.getId(), wrap(id.getId() + ".", aT));
     }
 
     /**
      * This is called to wrap the given object by a safer version.
      * 
-     * @param aId
-     *            Id.
      * @param aT
      *            Object to wrap.
      * @return Wrapped object.
      */
-    public abstract T wrap(Id<T> aId, T aT);
+    public abstract T wrap(String aPrefix, T aT);
 
     /*
      * (non-Javadoc)
@@ -80,25 +109,34 @@ public abstract class ConfigImpl<T> implements ExtendedConfig<T> {
      */
     @Override
     public synchronized boolean remove(Id<T> aId) {
-        notNull(aId);
-        dirty = true;
-        return registered.remove(aId) != null;
+        notNull("aId", aId);
+        T value = registered.get(aId);
+        if (value != null) {
+            registered.remove(aId);
+            return true;
+        }
+        return false;
     }
 
     @Override
-    public Map<Id<T>, T> map() {
-        return Collections.unmodifiableMap(registered);
+    public Collection<T> values() {
+        return Collections.unmodifiableCollection(registered.values());
     }
 
-    private void notNull(T aT) {
-        if (aT == null) {
-            throw new NullPointerException("Object is null");
+    @Override
+    public boolean equals(Object aObj) {
+        if (aObj == null) {
+            return false;
+        }
+        if (!(aObj instanceof ConfigImpl)) {
+            return false;
         }
+        ConfigImpl obj = (ConfigImpl) aObj;
+        return registered.keySet().equals(obj.registered.keySet());
     }
 
-    private void notNull(Id<T> aId) {
-        if (aId == null) {
-            throw new NullPointerException("Id is null");
-        }
+    @Override
+    public int hashCode() {
+        return registered.keySet().hashCode();
     }
 }