Merge "Extended binding-model-api to support of Enclosed Generated Types and TOs."

[controller.git] / opendaylight / sal / yang-prototype / code-generator / binding-generator-util / src / main / java / org / opendaylight / controller / binding / generator / util / AbstractBaseType.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/AbstractBaseType.java b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/AbstractBaseType.java
index 5496cf96acf80e2b0a2829a615f407575d17dc20..a67e4163e9a15694c70584ba6aafd0ba4b319fb2 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/AbstractBaseType.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/AbstractBaseType.java
@@ -21,10 +21,18 @@ public class AbstractBaseType implements Type {
 \r
     @Override\r
     public String getName() {\r
-\r
         return name;\r
     }\r
 \r
+    @Override\r
+    public String getFullyQualifiedName() {\r
+        if (packageName.isEmpty()) {\r
+            return name;\r
+        } else {\r
+            return packageName + "." + name;\r
+        }\r
+    }\r
+\r
     protected AbstractBaseType(String pkName, String name) {\r
         this.packageName = pkName;\r
         this.name = name;\r
@@ -52,7 +60,7 @@ public class AbstractBaseType implements Type {
         if (name == null) {\r
             if (other.getName() != null)\r
                 return false;\r
-        } else if (!name.equals(other.getPackageName()))\r
+        } else if (!name.equals(other.getName()))\r
             return false;\r
         if (packageName == null) {\r
             if (other.getPackageName() != null)\r
@@ -64,8 +72,9 @@ public class AbstractBaseType implements Type {
 \r
     @Override\r
     public String toString() {\r
-\r
+        if (packageName.isEmpty()) {\r
+            return "Type (" + name + ")";\r
+        }\r
         return "Type (" + packageName + "." + name + ")";\r
     }\r
-\r
 }\r