1、目录结构优化

2、菜单优化


Former-commit-id: ff72b1324d4343d695f8aded1ded0ec7d063c407

src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java

@@ -44,8 +44,8 @@ import xyz.wbsite.dbtool.javafx.ctrl.DetailModuleController;
 import xyz.wbsite.dbtool.javafx.ctrl.DetailProjectController;
 import xyz.wbsite.dbtool.javafx.ctrl.DetailTableController;
 import xyz.wbsite.dbtool.javafx.ctrl.MainController;
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
+import xyz.wbsite.dbtool.javafx.po.DataBase;
-import xyz.wbsite.dbtool.javafx.enums.FieldType;
+import xyz.wbsite.dbtool.javafx.po.FieldType;
 import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
 import xyz.wbsite.dbtool.javafx.manger.ProjectManager;
 import xyz.wbsite.dbtool.javafx.po.Field;

src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java

@@ -192,4 +192,10 @@ public class MainController {
     public void generateAndroid(ActionEvent actionEvent) {
         Dialog.showAndroid();
     }
+
+    @FXML
+    public void exit(ActionEvent actionEvent) {
+        modelSave(actionEvent);
+        System.exit(0);
+    }
 }

src/main/java/xyz/wbsite/dbtool/javafx/listener/GenerateOptionListener.java

@@ -1,6 +1,6 @@
 package xyz.wbsite.dbtool.javafx.listener;
 
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
+import xyz.wbsite.dbtool.javafx.po.DataBase;
 
 public interface GenerateOptionListener {
     void onGenerate(String option, DataBase dataBase);

src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java

@@ -1,7 +1,7 @@
 package xyz.wbsite.dbtool.javafx.manger;
 
 import org.springframework.boot.system.ApplicationHome;
-import xyz.wbsite.dbtool.javafx.enums.FieldType;
+import xyz.wbsite.dbtool.javafx.po.FieldType;
 import xyz.wbsite.dbtool.javafx.manger.callable.AndroidCallable;
 import xyz.wbsite.dbtool.javafx.manger.callable.ApiCallable;
 import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootCallable;

src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java

@@ -4,8 +4,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import xyz.wbsite.dbtool.javafx.annotation.Property;
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
+import xyz.wbsite.dbtool.javafx.po.DataBase;
-import xyz.wbsite.dbtool.javafx.enums.FieldType;
+import xyz.wbsite.dbtool.javafx.po.FieldType;
 import xyz.wbsite.dbtool.javafx.po.Field;
 import xyz.wbsite.dbtool.javafx.po.Module;
 import xyz.wbsite.dbtool.javafx.po.Project;

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java

@@ -1,6 +1,6 @@
 package xyz.wbsite.dbtool.javafx.manger.callable;
 
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
+import xyz.wbsite.dbtool.javafx.po.DataBase;
 import xyz.wbsite.dbtool.javafx.manger.FreeMarkerManager;
 import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
 import xyz.wbsite.dbtool.javafx.manger.XmlManager;

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringMVCCallable.java

@@ -1,6 +1,6 @@
 package xyz.wbsite.dbtool.javafx.manger.callable;
 
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
+import xyz.wbsite.dbtool.javafx.po.DataBase;
 import xyz.wbsite.dbtool.javafx.manger.FreeMarkerManager;
 import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
 import xyz.wbsite.dbtool.javafx.manger.XmlManager;

src/main/java/xyz/wbsite/dbtool/javafx/po/AbstractDBmapper.java

@@ -1,8 +1,5 @@
 package xyz.wbsite.dbtool.javafx.po;
 
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
-import xyz.wbsite.dbtool.javafx.enums.FieldType;
-
 public abstract class AbstractDBmapper {
 
     public abstract DataBase getDataBase();

src/main/java/xyz/wbsite/dbtool/javafx/po/DataBase.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.dbtool.javafx.enums;
+package xyz.wbsite.dbtool.javafx.po;
 
 
 public enum DataBase {

src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java

@@ -1,7 +1,6 @@
 package xyz.wbsite.dbtool.javafx.po;
 
 import org.springframework.util.StringUtils;
-import xyz.wbsite.dbtool.javafx.enums.FieldType;
 import xyz.wbsite.dbtool.javafx.tool.Tool;
 
 import java.util.regex.Matcher;

src/main/java/xyz/wbsite/dbtool/javafx/po/FieldType.java

@@ -1,4 +1,4 @@
-package xyz.wbsite.dbtool.javafx.enums;
+package xyz.wbsite.dbtool.javafx.po;
 
 public enum FieldType {
     Boolean(0),//布尔

src/main/java/xyz/wbsite/dbtool/javafx/po/MySQLDBmapper.java

@@ -1,8 +1,5 @@
 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 {
 
     @Override

src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java

@@ -1,8 +1,5 @@
 package xyz.wbsite.dbtool.javafx.po;
 
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
-import xyz.wbsite.dbtool.javafx.enums.FieldType;
-
 public class OracleDBmapper extends AbstractDBmapper {
 
     @Override

src/main/java/xyz/wbsite/dbtool/javafx/po/Project.java

@@ -2,7 +2,6 @@ package xyz.wbsite.dbtool.javafx.po;
 
 import javafx.scene.control.TreeItem;
 import xyz.wbsite.dbtool.javafx.annotation.Property;
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/xyz/wbsite/dbtool/javafx/po/SQLiteDBmapper.java

@@ -1,8 +1,5 @@
 package xyz.wbsite.dbtool.javafx.po;
 
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
-import xyz.wbsite.dbtool.javafx.enums.FieldType;
-
 public class SQLiteDBmapper extends AbstractDBmapper {
 
     @Override

src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java

@@ -20,8 +20,6 @@ import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 import xyz.wbsite.dbtool.Application;
 import xyz.wbsite.dbtool.javafx.ctrl.*;
-import xyz.wbsite.dbtool.javafx.enums.DataBase;
-import xyz.wbsite.dbtool.javafx.listener.GenerateOptionListener;
 import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
 import xyz.wbsite.dbtool.javafx.manger.ProjectManager;
 import xyz.wbsite.dbtool.javafx.po.*;
@@ -31,7 +29,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

src/main/resources/fxml/main.fxml

@@ -29,6 +29,7 @@
                         <MenuItem mnemonicParsing="false" onAction="#modelOpen" text="打开模型"/>
                         <MenuItem mnemonicParsing="false" onAction="#modelImport" text="模型导入"/>
                         <MenuItem mnemonicParsing="false" onAction="#modelGenerate" text="生成模型"/>
+                        <MenuItem mnemonicParsing="false" onAction="#exit" text="保存退出"/>
                     </items>
                 </Menu>
                 <Menu mnemonicParsing="false" text="其他模型">