Voomra/trader
Archived
0
Fork 0
Code Activity

fix add to route

Browse Source
This commit is contained in:
iMoHax
2015-10-01 16:23:27 +03:00
parent 66280c399a
commit 7fa2aeed64
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,7 @@ public class RouterController {
RouteModel r = market.getPath(s, sS, t, tS); RouteModel r = market.getPath(s, sS, t, tS);
if (r == null) return; if (r == null) return;
if (route != null){ if (route != null){
route.add(r); route = route.add(r);
} else { } else {
route = r; route = r;
} }
@@ -203,7 +203,7 @@ public class RouterController {
if (!select.isEmpty()){ if (!select.isEmpty()){
int index = select.getSelectedIndex(); int index = select.getSelectedIndex();
if (index > 0){ if (index > 0){
route.remove(select.getSelectedItem()); route = route.remove(select.getSelectedItem());
} else { } else {
route = null; route = null;
} }
@@ -298,14 +298,14 @@ public class RouterController {
if (this.route == null){ if (this.route == null){
this.route = route; this.route = route;
} else { } else {
this.route.add(route); this.route = this.route.add(route);
} }
refreshPath(); refreshPath();
} }
private void addOrderToPath(OrderModel order){ private void addOrderToPath(OrderModel order){
if (route != null){ if (route != null){
route.add(order); route = route.add(order);
} else { } else {
route = market.getPath(order); route = market.getPath(order);
} }

2
client/src/main/java/ru/trader/model/ProfileModel.java
View File

@@ -81,7 +81,7 @@ public class ProfileModel {
profile.getShip().setEngine(n); profile.getShip().setEngine(n);
}); });
route.addListener((ov, o, n) -> LOG.debug("Change route, old: {}, new: {}", o, n));
} }
Profile getProfile() { Profile getProfile() {