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%2FGroupingUtils.java;fp=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FGroupingUtils.java;h=2442d47b75eda5da1757538bffd88238690dd6f6;hb=3732594ea24d5f39f742631e0a38e3f917f3658a;hp=42957db085e0192263b07a77a91e4cc79a942003;hpb=949b5d427994f87a8000f5b2099d2ceff97dfd85;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java index 42957db085..2442d47b75 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java @@ -12,7 +12,6 @@ import java.util.Date; import java.util.Map; import java.util.Set; import java.util.TreeMap; - import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -61,10 +60,10 @@ public final class GroupingUtils { } ModuleBuilder dependentModule; + if(groupingPrefix == null) { dependentModule = module; - } - if (groupingPrefix.equals(module.getPrefix())) { + } else if (groupingPrefix.equals(module.getPrefix())) { dependentModule = module; } else { dependentModule = BuilderUtils.findModuleFromBuilders(modules, module, groupingPrefix, line); @@ -147,7 +146,7 @@ public final class GroupingUtils { * name of grouping * @return grouping with given name if present in collection, null otherwise */ - public static GroupingBuilder findGroupingBuilder(final Set groupings, final String name) { + private static GroupingBuilder findGroupingBuilder(final Set groupings, final String name) { for (GroupingBuilder grouping : groupings) { if (grouping.getQName().getLocalName().equals(name)) { return grouping; @@ -165,7 +164,7 @@ public final class GroupingUtils { * name of grouping * @return grouping with given name if present in collection, null otherwise */ - public static GroupingDefinition findGroupingDefinition(final Set groupings, final String name) { + private static GroupingDefinition findGroupingDefinition(final Set groupings, final String name) { for (GroupingDefinition grouping : groupings) { if (grouping.getQName().getLocalName().equals(name)) { return grouping;