Select copyPolicy for each StatementSupport class

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java
index 9e0ee37d26d25636ede1233f94220cfeac173bec..962bb178d01e77a005b17b17498617a0477dd842 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/units/UnitsStatementSupport.java
@@ -14,6 +14,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnitsStatement;
 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;
 
@@ -25,7 +26,7 @@ public final class UnitsStatementSupport
     private static final UnitsStatementSupport INSTANCE = new UnitsStatementSupport();
 
     private UnitsStatementSupport() {
-        super(YangStmtMapping.UNITS);
+        super(YangStmtMapping.UNITS, CopyPolicy.CONTEXT_INDEPENDENT);
     }
 
     public static UnitsStatementSupport getInstance() {
@@ -40,25 +41,18 @@ public final class UnitsStatementSupport
     @Override
     protected UnitsStatement createDeclared(final StmtContext<String, UnitsStatement, ?> ctx,
             final ImmutableList<? extends DeclaredStatement<?>> substatements) {
-        return new RegularUnitsStatement(ctx.coerceRawStatementArgument(), substatements);
+        return new RegularUnitsStatement(ctx.getRawArgument(), substatements);
     }
 
     @Override
     protected UnitsStatement createEmptyDeclared(final StmtContext<String, UnitsStatement, ?> ctx) {
-        return new EmptyUnitsStatement(ctx.coerceRawStatementArgument());
+        return new EmptyUnitsStatement(ctx.getRawArgument());
     }
 
     @Override
-    protected UnitsEffectiveStatement createEffective(
-            final StmtContext<String, UnitsStatement, UnitsEffectiveStatement> ctx,
-            final UnitsStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new RegularUnitsEffectiveStatement(declared, substatements);
-    }
-
-    @Override
-    protected UnitsEffectiveStatement createEmptyEffective(
-            final StmtContext<String, UnitsStatement, UnitsEffectiveStatement> ctx,
-            final UnitsStatement declared) {
-        return new EmptyUnitsEffectiveStatement(declared);
+    protected UnitsEffectiveStatement createEffective(final Current<String, UnitsStatement> stmt,
+            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+        return substatements.isEmpty() ? new EmptyUnitsEffectiveStatement(stmt.declared())
+            : new RegularUnitsEffectiveStatement(stmt.declared(), substatements);
     }
 }