Merge "SAX parsing uses UTF-8 format"

qwasson · Aug 8, 2013 · c8a54a8 · c8a54a8
2 parents b94088c e7d0adb
commit c8a54a8
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/android/src/com/android/tools/idea/templates/Template.java b/android/src/com/android/tools/idea/templates/Template.java
@@ -52,6  52,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.w3c.dom.*;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -306,7  307,12 @@ private void processFile(@NotNull final Configuration freemarker, @NotNull Strin
         xml = processFreemarkerTemplate(freemarker, paramMap, path);
       }
 
-      SAXParserFactory.newInstance().newSAXParser().parse(new ByteArrayInputStream(xml.getBytes()), new DefaultHandler() {
       // Handle UTF-8 since processed file may contain file paths
       ByteArrayInputStream inputStream = new ByteArrayInputStream(xml.getBytes(Charsets.UTF_8.toString()));
       Reader reader = new InputStreamReader(inputStream, Charsets.UTF_8.toString());
       InputSource inputSource = new InputSource(reader);
       inputSource.setEncoding(Charsets.UTF_8.toString());
       SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new DefaultHandler() {
         @Override
         public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException {
           if (TAG_PARAMETER.equals(name)) {
@@ -433,8  439,13 @@ private void executeRecipeFile(@NotNull final Configuration freemarker, @NotNull
       myLoader.setTemplateFile(getTemplateFile(file));
       String xml = processFreemarkerTemplate(freemarker, paramMap, file);
 
-      // Parse and execute the resulting instruction list.
-      SAXParserFactory.newInstance().newSAXParser().parse(new ByteArrayInputStream(xml.getBytes()), new DefaultHandler() {
       // Parse and execute the resulting instruction list. We handle UTF-8 since the processed file contains paths which may
       // have UTF-8 characters.
       ByteArrayInputStream inputStream = new ByteArrayInputStream(xml.getBytes(Charsets.UTF_8.toString()));
       Reader reader = new InputStreamReader(inputStream, Charsets.UTF_8.toString());
       InputSource inputSource = new InputSource(reader);
       inputSource.setEncoding(Charsets.UTF_8.toString());
       SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new DefaultHandler() {
         @Override
         public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException {
           try {
@@ -487,7  498,6 @@ else if (!name.equals("recipe")) {
           }
         }
       });
-
     } catch (Exception e) {
       ourMostRecentException = e;
       LOG.warn(e);