Improve code / xml formatting, closes #54
This commit is contained in:
@@ -14,6 +14,12 @@
|
||||
*/
|
||||
package org.oscim.android.filepicker;
|
||||
|
||||
import org.oscim.theme.XmlThemeBuilder;
|
||||
import org.oscim.tiling.TileSource.OpenResult;
|
||||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.XMLReader;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
@@ -22,50 +28,44 @@ import java.io.InputStream;
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
import javax.xml.parsers.SAXParserFactory;
|
||||
|
||||
import org.oscim.theme.XmlThemeBuilder;
|
||||
import org.oscim.tiling.TileSource.OpenResult;
|
||||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.XMLReader;
|
||||
|
||||
/**
|
||||
* Accepts all valid render theme XML files.
|
||||
*/
|
||||
public final class ValidRenderTheme implements ValidFileFilter {
|
||||
private OpenResult mOpenResult;
|
||||
private OpenResult mOpenResult;
|
||||
|
||||
@Override
|
||||
public boolean accept(File file) {
|
||||
InputStream inputStream = null;
|
||||
@Override
|
||||
public boolean accept(File file) {
|
||||
InputStream inputStream = null;
|
||||
|
||||
try {
|
||||
inputStream = new FileInputStream(file);
|
||||
XmlThemeBuilder renderThemeHandler = new XmlThemeBuilder();
|
||||
XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
|
||||
xmlReader.setContentHandler(renderThemeHandler);
|
||||
xmlReader.parse(new InputSource(inputStream));
|
||||
mOpenResult = OpenResult.SUCCESS;
|
||||
} catch (ParserConfigurationException e) {
|
||||
mOpenResult = new OpenResult(e.getMessage());
|
||||
} catch (SAXException e) {
|
||||
mOpenResult = new OpenResult(e.getMessage());
|
||||
} catch (IOException e) {
|
||||
mOpenResult = new OpenResult(e.getMessage());
|
||||
} finally {
|
||||
try {
|
||||
if (inputStream != null) {
|
||||
inputStream.close();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
mOpenResult = new OpenResult(e.getMessage());
|
||||
}
|
||||
}
|
||||
try {
|
||||
inputStream = new FileInputStream(file);
|
||||
XmlThemeBuilder renderThemeHandler = new XmlThemeBuilder();
|
||||
XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
|
||||
xmlReader.setContentHandler(renderThemeHandler);
|
||||
xmlReader.parse(new InputSource(inputStream));
|
||||
mOpenResult = OpenResult.SUCCESS;
|
||||
} catch (ParserConfigurationException e) {
|
||||
mOpenResult = new OpenResult(e.getMessage());
|
||||
} catch (SAXException e) {
|
||||
mOpenResult = new OpenResult(e.getMessage());
|
||||
} catch (IOException e) {
|
||||
mOpenResult = new OpenResult(e.getMessage());
|
||||
} finally {
|
||||
try {
|
||||
if (inputStream != null) {
|
||||
inputStream.close();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
mOpenResult = new OpenResult(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
return mOpenResult.isSuccess();
|
||||
}
|
||||
return mOpenResult.isSuccess();
|
||||
}
|
||||
|
||||
@Override
|
||||
public OpenResult getFileOpenResult() {
|
||||
return mOpenResult;
|
||||
}
|
||||
@Override
|
||||
public OpenResult getFileOpenResult() {
|
||||
return mOpenResult;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user