kemitix/node
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NodeItem: inline verifyChildWithSameNameDoesNotAlreadyExis

Browse source
This commit is contained in:
Paul Campbell 2017-02-16 21:09:09 +00:00
parent 151a6f351c
commit eb4acbaf89
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/net/kemitix/node/NodeItem.java
View file

@ -143,7 +143,13 @@ class NodeItem<T> implements Node<T> {
@Override @Override
public void addChild(@NonNull final Node<T> child) { public void addChild(@NonNull final Node<T> child) {
verifyChildIsNotAnAncestor(child); verifyChildIsNotAnAncestor(child);
verifyChildWithSameNameDoesNotAlreadyExist(child); //verifyChildWithSameNameDoesNotAlreadyExist
if (child.isNamed()) {
findChildByName(child.getName()).filter(existingChild -> existingChild != child)
.ifPresent(existingChild -> {
throw new NodeException("Node with that name already exists here");
});
}
children.add(child); children.add(child);
// update the child's parent if they don't have one or it is not this // update the child's parent if they don't have one or it is not this
val childParent = child.getParent(); val childParent = child.getParent();
@ -153,17 +159,6 @@ class NodeItem<T> implements Node<T> {
} }
} }
private void verifyChildWithSameNameDoesNotAlreadyExist(
final @NonNull Node<T> child
) {
if (child.isNamed()) {
findChildByName(child.getName()).filter(existingChild -> existingChild != child)
.ifPresent(existingChild -> {
throw new NodeException("Node with that name already exists here");
});
}
}
private void verifyChildIsNotAnAncestor(final @NonNull Node<T> child) { private void verifyChildIsNotAnAncestor(final @NonNull Node<T> child) {
if (this.equals(child) || isDescendantOf(child)) { if (this.equals(child) || isDescendantOf(child)) {
throw new NodeException("Child is an ancestor"); throw new NodeException("Child is an ancestor");