git://wamblee.org
/
xmlrouter
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
equality based on the ids of the contents of SingleRouterConfig.
[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 2523ef8d652b76752251f340c05e60b88ceca7a4..c9e250e49824fa44272aa3f1addd919f74871c09 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;
/**
@@
-37,33
+37,33
@@
import org.wamblee.xmlrouter.config.Identifiable;
public class CompositeConfig<T extends Identifiable<T>> implements
ExtendedConfig<T> {
public class CompositeConfig<T extends Identifiable<T>> implements
ExtendedConfig<T> {
+ private static final Id<Config> ID = new Id<Config>("compositeconfig");
private static final String READ_ONLY_INSTANCE = "read only instance";
private Set<Id<Config>> ids;
private static final String READ_ONLY_INSTANCE = "read only instance";
private Set<Id<Config>> ids;
- private Id<Config> id;
private List<Id<T>> valueIds;
private List<T> values;
private List<Id<T>> valueIds;
private List<T> values;
- public CompositeConfig(Id<Config> aId) {
- notNull("aId", aId);
+ public CompositeConfig() {
ids = new HashSet<Id<Config>>();
ids = new HashSet<Id<Config>>();
- id = aId;
valueIds = new ArrayList<Id<T>>();
values = new ArrayList<T>();
}
@Override
public Id<Config> getId() {
valueIds = new ArrayList<Id<T>>();
values = new ArrayList<T>();
}
@Override
public Id<Config> getId() {
- return
id
;
+ return
ID
;
}
public void addConfig(Config<T> aConfig) {
notNull("aConfig", aConfig);
if (ids.contains(aConfig.getId())) {
}
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())) {
}
for (T item : aConfig.values()) {
if (valueIds.contains(item.getId())) {
- throw new DuplicateException(item.getId().toString());
+ throw new ConfigException("duplicate id '" +
+ item.getId().toString() + "'");
}
}
}
}