Added support for parsing submodules & added dependency utility parser

[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 28936646d523e407e73e681e3d2f65222f9094ea..39c4c5e78af6883458f551327048b4c4f1b400af 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
@@ -50,8 +50,12 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
         return qname;
     }
 
+    public Map<QName, DataSchemaNode> getChildNodes() {
+        return childNodes;
+    }
+
     @Override
-    public Set<DataSchemaNodeBuilder> getChildNodes() {
+    public Set<DataSchemaNodeBuilder> getChildNodeBuilders() {
         return addedChildNodes;
     }
 
@@ -67,9 +71,9 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
 
     @Override
     public void addChildNode(DataSchemaNodeBuilder child) {
-        String childName = child.getQName().getLocalName();
+        QName childName = child.getQName();
         for (DataSchemaNodeBuilder addedChildNode : addedChildNodes) {
-            if (addedChildNode.getQName().getLocalName().equals(childName)) {
+            if (addedChildNode.getQName().equals(childName)) {
                 throw new YangParseException(child.getModuleName(), child.getLine(), "Can not add '" + child + "' to '"
                         + this + "' in module '" + moduleName + "': node with same name already declared at line "
                         + addedChildNode.getLine());
@@ -109,9 +113,9 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
 
     @Override
     public void addGrouping(GroupingBuilder grouping) {
-        String groupingName = grouping.getQName().getLocalName();
+        QName groupingName = grouping.getQName();
         for (GroupingBuilder addedGrouping : addedGroupings) {
-            if (addedGrouping.getQName().getLocalName().equals(groupingName)) {
+            if (addedGrouping.getQName().equals(groupingName)) {
                 throw new YangParseException(grouping.getModuleName(), grouping.getLine(), "Can not add '" + grouping
                         + "': grouping with same name already declared in module '" + moduleName + "' at line "
                         + addedGrouping.getLine());
@@ -121,7 +125,16 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
     }
 
     @Override
-    public Set<UsesNodeBuilder> getUsesNodes() {
+    public Set<TypeDefinition<?>> getTypeDefinitions() {
+        return typedefs;
+    }
+
+    public Set<UsesNode> getUsesNodes() {
+        return usesNodes;
+    }
+
+    @Override
+    public Set<UsesNodeBuilder> getUsesNodeBuilders() {
         return addedUsesNodes;
     }