Bug 2366 - Effective statments impl merge, retest & bugfix

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / EnumStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java
index 3fa1b1ce7f303e8e00c191d101cafbe12d6493c1..40f8454b1941ebd8335416a7562639c00ecc8677 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/EnumStatementImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -7,49 +7,45 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EnumEffectiveStatementImpl;
-
-import org.opendaylight.yangtools.yang.model.api.stmt.ValueStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.EnumStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.ValueStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.EnumEffectiveStatementImpl;
 
-public class EnumStatementImpl extends AbstractDeclaredStatement<String>
-        implements EnumStatement {
+public class EnumStatementImpl extends AbstractDeclaredStatement<QName> implements EnumStatement {
 
-    protected EnumStatementImpl(
-            StmtContext<String, EnumStatement, ?> context) {
+    protected EnumStatementImpl(StmtContext<QName, EnumStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
-            AbstractStatementSupport<String, EnumStatement, EffectiveStatement<String, EnumStatement>> {
+    public static class Definition extends
+            AbstractStatementSupport<QName, EnumStatement, EffectiveStatement<QName, EnumStatement>> {
 
         public Definition() {
             super(Rfc6020Mapping.ENUM);
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
-            return value;
+        public QName parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+            return Utils.qNameFromArgument(ctx, value);
         }
 
         @Override
-        public EnumStatement createDeclared(
-                StmtContext<String, EnumStatement, ?> ctx) {
+        public EnumStatement createDeclared(StmtContext<QName, EnumStatement, ?> ctx) {
             return new EnumStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, EnumStatement> createEffective(
-                StmtContext<String, EnumStatement, EffectiveStatement<String, EnumStatement>> ctx) {
+        public EffectiveStatement<QName, EnumStatement> createEffective(
+                StmtContext<QName, EnumStatement, EffectiveStatement<QName, EnumStatement>> ctx) {
             return new EnumEffectiveStatementImpl(ctx);
         }
 
@@ -72,7 +68,7 @@ public class EnumStatementImpl extends AbstractDeclaredStatement<String>
 
     @Override
     public String getName() {
-        return argument();
+        return argument().getLocalName();
     }
 
     @Override