From 6e2a37ed06a5989bf0d2c4322bba1eaece1ef354 Mon Sep 17 00:00:00 2001
From: wangbing <1919101440@qq.com>
Date: Mon, 16 Dec 2019 20:59:11 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 7cfd46411ddcfb2559ee0532a14f362827d117ca
---
 .../dbtool/javafx/manger/ProjectManager.java  | 36 ++++---------------
 ...MySqlDBmapper.java => MySQLDBmapper_.java} |  4 +--
 2 files changed, 8 insertions(+), 32 deletions(-)
 rename src/main/java/xyz/wbsite/dbtool/javafx/po/{MySqlDBmapper.java => MySQLDBmapper_.java} (98%)

diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java
index 0b8105c9..eb73fd17 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java
@@ -3,40 +3,16 @@ package xyz.wbsite.dbtool.javafx.manger;
 import org.springframework.boot.system.ApplicationHome;
 import xyz.wbsite.dbtool.javafx.enums.DataBase;
 import xyz.wbsite.dbtool.javafx.enums.FieldType;
-import xyz.wbsite.dbtool.javafx.manger.callable.AndroidCallable;
-import xyz.wbsite.dbtool.javafx.manger.callable.ApiCallable;
-import xyz.wbsite.dbtool.javafx.manger.callable.SBMDBCallable;
-import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootCallable;
-import xyz.wbsite.dbtool.javafx.manger.callable.SpringMVCCallable;
-import xyz.wbsite.dbtool.javafx.manger.callable.VueCallable;
-import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper;
-import xyz.wbsite.dbtool.javafx.po.AndroidOption;
-import xyz.wbsite.dbtool.javafx.po.Api;
-import xyz.wbsite.dbtool.javafx.po.Field;
-import xyz.wbsite.dbtool.javafx.po.Module;
-import xyz.wbsite.dbtool.javafx.po.MySQLDBmapper;
-import xyz.wbsite.dbtool.javafx.po.OracleDBmapper;
-import xyz.wbsite.dbtool.javafx.po.Project;
-import xyz.wbsite.dbtool.javafx.po.SBMDBOption;
-import xyz.wbsite.dbtool.javafx.po.SQLiteDBmapper;
-import xyz.wbsite.dbtool.javafx.po.Table;
-import xyz.wbsite.dbtool.javafx.po.VueOption;
+import xyz.wbsite.dbtool.javafx.manger.callable.*;
+import xyz.wbsite.dbtool.javafx.po.*;
 import xyz.wbsite.dbtool.javafx.tool.Dialog;
 
 import java.io.File;
 import java.io.FilenameFilter;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+import java.util.concurrent.*;
 
 public class ProjectManager {
 
@@ -244,7 +220,7 @@ public class ProjectManager {
 
     public void tryGetDBmapper(DataBase dataBase) {
         if (dataBase.name().toUpperCase().equals(DataBase.MySQL.name().toUpperCase())) {
-            dBmapper = new MySQLDBmapper(dataBase);
+            dBmapper = new MySQLDBmapper_(dataBase);
         } else if (dataBase.name().toUpperCase().equals(DataBase.Oracle.name().toUpperCase())) {
             dBmapper = new OracleDBmapper(dataBase);
         } else if (dataBase.name().toUpperCase().equals(DataBase.SQLite.name().toUpperCase())) {
@@ -523,7 +499,7 @@ public class ProjectManager {
             }
         } else if ("Mysql".equals(type)) {
             try {
-                dBmapper = new MySQLDBmapper(DataBase.MySQL);
+                dBmapper = new MySQLDBmapper_(DataBase.MySQL);
 
                 //加载驱动类
                 Class.forName(driverClassName);
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/MySQLDBmapper_.java
similarity index 98%
rename from src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java
rename to src/main/java/xyz/wbsite/dbtool/javafx/po/MySQLDBmapper_.java
index 4420e63b..54024837 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/MySQLDBmapper_.java
@@ -3,9 +3,9 @@ package xyz.wbsite.dbtool.javafx.po;
 import xyz.wbsite.dbtool.javafx.enums.DataBase;
 import xyz.wbsite.dbtool.javafx.enums.FieldType;
 
-public class MySQLDBmapper extends AbstractDBmapper {
+public class MySQLDBmapper_ extends AbstractDBmapper {
 
-    public MySQLDBmapper(DataBase mDataBase) {
+    public MySQLDBmapper_(DataBase mDataBase) {
         super(mDataBase);
     }