Improve the error message for simple values by including the value.

RELNOTES: None

PiperOrigin-RevId: 151630049

9 files changed, 51 insertions, 0 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/ArrayXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/ArrayXmlResourceValue.java
index 65e8e03e97..721cd29715 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/ArrayXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/ArrayXmlResourceValue.java
@@ -215,4 +215,9 @@ public class ArrayXmlResourceValue implements XmlResourceValue {
       throw new XMLStreamException(e.getMessage(), start.getLocation());
     }
   }
+
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    return source.asConflictString();
+  }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/AttrXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/AttrXmlResourceValue.java
index e9578d6fa2..252b4cbac6 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/AttrXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/AttrXmlResourceValue.java
@@ -756,4 +756,9 @@ public class AttrXmlResourceValue implements XmlResourceValue {
     public void writeToClass(AndroidResourceClassWriter writer) {
     }
   }
+
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    return source.asConflictString();
+  }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/IdXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/IdXmlResourceValue.java
index 16bc0a5c07..d0a4114c2f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/IdXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/IdXmlResourceValue.java
@@ -146,4 +146,9 @@ public class IdXmlResourceValue implements XmlResourceValue {
     }
     throw new IllegalArgumentException(resourceValue + "is not combinable with " + this);
   }
+
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    return source.asConflictString();
+  }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/PluralXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/PluralXmlResourceValue.java
index c2fc64e24c..faf418a77f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/PluralXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/PluralXmlResourceValue.java
@@ -156,4 +156,9 @@ public class PluralXmlResourceValue implements XmlResourceValue {
   public XmlResourceValue combineWith(XmlResourceValue value) {
     throw new IllegalArgumentException(this + " is not a combinable resource.");
   }
+  
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    return source.asConflictString();
+  }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/PublicXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/PublicXmlResourceValue.java
index fe1ae7c927..9399c64647 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/PublicXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/PublicXmlResourceValue.java
@@ -173,4 +173,9 @@ public class PublicXmlResourceValue implements XmlResourceValue {
     }
     return of(combined);
   }
+  
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    return source.asConflictString();
+  }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/ResourcesAttribute.java b/src/tools/android/java/com/google/devtools/build/android/xml/ResourcesAttribute.java
index b1d97407b8..e92565fb35 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/ResourcesAttribute.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/ResourcesAttribute.java
@@ -114,4 +114,12 @@ public class ResourcesAttribute implements XmlResourceValue {
       FullyQualifiedName key, AndroidResourceClassWriter resourceClassWriter) {
     // This is an xml attribute and does not have any java representation.
   }
+
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    if (value != null) {
+      return String.format(" %s (with value %s)", source.asConflictString(), value);
+    }
+    return source.asConflictString();
+  }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java
index d560187fa8..edcfe3fe4f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java
@@ -266,4 +266,12 @@ public class SimpleXmlResourceValue implements XmlResourceValue {
   public XmlResourceValue combineWith(XmlResourceValue value) {
     throw new IllegalArgumentException(this + " is not a combinable resource.");
   }
+  
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    if (value != null) {
+      return String.format(" %s (with value %s)", source.asConflictString(), value);
+    }
+    return source.asConflictString();
+  }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/StyleXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/StyleXmlResourceValue.java
index 07d60ac636..bfc02a4244 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/StyleXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/StyleXmlResourceValue.java
@@ -153,4 +153,9 @@ public class StyleXmlResourceValue implements XmlResourceValue {
   public XmlResourceValue combineWith(XmlResourceValue value) {
     throw new IllegalArgumentException(this + " is not a combinable resource.");
   }
+  
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    return source.asConflictString();
+  }
 }
diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java
index 6d90a0a0ff..93478876a3 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/StyleableXmlResourceValue.java
@@ -216,4 +216,9 @@ public class StyleableXmlResourceValue implements XmlResourceValue {
     }
     return of(combined);
   }
+
+  @Override
+  public String asConflictStringWith(DataSource source) {
+    return source.asConflictString();
+  }
 }