Voomra/trader
Archived
0
Fork 0
Code Activity

print station name in offers and orders desc

Browse Source
This commit is contained in:
iMoHax
2014-11-27 10:35:50 +03:00
parent 449d5df5bd
commit b673914852
8 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/ru/trader/model/OfferModel.java
View File

@@ -199,11 +199,11 @@ public class OfferModel {
return diffProperty().get();
}
public String toPString(){
public String toStationString(){
return offer.toPString();
}
public String toIString(){
public String toItemString(){
return offer.toIString();
}

3
client/src/main/java/ru/trader/model/OrderModel.java
View File

@@ -94,6 +94,9 @@ public class OrderModel {
this.max.setValue(max);
}
public SystemModel getSystem() {
return offer.getSystem();
}
public StationModel getStation() {
return offer.getStation();

8
client/src/main/java/ru/trader/model/support/ModelBindings.java
View File

@@ -17,11 +17,11 @@ public class ModelBindings {
public static StringBinding asString(final OfferModel offer){
return Bindings.createStringBinding(offer::toPString, offer.priceProperty(), offer.getSystem().nameProperty());
return Bindings.createStringBinding(offer::toStationString, offer.priceProperty(), offer.getSystem().nameProperty());
}
public static StringBinding asItemString(final OfferModel offer){
return Bindings.createStringBinding(offer::toIString, offer.priceProperty(), offer.nameProperty());
return Bindings.createStringBinding(offer::toItemString, offer.priceProperty(), offer.nameProperty());
}
public static DoubleBinding price(final ObservableValue<OfferModel> offer){
@@ -56,7 +56,7 @@ public class ModelBindings {
private static StringBinding asItemString(final ObservableValue<OfferModel> offer, final Observable... dependencies){
return Bindings.createStringBinding(() -> {
OfferModel o = offer.getValue();
return o != null ? o.toIString(): "";
return o != null ? o.toItemString(): "";
}, dependencies);
}
@@ -64,7 +64,7 @@ public class ModelBindings {
private static StringBinding asString(final ObservableValue<OfferModel> offer, final Observable... dependencies){
return Bindings.createStringBinding(() -> {
OfferModel o = offer.getValue();
return o != null ? o.toPString() : "";
return o != null ? o.toStationString() : "";
}, dependencies);
}