删除writableModel.filePath属性

杨利兵 · 杨利兵 · commit 1ce29b4196e2 · 2020-05-29T21:15:18.000+08:00
diff --git a/src/main/java/com/yanglb/codegen/core/translator/BaseTranslator.java b/src/main/java/com/yanglb/codegen/core/translator/BaseTranslator.java
@@ -62,7 +62,6 @@ protected void onBeforeTranslate() throws CodeGenException {
 		// 设置文件名、等初始化操作
 		this.writableModel.setEncode("utf-8");
 		this.writableModel.setFileName("untitled");
-		this.writableModel.setFilePath("");
 		this.writableModel.setData(new StringBuilder());
 		this.writableModel.setOutputDir(this.paramaModel.getOptDir());
 		return;
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/DdlMysqlTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/DdlMysqlTranslatorImpl.java
@@ -45,7 +45,6 @@ public DdlMysqlTranslatorImpl() {
 	protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		this.writableModel.setExtension("ddl");
-		this.writableModel.setFilePath("ddl_mysql");
 
 		// 设置文件名（同Excel名）
 		String fileName = this.model.get(0).getExcelFileName();
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/DdlSqlServerTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/DdlSqlServerTranslatorImpl.java
@@ -35,7 +35,6 @@ public DdlSqlServerTranslatorImpl() {
 	@Override
 	protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
-		this.writableModel.setFilePath("ddl_sqlserver");
 	}
 
 	@Override
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/DdlSqliteTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/DdlSqliteTranslatorImpl.java
@@ -32,7 +32,6 @@ public class DdlSqliteTranslatorImpl extends BaseDdlTranslator {
 	protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		this.writableModel.setExtension("ddl");
-		this.writableModel.setFilePath("ddl_sqlite");
 
 		// 设置文件名（同Excel名）
 		String fileName = this.model.get(0).getExcelFileName();
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/DmlTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/DmlTranslatorImpl.java
@@ -30,7 +30,6 @@ public class DmlTranslatorImpl extends BaseSqlTranslator<DmlModel> {
 	protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		this.writableModel.setExtension("dml");
-		this.writableModel.setFilePath("dml");
 
 		// 设置文件名（同Excel名）
 		String fileName = this.model.get(0).getExcelFileName();
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/MsgAndroidTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/MsgAndroidTranslatorImpl.java
@@ -32,13 +32,16 @@ protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		
 		this.writableModel.setExtension("xml");
-		String path =  (this.isDefaultLanguage() ? "" : this.getSplitString() + this.msgLang);
-		this.writableModel.setFilePath("msg/android/values" + path);
-		
+
 		// 文件名
 		if (this.paramaModel.getFileName() == null) {
 			this.writableModel.setFileName("strings");
 		}
+
+		String fileName = writableModel.getFileName();
+		String path =  (this.isDefaultLanguage() ? "" : this.getSplitString() + this.msgLang);
+		fileName = ("values" + path) + "/" + fileName;
+		writableModel.setFileName(fileName);
 	}
 	
 	@Override
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/MsgCSTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/MsgCSTranslatorImpl.java
@@ -31,7 +31,6 @@ protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		
 		this.writableModel.setExtension("resx");
-		this.writableModel.setFilePath("msg/resx");
 	}
 
 	@Override
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/MsgIOSTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/MsgIOSTranslatorImpl.java
@@ -32,10 +32,9 @@ protected void onBeforeTranslate() throws CodeGenException {
 		
 		this.writableModel.setExtension("strings");
 		String path = (this.isDefaultLanguage() ? "Base" : this.msgLang) + ".lproj";
-		this.writableModel.setFilePath("msg/strings/" + path);
-		
+
 		// 文件名
-		String fileName = getFileName();
+		String fileName = path + "/" + getFileName();
 		this.writableModel.setFileName(fileName);
 	}
 
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/MsgJavaTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/MsgJavaTranslatorImpl.java
@@ -33,7 +33,6 @@ protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		
 		this.writableModel.setExtension("properties");
-		this.writableModel.setFilePath("msg/properties");
 	}
 
 	@Override
diff --git a/src/main/java/com/yanglb/codegen/core/translator/impl/MsgJsonTranslatorImpl.java b/src/main/java/com/yanglb/codegen/core/translator/impl/MsgJsonTranslatorImpl.java
@@ -29,7 +29,6 @@ protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		
 		this.writableModel.setExtension("json");
-		this.writableModel.setFilePath("msg/json");
 	}
 
 	@Override
