3.73 of 5: Convert xml parsing to use the map based storage

Introduces two new interfaces:
  DataValue, which compliments DataKey and allows a cleaner interface MergeConflict
  AndroidDataSet.KeyValueConsumer, abstraction that allows a common interface for consuming parsed resources, which is a lot cleanr for DataValue as well.

--
MOS_MIGRATED_REVID=118466739

1 files changed, 1 insertions, 12 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataResource.java b/src/tools/android/java/com/google/devtools/build/android/DataResource.java
index 877a701258..e369a08bb0 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataResource.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataResource.java
@@ -19,18 +19,7 @@ import java.nio.file.Path;
 /**
  * Represents an Android Resource parsed from an xml or binary file.
  */
-public interface DataResource {
-
-  /**
-   * Provides the FullyQualifiedName of the DataResource.
-   */
-  DataKey dataKey();
-
-  /**
-   * Provides the Path to the file from which the DataResource was derived.
-   */
-  Path source();
-
+public interface DataResource extends DataValue {
   /**
    * Writes the resource to the given resource directory.
    * @param newResourceDirectory The new directory for this resource.