Bug 4412: New yang parser effective statements cleanup

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java
index 93e227ac00c80ac80a8398f336b8b4e783a155e5..1bce3556ddf936cabd3ac846b33fc884bf256d6f 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/BitStatementImpl.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.BitEffectiveStatementImpl;
-
+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.BitStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.PositionStatement;
 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.Rfc6020Mapping;
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.BitStatement;
 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.BitEffectiveStatementImpl;
 
-public class BitStatementImpl extends AbstractDeclaredStatement<String>
-        implements BitStatement {
+public class BitStatementImpl extends AbstractDeclaredStatement<QName> implements BitStatement {
 
-    protected BitStatementImpl(
-            StmtContext<String, BitStatement, ?> context) {
+    protected BitStatementImpl(StmtContext<QName, BitStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition
-            extends
-            AbstractStatementSupport<String, BitStatement, EffectiveStatement<String, BitStatement>> {
+    public static class Definition extends
+            AbstractStatementSupport<QName, BitStatement, EffectiveStatement<QName, BitStatement>> {
 
         public Definition() {
             super(Rfc6020Mapping.BIT);
         }
 
         @Override
-        public String parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
-            return value;
+        public QName parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
+            return Utils.qNameFromArgument(ctx, value);
         }
 
         @Override
-        public BitStatement createDeclared(
-                StmtContext<String, BitStatement, ?> ctx) {
+        public BitStatement createDeclared(StmtContext<QName, BitStatement, ?> ctx) {
             return new BitStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, BitStatement> createEffective(
-                StmtContext<String, BitStatement, EffectiveStatement<String, BitStatement>> ctx) {
+        public EffectiveStatement<QName, BitStatement> createEffective(
+                StmtContext<QName, BitStatement, EffectiveStatement<QName, BitStatement>> ctx) {
             return new BitEffectiveStatementImpl(ctx);
         }
 
@@ -72,7 +68,7 @@ public class BitStatementImpl extends AbstractDeclaredStatement<String>
 
     @Override
     public String getName() {
-        return argument();
+        return argument().getLocalName();
     }
 
     @Override