Reformulate StatementContextFactory.createEffective()

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java
index 9ddd282aa17357aafa22df594f4710e8e5881588..78d303fd5bb3521e95a16d1d7d77dbf19a6220be 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/revision/RevisionStatementSupport.java
@@ -16,6 +16,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.RevisionEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.RevisionStatement;
 import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+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;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
@@ -64,16 +65,9 @@ public final class RevisionStatementSupport
     }
 
     @Override
-    protected RevisionEffectiveStatement createEffective(
-            final StmtContext<Revision, RevisionStatement, RevisionEffectiveStatement> ctx,
-            final RevisionStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularRevisionEffectiveStatement(declared, substatements);
-    }
-
-    @Override
-    protected RevisionEffectiveStatement createEmptyEffective(
-            final StmtContext<Revision, RevisionStatement, RevisionEffectiveStatement> ctx,
-            final RevisionStatement declared) {
-        return new EmptyRevisionEffectiveStatement(declared);
+    protected RevisionEffectiveStatement createEffective(final Current<Revision, RevisionStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return substatements.isEmpty() ? new EmptyRevisionEffectiveStatement(stmt.declared())
+            : new RegularRevisionEffectiveStatement(stmt.declared(), substatements);
     }
 }
\ No newline at end of file