Merge "Revert "Make distributionManagement reference groups""

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java
index 1a1b6b8d4cbbce321de77146ebb4e7cf179b29e4..607622f33a7d336d7f795d7fae53e63842fcad5a 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractSchemaNodeBuilder.java
@@ -11,19 +11,14 @@ import java.util.List;
 \r
 import org.opendaylight.yangtools.yang.common.QName;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
-import org.opendaylight.yangtools.yang.model.api.Status;\r
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;\r
 \r
 /**\r
  * Basic implementation of SchemaNodeBuilder.\r
  */\r
 public abstract class AbstractSchemaNodeBuilder extends AbstractBuilder implements SchemaNodeBuilder {\r
-    protected QName qname;\r
+    protected final QName qname;\r
     protected SchemaPath schemaPath;\r
-    protected String description;\r
-    protected String reference;\r
-    protected Status status = Status.CURRENT;\r
-    protected List<UnknownSchemaNode> unknownNodes;\r
 \r
     protected AbstractSchemaNodeBuilder(final String moduleName, final int line, final QName qname) {\r
         super(moduleName, line);\r
@@ -34,7 +29,7 @@ public abstract class AbstractSchemaNodeBuilder extends AbstractBuilder implemen
     public int hashCode() {\r
         final int prime = 31;\r
         int result = super.hashCode();\r
-        result = prime * result + ((parent == null) ? 0 : parent.hashCode());\r
+        result = prime * result + ((parentBuilder == null) ? 0 : parentBuilder.hashCode());\r
         result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode());\r
         return result;\r
     }\r
@@ -54,11 +49,11 @@ public abstract class AbstractSchemaNodeBuilder extends AbstractBuilder implemen
             return false;\r
         }\r
         AbstractSchemaNodeBuilder other = (AbstractSchemaNodeBuilder) obj;\r
-        if (parent == null) {\r
-            if (other.parent != null) {\r
+        if (parentBuilder == null) {\r
+            if (other.parentBuilder != null) {\r
                 return false;\r
             }\r
-        } else if (!parent.equals(other.parent)) {\r
+        } else if (!parentBuilder.equals(other.parentBuilder)) {\r
             return false;\r
         }\r
         if (schemaPath == null) {\r
@@ -71,54 +66,13 @@ public abstract class AbstractSchemaNodeBuilder extends AbstractBuilder implemen
         return true;\r
     }\r
 \r
+    @Override\r
     public QName getQName() {\r
         return qname;\r
     }\r
 \r
-    @Override\r
-    public SchemaPath getPath() {\r
-        return schemaPath;\r
-    }\r
-\r
-    @Override\r
-    public void setPath(SchemaPath schemaPath) {\r
-        this.schemaPath = schemaPath;\r
-    }\r
-\r
-    @Override\r
-    public String getDescription() {\r
-        return description;\r
-    }\r
-\r
-    @Override\r
-    public void setDescription(String description) {\r
-        this.description = description;\r
-    }\r
-\r
-    @Override\r
-    public String getReference() {\r
-        return reference;\r
-    }\r
-\r
-    @Override\r
-    public void setReference(String reference) {\r
-        this.reference = reference;\r
-    }\r
-\r
-    @Override\r
-    public Status getStatus() {\r
-        return status;\r
-    }\r
-\r
-    @Override\r
-    public void setStatus(Status status) {\r
-        if (status != null) {\r
-            this.status = status;\r
-        }\r
-    }\r
-\r
     public void setUnknownNodes(List<UnknownSchemaNode> unknownNodes) {\r
-        this.unknownNodes = unknownNodes;\r
+        this.unknownNodes.addAll(unknownNodes);\r
     }\r
 \r
 }\r