BUG-6972: eliminate StmtContext.getOrder()

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / spi / meta / StatementNamespace.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementNamespace.java
index 02840c6f65a3327c0cef2690399f5be28ac26e9c..7728841a333ee13dce91f9b33daa401d73c7ee02 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementNamespace.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StatementNamespace.java
@@ -7,25 +7,24 @@
  */
 package org.opendaylight.yangtools.yang.parser.spi.meta;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
 
-public interface StatementNamespace<K, D extends DeclaredStatement<?>,E extends EffectiveStatement<?,D>>  extends IdentifierNamespace<K, E>  {
-
+public interface StatementNamespace<K, D extends DeclaredStatement<?>, E extends EffectiveStatement<?, D>> extends
+        IdentifierNamespace<K, StmtContext<?, D, E>> {
     @Override
-    @Nullable E get(K key);
-
-    public interface TreeScoped<K, D extends DeclaredStatement<?>,E extends EffectiveStatement<?,D>> extends StatementNamespace<K,D,E> {
-
-        TreeScoped<K,D,E> getParentContext();
+    @Nullable
+    StmtContext<?, D, E> get(@Nonnull K key);
 
+    interface TreeScoped<K, D extends DeclaredStatement<?>, E extends EffectiveStatement<?, D>> extends
+            StatementNamespace<K, D, E> {
+        TreeScoped<K, D, E> getParentContext();
     }
 
-    public interface TreeBased<K,D extends DeclaredStatement<?>,E extends EffectiveStatement<?,D>> {
+    interface TreeBased<K, D extends DeclaredStatement<?>, E extends EffectiveStatement<?, D>> {
 
     }
-
-
 }