diff --git a/src/main/java/gov/usgs/earthquake/nshmp/data/ArrayXySequence.java b/src/main/java/gov/usgs/earthquake/nshmp/data/ArrayXySequence.java index 6e531a07bdd5d3048a92533379f96f59db88ac0f..82f2301e4b6bedc79a792c30364e702b1c87b1d6 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/data/ArrayXySequence.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/data/ArrayXySequence.java @@ -3,14 +3,13 @@ package gov.usgs.earthquake.nshmp.data; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkElementIndex; import static gov.usgs.earthquake.nshmp.Text.NEWLINE; +import static java.util.stream.Collectors.joining; import java.util.Arrays; import java.util.Iterator; import java.util.Objects; import java.util.stream.DoubleStream; -import com.google.common.base.Joiner; - /** * An immutable, array-backed implementation of {@code XySequence}. * @@ -127,7 +126,9 @@ class ArrayXySequence implements XySequence { return new StringBuilder(getClass().getSimpleName()) .append(":") .append(NEWLINE) - .append(Joiner.on(NEWLINE).join(this)) + .append(stream() + .map(XyPoint::toString) + .collect(joining(NEWLINE))) .toString(); } @@ -156,8 +157,9 @@ class ArrayXySequence implements XySequence { @Override public String toString() { - return "XyPoint: [" + x() + ", " + y() + "]"; + return " [" + x() + ", " + y() + "]"; } + } @Override diff --git a/src/test/java/gov/usgs/earthquake/nshmp/data/XySequenceTests.java b/src/test/java/gov/usgs/earthquake/nshmp/data/XySequenceTests.java index 379ea4e530515d4e171721bb8ff60e5cd57e69a5..77f7a2c7d1ec874b72cf6909701d8e5da3a38e35 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/data/XySequenceTests.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/data/XySequenceTests.java @@ -212,10 +212,10 @@ class XySequenceTests { final void testToString() { String expected = new StringBuilder() .append("ArrayXySequence:").append(Text.NEWLINE) - .append("XyPoint: [0.0, -1.0]").append(Text.NEWLINE) - .append("XyPoint: [1.0, 10.5]").append(Text.NEWLINE) - .append("XyPoint: [2.0, 5.25]").append(Text.NEWLINE) - .append("XyPoint: [3.0, 2.5]").toString(); + .append(" [0.0, -1.0]").append(Text.NEWLINE) + .append(" [1.0, 10.5]").append(Text.NEWLINE) + .append(" [2.0, 5.25]").append(Text.NEWLINE) + .append(" [3.0, 2.5]").toString(); assertEquals(expected, xy.toString()); }