Implemented ordering of yang module data nodes. Added Comparators utility class.

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / main / java / org / opendaylight / controller / yang / parser / util / YangModelBuilderUtil.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/YangModelBuilderUtil.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/YangModelBuilderUtil.java
index 856f8e2ba711c4d09c7d9447cd38ad453868c588..ada2d2cfd8c427cf4072ac9c2d6227359bbab4ae 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/YangModelBuilderUtil.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/util/YangModelBuilderUtil.java
@@ -924,12 +924,12 @@ public final class YangModelBuilderUtil {
                 // If the parent node is a 'case' node, the value is the same as
                 // the 'case' node's parent 'choice' node
                 ChoiceCaseBuilder choiceCase = (ChoiceCaseBuilder) parent;
-                ChoiceBuilder choice = choiceCase.getParent();
+                Builder choice = choiceCase.getParent();
                 Boolean parentConfig = null;
-                if (choice == null) {
-                    parentConfig = true;
+                if(choice instanceof ChoiceBuilder) {
+                    parentConfig = ((ChoiceBuilder)choice).isConfiguration();
                 } else {
-                    parentConfig = choice.isConfiguration();
+                    parentConfig = true;
                 }
                 result = parentConfig;
             } else {
@@ -1460,7 +1460,7 @@ public final class YangModelBuilderUtil {
      */
     public static RefineHolder parseRefine(Refine_stmtContext refineCtx) {
         final String refineTarget = stringFromNode(refineCtx);
-        final RefineHolder refine = new RefineHolder(refineTarget, refineCtx.getStart().getLine());
+        final RefineHolder refine = new RefineHolder(refineCtx.getStart().getLine(), refineTarget);
         for (int j = 0; j < refineCtx.getChildCount(); j++) {
             ParseTree refinePom = refineCtx.getChild(j);
             if (refinePom instanceof Refine_pomContext) {