X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FXmlFileLoader.java;h=454149f2c35cd432761edde2c8d271c50d2b3b15;hp=d528420029a325f8cfc33238de6c80b5c55ef8cc;hb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;hpb=3745d70b1427bb8ac1a085e47cbdc566936784e1 diff --git a/tim/prune/load/xml/XmlFileLoader.java b/tim/prune/load/xml/XmlFileLoader.java index d528420..454149f 100644 --- a/tim/prune/load/xml/XmlFileLoader.java +++ b/tim/prune/load/xml/XmlFileLoader.java @@ -2,6 +2,7 @@ package tim.prune.load.xml; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -84,20 +85,18 @@ public class XmlFileLoader extends DefaultHandler implements Runnable SourceInfo sourceInfo = new SourceInfo(_file, (_handler instanceof GpxHandler?SourceInfo.FILE_TYPE.GPX:SourceInfo.FILE_TYPE.KML)); _app.informDataLoaded(_handler.getFieldArray(), _handler.getDataArray(), - Altitude.Format.METRES, sourceInfo, _handler.getTrackNameList()); + Altitude.Format.METRES, sourceInfo, _handler.getTrackNameList(), _handler.getLinkArray()); } } catch (Exception e) { - // clean up file stream - try { - inStream.close(); - } - catch (Exception e2) {} // Show error dialog _app.showErrorMessageNoLookup("error.load.dialogtitle", I18nManager.getText("error.load.othererror") + " " + e.getMessage()); } + finally { + try {inStream.close();} catch (IOException e2) {} + } }