Reformulate StatementContextFactory.createEffective()

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / description / DescriptionStatementSupport.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java
index 54ee112466965d9ebdca9b29a3f1b54cde73c426..8f98ee80012ce7801a9296cd6a31051031b1161c 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/description/DescriptionStatementSupport.java
@@ -14,6 +14,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DescriptionStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStringStatementSupport;
+import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
@@ -48,17 +49,9 @@ public final class DescriptionStatementSupport
     }
 
     @Override
-    protected DescriptionEffectiveStatement createEffective(
-            final StmtContext<String, DescriptionStatement, DescriptionEffectiveStatement> ctx,
-            final DescriptionStatement declared,
+    protected DescriptionEffectiveStatement createEffective(final Current<String, DescriptionStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularDescriptionEffectiveStatement(declared, substatements);
-    }
-
-    @Override
-    protected DescriptionEffectiveStatement createEmptyEffective(
-            final StmtContext<String, DescriptionStatement, DescriptionEffectiveStatement> ctx,
-            final DescriptionStatement declared) {
-        return new EmptyDescriptionEffectiveStatement(declared);
+        return substatements.isEmpty() ? new EmptyDescriptionEffectiveStatement(stmt.declared())
+            : new RegularDescriptionEffectiveStatement(stmt.declared(), substatements);
     }
 }