Fixed resolving of schema path and qname for nodes added by augmentation.

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / UsesNodeBuilderImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java
index abc1fe767a1748ef8363d371590d54dc0785c852..4941e3f4cedc8557bbfb072b697ffdb87e3c68cd 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/UsesNodeBuilderImpl.java
@@ -42,14 +42,16 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
     private GroupingDefinition groupingDefinition;
     private GroupingBuilder groupingBuilder;
     private boolean addedByUses;
+    private boolean augmenting;
+    private AugmentationSchemaBuilder parentAugment;
     private final Set<AugmentationSchemaBuilder> addedAugments = new HashSet<AugmentationSchemaBuilder>();
     private final List<SchemaNodeBuilder> refineBuilders = new ArrayList<SchemaNodeBuilder>();
     private final List<RefineHolder> refines = new ArrayList<RefineHolder>();
 
-    private Set<DataSchemaNodeBuilder> targetChildren = new HashSet<>();
-    private Set<GroupingBuilder> targetGroupings = new HashSet<>();
-    private Set<TypeDefinitionBuilder> targetTypedefs = new HashSet<>();
-    private List<UnknownSchemaNodeBuilder> targetUnknownNodes = new ArrayList<>();
+    private final Set<DataSchemaNodeBuilder> targetChildren = new HashSet<>();
+    private final Set<GroupingBuilder> targetGroupings = new HashSet<>();
+    private final Set<TypeDefinitionBuilder> targetTypedefs = new HashSet<>();
+    private final List<UnknownSchemaNodeBuilder> targetUnknownNodes = new ArrayList<>();
 
     private final boolean isCopy;
     private boolean dataCollected;
@@ -185,6 +187,26 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
         this.addedByUses = addedByUses;
     }
 
+    @Override
+    public boolean isAugmenting() {
+        return augmenting;
+    }
+
+    @Override
+    public void setAugmenting(boolean augmenting) {
+        this.augmenting = augmenting;
+    }
+
+    @Override
+    public AugmentationSchemaBuilder getParentAugment() {
+        return parentAugment;
+    }
+
+    @Override
+    public void setParentAugment(AugmentationSchemaBuilder augment) {
+        this.parentAugment = augment;
+    }
+
     @Override
     public List<SchemaNodeBuilder> getRefineNodes() {
         return refineBuilders;
@@ -210,48 +232,27 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
         return targetChildren;
     }
 
-    @Override
-    public void setTargetChildren(Set<DataSchemaNodeBuilder> targetChildren) {
-        this.targetChildren = targetChildren;
-    }
-
     @Override
     public Set<GroupingBuilder> getTargetGroupings() {
         return targetGroupings;
     }
 
-    @Override
-    public void setTargetGroupings(Set<GroupingBuilder> targetGroupings) {
-        this.targetGroupings = targetGroupings;
-    }
-
     @Override
     public Set<TypeDefinitionBuilder> getTargetTypedefs() {
         return targetTypedefs;
     }
 
-    @Override
-    public void setTargetTypedefs(Set<TypeDefinitionBuilder> targetTypedefs) {
-        this.targetTypedefs = targetTypedefs;
-    }
-
     @Override
     public List<UnknownSchemaNodeBuilder> getTargetUnknownNodes() {
         return targetUnknownNodes;
     }
 
-    @Override
-    public void setTargetUnknownNodes(List<UnknownSchemaNodeBuilder> targetUnknownNodes) {
-        this.targetUnknownNodes = targetUnknownNodes;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((groupingName == null) ? 0 : groupingName.hashCode());
         result = prime * result + ((parent == null) ? 0 : parent.hashCode());
-        result = prime * result + ((refines == null) ? 0 : refines.hashCode());
         return result;
     }
 
@@ -281,13 +282,6 @@ public final class UsesNodeBuilderImpl extends AbstractBuilder implements UsesNo
         } else if (!parent.equals(other.parent)) {
             return false;
         }
-        if (refines == null) {
-            if (other.refines != null) {
-                return false;
-            }
-        } else if (!refines.equals(other.refines)) {
-            return false;
-        }
         return true;
     }