[TypeScriptAngular2Client] Fixed namespace naming conflict for models using enums swagger-api#1334

Author: iain17

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java

@@ -345,7 +345,7 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
             for (CodegenProperty var : cm.vars) {
                 // name enum with model name, e.g. StatuEnum => Pet.StatusEnum
                 if (Boolean.TRUE.equals(var.isEnum)) {
-                    var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + "." + var.enumName);
+                    var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + "Enums." + var.enumName);
                 }
             }
         } 

modules/swagger-codegen/src/main/resources/typescript-angular2/modelGeneric.mustache

@@ -13,7 +13,7 @@ export class {{classname}} {{#parent}}extends models.{{{parent}}} {{/parent}}{
 
 {{/vars}}
 }{{#hasEnums}}
-export namespace {{classname}} {
+export namespace {{classname}}Enums {
 {{#vars}}
     {{#isEnum}}
     export enum {{enumName}} {

samples/client/petstore/typescript-angular2/default/model/Order.ts

@@ -24,12 +24,12 @@ export class Order {
     /**
      * Order Status
      */
-    status?: Order.StatusEnum;
+    status?: OrderEnums.StatusEnum;
 
     complete?: boolean;
 
 }
-export namespace Order {
+export namespace OrderEnums {
     export enum StatusEnum {
         Placed = <any> 'placed',
         Approved = <any> 'approved',

samples/client/petstore/typescript-angular2/default/model/Pet.ts

@@ -26,10 +26,10 @@ export class Pet {
     /**
      * pet status in the store
      */
-    status?: Pet.StatusEnum;
+    status?: PetEnums.StatusEnum;
 
 }
-export namespace Pet {
+export namespace PetEnums {
     export enum StatusEnum {
         Available = <any> 'available',
         Pending = <any> 'pending',

samples/client/petstore/typescript-angular2/npm/model/Order.ts

@@ -24,12 +24,12 @@ export class Order {
     /**
      * Order Status
      */
-    status?: Order.StatusEnum;
+    status?: OrderEnums.StatusEnum;
 
     complete?: boolean;
 
 }
-export namespace Order {
+export namespace OrderEnums {
     export enum StatusEnum {
         Placed = <any> 'placed',
         Approved = <any> 'approved',

samples/client/petstore/typescript-angular2/npm/model/Pet.ts

@@ -26,10 +26,10 @@ export class Pet {
     /**
      * pet status in the store
      */
-    status?: Pet.StatusEnum;
+    status?: PetEnums.StatusEnum;
 
 }
-export namespace Pet {
+export namespace PetEnums {
     export enum StatusEnum {
         Available = <any> 'available',
         Pending = <any> 'pending',