xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

try to load external themes from asset path first

Browse Source
This commit is contained in:
Hannes Janetzek 2013-09-21 14:20:56 +02:00
parent 21020abcbd
commit 7e6833d5fd
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vtm/src/org/oscim/theme/ExternalRenderTheme.java
View File

@ -21,6 +21,8 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import org.oscim.backend.AssetAdapter;
/** /**
* An ExternalRenderTheme allows for customizing the rendering style of the map * An ExternalRenderTheme allows for customizing the rendering style of the map
* via an XML file. * via an XML file.
@ -32,6 +34,8 @@ public class ExternalRenderTheme implements Theme {
private transient int mHashCodeValue; private transient int mHashCodeValue;
private final String mRenderThemePath; private final String mRenderThemePath;
private InputStream mInputStream;
/** /**
* @param renderThemePath * @param renderThemePath
* the path to the XML render theme file. * the path to the XML render theme file.
@ -39,6 +43,12 @@ public class ExternalRenderTheme implements Theme {
* if the file does not exist or cannot be read. * if the file does not exist or cannot be read.
*/ */
public ExternalRenderTheme(String renderThemePath) throws FileNotFoundException { public ExternalRenderTheme(String renderThemePath) throws FileNotFoundException {
mInputStream = AssetAdapter.g.openFileAsStream(renderThemePath);
if (mInputStream != null) {
mRenderThemePath = null;
mFileModificationDate = 0;
return;
}
File renderThemeFile = new File(renderThemePath); File renderThemeFile = new File(renderThemePath);
if (!renderThemeFile.exists()) { if (!renderThemeFile.exists()) {
throw new FileNotFoundException("file does not exist: " + renderThemePath); throw new FileNotFoundException("file does not exist: " + renderThemePath);
@ -76,6 +86,9 @@ public class ExternalRenderTheme implements Theme {
@Override @Override
public InputStream getRenderThemeAsStream() throws FileNotFoundException { public InputStream getRenderThemeAsStream() throws FileNotFoundException {
if (mInputStream != null)
return mInputStream;
return new FileInputStream(mRenderThemePath); return new FileInputStream(mRenderThemePath);
} }
@ -102,7 +115,7 @@ public class ExternalRenderTheme implements Theme {
} }
private void readObject(ObjectInputStream objectInputStream) throws IOException, private void readObject(ObjectInputStream objectInputStream) throws IOException,
ClassNotFoundException { ClassNotFoundException {
objectInputStream.defaultReadObject(); objectInputStream.defaultReadObject();
calculateTransientValues(); calculateTransientValues();
} }