git://wamblee.org
/
xmlrouter
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor
[xmlrouter]
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
xmlrouter
/
impl
/
CompositeConfig.java
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 22052108f5dd780c5eaffc3eb23f0e90bddafca0..d837f1776aec4039cfe587874a05a0cece8d4694 100644
(file)
--- 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.common.Id;
import org.wamblee.xmlrouter.config.Config;
-import org.wamblee.xmlrouter.config.
Duplicate
Exception;
+import org.wamblee.xmlrouter.config.
Config
Exception;
import org.wamblee.xmlrouter.config.Identifiable;
/**
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) {
private List<T> values;
public CompositeConfig(Id<Config> aId) {
+ notNull("aId", aId);
ids = new HashSet<Id<Config>>();
id = aId;
valueIds = new ArrayList<Id<T>>();
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) {
}
public void addConfig(Config<T> aConfig) {
+ notNull("aConfig", aConfig);
if (ids.contains(aConfig.getId())) {
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())) {
}
for (T item : aConfig.values()) {
if (valueIds.contains(item.getId())) {
- throw new DuplicateException(item.getId().toString());
+ throw new ConfigException("duplicate id '" +
+ item.getId().toString() + "'");
}
}
}
}