Merge "Parents pom distribution"

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / main / java / org / opendaylight / controller / yang / parser / builder / impl / UsesNodeBuilderImpl.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java
index dba747db1dd9bad3aa31a3d265279119d8434b85..850938161bf4c25cc30fd5d7e7270d0056d9f596 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UsesNodeBuilderImpl.java
@@ -15,7 +15,6 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Set;\r
 \r
-import org.opendaylight.controller.yang.common.QName;\r
 import org.opendaylight.controller.yang.model.api.AugmentationSchema;\r
 import org.opendaylight.controller.yang.model.api.SchemaNode;\r
 import org.opendaylight.controller.yang.model.api.SchemaPath;\r
@@ -27,25 +26,25 @@ import org.opendaylight.controller.yang.parser.util.RefineHolder;
 \r
 public final class UsesNodeBuilderImpl implements UsesNodeBuilder {\r
     private boolean isBuilt;\r
-    private final UsesNodeImpl instance;\r
+    private UsesNodeImpl instance;\r
     private final int line;\r
-    private final String groupingPathStr;\r
-    private final SchemaPath groupingPath;\r
+    private SchemaPath schemaPath;\r
+    private final String groupingName;\r
+    private SchemaPath groupingPath;\r
     private boolean augmenting;\r
     private final Set<AugmentationSchemaBuilder> addedAugments = new HashSet<AugmentationSchemaBuilder>();\r
     private List<SchemaNodeBuilder> refineBuilders = new ArrayList<SchemaNodeBuilder>();\r
     private List<RefineHolder> refines = new ArrayList<RefineHolder>();\r
 \r
-    public UsesNodeBuilderImpl(final String groupingPathStr, final int line) {\r
-        this.groupingPathStr = groupingPathStr;\r
-        this.groupingPath = parseUsesPath(groupingPathStr);\r
+    public UsesNodeBuilderImpl(final String groupingName, final int line) {\r
+        this.groupingName = groupingName;\r
         this.line = line;\r
-        instance = new UsesNodeImpl(groupingPath);\r
     }\r
 \r
     @Override\r
     public UsesNode build() {\r
         if (!isBuilt) {\r
+            instance = new UsesNodeImpl(groupingPath);\r
             instance.setAugmenting(augmenting);\r
 \r
             // AUGMENTATIONS\r
@@ -74,13 +73,23 @@ public final class UsesNodeBuilderImpl implements UsesNodeBuilder {
     }\r
 \r
     @Override\r
-    public String getGroupingPathString() {\r
-        return groupingPathStr;\r
+    public void setGroupingPath(SchemaPath groupingPath) {\r
+        this.groupingPath = groupingPath;\r
     }\r
 \r
     @Override\r
-    public SchemaPath getGroupingPath() {\r
-        return groupingPath;\r
+    public SchemaPath getPath() {\r
+        return schemaPath;\r
+    }\r
+\r
+    @Override\r
+    public void setPath(SchemaPath path) {\r
+        this.schemaPath = path;\r
+    }\r
+\r
+    @Override\r
+    public String getGroupingName() {\r
+        return groupingName;\r
     }\r
 \r
     @Override\r
@@ -123,23 +132,6 @@ public final class UsesNodeBuilderImpl implements UsesNodeBuilder {
         refines.add(refine);\r
     }\r
 \r
-    private SchemaPath parseUsesPath(final String groupingPathStr) {\r
-        final String[] splittedPath = groupingPathStr.split("/");\r
-        final List<QName> path = new ArrayList<QName>();\r
-        QName name;\r
-        for (String pathElement : splittedPath) {\r
-            final String[] splittedElement = pathElement.split(":");\r
-            if (splittedElement.length == 1) {\r
-                name = new QName(null, null, null, splittedElement[0]);\r
-            } else {\r
-                name = new QName(null, null, splittedElement[0],\r
-                        splittedElement[1]);\r
-            }\r
-            path.add(name);\r
-        }\r
-        final boolean absolute = groupingPathStr.startsWith("/");\r
-        return new SchemaPath(path, absolute);\r
-    }\r
 \r
     private final class UsesNodeImpl implements UsesNode {\r
         private final SchemaPath groupingPath;\r