X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FModuleBuilder.java;h=e49a181717dacce38eb7fa82daff8001f50dc19c;hb=d013385ef8f5f5724f8233d482d1500d78599125;hp=0007a751b3aac2a51424ba52c86c438e84b9b6f6;hpb=56301b40c4372ad9380081e95528c9f2fee3e6e5;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java index 0007a751b3..e49a181717 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java @@ -48,6 +48,7 @@ import org.opendaylight.yangtools.yang.parser.builder.api.TypeAwareBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; import org.opendaylight.yangtools.yang.parser.util.Comparators; +import org.opendaylight.yangtools.yang.parser.util.ModuleImportImpl; import org.opendaylight.yangtools.yang.parser.util.RefineHolder; import org.opendaylight.yangtools.yang.parser.util.YangParseException; @@ -1214,9 +1215,6 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder { */ private void addChildToSubnodeOfModule(final Builder parent, final DataSchemaNodeBuilder child, final String childName, final int lineNum) { - if (parent instanceof AugmentationSchemaBuilder) { - child.setAugmenting(true); - } // no need for checking rpc and notification because they can be // defined only under module or submodule if (parent instanceof DataNodeContainerBuilder) { @@ -1240,91 +1238,6 @@ public class ModuleBuilder extends AbstractDataNodeContainerBuilder { } } - /** - * - * Implementation of ModuleImport interface only for the method - * {@link ModuleBuilder#createModuleImport(String, Date, String) - * createModuleImport}. - * - */ - private class ModuleImportImpl implements ModuleImport { - final String moduleName; - final Date revision; - final String prefix; - - private ModuleImportImpl(final String moduleName, final Date revision, final String prefix) { - this.moduleName = moduleName; - this.revision = revision; - this.prefix = prefix; - } - - @Override - public String getModuleName() { - return moduleName; - } - - @Override - public Date getRevision() { - return revision; - } - - @Override - public String getPrefix() { - return prefix; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((moduleName == null) ? 0 : moduleName.hashCode()); - result = prime * result + ((revision == null) ? 0 : revision.hashCode()); - result = prime * result + ((prefix == null) ? 0 : prefix.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - ModuleImport other = (ModuleImport) obj; - if (getModuleName() == null) { - if (other.getModuleName() != null) { - return false; - } - } else if (!getModuleName().equals(other.getModuleName())) { - return false; - } - if (getRevision() == null) { - if (other.getRevision() != null) { - return false; - } - } else if (!getRevision().equals(other.getRevision())) { - return false; - } - if (getPrefix() == null) { - if (other.getPrefix() != null) { - return false; - } - } else if (!getPrefix().equals(other.getPrefix())) { - return false; - } - return true; - } - - @Override - public String toString() { - return "ModuleImport[moduleName=" + moduleName + ", revision=" + revision + ", prefix=" + prefix + "]"; - } - } - private ModuleImport createModuleImport(final String moduleName, final Date revision, final String prefix) { final ModuleImport moduleImport = new ModuleImportImpl(moduleName, revision, prefix); return moduleImport;