Skip to content

Commit d823d84

Browse files
author
杨利兵
committed
整理代码结构
1 parent 96093ba commit d823d84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+88
-88
lines changed

‎src/main/java/cg.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import com.yanglb.codegen.shell.CodeGenShell;
16+
import com.yanglb.codegen.shell.CGShell;
1717

1818

1919
public class cg {
2020

2121
public static void main(String[] args) {
22-
CodeGenShell shell = new CodeGenShell();
22+
CGShell shell = new CGShell();
2323
boolean r = shell.invoke(args);
2424
if (!r) {
2525
System.exit(1);

‎src/main/java/com/yanglb/codegen/converter/TableModelConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.List;
2020
import java.util.Map;
2121

22-
import com.yanglb.codegen.core.model.TableModel;
22+
import com.yanglb.codegen.model.TableModel;
2323
import com.yanglb.codegen.exceptions.CodeGenException;
2424

2525
public class TableModelConverter<T> {

‎src/main/java/com/yanglb/codegen/core/generator/BaseGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package com.yanglb.codegen.core.generator;
1717

18-
import com.yanglb.codegen.core.model.OptionModel;
19-
import com.yanglb.codegen.core.model.ParamaModel;
18+
import com.yanglb.codegen.model.OptionModel;
19+
import com.yanglb.codegen.model.ParamaModel;
2020
import com.yanglb.codegen.exceptions.CodeGenException;
2121
import com.yanglb.codegen.exceptions.ParamaCheckException;
2222
import org.apache.commons.cli.CommandLine;

‎src/main/java/com/yanglb/codegen/core/generator/IGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import java.util.List;
1919

20-
import com.yanglb.codegen.core.model.OptionModel;
21-
import com.yanglb.codegen.core.model.ParamaModel;
20+
import com.yanglb.codegen.model.OptionModel;
21+
import com.yanglb.codegen.model.ParamaModel;
2222
import com.yanglb.codegen.exceptions.CodeGenException;
2323
import com.yanglb.codegen.exceptions.ParamaCheckException;
2424

‎src/main/java/com/yanglb/codegen/core/generator/impl/DdlGeneratorImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
import com.yanglb.codegen.core.GenFactory;
1919
import com.yanglb.codegen.core.generator.BaseGenerator;
20-
import com.yanglb.codegen.core.model.DdlModel;
21-
import com.yanglb.codegen.core.model.WritableModel;
20+
import com.yanglb.codegen.model.DdlModel;
21+
import com.yanglb.codegen.model.WritableModel;
2222
import com.yanglb.codegen.core.reader.IReader;
2323
import com.yanglb.codegen.core.translator.ITranslator;
2424
import com.yanglb.codegen.core.writer.IWriter;
2525
import com.yanglb.codegen.exceptions.CodeGenException;
26-
import com.yanglb.codegen.support.SupportGen;
26+
import com.yanglb.codegen.utils.GenTypes;
2727
import com.yanglb.codegen.utils.Conf;
2828
import com.yanglb.codegen.utils.Resources;
2929

@@ -48,8 +48,8 @@ protected void onGeneration() throws CodeGenException {
4848
WritableModel writableModel = translator.translate(settingMap, this.paramaModel, list);
4949

5050
// 默认使用UTF-8编码
51-
SupportGen.Writer supportWriter = SupportGen.Writer.utf8;
52-
if (writableModel.getEncode() == "ascii") supportWriter = SupportGen.Writer.ascii;
51+
GenTypes.Writer supportWriter = GenTypes.Writer.utf8;
52+
if (writableModel.getEncode() == "ascii") supportWriter = GenTypes.Writer.ascii;
5353

5454
// 写入到文件中
5555
IWriter writer = GenFactory.createByName(Conf.getString(Conf.CATEGORY_WRITER, supportWriter.name()));

‎src/main/java/com/yanglb/codegen/core/generator/impl/DmlGeneratorImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
import com.yanglb.codegen.core.GenFactory;
2121
import com.yanglb.codegen.core.generator.BaseGenerator;
22-
import com.yanglb.codegen.core.model.DdlModel;
23-
import com.yanglb.codegen.core.model.WritableModel;
22+
import com.yanglb.codegen.model.DdlModel;
23+
import com.yanglb.codegen.model.WritableModel;
2424
import com.yanglb.codegen.core.reader.IReader;
2525
import com.yanglb.codegen.core.translator.ITranslator;
2626
import com.yanglb.codegen.core.writer.IWriter;
2727
import com.yanglb.codegen.exceptions.CodeGenException;
28-
import com.yanglb.codegen.support.SupportGen;
28+
import com.yanglb.codegen.utils.GenTypes;
2929
import com.yanglb.codegen.utils.Conf;
3030
import com.yanglb.codegen.utils.Resources;
3131

@@ -47,8 +47,8 @@ protected void onGeneration() throws CodeGenException {
4747
WritableModel writableModel = translator.translate(settingMap, this.paramaModel, list);
4848

4949
// 默认使用UTF-8编码
50-
SupportGen.Writer supportWriter = SupportGen.Writer.utf8;
51-
if (writableModel.getEncode() == "ascii") supportWriter = SupportGen.Writer.ascii;
50+
GenTypes.Writer supportWriter = GenTypes.Writer.utf8;
51+
if (writableModel.getEncode() == "ascii") supportWriter = GenTypes.Writer.ascii;
5252

5353
// 写入到文件中
5454
IWriter writer = GenFactory.createByName(Conf.getString(Conf.CATEGORY_WRITER, supportWriter.name()));

‎src/main/java/com/yanglb/codegen/core/generator/impl/MsgGeneratorImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
import com.yanglb.codegen.core.GenFactory;
2020
import com.yanglb.codegen.core.generator.BaseGenerator;
21-
import com.yanglb.codegen.core.model.TableModel;
22-
import com.yanglb.codegen.core.model.WritableModel;
21+
import com.yanglb.codegen.model.TableModel;
22+
import com.yanglb.codegen.model.WritableModel;
2323
import com.yanglb.codegen.core.reader.ITableReader;
2424
import com.yanglb.codegen.core.translator.ITranslator;
2525
import com.yanglb.codegen.core.writer.IWriter;
2626
import com.yanglb.codegen.exceptions.CodeGenException;
27-
import com.yanglb.codegen.support.SupportGen;
27+
import com.yanglb.codegen.utils.GenTypes;
2828
import com.yanglb.codegen.utils.Conf;
2929
import com.yanglb.codegen.utils.Resources;
3030

@@ -59,8 +59,8 @@ protected void onGeneration() throws CodeGenException {
5959
WritableModel writableModel = translator.translate(settingMap, paramaModel, list);
6060

6161
// 默认使用UTF-8编码
62-
SupportGen.Writer supportWriter = SupportGen.Writer.utf8;
63-
if (writableModel.getEncode() == "ascii") supportWriter = SupportGen.Writer.ascii;
62+
GenTypes.Writer supportWriter = GenTypes.Writer.utf8;
63+
if (writableModel.getEncode() == "ascii") supportWriter = GenTypes.Writer.ascii;
6464

6565
// 写入到文件中
6666
IWriter writer = GenFactory.createByName(Conf.getString(Conf.CATEGORY_WRITER, supportWriter.name()));

‎src/main/java/com/yanglb/codegen/core/parser/IParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package com.yanglb.codegen.core.parser;
1717

1818
import com.yanglb.codegen.core.GenFactory;
19-
import com.yanglb.codegen.core.model.CmdModel;
20-
import com.yanglb.codegen.core.model.ParamaModel;
19+
import com.yanglb.codegen.model.CmdModel;
20+
import com.yanglb.codegen.model.ParamaModel;
2121
import com.yanglb.codegen.core.parser.impl.BaseParser;
2222
import com.yanglb.codegen.utils.Conf;
2323

‎src/main/java/com/yanglb/codegen/core/parser/impl/BaseParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.yanglb.codegen.core.parser.impl;
1717

18-
import com.yanglb.codegen.core.model.ParamaModel;
18+
import com.yanglb.codegen.model.ParamaModel;
1919
import com.yanglb.codegen.core.parser.IParser;
2020
import com.yanglb.codegen.utils.Conf;
2121
import com.yanglb.codegen.utils.Infos;

‎src/main/java/com/yanglb/codegen/core/reader/BaseModelReader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.apache.poi.xssf.usermodel.XSSFSheet;
1919

20-
import com.yanglb.codegen.core.model.BaseModel;
20+
import com.yanglb.codegen.model.BaseModel;
2121
import com.yanglb.codegen.exceptions.CodeGenException;
2222

2323
/**

0 commit comments

Comments
 (0)