代码优化

master
wangbing 6 years ago
parent 68ac6c917f
commit 03144a3431

@ -26,12 +26,12 @@ import javafx.stage.WindowEvent;
import javafx.util.Callback; import javafx.util.Callback;
import javafx.util.converter.DefaultStringConverter; import javafx.util.converter.DefaultStringConverter;
import javafx.util.converter.IntegerStringConverter; import javafx.util.converter.IntegerStringConverter;
import xyz.wbsite.dbtool.javafx.ctrl.DbDetailController; import xyz.wbsite.dbtool.javafx.ctrl.DetailModuleController;
import xyz.wbsite.dbtool.javafx.ctrl.MainController; import xyz.wbsite.dbtool.javafx.ctrl.MainController;
import xyz.wbsite.dbtool.javafx.ctrl.ProjectDetailController; import xyz.wbsite.dbtool.javafx.ctrl.DetailProjectController;
import xyz.wbsite.dbtool.javafx.ctrl.TableDetailController; import xyz.wbsite.dbtool.javafx.ctrl.DetailTableController;
import xyz.wbsite.dbtool.javafx.customview.DBCheckBoxTableCell; import xyz.wbsite.dbtool.javafx.view.DBCheckBoxTableCell;
import xyz.wbsite.dbtool.javafx.enumeration.FieldType; import xyz.wbsite.dbtool.javafx.enums.FieldType;
import xyz.wbsite.dbtool.javafx.manger.ManagerFactory; import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
import xyz.wbsite.dbtool.javafx.manger.ProjectManager; import xyz.wbsite.dbtool.javafx.manger.ProjectManager;
import xyz.wbsite.dbtool.javafx.po.Field; import xyz.wbsite.dbtool.javafx.po.Field;
@ -39,7 +39,6 @@ import xyz.wbsite.dbtool.javafx.po.Module;
import xyz.wbsite.dbtool.javafx.po.Project; import xyz.wbsite.dbtool.javafx.po.Project;
import xyz.wbsite.dbtool.javafx.po.Table; import xyz.wbsite.dbtool.javafx.po.Table;
import xyz.wbsite.dbtool.javafx.tool.*; import xyz.wbsite.dbtool.javafx.tool.*;
import xyz.wbsite.dbtool.javafx.tool.Dialog;
import java.net.URL; import java.net.URL;
import java.util.Iterator; import java.util.Iterator;
@ -59,9 +58,9 @@ public class JavaFxApplication extends Application {
private FXMLLoader mddetailloader; private FXMLLoader mddetailloader;
private FXMLLoader tabledetailloader; private FXMLLoader tabledetailloader;
private MainController mainController; private MainController mainController;
private ProjectDetailController projectDetailController; private DetailProjectController detailProjectController;
private DbDetailController mdDetailController; private DetailModuleController mdDetailController;
private TableDetailController tableDetailController; private DetailTableController detailTableController;
private Project currentProject; private Project currentProject;
private Module currentMD; private Module currentMD;
private Table currentTable; private Table currentTable;
@ -188,7 +187,7 @@ public class JavaFxApplication extends Application {
} }
projectdetailloader = new FXMLLoader(projectdetail); projectdetailloader = new FXMLLoader(projectdetail);
projectdetailloader.load(); projectdetailloader.load();
projectDetailController = projectdetailloader.getController(); detailProjectController = projectdetailloader.getController();
URL mddetail = JavaFxApplication.class.getClassLoader().getResource("fxml/moduledetail.fxml"); URL mddetail = JavaFxApplication.class.getClassLoader().getResource("fxml/moduledetail.fxml");
if (mddetail == null) { if (mddetail == null) {
@ -205,7 +204,7 @@ public class JavaFxApplication extends Application {
} }
tabledetailloader = new FXMLLoader(tabledetail); tabledetailloader = new FXMLLoader(tabledetail);
tabledetailloader.load(); tabledetailloader.load();
tableDetailController = tabledetailloader.getController(); detailTableController = tabledetailloader.getController();
mdtree.setShowRoot(true); mdtree.setShowRoot(true);
mdtree.setEditable(true); mdtree.setEditable(true);
@ -425,19 +424,19 @@ public class JavaFxApplication extends Application {
} }
{// 初始化项目面板 {// 初始化项目面板
projectDetailController.getProjectName().textProperty().addListener(new ChangeListener<String>() { detailProjectController.getProjectName().textProperty().addListener(new ChangeListener<String>() {
@Override @Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) { public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
currentProject.setProjectName(newValue); currentProject.setProjectName(newValue);
} }
}); });
projectDetailController.getProjectBasePackage().textProperty().addListener(new ChangeListener<String>() { detailProjectController.getProjectBasePackage().textProperty().addListener(new ChangeListener<String>() {
@Override @Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) { public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
currentProject.setProjectBasePackage(newValue); currentProject.setProjectBasePackage(newValue);
} }
}); });
projectDetailController.getProjectAuthor().textProperty().addListener(new ChangeListener<String>() { detailProjectController.getProjectAuthor().textProperty().addListener(new ChangeListener<String>() {
@Override @Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) { public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
currentProject.setProjectAuthor(newValue); currentProject.setProjectAuthor(newValue);
@ -446,7 +445,7 @@ public class JavaFxApplication extends Application {
} }
{//初始化表面板 {//初始化表面板
tableDetailController.getTablename().textProperty().addListener(new ChangeListener<String>() { detailTableController.getTablename().textProperty().addListener(new ChangeListener<String>() {
@Override @Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) { public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
if (currentTable != null) { if (currentTable != null) {
@ -455,7 +454,7 @@ public class JavaFxApplication extends Application {
} }
} }
}); });
tableDetailController.getTablecomment().textProperty().addListener(new ChangeListener<String>() { detailTableController.getTablecomment().textProperty().addListener(new ChangeListener<String>() {
@Override @Override
public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) { public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
if (currentTable != null) { if (currentTable != null) {
@ -463,43 +462,43 @@ public class JavaFxApplication extends Application {
} }
} }
}); });
tableDetailController.getCreate().selectedProperty().addListener(new ChangeListener<Boolean>() { detailTableController.getCreate().selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
currentTable.setCreate(newValue); currentTable.setCreate(newValue);
} }
}); });
tableDetailController.getDelete().selectedProperty().addListener(new ChangeListener<Boolean>() { detailTableController.getDelete().selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
currentTable.setDelete(newValue); currentTable.setDelete(newValue);
} }
}); });
tableDetailController.getUpdate().selectedProperty().addListener(new ChangeListener<Boolean>() { detailTableController.getUpdate().selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
currentTable.setUpdate(newValue); currentTable.setUpdate(newValue);
} }
}); });
tableDetailController.getFind().selectedProperty().addListener(new ChangeListener<Boolean>() { detailTableController.getFind().selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
currentTable.setFind(newValue); currentTable.setFind(newValue);
} }
}); });
tableDetailController.getGet().selectedProperty().addListener(new ChangeListener<Boolean>() { detailTableController.getGet().selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
currentTable.setGet(newValue); currentTable.setGet(newValue);
} }
}); });
tableDetailController.getSearch().selectedProperty().addListener(new ChangeListener<Boolean>() { detailTableController.getSearch().selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
currentTable.setSearch(newValue); currentTable.setSearch(newValue);
} }
}); });
tableDetailController.getGetAll().selectedProperty().addListener(new ChangeListener<Boolean>() { detailTableController.getGetAll().selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override @Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) { public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
currentTable.setGetAll(newValue); currentTable.setGetAll(newValue);
@ -702,9 +701,9 @@ public class JavaFxApplication extends Application {
public void loadingProject() { public void loadingProject() {
GridPane gridPane = projectdetailloader.getRoot(); GridPane gridPane = projectdetailloader.getRoot();
projectDetailController.getProjectName().setText(currentProject.getProjectName()); detailProjectController.getProjectName().setText(currentProject.getProjectName());
projectDetailController.getProjectBasePackage().setText(currentProject.getProjectBasePackage()); detailProjectController.getProjectBasePackage().setText(currentProject.getProjectBasePackage());
projectDetailController.getProjectAuthor().setText(currentProject.getProjectAuthor()); detailProjectController.getProjectAuthor().setText(currentProject.getProjectAuthor());
if (gridPane != null) { if (gridPane != null) {
detail.getChildren().clear(); detail.getChildren().clear();
@ -726,15 +725,15 @@ public class JavaFxApplication extends Application {
} }
GridPane gridPane = tabledetailloader.getRoot(); GridPane gridPane = tabledetailloader.getRoot();
if (currentTable != null) { if (currentTable != null) {
tableDetailController.getTablename().setText(currentTable.getTableName()); detailTableController.getTablename().setText(currentTable.getTableName());
tableDetailController.getTablecomment().setText(currentTable.getTableComment()); detailTableController.getTablecomment().setText(currentTable.getTableComment());
tableDetailController.getCreate().setSelected(currentTable.getCreate()); detailTableController.getCreate().setSelected(currentTable.getCreate());
tableDetailController.getDelete().setSelected(currentTable.getDelete()); detailTableController.getDelete().setSelected(currentTable.getDelete());
tableDetailController.getUpdate().setSelected(currentTable.getUpdate()); detailTableController.getUpdate().setSelected(currentTable.getUpdate());
tableDetailController.getFind().setSelected(currentTable.getFind()); detailTableController.getFind().setSelected(currentTable.getFind());
tableDetailController.getGet().setSelected(currentTable.getGet()); detailTableController.getGet().setSelected(currentTable.getGet());
tableDetailController.getSearch().setSelected(currentTable.getSearch()); detailTableController.getSearch().setSelected(currentTable.getSearch());
tableDetailController.getGetAll().setSelected(currentTable.getGetAll()); detailTableController.getGetAll().setSelected(currentTable.getGetAll());
} }

@ -3,7 +3,7 @@ package xyz.wbsite.dbtool.javafx.ctrl;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
public class DbDetailController { public class DetailModuleController {
@FXML @FXML
private TextField moduleComment; private TextField moduleComment;

@ -3,7 +3,7 @@ package xyz.wbsite.dbtool.javafx.ctrl;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
public class ProjectDetailController { public class DetailProjectController {
@FXML @FXML
private TextField projectName; private TextField projectName;

@ -4,7 +4,7 @@ import javafx.fxml.FXML;
import javafx.scene.control.CheckBox; import javafx.scene.control.CheckBox;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
public class TableDetailController { public class DetailTableController {
@FXML @FXML
private TextField tablename; private TextField tablename;

@ -13,7 +13,7 @@ import javafx.stage.DirectoryChooser;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import javafx.stage.Stage; import javafx.stage.Stage;
import xyz.wbsite.dbtool.javafx.JavaFxApplication; import xyz.wbsite.dbtool.javafx.JavaFxApplication;
import xyz.wbsite.dbtool.javafx.enumeration.DataBase; import xyz.wbsite.dbtool.javafx.enums.DataBase;
import xyz.wbsite.dbtool.javafx.listener.GenerateOptionListener; import xyz.wbsite.dbtool.javafx.listener.GenerateOptionListener;
import xyz.wbsite.dbtool.javafx.manger.ManagerFactory; import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
import xyz.wbsite.dbtool.javafx.manger.ProjectManager; import xyz.wbsite.dbtool.javafx.manger.ProjectManager;

@ -5,7 +5,7 @@ import javafx.scene.control.Button;
import javafx.scene.control.CheckBox; import javafx.scene.control.CheckBox;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
public class AndroidOptionController { public class OptionAndroidController {
@FXML @FXML
private TextField name; private TextField name;

@ -1,6 +1,6 @@
package xyz.wbsite.dbtool.javafx.ctrl; package xyz.wbsite.dbtool.javafx.ctrl;
import xyz.wbsite.dbtool.javafx.customview.DBCheckBoxTableCell; import xyz.wbsite.dbtool.javafx.view.DBCheckBoxTableCell;
import xyz.wbsite.dbtool.javafx.po.Api; import xyz.wbsite.dbtool.javafx.po.Api;
import xyz.wbsite.dbtool.javafx.tool.Dialog; import xyz.wbsite.dbtool.javafx.tool.Dialog;
import xyz.wbsite.dbtool.javafx.tool.Tool; import xyz.wbsite.dbtool.javafx.tool.Tool;
@ -22,7 +22,7 @@ import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class SdkInfoController { public class OptionApiController {
@FXML @FXML
private TextField modulePath; private TextField modulePath;

@ -7,7 +7,7 @@ import javafx.scene.control.CheckBox;
import javafx.scene.control.RadioButton; import javafx.scene.control.RadioButton;
import javafx.scene.control.ToggleGroup; import javafx.scene.control.ToggleGroup;
public class GenerateOptionController { public class OptionMainController {
private GenerateOptionListener listener; private GenerateOptionListener listener;

@ -5,7 +5,7 @@ import javafx.scene.control.Button;
import javafx.scene.control.CheckBox; import javafx.scene.control.CheckBox;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
public class VueOptionController { public class OptionVueController {
@FXML @FXML
private TextField name; private TextField name;

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

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

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

@ -1,8 +1,8 @@
package xyz.wbsite.dbtool.javafx.manger; package xyz.wbsite.dbtool.javafx.manger;
import org.springframework.boot.system.ApplicationHome; import org.springframework.boot.system.ApplicationHome;
import xyz.wbsite.dbtool.javafx.enumeration.DataBase; import xyz.wbsite.dbtool.javafx.enums.DataBase;
import xyz.wbsite.dbtool.javafx.enumeration.FieldType; import xyz.wbsite.dbtool.javafx.enums.FieldType;
import xyz.wbsite.dbtool.javafx.manger.callable.*; import xyz.wbsite.dbtool.javafx.manger.callable.*;
import xyz.wbsite.dbtool.javafx.po.*; import xyz.wbsite.dbtool.javafx.po.*;
import xyz.wbsite.dbtool.javafx.tool.Dialog; import xyz.wbsite.dbtool.javafx.tool.Dialog;

@ -3,7 +3,7 @@ package xyz.wbsite.dbtool.javafx.manger;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import xyz.wbsite.dbtool.javafx.enumeration.FieldType; import xyz.wbsite.dbtool.javafx.enums.FieldType;
import xyz.wbsite.dbtool.javafx.po.Field; import xyz.wbsite.dbtool.javafx.po.Field;
import xyz.wbsite.dbtool.javafx.po.Module; import xyz.wbsite.dbtool.javafx.po.Module;
import xyz.wbsite.dbtool.javafx.po.Project; import xyz.wbsite.dbtool.javafx.po.Project;

@ -206,53 +206,4 @@ public class AndroidCallable implements Callable {
System.out.println("finish"); System.out.println("finish");
return true; return true;
} }
public class Method {
private String request;
private String stringMethod;
private String manager;
private String method;
private String target;
public String getRequest() {
return request;
}
public void setRequest(String request) {
this.request = request;
}
public String getTarget() {
return target;
}
public void setTarget(String target) {
this.target = target;
}
public String getStringMethod() {
return stringMethod;
}
public void setStringMethod(String stringMethod) {
this.stringMethod = stringMethod;
}
public String getManager() {
return manager;
}
public void setManager(String manager) {
this.manager = manager;
}
public String getMethod() {
return method;
}
public void setMethod(String method) {
this.method = method;
}
}
} }

@ -591,15 +591,15 @@ public class SDKCallable implements Callable {
// } // }
{ {
System.out.println("生成模块:ApiController"); System.out.println("生成模块:OptionApiController");
HashMap<String, Object> ctx = new HashMap<String, Object>(); HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("tool", tool); ctx.put("tool", tool);
ctx.put("domain", domain); ctx.put("domain", domain);
ctx.put("module", module); ctx.put("module", module);
ctx.put("managerList", managerList); ctx.put("managerList", managerList);
ctx.put("methodList", methodList); ctx.put("methodList", methodList);
File file = new File(frameWork.getAbsolutePath() + File.separator + module + File.separator + "ApiController.java"); File file = new File(frameWork.getAbsolutePath() + File.separator + module + File.separator + "OptionApiController.java");
freeMarkerManager.outputTemp(file, "Java_api/module/controller/ApiController.ftl", ctx); freeMarkerManager.outputTemp(file, "Java_api/module/controller/OptionApiController.ftl", ctx);
} }
System.out.println("生成基础类"); System.out.println("生成基础类");

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

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

@ -1,7 +1,7 @@
package xyz.wbsite.dbtool.javafx.po; package xyz.wbsite.dbtool.javafx.po;
import xyz.wbsite.dbtool.javafx.enumeration.DataBase; import xyz.wbsite.dbtool.javafx.enums.DataBase;
import xyz.wbsite.dbtool.javafx.enumeration.FieldType; import xyz.wbsite.dbtool.javafx.enums.FieldType;
public abstract class AbstractDBmapper { public abstract class AbstractDBmapper {
DataBase mDataBase = null; DataBase mDataBase = null;

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

@ -1,7 +1,7 @@
package xyz.wbsite.dbtool.javafx.po; package xyz.wbsite.dbtool.javafx.po;
import xyz.wbsite.dbtool.javafx.enumeration.DataBase; import xyz.wbsite.dbtool.javafx.enums.DataBase;
import xyz.wbsite.dbtool.javafx.enumeration.FieldType; import xyz.wbsite.dbtool.javafx.enums.FieldType;
public class MySqlDBmapper extends AbstractDBmapper { public class MySqlDBmapper extends AbstractDBmapper {

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

@ -0,0 +1,9 @@
package xyz.wbsite.dbtool.javafx.tool;
public class DataBase {
String url;
String userName;
String password;
String driver;
}

@ -1,8 +1,8 @@
package xyz.wbsite.dbtool.javafx.tool; package xyz.wbsite.dbtool.javafx.tool;
public class Info { public class DataBaseInfo {
static DBInfo orcle = new DBInfo(); static DataBase orcle = new DataBase();
static DBInfo mysql = new DBInfo(); static DataBase mysql = new DataBase();
static { static {
orcle.url = "jdbc:oracle:thin:@127.0.0.1:1521:orcl"; orcle.url = "jdbc:oracle:thin:@127.0.0.1:1521:orcl";
@ -16,9 +16,3 @@ public class Info {
} }
} }
class DBInfo{
String url;
String userName;
String password;
String driver;
}

@ -20,7 +20,7 @@ import javafx.stage.Stage;
import javafx.stage.WindowEvent; import javafx.stage.WindowEvent;
import xyz.wbsite.dbtool.Application; import xyz.wbsite.dbtool.Application;
import xyz.wbsite.dbtool.javafx.ctrl.*; import xyz.wbsite.dbtool.javafx.ctrl.*;
import xyz.wbsite.dbtool.javafx.enumeration.DataBase; import xyz.wbsite.dbtool.javafx.enums.DataBase;
import xyz.wbsite.dbtool.javafx.listener.GenerateOptionListener; import xyz.wbsite.dbtool.javafx.listener.GenerateOptionListener;
import xyz.wbsite.dbtool.javafx.manger.ManagerFactory; import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
import xyz.wbsite.dbtool.javafx.manger.ProjectManager; import xyz.wbsite.dbtool.javafx.manger.ProjectManager;
@ -209,7 +209,7 @@ public class Dialog {
return; return;
} }
Parent root = dbdetailloader.getRoot(); Parent root = dbdetailloader.getRoot();
GenerateOptionController controller = dbdetailloader.getController(); OptionMainController controller = dbdetailloader.getController();
controller.setListener(listener); controller.setListener(listener);
controller.getCancel().setOnAction(new EventHandler<ActionEvent>() { controller.getCancel().setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
@ -278,9 +278,9 @@ public class Dialog {
}); });
TextField driver = controller.getDriver(); TextField driver = controller.getDriver();
driver.setText(Info.orcle.driver); driver.setText(DataBaseInfo.orcle.driver);
TextField url = controller.getUrl(); TextField url = controller.getUrl();
url.setText(Info.orcle.url); url.setText(DataBaseInfo.orcle.url);
Button test = controller.getTest(); Button test = controller.getTest();
test.setOnAction(new EventHandler<ActionEvent>() { test.setOnAction(new EventHandler<ActionEvent>() {
@ -388,7 +388,7 @@ public class Dialog {
stage.setScene(scene); stage.setScene(scene);
stage.setTitle("API生成"); stage.setTitle("API生成");
SdkInfoController controller = dbdetailloader.getController(); OptionApiController controller = dbdetailloader.getController();
TextField modulePath = controller.getModulePath(); TextField modulePath = controller.getModulePath();
TextField sdkPath = controller.getSdkPath(); TextField sdkPath = controller.getSdkPath();
TableView apis = controller.getApis(); TableView apis = controller.getApis();
@ -562,7 +562,7 @@ public class Dialog {
return; return;
} }
Parent root = dbdetailloader.getRoot(); Parent root = dbdetailloader.getRoot();
AndroidOptionController controller = dbdetailloader.getController(); OptionAndroidController controller = dbdetailloader.getController();
controller.getCancel().setOnAction(new EventHandler<ActionEvent>() { controller.getCancel().setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
public void handle(ActionEvent event) { public void handle(ActionEvent event) {
@ -623,7 +623,7 @@ public class Dialog {
return; return;
} }
Parent root = dbdetailloader.getRoot(); Parent root = dbdetailloader.getRoot();
VueOptionController controller = dbdetailloader.getController(); OptionVueController controller = dbdetailloader.getController();
controller.getCancel().setOnAction(new EventHandler<ActionEvent>() { controller.getCancel().setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
public void handle(ActionEvent event) { public void handle(ActionEvent event) {
@ -672,7 +672,7 @@ public class Dialog {
popup.show(); popup.show();
} }
private static void check(SdkInfoController controller, boolean check, String key) { private static void check(OptionApiController controller, boolean check, String key) {
for (Api api : controller.getData()) { for (Api api : controller.getData()) {
if (api.getMethod().endsWith(key) || (key.equals(".api.") && api.getMethod().contains(".api."))) { if (api.getMethod().endsWith(key) || (key.equals(".api.") && api.getMethod().contains(".api."))) {
api.setCheck(check); api.setCheck(check);

@ -1,4 +1,4 @@
package xyz.wbsite.dbtool.javafx.customview; package xyz.wbsite.dbtool.javafx.view;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValue;

@ -2,7 +2,7 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.AndroidOptionController" prefHeight="250.0" prefWidth="500.0" <BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.OptionAndroidController" prefHeight="250.0" prefWidth="500.0"
xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1"> xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
<center> <center>
<VBox prefHeight="210" prefWidth="500"> <VBox prefHeight="210" prefWidth="500">

@ -3,7 +3,7 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.SdkInfoController" <BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.OptionApiController"
maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0"
xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"> xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">

@ -2,7 +2,7 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.GenerateOptionController" prefHeight="199.0" prefWidth="468.0" <BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.OptionMainController" prefHeight="199.0" prefWidth="468.0"
xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1"> xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
<center> <center>
<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="173.0" <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="173.0"

@ -2,7 +2,7 @@
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.DbDetailController" maxHeight="-Infinity" maxWidth="-Infinity" <GridPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.DetailModuleController" maxHeight="-Infinity" maxWidth="-Infinity"
minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.65" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.65"
xmlns:fx="http://javafx.com/fxml/1"> xmlns:fx="http://javafx.com/fxml/1">
<columnConstraints> <columnConstraints>

@ -2,7 +2,7 @@
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.ProjectDetailController" maxHeight="-Infinity" maxWidth="-Infinity" <GridPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.DetailProjectController" maxHeight="-Infinity" maxWidth="-Infinity"
minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.65" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.65"
xmlns:fx="http://javafx.com/fxml/1"> xmlns:fx="http://javafx.com/fxml/1">
<columnConstraints> <columnConstraints>

@ -2,7 +2,7 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.SdkInfoController" maxHeight="-Infinity" maxWidth="-Infinity" <BorderPane fx:controller="xyz.wbsite.dbtool.javafx.ctrl.OptionApiController" maxHeight="-Infinity" maxWidth="-Infinity"
minHeight="-Infinity" minWidth="-Infinity" prefHeight="400" prefWidth="500" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400" prefWidth="500"
xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1"> xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
<center> <center>

@ -3,7 +3,7 @@
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.wbsite.dbtool.javafx.ctrl.TableDetailController"> <GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.wbsite.dbtool.javafx.ctrl.DetailTableController">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0" /> <ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" prefWidth="60.0" /> <ColumnConstraints hgrow="SOMETIMES" prefWidth="60.0" />

@ -4,7 +4,7 @@
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<BorderPane prefHeight="170.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" <BorderPane prefHeight="170.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="xyz.wbsite.dbtool.javafx.ctrl.VueOptionController"> fx:controller="xyz.wbsite.dbtool.javafx.ctrl.OptionVueController">
<center> <center>
<VBox prefHeight="120" prefWidth="300"> <VBox prefHeight="120" prefWidth="300">
<children> <children>

@ -16245,7 +16245,7 @@
methods: { methods: {
open35_13: function () { open35_13: function () {
this.$notify.success({ this.$notify.success({
title: 'Info', title: 'DataBaseInfo',
message: '这是一条没有关闭按钮的消息', message: '这是一条没有关闭按钮的消息',
showClose: false showClose: false
}); });

@ -3320,7 +3320,7 @@ function initProps (vm, propsOptions) {
var propsData = vm.$options.propsData || {}; var propsData = vm.$options.propsData || {};
var props = vm._props = {}; var props = vm._props = {};
// cache prop keys so that future props updates can iterate using Array // cache prop keys so that future props updates can iterate using Array
// instead of dynamic object key enumeration. // instead of dynamic object key enums.
var keys = vm.$options._propKeys = []; var keys = vm.$options._propKeys = [];
var isRoot = !vm.$parent; var isRoot = !vm.$parent;
// root instance props should be converted // root instance props should be converted
@ -4631,7 +4631,7 @@ function initMixin (Vue) {
function initInternalComponent (vm, options) { function initInternalComponent (vm, options) {
var opts = vm.$options = Object.create(vm.constructor.options); var opts = vm.$options = Object.create(vm.constructor.options);
// doing this because it's faster than dynamic enumeration. // doing this because it's faster than dynamic enums.
var parentVnode = options._parentVnode; var parentVnode = options._parentVnode;
opts.parent = options.parent; opts.parent = options.parent;
opts._parentVnode = parentVnode; opts._parentVnode = parentVnode;

Loading…
Cancel
Save

Powered by TurnKey Linux.