* Clean up of the old Iterable<String> method of writing xml

* Add in some line breaks for easier to read output.

--
MOS_MIGRATED_REVID=126315204

1 files changed, 0 insertions, 53 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
index ab43942abd..4be59ba433 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataWriter.java
@@ -48,7 +48,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 
@@ -81,40 +80,6 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor {
     }
   }
 
-  private static final class WriteValuesXmlTask implements Callable<Boolean> {
-
-    private final Path valuesPath;
-    private final Map<FullyQualifiedName, Iterable<String>> valueFragments;
-
-    WriteValuesXmlTask(Path valuesPath, Map<FullyQualifiedName, Iterable<String>> valueFragments) {
-      this.valuesPath = valuesPath;
-      this.valueFragments = valueFragments;
-    }
-
-    @Override
-    public Boolean call() throws Exception {
-      // TODO(corysmith): replace the xml writing with a real xml writing library.
-      Files.createDirectories(valuesPath.getParent());
-      try (BufferedWriter writer =
-          Files.newBufferedWriter(
-              valuesPath,
-              StandardCharsets.UTF_8,
-              StandardOpenOption.CREATE_NEW,
-              StandardOpenOption.WRITE)) {
-        writer.write(START_RESOURCES);
-        for (FullyQualifiedName key :
-            Ordering.natural().immutableSortedCopy(valueFragments.keySet())) {
-          for (String line : valueFragments.get(key)) {
-            writer.write(line);
-            writer.write(LINE_END);
-          }
-        }
-        writer.write(END_RESOURCES);
-      }
-      return Boolean.TRUE;
-    }
-  }
-
   private static final class CopyTask implements Callable<Boolean> {
 
     private final Path sourcePath;
@@ -263,14 +228,6 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor {
    */
   @Override
   public void flush() throws IOException {
-    for (Entry<String, Map<FullyQualifiedName, Iterable<String>>> entry :
-        valueFragments.entrySet()) {
-      writeTasks.add(
-          executorService.submit(
-              new WriteValuesXmlTask(
-                  resourceDirectory().resolve(entry.getKey()), entry.getValue())));
-    }
-    
     for (Entry<String, ResourceValuesDefinitions> entry : valueTags.entrySet()) {
       writeTasks.add(
           executorService.submit(
@@ -285,16 +242,6 @@ public class AndroidDataWriter implements AndroidDataWritingVisitor {
   }
 
   @Override
-  public void writeToValuesXml(FullyQualifiedName key, Iterable<String> xmlFragment) {
-    String valuesPathString = key.valuesPath();
-    if (!valueFragments.containsKey(valuesPathString)) {
-      valueFragments.put(
-          valuesPathString, new TreeMap<FullyQualifiedName, Iterable<String>>(Ordering.natural()));
-    }
-    valueFragments.get(valuesPathString).put(key, xmlFragment);
-  }
-
-  @Override
   public ValueResourceDefinitionMetadata define(FullyQualifiedName fqn) {
     String valuesPath = fqn.valuesPath();
     if (!valueTags.containsKey(valuesPath)) {