Refactored ModuleBuilder to avoid name conflicts. Fixed implementation of ChoiceBuilder.

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / main / java / org / opendaylight / controller / yang / parser / builder / impl / ChoiceCaseBuilder.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceCaseBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceCaseBuilder.java
index a3b21b4abf5d83a94573fe7545bccea611c932e1..7117afe4693c9380aad602112a7350d5b6092db4 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceCaseBuilder.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ChoiceCaseBuilder.java
@@ -19,13 +19,13 @@ import org.opendaylight.controller.yang.model.api.Status;
 import org.opendaylight.controller.yang.model.api.TypeDefinition;
 import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.controller.yang.model.api.UsesNode;
-import org.opendaylight.controller.yang.parser.builder.api.AbstractChildNodeBuilder;
+import org.opendaylight.controller.yang.parser.builder.api.AbstractDataNodeContainerBuilder;
 import org.opendaylight.controller.yang.parser.builder.api.DataSchemaNodeBuilder;
 import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
 import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder;
 import org.opendaylight.controller.yang.parser.util.YangParseException;
 
-public final class ChoiceCaseBuilder extends AbstractChildNodeBuilder implements
+public final class ChoiceCaseBuilder extends AbstractDataNodeContainerBuilder implements
         DataSchemaNodeBuilder {
     private final ChoiceCaseNodeImpl instance;
     private final int line;
@@ -150,6 +150,11 @@ public final class ChoiceCaseBuilder extends AbstractChildNodeBuilder implements
         addedUsesNodes.add(usesNodeBuilder);
     }
 
+    @Override
+    public Set<TypeDefinitionBuilder> getTypeDefinitions() {
+        return Collections.emptySet();
+    }
+
     @Override
     public void addTypedef(TypeDefinitionBuilder typedefBuilder) {
         throw new YangParseException(line,
@@ -171,7 +176,7 @@ public final class ChoiceCaseBuilder extends AbstractChildNodeBuilder implements
         return augmentations;
     }
 
-    private class ChoiceCaseNodeImpl implements ChoiceCaseNode {
+    private final class ChoiceCaseNodeImpl implements ChoiceCaseNode {
         private final QName qname;
         private SchemaPath path;
         private String description;
@@ -265,6 +270,10 @@ public final class ChoiceCaseBuilder extends AbstractChildNodeBuilder implements
             }
         }
 
+        /**
+         * Always returns an empty set, because case node can not contains type
+         * definitions.
+         */
         @Override
         public Set<TypeDefinition<?>> getTypeDefinitions() {
             return Collections.emptySet();