X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FUsesNodeBuilderImpl.java;h=ee07e8be4603ac99d14f68f2c0fbaf33abc97db6;hb=ac39de5a9b96438d30df745895454c02e15e51e3;hp=3b1eb33d3940b86187848d9cd2cd08397ecae963;hpb=88187167a1b7928602fd8d72cb7d4dc2b38dfa70;p=controller.git diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java index 3b1eb33d39..ee07e8be46 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java @@ -20,6 +20,7 @@ import org.opendaylight.controller.yang.model.api.SchemaNode; import org.opendaylight.controller.yang.model.api.SchemaPath; import org.opendaylight.controller.yang.model.api.UnknownSchemaNode; import org.opendaylight.controller.yang.model.api.UsesNode; +import org.opendaylight.controller.yang.parser.builder.api.AbstractBuilder; import org.opendaylight.controller.yang.parser.builder.api.AugmentationSchemaBuilder; import org.opendaylight.controller.yang.parser.builder.api.Builder; import org.opendaylight.controller.yang.parser.builder.api.DataNodeContainerBuilder; @@ -28,10 +29,9 @@ import org.opendaylight.controller.yang.parser.builder.api.UsesNodeBuilder; import org.opendaylight.controller.yang.parser.util.RefineHolder; import org.opendaylight.controller.yang.parser.util.YangParseException; -public final class UsesNodeBuilderImpl implements UsesNodeBuilder { +public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNodeBuilder { private boolean isBuilt; private UsesNodeImpl instance; - private final int line; private DataNodeContainerBuilder parent; private final String groupingName; private SchemaPath groupingPath; @@ -40,16 +40,15 @@ public final class UsesNodeBuilderImpl implements UsesNodeBuilder { private final Set addedAugments = new HashSet(); private final List refineBuilders = new ArrayList(); private final List refines = new ArrayList(); - private final List addedUnknownNodes = new ArrayList(); - public UsesNodeBuilderImpl(final int line, final String groupingName) { + public UsesNodeBuilderImpl(final String moduleName, final int line, final String groupingName) { + super(moduleName, line); this.groupingName = groupingName; - this.line = line; } public UsesNodeBuilderImpl(UsesNodeBuilder b) { + super(b.getModuleName(), b.getLine()); groupingName = b.getGroupingName(); - line = b.getLine(); parent = b.getParent(); groupingPath = b.getGroupingPath(); augmenting = b.isAugmenting(); @@ -93,11 +92,6 @@ public final class UsesNodeBuilderImpl implements UsesNodeBuilder { return instance; } - @Override - public int getLine() { - return line; - } - @Override public DataNodeContainerBuilder getParent() { return parent; @@ -106,7 +100,7 @@ public final class UsesNodeBuilderImpl implements UsesNodeBuilder { @Override public void setParent(Builder parent) { if (!(parent instanceof DataNodeContainerBuilder)) { - throw new YangParseException(line, "Unresolved parent of uses '" + groupingName + "'."); + throw new YangParseException(moduleName, line, "Unresolved parent of uses '" + groupingName + "'."); } this.parent = (DataNodeContainerBuilder) parent; } @@ -176,16 +170,6 @@ public final class UsesNodeBuilderImpl implements UsesNodeBuilder { refines.add(refine); } - @Override - public List getUnknownNodeBuilders() { - return addedUnknownNodes; - } - - @Override - public void addUnknownNodeBuilder(UnknownSchemaNodeBuilder unknownNode) { - addedUnknownNodes.add(unknownNode); - } - @Override public int hashCode() { final int prime = 31;