Move more statements

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/CaseStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/CaseStatementSupport.java
index 62f01890e96927a52a8c9c54102c4410787cb3fa..8fdf76839600d3829dfe34d4a88c9b75da696ffe 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/CaseStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/case_/CaseStatementSupport.java
@@ -122,14 +122,14 @@ public final class CaseStatementSupport
     protected CaseEffectiveStatement copyDeclaredEffective(final Current<QName, CaseStatement> stmt,
             final CaseEffectiveStatement original) {
         return new DeclaredCaseEffectiveStatement((DeclaredCaseEffectiveStatement) original, stmt.effectivePath(),
-            computeFlags(stmt, original.effectiveSubstatements()), findOriginal(stmt));
+            computeFlags(stmt, original.effectiveSubstatements()), stmt.original(CaseSchemaNode.class));
     }
 
     @Override
     protected CaseEffectiveStatement copyUndeclaredEffective(final Current<QName, CaseStatement> stmt,
             final CaseEffectiveStatement original) {
         return new UndeclaredCaseEffectiveStatement((UndeclaredCaseEffectiveStatement) original, stmt.effectivePath(),
-            computeFlags(stmt, original.effectiveSubstatements()),findOriginal(stmt));
+            computeFlags(stmt, original.effectiveSubstatements()), stmt.original(CaseSchemaNode.class));
     }
 
     @Override
@@ -137,7 +137,7 @@ public final class CaseStatementSupport
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
         try {
             return new DeclaredCaseEffectiveStatement(stmt.declared(), substatements, stmt.effectivePath(),
-                computeFlags(stmt, substatements), findOriginal(stmt));
+                computeFlags(stmt, substatements), stmt.original(CaseSchemaNode.class));
         } catch (SubstatementIndexingException e) {
             throw new SourceException(e.getMessage(), stmt, e);
         }
@@ -148,16 +148,12 @@ public final class CaseStatementSupport
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
         try {
             return new UndeclaredCaseEffectiveStatement(substatements, stmt.effectivePath(),
-                computeFlags(stmt, substatements), findOriginal(stmt));
+                computeFlags(stmt, substatements), stmt.original(CaseSchemaNode.class));
         } catch (SubstatementIndexingException e) {
             throw new SourceException(e.getMessage(), stmt, e);
         }
     }
 
-    private static @Nullable CaseSchemaNode findOriginal(final Current<?, ?> stmt) {
-        return (CaseSchemaNode) stmt.original();
-    }
-
     private static int computeFlags(final Current<?, ?> stmt,
             final Collection<? extends EffectiveStatement<?, ?>> substatements) {
         final Boolean config;