X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fmodel%2Fparser%2Fbuilder%2Fimpl%2FModuleBuilder.java;h=5d72a0edf1467e9a8c029298829aa3c39701139a;hp=cca505e98505d26907b0c49202285cfda98040d6;hb=a3ff738aee0c392a1adbd3c6397539bb4130b57d;hpb=4c70510f54f8edaed415aa62bc74b7eedb6b674d diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/ModuleBuilder.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/ModuleBuilder.java index cca505e985..5d72a0edf1 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/ModuleBuilder.java +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/builder/impl/ModuleBuilder.java @@ -164,6 +164,11 @@ public class ModuleBuilder implements Builder { return instance; } + @Override + public int getLine() { + return 0; + } + public Builder getNode(final List path) { return moduleNodes.get(path); } @@ -286,17 +291,18 @@ public class ModuleBuilder implements Builder { return imports; } - public ExtensionBuilder addExtension(final QName qname) { - final ExtensionBuilder builder = new ExtensionBuilder(qname); + public ExtensionBuilder addExtension(final QName qname, final int line) { + final ExtensionBuilder builder = new ExtensionBuilder(qname, line); addedExtensions.add(builder); return builder; } public ContainerSchemaNodeBuilder addContainerNode( - final QName containerName, final List parentPath) { + final QName containerName, final List parentPath, + final int line) { final List pathToNode = new ArrayList(parentPath); final ContainerSchemaNodeBuilder containerBuilder = new ContainerSchemaNodeBuilder( - containerName); + containerName, line); final ChildNodeBuilder parent = (ChildNodeBuilder) moduleNodes .get(pathToNode); if (parent != null) { @@ -314,10 +320,10 @@ public class ModuleBuilder implements Builder { } public ListSchemaNodeBuilder addListNode(final QName listName, - final List parentPath) { + final List parentPath, final int line) { final List pathToNode = new ArrayList(parentPath); final ListSchemaNodeBuilder listBuilder = new ListSchemaNodeBuilder( - listName); + listName, line); final ChildNodeBuilder parent = (ChildNodeBuilder) moduleNodes .get(pathToNode); if (parent != null) { @@ -335,10 +341,10 @@ public class ModuleBuilder implements Builder { } public LeafSchemaNodeBuilder addLeafNode(final QName leafName, - final List parentPath) { + final List parentPath, final int line) { final List pathToNode = new ArrayList(parentPath); final LeafSchemaNodeBuilder leafBuilder = new LeafSchemaNodeBuilder( - leafName); + leafName, line); final ChildNodeBuilder parent = (ChildNodeBuilder) moduleNodes .get(pathToNode); if (parent != null) { @@ -356,10 +362,10 @@ public class ModuleBuilder implements Builder { } public LeafListSchemaNodeBuilder addLeafListNode(final QName leafListName, - final List parentPath) { + final List parentPath, final int line) { final List pathToNode = new ArrayList(parentPath); final LeafListSchemaNodeBuilder leafListBuilder = new LeafListSchemaNodeBuilder( - leafListName); + leafListName, line); final ChildNodeBuilder parent = (ChildNodeBuilder) moduleNodes .get(pathToNode); if (parent != null) { @@ -377,9 +383,9 @@ public class ModuleBuilder implements Builder { } public GroupingBuilder addGrouping(final QName qname, - final List parentPath) { + final List parentPath, final int line) { final List pathToGroup = new ArrayList(parentPath); - final GroupingBuilder builder = new GroupingBuilderImpl(qname); + final GroupingBuilder builder = new GroupingBuilderImpl(qname, line); final ChildNodeBuilder parentNodeBuilder = (ChildNodeBuilder) moduleNodes .get(pathToGroup); if (parentNodeBuilder != null) { @@ -395,10 +401,10 @@ public class ModuleBuilder implements Builder { } public AugmentationSchemaBuilder addAugment(final String name, - final List parentPath) { + final List parentPath, final int line) { final List pathToAugment = new ArrayList(parentPath); final AugmentationSchemaBuilder builder = new AugmentationSchemaBuilderImpl( - name); + name, line); // augment can only be in 'module' or 'uses' statement final UsesNodeBuilder parent = addedUsesNodes.get(pathToAugment); @@ -414,10 +420,10 @@ public class ModuleBuilder implements Builder { } public UsesNodeBuilder addUsesNode(final String groupingPathStr, - final List parentPath) { + final List parentPath, final int line) { final List pathToUses = new ArrayList(parentPath); final UsesNodeBuilder usesBuilder = new UsesNodeBuilderImpl( - groupingPathStr); + groupingPathStr, line); final ChildNodeBuilder parent = (ChildNodeBuilder) moduleNodes .get(pathToUses); if (parent != null) { @@ -445,9 +451,10 @@ public class ModuleBuilder implements Builder { } public RpcDefinitionBuilder addRpc(final QName qname, - final List parentPath) { + final List parentPath, final int line) { final List pathToRpc = new ArrayList(parentPath); - final RpcDefinitionBuilder rpcBuilder = new RpcDefinitionBuilder(qname); + final RpcDefinitionBuilder rpcBuilder = new RpcDefinitionBuilder(qname, + line); pathToRpc.add(qname.getLocalName()); addedRpcs.put(pathToRpc, rpcBuilder); @@ -455,7 +462,7 @@ public class ModuleBuilder implements Builder { final QName inputQName = new QName(qname.getNamespace(), qname.getRevision(), qname.getPrefix(), "input"); final ContainerSchemaNodeBuilder inputBuilder = new ContainerSchemaNodeBuilder( - inputQName); + inputQName, line); final List pathToInput = new ArrayList(pathToRpc); pathToInput.add("input"); moduleNodes.put(pathToInput, inputBuilder); @@ -464,7 +471,7 @@ public class ModuleBuilder implements Builder { final QName outputQName = new QName(qname.getNamespace(), qname.getRevision(), qname.getPrefix(), "output"); final ContainerSchemaNodeBuilder outputBuilder = new ContainerSchemaNodeBuilder( - outputQName); + outputQName, line); final List pathToOutput = new ArrayList(pathToRpc); pathToOutput.add("output"); moduleNodes.put(pathToOutput, outputBuilder); @@ -474,11 +481,12 @@ public class ModuleBuilder implements Builder { } public NotificationBuilder addNotification(final QName notificationName, - final List parentPath) { + final List parentPath, final int line) { final List pathToNotification = new ArrayList( parentPath); - NotificationBuilder builder = new NotificationBuilder(notificationName); + NotificationBuilder builder = new NotificationBuilder(notificationName, + line); pathToNotification.add(notificationName.getLocalName()); moduleNodes.put(pathToNotification, builder); @@ -488,19 +496,19 @@ public class ModuleBuilder implements Builder { } public FeatureBuilder addFeature(final QName featureName, - final List parentPath) { + final List parentPath, final int line) { List pathToFeature = new ArrayList(parentPath); pathToFeature.add(featureName.getLocalName()); - FeatureBuilder builder = new FeatureBuilder(featureName); + FeatureBuilder builder = new FeatureBuilder(featureName, line); addedFeatures.put(pathToFeature, builder); return builder; } public ChoiceBuilder addChoice(final QName choiceName, - final List parentPath) { + final List parentPath, final int line) { List pathToChoice = new ArrayList(parentPath); - ChoiceBuilder builder = new ChoiceBuilder(choiceName); + ChoiceBuilder builder = new ChoiceBuilder(choiceName, line); final ChildNodeBuilder parent = (ChildNodeBuilder) moduleNodes .get(pathToChoice); @@ -519,9 +527,9 @@ public class ModuleBuilder implements Builder { } public ChoiceCaseBuilder addCase(final QName caseName, - final List parentPath) { + final List parentPath, final int line) { List pathToCase = new ArrayList(parentPath); - ChoiceCaseBuilder builder = new ChoiceCaseBuilder(caseName); + ChoiceCaseBuilder builder = new ChoiceCaseBuilder(caseName, line); final ChildNodeBuilder parent = (ChildNodeBuilder) moduleNodes .get(pathToCase); @@ -539,9 +547,9 @@ public class ModuleBuilder implements Builder { } public AnyXmlBuilder addAnyXml(final QName anyXmlName, - final List parentPath) { + final List parentPath, final int line) { List pathToAnyXml = new ArrayList(parentPath); - AnyXmlBuilder builder = new AnyXmlBuilder(anyXmlName); + AnyXmlBuilder builder = new AnyXmlBuilder(anyXmlName, line); final ChildNodeBuilder parent = (ChildNodeBuilder) moduleNodes .get(pathToAnyXml); @@ -561,9 +569,9 @@ public class ModuleBuilder implements Builder { } public TypedefBuilder addTypedef(final QName typeDefName, - final List parentPath) { + final List parentPath, final int line) { List pathToType = new ArrayList(parentPath); - TypedefBuilder builder = new TypedefBuilder(typeDefName); + TypedefBuilder builder = new TypedefBuilder(typeDefName, line); TypeDefinitionAwareBuilder parent = (TypeDefinitionAwareBuilder) moduleNodes .get(pathToType); if (parent != null) { @@ -587,12 +595,12 @@ public class ModuleBuilder implements Builder { } public void addUnionType(final List actualPath, - final URI namespace, final Date revision) { + final URI namespace, final Date revision, final int line) { List pathToUnion = new ArrayList(actualPath); TypeAwareBuilder parent = (TypeAwareBuilder) moduleNodes .get(pathToUnion); UnionTypeBuilder union = new UnionTypeBuilder(pathToUnion, namespace, - revision); + revision, line); parent.setType(union); List path = new ArrayList(pathToUnion); @@ -601,31 +609,33 @@ public class ModuleBuilder implements Builder { moduleNodes.put(path, union); } - public void addIdentityrefType(String baseString, List parentPath, - SchemaPath schemaPath) { + public void addIdentityrefType(final String baseString, + final List parentPath, final SchemaPath schemaPath, + final int line) { List pathToIdentityref = new ArrayList(parentPath); TypeAwareBuilder parent = (TypeAwareBuilder) moduleNodes .get(pathToIdentityref); IdentityrefTypeBuilder identityref = new IdentityrefTypeBuilder( - baseString, schemaPath); + baseString, schemaPath, line); parent.setType(identityref); dirtyNodes.put(pathToIdentityref, parent); } - public DeviationBuilder addDeviation(String targetPath, - List parentPath) { + public DeviationBuilder addDeviation(final String targetPath, + final List parentPath, final int line) { final List pathToDeviation = new ArrayList(parentPath); pathToDeviation.add(targetPath); - DeviationBuilder builder = new DeviationBuilder(targetPath); + DeviationBuilder builder = new DeviationBuilder(targetPath, line); addedDeviations.put(targetPath, builder); moduleNodes.put(pathToDeviation, builder); return builder; } - public IdentitySchemaNodeBuilder addIdentity(QName qname, - List parentPath) { - List pathToIdentity = new ArrayList(parentPath); - IdentitySchemaNodeBuilder builder = new IdentitySchemaNodeBuilder(qname); + public IdentitySchemaNodeBuilder addIdentity(final QName qname, + final List parentPath, final int line) { + final List pathToIdentity = new ArrayList(parentPath); + final IdentitySchemaNodeBuilder builder = new IdentitySchemaNodeBuilder( + qname, line); pathToIdentity.add(qname.getLocalName()); moduleNodes.put(pathToIdentity, builder); addedIdentities.add(builder); @@ -642,11 +652,11 @@ public class ModuleBuilder implements Builder { } } - public UnknownSchemaNodeBuilder addUnknownSchemaNode(QName qname, - List parentPath) { + public UnknownSchemaNodeBuilder addUnknownSchemaNode(final QName qname, + final List parentPath, final int line) { final List pathToUnknown = new ArrayList(parentPath); final UnknownSchemaNodeBuilder builder = new UnknownSchemaNodeBuilder( - qname); + qname, line); final Builder parent = moduleNodes.get(pathToUnknown); if (parent instanceof RefineHolder) { ((RefineHolder) parent).addUnknownSchemaNode(builder);