diff --git a/client/src/main/java/ru/trader/controllers/OrdersController.java b/client/src/main/java/ru/trader/controllers/OrdersController.java index e463637..f205c6e 100644 --- a/client/src/main/java/ru/trader/controllers/OrdersController.java +++ b/client/src/main/java/ru/trader/controllers/OrdersController.java @@ -80,7 +80,9 @@ public class OrdersController { dlg.setContent(content); dlg.getActions().addAll(OK, Dialog.Actions.CANCEL); dlg.setResizable(false); - return dlg.show() == OK ? getOrders() : null; + Collection res = dlg.show() == OK ? getOrders() : null; + tblOrders.getItems().clear(); + return res; } private Collection getOrders() { diff --git a/client/src/main/java/ru/trader/controllers/PathsController.java b/client/src/main/java/ru/trader/controllers/PathsController.java index b7288e4..6b4d48d 100644 --- a/client/src/main/java/ru/trader/controllers/PathsController.java +++ b/client/src/main/java/ru/trader/controllers/PathsController.java @@ -46,7 +46,9 @@ public class PathsController { dlg.setContent(content); dlg.getActions().addAll(OK, Dialog.Actions.CANCEL); dlg.setResizable(false); - return dlg.show() == OK ? getPath() : null; + PathRouteModel res = dlg.show() == OK ? getPath() : null; + tblPaths.getItems().clear(); + return res; } public PathRouteModel getPath(){ diff --git a/client/src/main/java/ru/trader/controllers/Screeners.java b/client/src/main/java/ru/trader/controllers/Screeners.java index 54b7a49..6e2d4ba 100644 --- a/client/src/main/java/ru/trader/controllers/Screeners.java +++ b/client/src/main/java/ru/trader/controllers/Screeners.java @@ -131,12 +131,12 @@ public class Screeners { return Dialogs.create().owner(mainScreen).message(text).showConfirm(); } - public static Action showAddVendor(){ - return vEditorController.showDialog(mainScreen, vEditorScreen, null); + public static void showAddVendor(){ + vEditorController.showDialog(mainScreen, vEditorScreen, null); } - public static Action showEditVendor(VendorModel vendor){ - return vEditorController.showDialog(mainScreen, vEditorScreen, vendor); + public static void showEditVendor(VendorModel vendor){ + vEditorController.showDialog(mainScreen, vEditorScreen, vendor); } public static Parent getMainScreen(){ diff --git a/client/src/main/java/ru/trader/controllers/TopOrdersController.java b/client/src/main/java/ru/trader/controllers/TopOrdersController.java index 8340749..0d4c4d9 100644 --- a/client/src/main/java/ru/trader/controllers/TopOrdersController.java +++ b/client/src/main/java/ru/trader/controllers/TopOrdersController.java @@ -54,7 +54,9 @@ public class TopOrdersController { dlg.setContent(content); dlg.getActions().addAll(OK, Dialog.Actions.CANCEL); dlg.setResizable(false); - return dlg.show() == OK ? order : null; + OrderModel res = dlg.show() == OK ? order : null; + tblOrders.getItems().clear(); + return res; } diff --git a/client/src/main/java/ru/trader/controllers/VendorEditorController.java b/client/src/main/java/ru/trader/controllers/VendorEditorController.java index a8fc0db..9b7c212 100644 --- a/client/src/main/java/ru/trader/controllers/VendorEditorController.java +++ b/client/src/main/java/ru/trader/controllers/VendorEditorController.java @@ -103,14 +103,14 @@ public class VendorEditorController { items.setItems(updater.getOffers()); } - public Action showDialog(Parent parent, Parent content, VendorModel vendor){ - updater.reset(); + public void showDialog(Parent parent, Parent content, VendorModel vendor){ updater.init(vendor); Dialog dlg = new Dialog(parent, Localization.getString(vendor == null ? "vEditor.title.add" : "vEditor.title.edit")); dlg.setContent(content); dlg.getActions().addAll(actSave, actCancel); dlg.setResizable(false); - return dlg.show(); + dlg.show(); + updater.reset(); } public void up(){