From e28214eff8cd0865813eccfcd51fcff08e633cdc Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 8 Jun 2017 17:47:53 +0200 Subject: [PATCH] Remove appendCopyHistory from public view This is an internal detail of the copy process, hence it should not be visible in StmtContext.Mutable. Change-Id: I890af7f9f8273fc3960c4acd5340fa97f5c3c6c2 Signed-off-by: Robert Varga --- .../yangtools/yang/parser/spi/meta/StmtContext.java | 4 ---- .../yang/parser/stmt/reactor/RootStatementContext.java | 2 +- .../yang/parser/stmt/reactor/StatementContextBase.java | 6 ++---- .../yang/parser/stmt/reactor/SubstatementContext.java | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java index d174b97543..3d338b73b3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java @@ -221,10 +221,6 @@ public interface StmtContext, E extends Effect void setIsSupportedToBuildEffective(boolean isSupportedToBuild); - void appendCopyHistory(CopyType typeOfCopy, CopyHistory toAppend); - - void setOriginalCtx(StmtContext originalCtx); - void setOrder(int order); // FIXME: this seems to be unused, but looks useful. diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java index 7bb341e73c..526756bd83 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java @@ -71,7 +71,7 @@ public class RootStatementContext, E extends E this.setRootIdentifier(identifier); } - RootStatementContext(final RootStatementContext original, final QNameModule newQNameModule, + private RootStatementContext(final RootStatementContext original, final QNameModule newQNameModule, final CopyType typeOfCopy) { super(original); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java index 423a0cabb9..86236bb099 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java @@ -167,8 +167,7 @@ public abstract class StatementContextBase, E return copyHistory; } - @Override - public void appendCopyHistory(final CopyType typeOfCopy, final CopyHistory toAppend) { + final void appendCopyHistory(final CopyType typeOfCopy, final CopyHistory toAppend) { copyHistory = copyHistory.append(typeOfCopy, toAppend); } @@ -177,8 +176,7 @@ public abstract class StatementContextBase, E return originalCtx; } - @Override - public void setOriginalCtx(final StmtContext originalCtx) { + final void setOriginalCtx(final StmtContext originalCtx) { this.originalCtx = originalCtx; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java index b736a23c28..198830eaf3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java @@ -79,7 +79,7 @@ final class SubstatementContext, E extends Eff } @SuppressWarnings("unchecked") - SubstatementContext(final SubstatementContext original, final QNameModule newQNameModule, + private SubstatementContext(final SubstatementContext original, final QNameModule newQNameModule, final StatementContextBase newParent, final CopyType typeOfCopy) { super(original); this.parent = newParent; -- 2.36.6