updated file separator replacement

fehguy · fehguy · commit 06164cdc514b · 2015-02-17T15:04:06.000-08:00
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
@@ -71,11 +71,11 @@ public String escapeReservedWord(String name) {
 
   @Override
   public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
   }
 
   public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
   }
 
   @Override
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
@@ -80,11 +80,11 @@ public String escapeReservedWord(String name) {
 
   @Override
   public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
   }
 
   public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
   }
 
   @Override
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
@@ -69,11 +69,11 @@ public String escapeReservedWord(String name) {
 
   @Override
   public String apiFileFolder() {
-    return outputFolder + "/" + apiPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
   }
 
   public String modelFileFolder() {
-    return outputFolder + "/" + modelPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
   }
 
   @Override
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java
@@ -106,11 +106,11 @@ public String escapeReservedWord(String name) {
 
   @Override
   public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
   }
 
   public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
   }
 
   @Override
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java
@@ -128,11 +128,11 @@ public String escapeReservedWord(String name) {
 
   @Override
   public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
   }
 
   public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");
+    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,11 @@ public String escapeReservedWord(String name) {`
`71`	`71`
`72`	`72`	`@Override`
`73`	`73`	`public String apiFileFolder() {`
`74`		`- return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");`
	`74`	`+ return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public String modelFileFolder() {`
`78`		`- return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");`
	`78`	`+ return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,11 @@ public String escapeReservedWord(String name) {`
`80`	`80`
`81`	`81`	`@Override`
`82`	`82`	`public String apiFileFolder() {`
`83`		`- return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");`
	`83`	`+ return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public String modelFileFolder() {`
`87`		`- return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");`
	`87`	`+ return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ public String escapeReservedWord(String name) {`
`69`	`69`
`70`	`70`	`@Override`
`71`	`71`	`public String apiFileFolder() {`
`72`		`- return outputFolder + "/" + apiPackage().replaceAll("\\.", "/");`
	`72`	`+ return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public String modelFileFolder() {`
`76`		`- return outputFolder + "/" + modelPackage().replaceAll("\\.", "/");`
	`76`	`+ return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,11 @@ public String escapeReservedWord(String name) {`
`106`	`106`
`107`	`107`	`@Override`
`108`	`108`	`public String apiFileFolder() {`
`109`		`- return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");`
	`109`	`+ return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`public String modelFileFolder() {`
`113`		`- return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");`
	`113`	`+ return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -128,11 +128,11 @@ public String escapeReservedWord(String name) {`
`128`	`128`
`129`	`129`	`@Override`
`130`	`130`	`public String apiFileFolder() {`
`131`		`- return outputFolder + "/" + sourceFolder + "/" + apiPackage().replaceAll("\\.", "/");`
	`131`	`+ return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public String modelFileFolder() {`
`135`		`- return outputFolder + "/" + sourceFolder + "/" + modelPackage().replaceAll("\\.", "/");`
	`135`	`+ return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`@Override`