From d43af2939e6db84a2a2e9c7fd748d458f72ae7ce Mon Sep 17 00:00:00 2001 From: iMoHax Date: Wed, 21 Jan 2015 13:19:49 +0300 Subject: [PATCH] print distance to the station in route and offer --- client/src/main/java/ru/trader/view/support/RouteNode.java | 5 +++-- core/src/main/java/ru/trader/core/Offer.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/src/main/java/ru/trader/view/support/RouteNode.java b/client/src/main/java/ru/trader/view/support/RouteNode.java index 67dab35..bc655d9 100644 --- a/client/src/main/java/ru/trader/view/support/RouteNode.java +++ b/client/src/main/java/ru/trader/view/support/RouteNode.java @@ -59,7 +59,6 @@ public class RouteNode { Text t = new Text(DistanceCell.distanceToString(p.getDistance())); t.getStyleClass().add(CSS_TRACK_TEXT); - track.getChildren().addAll(t, Glyph.create("FontAwesome|LONG_ARROW_RIGHT")); node.getChildren().addAll(track); @@ -98,7 +97,9 @@ public class RouteNode { if (!vendor.getName().isEmpty()) { Text stationText = new Text(vendor.getName()); stationText.getStyleClass().add(CSS_STATION_TEXT); - text.getChildren().addAll(stationText); + Text distanceText = new Text(String.format("%.0f Ls", vendor.getDistance())); + distanceText.getStyleClass().add(CSS_STATION_TEXT); + text.getChildren().addAll(stationText, distanceText); } return text; diff --git a/core/src/main/java/ru/trader/core/Offer.java b/core/src/main/java/ru/trader/core/Offer.java index ddd2a39..a56c96f 100644 --- a/core/src/main/java/ru/trader/core/Offer.java +++ b/core/src/main/java/ru/trader/core/Offer.java @@ -38,7 +38,7 @@ public interface Offer extends Comparable { } default String toPString(){ - return String.format("%.0f (%s - %s)", getPrice(), getVendor().getPlace().getName(), getVendor().getName()); + return String.format("%.0f (%s - %s (%.0f Ls))", getPrice(), getVendor().getPlace().getName(), getVendor().getName(), getVendor().getDistance()); } default String toIString(){