From 01bc6b6219079eab55d168c630006461e011af1d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 16 Jun 2013 13:10:40 +0200 Subject: [PATCH] nicer QueryTripsResult.toString() --- .../schildbach/pte/dto/QueryTripsResult.java | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java b/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java index 586bfde3..67e2f853 100644 --- a/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java +++ b/enabler/src/de/schildbach/pte/dto/QueryTripsResult.java @@ -98,15 +98,27 @@ public final class QueryTripsResult implements Serializable public String toString() { final StringBuilder builder = new StringBuilder(getClass().getName()); - builder.append("[").append(this.status).append(": "); - if (trips != null) - builder.append(trips.size()).append(" trips " + trips + ", "); - if (ambiguousFrom != null) - builder.append(ambiguousFrom.size()).append(" ambiguous from, "); - if (ambiguousVia != null) - builder.append(ambiguousVia.size()).append(" ambiguous via, "); - if (ambiguousTo != null) - builder.append(ambiguousTo.size()).append(" ambiguous to, "); + builder.append("["); + + if (status == Status.OK) + { + if (trips != null) + builder.append(trips.size()).append(" trips " + trips + ", "); + } + else if (status == Status.AMBIGUOUS) + { + if (ambiguousFrom != null) + builder.append(ambiguousFrom.size()).append(" ambiguous from, "); + if (ambiguousVia != null) + builder.append(ambiguousVia.size()).append(" ambiguous via, "); + if (ambiguousTo != null) + builder.append(ambiguousTo.size()).append(" ambiguous to, "); + } + else + { + builder.append(this.status); + } + if (builder.substring(builder.length() - 2).equals(", ")) builder.setLength(builder.length() - 2); builder.append("]");