Skip to content

Commit c226b1d

Browse files
committed
#158: Simplify 'GPX.Writer' implementation.
1 parent 9ebb677 commit c226b1d

File tree

1 file changed

+10
-15
lines changed
  • jpx/src/main/java/io/jenetics/jpx

1 file changed

+10
-15
lines changed

jpx/src/main/java/io/jenetics/jpx/GPX.java

+10-15
Original file line numberDiff line numberDiff line change
@@ -1190,14 +1190,7 @@ public GPX read(final Source source)
11901190
.xmlInputFactory()
11911191
.createXMLStreamReader(source);
11921192

1193-
final var closeable = new AutoCloseable() {
1194-
@Override
1195-
public void close() throws XMLStreamException {
1196-
reader.close();
1197-
}
1198-
};
1199-
1200-
try (closeable; var input = new XMLStreamReaderAdapter(reader)) {
1193+
try (var input = new XMLStreamReaderAdapter(reader)) {
12011194
if (input.hasNext()) {
12021195
input.next();
12031196

@@ -1435,14 +1428,16 @@ public void write(final GPX gpx, final Result result)
14351428
? new XMLStreamWriterAdapter(writer)
14361429
: new IndentingXMLStreamWriter(writer, _indent);
14371430

1438-
final NumberFormat format = NumberFormat.getNumberInstance(ENGLISH);
1439-
format.setMaximumFractionDigits(_maximumFractionDigits);
1440-
final Function<Number, String> formatter = value ->
1441-
value != null ? format.format(value) : null;
1431+
try (output) {
1432+
final NumberFormat format = NumberFormat.getNumberInstance(ENGLISH);
1433+
format.setMaximumFractionDigits(_maximumFractionDigits);
1434+
final Function<Number, String> formatter = value ->
1435+
value != null ? format.format(value) : null;
14421436

1443-
output.writeStartDocument("UTF-8", "1.0");
1444-
GPX.xmlWriter(gpx._version, formatter).write(output, gpx);
1445-
output.writeEndDocument();
1437+
output.writeStartDocument("UTF-8", "1.0");
1438+
GPX.xmlWriter(gpx._version, formatter).write(output, gpx);
1439+
output.writeEndDocument();
1440+
}
14461441
} catch (XMLStreamException e) {
14471442
throw new IOException(e);
14481443
}

0 commit comments

Comments
 (0)