diff --git a/src/main/java/com/yanglb/codegen/core/writer/BaseWriter.java b/src/main/java/com/yanglb/codegen/core/writer/BaseWriter.java
@@ -57,9 +57,9 @@ protected void onCreateDir() throws CodeGenException {
 			outPath = outPath.substring(0, outPath.length()-1);
 		}
 		
-		outPath = String.format("%s/%s/%s.%s", 
+		outPath = String.format("%s/%s.%s",
 				outPath, 
-				this.writableModel.getFilePath(), 
+//				this.writableModel.getFilePath(),
 				this.writableModel.getFileName(),
 				this.writableModel.getExtension());
 		
diff --git a/src/main/java/com/yanglb/codegen/model/WritableModel.java b/src/main/java/com/yanglb/codegen/model/WritableModel.java
@@ -18,7 +18,6 @@
 public class WritableModel {
 	private String encode;
 	private String extension;
-	private String filePath;
 	private String fileName;
 	private String outputDir;
 	private String fullPath;
@@ -85,18 +84,6 @@ public StringBuilder getData() {
 	public void setData(StringBuilder data) {
 		this.data = data;
 	}
-	/**
-	 * @return the filePath
-	 */
-	public String getFilePath() {
-		return filePath;
-	}
-	/**
-	 * @param filePath the filePath to set
-	 */
-	public void setFilePath(String filePath) {
-		this.filePath = filePath;
-	}
 	/**
 	 * @return the fileName
 	 */
diff --git a/src/main/java/com/yanglb/codegen/shell/CGShell.java b/src/main/java/com/yanglb/codegen/shell/CGShell.java
@@ -26,10 +26,10 @@ public class CGShell {
 	public boolean invoke(String[] args) {
 
 		// test data
-		args = new String[] {"msg.json", "/Users/yanglibing/Work/cg/tests/msg.xlsx", "-c1", "-fn", "ttt"};
-		args = new String[] {"ddl.mysql", "/Users/yanglibing/Work/cg/tests/ddl.xlsx"};
-		args = new String[] {"dml", "/Users/yanglibing/Work/cg/tests/dml.xlsx"};
-//		args = new String[] {"msg.ios", "-h"};
+//		args = new String[] {"msg.prop", "/Users/yanglibing/Work/cg/tests/msg.xlsx"};
+//		args = new String[] {"ddl.sqlite", "/Users/yanglibing/Work/cg/tests/ddl.xlsx"};
+//		args = new String[] {"dml", "/Users/yanglibing/Work/cg/tests/dml.xlsx"};
+		args = new String[] {"ddl.mssql", "-h"};
 //		args = new String[] {"msg.prop", "src/main/resources/message.xlsx", "-fn", "message"};
 
 		IParser parser = IParser.parserByArgs(args);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public DdlSqlServerTranslatorImpl() {`
`35`	`35`	`@Override`
`36`	`36`	`protected void onBeforeTranslate() throws CodeGenException {`
`37`	`37`	`super.onBeforeTranslate();`
`38`		`- this.writableModel.setFilePath("ddl_sqlserver");`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ protected void onBeforeTranslate() throws CodeGenException {`
`31`	`31`	`super.onBeforeTranslate();`
`32`	`32`
`33`	`33`	`this.writableModel.setExtension("resx");`
`34`		`- this.writableModel.setFilePath("msg/resx");`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ protected void onBeforeTranslate() throws CodeGenException {`
`33`	`33`	`super.onBeforeTranslate();`
`34`	`34`
`35`	`35`	`this.writableModel.setExtension("properties");`
`36`		`- this.writableModel.setFilePath("msg/properties");`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ protected void onBeforeTranslate() throws CodeGenException {`
`29`	`29`	`super.onBeforeTranslate();`
`30`	`30`
`31`	`31`	`this.writableModel.setExtension("json");`
`32`		`- this.writableModel.setFilePath("msg/json");`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`@Override`