Binding generator v2 - uses statement - support list

[mdsal.git] / binding2 / mdsal-binding2-java-api-generator / src / main / twirl / org / opendaylight / mdsal / binding / javav2 / java / api / generator / classTemplateConstructors.scala.txt

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateConstructors.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateConstructors.scala.txt
index 53fad286a2d4a051d94ed0355f7036e57cbbc824..fc9aed44d52644bc1ce69423da089d9ba65cf27c 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateConstructors.scala.txt
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/classTemplateConstructors.scala.txt
@@ -10,16 +10,16 @@
 @import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName
 @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedTransferObject
 @import org.opendaylight.mdsal.binding.javav2.model.api.GeneratedProperty
-@import org.opendaylight.mdsal.binding2.util.BindingMapping.PATTERN_CONSTANT_NAME
+@import org.opendaylight.mdsal.binding.javav2.util.BindingMapping.PATTERN_CONSTANT_NAME
 
 @(genTo: GeneratedTransferObject, allProperties: List[GeneratedProperty], properties: List[GeneratedProperty],
 parentProperties: List[GeneratedProperty], importedNames: Map[String, String], argumentsDeclaration: String,
 unionConstructor: String, genRestrictions: String)
-@if(unionConstructor != null) {
+@if(!unionConstructor.isEmpty) {
 @{unionConstructor}
 } else {
     @if(genTo.isTypedef && !allProperties.isEmpty && allProperties.size == 1 && allProperties.get(0).getName.equals("value")) {
-        @@@{importedNames.get("constructorProperties")}("value")
+    @@@{importedNames.get("constructorProperties")}("value")
     }
     public @{genTo.getName}(@{argumentsDeclaration}) {
         @if(!parentProperties.isEmpty) {
@@ -46,7 +46,7 @@ unionConstructor: String, genRestrictions: String)
                     this.@{fieldName(prop)} = @{fieldName(prop)} == null ? null : @{fieldName(prop)}.clone();
                 }
             } else {
-                this.@{fieldName(prop)} = this.@{fieldName(prop)};
+                this.@{fieldName(prop)} = @{fieldName(prop)};
             }
         }
     }