Voomra/trader
Archived
0
Fork 0
Code Activity

clear dialogs content on close

Browse Source
This commit is contained in:
iMoHax
2014-09-04 14:27:17 +04:00
parent 9e104943f7
commit eaea4469c0
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/ru/trader/controllers/OrdersController.java
View File

@@ -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<OrderModel> res = dlg.show() == OK ? getOrders() : null;
tblOrders.getItems().clear();
return res;
}
private Collection<OrderModel> getOrders() {

4
client/src/main/java/ru/trader/controllers/PathsController.java
View File

@@ -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(){

8
client/src/main/java/ru/trader/controllers/Screeners.java
View File

@@ -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(){

4
client/src/main/java/ru/trader/controllers/TopOrdersController.java
View File

@@ -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;
}

6
client/src/main/java/ru/trader/controllers/VendorEditorController.java
View File

@@ -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(){