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

rename RenderThemeHandler - XmlThemeBuilder

Browse Source
This commit is contained in:
Hannes Janetzek 2014-03-08 19:35:27 +01:00
parent 61ca022d5b
commit 4e3fc1643d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtm-android-example/src/org/oscim/android/filepicker/ValidRenderTheme.java
View File

@ -22,7 +22,7 @@ import java.io.InputStream;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
import org.oscim.theme.RenderThemeHandler; import org.oscim.theme.XmlThemeBuilder;
import org.oscim.tiling.TileSource.OpenResult; import org.oscim.tiling.TileSource.OpenResult;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
@ -40,7 +40,7 @@ public final class ValidRenderTheme implements ValidFileFilter {
try { try {
inputStream = new FileInputStream(file); inputStream = new FileInputStream(file);
RenderThemeHandler renderThemeHandler = new RenderThemeHandler(); XmlThemeBuilder renderThemeHandler = new XmlThemeBuilder();
XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader(); XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
xmlReader.setContentHandler(renderThemeHandler); xmlReader.setContentHandler(renderThemeHandler);
xmlReader.parse(new InputSource(inputStream)); xmlReader.parse(new InputSource(inputStream));

2
vtm/src/org/oscim/theme/ThemeLoader.java
View File

@ -45,7 +45,7 @@ public class ThemeLoader {
InputStream inputStream = null; InputStream inputStream = null;
try { try {
inputStream = theme.getRenderThemeAsStream(); inputStream = theme.getRenderThemeAsStream();
IRenderTheme t = RenderThemeHandler.getRenderTheme(inputStream); IRenderTheme t = XmlThemeBuilder.from(inputStream);
if (t != null) if (t != null)
t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / 240 - 1) * 0.5f); t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / 240 - 1) * 0.5f);

14
vtm/src/org/oscim/theme/RenderThemeHandler.java → vtm/src/org/oscim/theme/XmlThemeBuilder.java
View File

@ -52,8 +52,8 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException; import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
public class RenderThemeHandler extends DefaultHandler { public class XmlThemeBuilder extends DefaultHandler {
static final Logger log = LoggerFactory.getLogger(RenderThemeHandler.class); static final Logger log = LoggerFactory.getLogger(XmlThemeBuilder.class);
private static final int RENDER_THEME_VERSION = 1; private static final int RENDER_THEME_VERSION = 1;
@ -83,10 +83,10 @@ public class RenderThemeHandler extends DefaultHandler {
* @throws IOException * @throws IOException
* if an I/O error occurs while reading from the input stream. * if an I/O error occurs while reading from the input stream.
*/ */
public static IRenderTheme getRenderTheme(InputStream inputStream) public static IRenderTheme from(InputStream inputStream)
throws SAXException, IOException { throws SAXException, IOException {
RenderThemeHandler renderThemeHandler = new RenderThemeHandler(); XmlThemeBuilder renderThemeHandler = new XmlThemeBuilder();
new XMLReaderAdapter().parse(renderThemeHandler, inputStream); new XMLReaderAdapter().parse(renderThemeHandler, inputStream);
@ -571,7 +571,7 @@ public class RenderThemeHandler extends DefaultHandler {
if ("img".equals(name)) { if ("img".equals(name)) {
img = value; img = value;
} else { } else {
RenderThemeHandler.logUnknownAttribute(elementName, name, value, i); XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
} }
} }
if (img == null) if (img == null)
@ -600,7 +600,7 @@ public class RenderThemeHandler extends DefaultHandler {
Integer.parseInt(pos[3])); Integer.parseInt(pos[3]));
} }
} else { } else {
RenderThemeHandler.logUnknownAttribute(elementName, name, value, i); XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
} }
} }
if (regionName == null || r == null) if (regionName == null || r == null)
@ -683,7 +683,7 @@ public class RenderThemeHandler extends DefaultHandler {
baseTextSize = Float.parseFloat(value); baseTextSize = Float.parseFloat(value);
else else
RenderThemeHandler.logUnknownAttribute(elementName, name, value, i); XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
} }

4
vtm/src/org/oscim/theme/rule/RuleBuilder.java
View File

@ -8,7 +8,7 @@ import java.util.Map;
import java.util.Stack; import java.util.Stack;
import org.oscim.theme.IRenderTheme.ThemeException; import org.oscim.theme.IRenderTheme.ThemeException;
import org.oscim.theme.RenderThemeHandler; import org.oscim.theme.XmlThemeBuilder;
import org.oscim.theme.styles.RenderStyle; import org.oscim.theme.styles.RenderStyle;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
@ -185,7 +185,7 @@ public class RuleBuilder {
if ("when-matched".equals(value)) if ("when-matched".equals(value))
selector |= SELECT_WHEN_MATCHED; selector |= SELECT_WHEN_MATCHED;
} else { } else {
RenderThemeHandler.logUnknownAttribute(elementName, name, value, i); XmlThemeBuilder.logUnknownAttribute(elementName, name, value, i);
} }
} }