Reformulate StatementContextFactory.createEffective()

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java
index 0d404ef5dbc312310234da581d1ccb1a5f5f2313..f1164b98a98b5e47c68ae9f689a8a90cd1eed5f4 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/error_message/ErrorMessageStatementSupport.java
@@ -14,6 +14,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.ErrorMessageStatement;
 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 ErrorMessageStatementSupport
     }
 
     @Override
-    protected ErrorMessageEffectiveStatement createEffective(
-            final StmtContext<String, ErrorMessageStatement, ErrorMessageEffectiveStatement> ctx,
-            final ErrorMessageStatement declared,
+    protected ErrorMessageEffectiveStatement createEffective(final Current<String, ErrorMessageStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularErrorMessageEffectiveStatement(declared, substatements);
-    }
-
-    @Override
-    protected ErrorMessageEffectiveStatement createEmptyEffective(
-            final StmtContext<String, ErrorMessageStatement, ErrorMessageEffectiveStatement> ctx,
-            final ErrorMessageStatement declared) {
-        return new EmptyErrorMessageEffectiveStatement(declared);
+        return substatements.isEmpty() ? new EmptyErrorMessageEffectiveStatement(stmt.declared())
+            : new RegularErrorMessageEffectiveStatement(stmt.declared(), substatements);
     }
 }