Added getParent() method to DataSchemaNode and DataNodeContainer. Fixed Bugs.

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / api / AbstractDataNodeContainerBuilder.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
index 927c7f7b35b295017d41aaf7e5365a80c9cb0958..55610d33b664ccaa1c3a3c55139809a3ca9e7f01 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
@@ -7,13 +7,20 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.api;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+import org.opendaylight.yangtools.yang.parser.util.Comparators;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 /**
@@ -22,12 +29,18 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder implements DataNodeContainerBuilder {
     protected QName qname;
 
-    protected Set<DataSchemaNode> childNodes;
+    protected Map<QName, DataSchemaNode> childNodes = new TreeMap<QName, DataSchemaNode>(Comparators.QNAME_COMP);
     protected final Set<DataSchemaNodeBuilder> addedChildNodes = new HashSet<DataSchemaNodeBuilder>();
 
-    protected Set<GroupingDefinition> groupings;
+    protected Set<GroupingDefinition> groupings = new TreeSet<GroupingDefinition>(Comparators.SCHEMA_NODE_COMP);
     protected final Set<GroupingBuilder> addedGroupings = new HashSet<GroupingBuilder>();
 
+    protected Set<TypeDefinition<?>> typedefs = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+    protected final Set<TypeDefinitionBuilder> addedTypedefs = new HashSet<>();
+
+    protected Set<UsesNode> usesNodes = new HashSet<>();
+    protected final Set<UsesNodeBuilder> addedUsesNodes = new HashSet<>();
+
     protected AbstractDataNodeContainerBuilder(final String moduleName, final int line, final QName qname) {
         super(moduleName, line);
         this.qname = qname;
@@ -39,15 +52,11 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
     }
 
     @Override
-    public Set<DataSchemaNode> getChildNodes() {
+    public Collection<DataSchemaNode> getChildNodes() {
         if (childNodes == null) {
             return Collections.emptySet();
         }
-        return childNodes;
-    }
-
-    public void setChildNodes(Set<DataSchemaNode> childNodes) {
-        this.childNodes = childNodes;
+        return childNodes.values();
     }
 
     @Override
@@ -78,6 +87,18 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
         addedChildNodes.add(child);
     }
 
+    @Override
+    public void addChildNode(DataSchemaNode child) {
+        QName childName = child.getQName();
+        for (QName qname : childNodes.keySet()) {
+            if (qname.equals(childName)) {
+                throw new YangParseException(moduleName, line, "Can not add '" + child + "' to '" + this
+                        + "' in module '" + moduleName + "': node with same name already declared");
+            }
+        }
+        childNodes.put(child.getQName(), child);
+    }
+
     @Override
     public Set<GroupingDefinition> getGroupings() {
         if (groupings == null) {
@@ -107,4 +128,18 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
         addedGroupings.add(grouping);
     }
 
+    @Override
+    public Set<UsesNodeBuilder> getUsesNodes() {
+        return addedUsesNodes;
+    }
+
+    public void setUsesnodes(final Set<UsesNode> usesNodes) {
+        this.usesNodes = usesNodes;
+    }
+
+    @Override
+    public void addUsesNode(UsesNodeBuilder usesNode) {
+        addedUsesNodes.add(usesNode);
+    }
+
 }