Update SchemaPath.getPath() implementation

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputStatementSupport.java
index 07848beb732edb67fff8e823af569ca28603fc38..0e31d0bf20fe1863845a0e89475ec0cde1d060f0 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/output/OutputStatementSupport.java
@@ -107,22 +107,22 @@ public final class OutputStatementSupport
     @Override
     protected OutputEffectiveStatement copyDeclaredEffective(final int flags,
             final Current<QName, OutputStatement> stmt, final OutputEffectiveStatement original) {
-        return new DeclaredOutputEffectiveStatement(flags, (DeclaredOutputEffectiveStatement) original,
-            stmt.wrapSchemaPath());
+        return new DeclaredOutputEffectiveStatement((DeclaredOutputEffectiveStatement) original, stmt.effectivePath(),
+            flags);
     }
 
     @Override
     protected OutputEffectiveStatement copyUndeclaredEffective(final int flags,
             final Current<QName, OutputStatement> stmt, final OutputEffectiveStatement original) {
-        return new UndeclaredOutputEffectiveStatement(flags, (UndeclaredOutputEffectiveStatement) original,
-            stmt.wrapSchemaPath());
+        return new UndeclaredOutputEffectiveStatement((UndeclaredOutputEffectiveStatement) original,
+            stmt.effectivePath(), flags);
     }
 
     @Override
     protected OutputEffectiveStatement createDeclaredEffective(final int flags,
             final Current<QName, OutputStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
-        return new DeclaredOutputEffectiveStatement(flags, stmt.declared(), substatements, stmt.wrapSchemaPath());
+        return new DeclaredOutputEffectiveStatement(stmt.declared(), substatements, stmt.effectivePath(), flags);
     }
 
     @Override
@@ -130,7 +130,7 @@ public final class OutputStatementSupport
             final Current<QName, OutputStatement> stmt,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
         try {
-            return new UndeclaredOutputEffectiveStatement(flags, substatements, stmt.wrapSchemaPath());
+            return new UndeclaredOutputEffectiveStatement(substatements, stmt.effectivePath(), flags);
         } catch (SubstatementIndexingException e) {
             throw new SourceException(e.getMessage(), stmt, e);
         }