X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-reactor%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Freactor%2FReplicaStatementContext.java;h=392642e0db27d0838db76455a9c76d4f613a169c;hb=1fb56f1d7d1e63a1e16e61497aaa3aee1adc9398;hp=eaa39de25ea6a6a47e276f9a1e3c2aeaf0d816ce;hpb=d546f6af6d382472db8fe37a95d69baff14af65d;p=yangtools.git

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java
index eaa39de25e..392642e0db 100644
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReplicaStatementContext.java
@@ -19,7 +19,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CopyHistory;
 import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.StorageNodeType;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ParserNamespace;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementNamespace;
@@ -36,13 +35,11 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
     private final ReactorStmtCtx<A, D, E> source;
 
     ReplicaStatementContext(final StatementContextBase<?, ?, ?> parent, final ReactorStmtCtx<A, D, E> source) {
-        super(source);
+        super(source, null);
         this.parent = requireNonNull(parent);
         this.source = requireNonNull(source);
         if (source.isSupportedToBuildEffective()) {
             source.incRef();
-            // FIXME: is this call really needed? it is inherited from source
-            setFullyDefined();
         }
     }
 
@@ -51,6 +48,11 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
         return source.buildEffective();
     }
 
+    @Override
+    ReactorStmtCtx<A, D, E> unmodifiedEffectiveSource() {
+        return source.unmodifiedEffectiveSource();
+    }
+
     @Override
     public EffectiveConfig effectiveConfig() {
         return source.effectiveConfig();
@@ -92,8 +94,8 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
     }
 
     @Override
-    public ModelProcessingPhase getCompletedPhase() {
-        return source.getCompletedPhase();
+    byte executionOrder() {
+        return source.executionOrder();
     }
 
     @Override
@@ -107,7 +109,7 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
     }
 
     @Override
-    public Mutable<A, D, E> replicaAsChildOf(final Mutable<?, ?, ?> newParent) {
+    ReplicaStatementContext<A, D, E> replicaAsChildOf(final StatementContextBase<?, ?, ?> newParent) {
         return source.replicaAsChildOf(newParent);
     }
 
@@ -120,7 +122,8 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
     @Override
     ReactorStmtCtx<?, ?, ?> asEffectiveChildOf(final StatementContextBase<?, ?, ?> newParent, final CopyType type,
             final QNameModule targetModule) {
-        return source.asEffectiveChildOf(newParent, type, targetModule);
+        final ReactorStmtCtx<?, ?, ?> ret = source.asEffectiveChildOf(newParent, type, targetModule);
+        return ret == null ? null : this;
     }
 
     @Override
@@ -135,7 +138,7 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
 
     @Override
     int sweepSubstatements() {
-        if (fullyDefined()) {
+        if (haveSourceReference()) {
             source.decRef();
         }
         return 0;
@@ -169,7 +172,8 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
         throw new UnsupportedOperationException();
     }
 
-    @Override boolean doTryToCompletePhase(final ModelProcessingPhase phase) {
+    @Override
+    boolean doTryToCompletePhase(final byte executionOrder) {
         throw new UnsupportedOperationException();
     }
 
@@ -181,7 +185,7 @@ final class ReplicaStatementContext<A, D extends DeclaredStatement<A>, E extends
      */
     @Override
     @Deprecated
-    public Optional<SchemaPath> schemaPath() {
+    public SchemaPath schemaPath() {
         return substatementGetSchemaPath();
     }