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, 35 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataValue.java b/src/tools/android/java/com/google/devtools/build/android/DataValue.java
new file mode 100644
index 0000000000..7598ab9390
--- /dev/null
+++ b/src/tools/android/java/com/google/devtools/build/android/DataValue.java
@@ -0,0 +1,35 @@
+// Copyright 2016 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.android;
+
+import java.nio.file.Path;
+
+/**
+ * Represents the value associated with DataKey interface for resource and asset values.
+ *
+ * A DataValue is either an android resource or asset derived from a Path.
+ */
+public interface DataValue {
+
+  /**
+   * Provides the DataKey of this value.
+   */
+  DataKey dataKey();
+
+  /**
+   * Provides the Path to the file from which the DataValue was derived.
+   */
+  Path source();
+
+}