Adjust to yangtools-2.0.0 changes

[mdsal.git] / binding2 / mdsal-binding2-generator-impl / src / main / java / org / opendaylight / mdsal / binding / javav2 / generator / yang / types / GroupingDefinitionDependencySort.java

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/yang/types/GroupingDefinitionDependencySort.java b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/yang/types/GroupingDefinitionDependencySort.java
index 4285e1c3452a40935f6501f941310185eac24e4a..6249b42bb58db43c66ffdb6a004fae585479b73a 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/yang/types/GroupingDefinitionDependencySort.java
+++ b/binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/yang/types/GroupingDefinitionDependencySort.java
@@ -18,8 +18,8 @@ import java.util.Map;
 import java.util.Set;
 import org.opendaylight.yangtools.util.TopologicalSort;
 import org.opendaylight.yangtools.util.TopologicalSort.Node;
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
-import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -130,7 +130,7 @@ public class GroupingDefinitionDependencySort {
         ret.addAll(usesNodes);
 
         for (UsesNode usesNode : usesNodes) {
-            for (AugmentationSchema augment : usesNode.getAugmentations()) {
+            for (AugmentationSchemaNode augment : usesNode.getAugmentations()) {
                 ret.addAll(getAllUsesNodes(augment));
             }
         }
@@ -142,8 +142,7 @@ public class GroupingDefinitionDependencySort {
             if (childNode instanceof DataNodeContainer) {
                 ret.addAll(getAllUsesNodes((DataNodeContainer) childNode));
             } else if (childNode instanceof ChoiceSchemaNode) {
-                Set<ChoiceCaseNode> cases = ((ChoiceSchemaNode) childNode).getCases();
-                for (ChoiceCaseNode choiceCaseNode : cases) {
+                for (CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) childNode).getCases().values()) {
                     ret.addAll(getAllUsesNodes(choiceCaseNode));
                 }
             }