From 0edfb0f24c32a9967571946a7fa1ac8e7c47e940 Mon Sep 17 00:00:00 2001 From: wangbing Date: Fri, 15 Mar 2019 16:50:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbtool/javafx/JavaFxApplication.java | 7 +++-- .../dbtool/javafx/ctrl/MainController.java | 13 +++++++-- .../dbtool/javafx/manger/ProjectManager.java | 4 +++ .../xyz/wbsite/dbtool/javafx/tool/Dialog.java | 29 +++++++++++++++++++ 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java index deff452d..e05b3744 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java @@ -38,7 +38,8 @@ import xyz.wbsite.dbtool.javafx.po.Field; import xyz.wbsite.dbtool.javafx.po.Module; import xyz.wbsite.dbtool.javafx.po.Project; import xyz.wbsite.dbtool.javafx.po.Table; -import xyz.wbsite.dbtool.javafx.tool.Tool; +import xyz.wbsite.dbtool.javafx.tool.*; +import xyz.wbsite.dbtool.javafx.tool.Dialog; import java.net.URL; import java.util.Iterator; @@ -699,7 +700,7 @@ public class JavaFxApplication extends Application { } } - private void loadingProject() { + public void loadingProject() { GridPane gridPane = projectdetailloader.getRoot(); projectDetailController.getProjectName().setText(currentProject.getProjectName()); projectDetailController.getProjectBasePackage().setText(currentProject.getProjectBasePackage()); @@ -1233,7 +1234,7 @@ public class JavaFxApplication extends Application { MenuItem target = (MenuItem) event.getTarget(); String text = target.getText(); - Project project =(Project) mdtree.getRoot(); + Project project = (Project) mdtree.getRoot(); TreeItem targetItem = (TreeItem) mdtree.getFocusModel().getFocusedItem(); int index = -1; diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java index b1ad7edd..a86034af 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java @@ -1,6 +1,8 @@ package xyz.wbsite.dbtool.javafx.ctrl; import javafx.event.ActionEvent; +import javafx.event.Event; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.CheckBox; @@ -153,8 +155,15 @@ public class MainController { @FXML public void clear(ActionEvent actionEvent) { - Project project = dBmanger.getProject(); - project = new Project(); + Dialog.showConfirmDialog("确认清空所有信息?", new EventHandler() { + + @Override + public void handle(Event event) { + dBmanger.clear(); + main.loadingProjectTree(); + main.loadingProject(); + } + }); } @FXML 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 8db00b29..10ad3cf3 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java @@ -36,6 +36,10 @@ public class ProjectManager { invalidate(); } + public void clear(){ + project = new Project(); + } + public Module findDBByDBName(String name) { for (Module md : project.getModules()) { if (md.getModuleName().equals(name)) { diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java index 418fae16..7e138f14 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java @@ -86,6 +86,8 @@ public class Dialog { public static void showConfirmDialog(String message) { popup = new Stage(); + popup.setWidth(200); + popup.setHeight(160); popup.setAlwaysOnTop(true); popup.initModality(Modality.APPLICATION_MODAL); final Button closeBtn = new Button("确认"); @@ -108,6 +110,33 @@ public class Dialog { popup.show(); } + public static void showConfirmDialog(String message, EventHandler handler) { + popup = new Stage(); + popup.setAlwaysOnTop(true); + popup.setWidth(200); + popup.setHeight(160); + popup.initModality(Modality.APPLICATION_MODAL); + final Button okBtn = new Button("确认"); + okBtn.setOnAction(new EventHandler() { + @Override + public void handle(ActionEvent event) { + popup.close(); + handler.handle(event); + } + }); + + VBox root = new VBox(); + root.setPadding(new Insets(20)); + root.setAlignment(Pos.BASELINE_CENTER); + root.setSpacing(20); + Label label = new Label(message); + root.getChildren().addAll(label, okBtn); + Scene scene = new Scene(root); + popup.setScene(scene); + popup.setTitle("提示信息"); + popup.show(); + } + public static void showError(String message) { Platform.runLater(new Runnable() { public void run() {