X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fbinding-generator-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fbinding%2Fgenerator%2Futil%2Fgenerated%2Ftype%2Fbuilder%2FGeneratedTOBuilderImpl.java;h=558fb438504eda14a3c64b1b793f71f3f0a28e60;hb=9c8108faabf300747a2a5529dc7a8ef76e79c2bc;hp=81104d244e769a9c3af593c4f466401a90f19312;hpb=7923d2e9a833908f0d98d37fdad30c1b8c72c98a;p=controller.git

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
index 81104d244e..558fb43850 100644
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/generated/type/builder/GeneratedTOBuilderImpl.java
@@ -17,7 +17,6 @@ import org.opendaylight.controller.sal.binding.model.api.Constant;
 import org.opendaylight.controller.sal.binding.model.api.Enumeration;
 import org.opendaylight.controller.sal.binding.model.api.GeneratedProperty;
 import org.opendaylight.controller.sal.binding.model.api.GeneratedTransferObject;
-import org.opendaylight.controller.sal.binding.model.api.GeneratedType;
 import org.opendaylight.controller.sal.binding.model.api.MethodSignature;
 import org.opendaylight.controller.sal.binding.model.api.Type;
 import org.opendaylight.controller.sal.binding.model.api.type.builder.AnnotationTypeBuilder;
@@ -33,7 +32,7 @@ public final class GeneratedTOBuilderImpl implements GeneratedTOBuilder {
     private String comment = "";
     
     private GeneratedTransferObject extendsType;
-    private final List<GeneratedType> implementsTypes = new ArrayList<GeneratedType>();
+    private final List<Type> implementsTypes = new ArrayList<Type>();
     private final List<EnumBuilder> enumerations = new ArrayList<EnumBuilder>();
     private final List<GeneratedPropertyBuilder> properties = new ArrayList<GeneratedPropertyBuilder>();
     private final List<GeneratedPropertyBuilder> equalsProperties = new ArrayList<GeneratedPropertyBuilder>();
@@ -84,7 +83,7 @@ public final class GeneratedTOBuilderImpl implements GeneratedTOBuilder {
     }
     
     @Override
-    public boolean addImplementsType(final GeneratedType genType) {
+    public boolean addImplementsType(final Type genType) {
         if (genType != null) {
             return implementsTypes.add(genType);
         }
@@ -102,7 +101,8 @@ public final class GeneratedTOBuilderImpl implements GeneratedTOBuilder {
     
     @Override
     public EnumBuilder addEnumeration(String name) {
-        final EnumBuilder builder = new EnumerationBuilderImpl(packageName,
+        final String innerPackageName = packageName + "." + this.name;
+        final EnumBuilder builder = new EnumerationBuilderImpl(innerPackageName,
                 name);
         enumerations.add(builder);
         return builder;
@@ -409,14 +409,14 @@ public final class GeneratedTOBuilderImpl implements GeneratedTOBuilder {
         private final List<AnnotationType> annotations;
         private final List<MethodSignature> methods;
         private final GeneratedTransferObject extendsType;
-        private final List<GeneratedType> implementsTypes;
+        private final List<Type> implementsTypes;
 
         public GeneratedTransferObjectImpl(final String packageName,
                 final String name,
                 final String comment,
                 final List<AnnotationTypeBuilder> annotationBuilders,
                 final GeneratedTransferObject extendsType,
-                final List<GeneratedType> implementsTypes,
+                final List<Type> implementsTypes,
                 final List<ConstantBuilder> constantBuilders,
                 final List<EnumBuilder> enumBuilders,
                 final List<MethodSignatureBuilder> methodBuilders,
@@ -511,7 +511,7 @@ public final class GeneratedTOBuilderImpl implements GeneratedTOBuilder {
         }
         
         @Override
-        public List<GeneratedType> getImplements() {
+        public List<Type> getImplements() {
             return implementsTypes;
         }