summaryrefslogtreecommitdiffstats
path: root/jack
diff options
context:
space:
mode:
authorBenoit Lamarche <benoitlamarche@google.com>2014-09-23 15:03:13 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-23 15:03:13 +0000
commit31cb6b9d47664a66a39470b83b772eaaf245bda7 (patch)
tree68b7e0f7b00d15d52a161fbf9d2efcaa09dc2148 /jack
parent34b6f21343eb5b31df108bbcc2d3bc9824f296a1 (diff)
parentb0fd061992730d77ce37d04cb585216ddf4a75d3 (diff)
downloadtoolchain_jack-31cb6b9d47664a66a39470b83b772eaaf245bda7.zip
toolchain_jack-31cb6b9d47664a66a39470b83b772eaaf245bda7.tar.gz
toolchain_jack-31cb6b9d47664a66a39470b83b772eaaf245bda7.tar.bz2
Merge "Fix messages of method and field lookup exceptions" into ub-jack
Diffstat (limited to 'jack')
-rw-r--r--jack/src/com/android/jack/ir/ast/JFieldLookupException.java5
-rw-r--r--jack/src/com/android/jack/lookup/JMethodLookupException.java4
2 files changed, 5 insertions, 4 deletions
diff --git a/jack/src/com/android/jack/ir/ast/JFieldLookupException.java b/jack/src/com/android/jack/ir/ast/JFieldLookupException.java
index 6c1fb2b..4482399 100644
--- a/jack/src/com/android/jack/ir/ast/JFieldLookupException.java
+++ b/jack/src/com/android/jack/ir/ast/JFieldLookupException.java
@@ -41,7 +41,8 @@ public class JFieldLookupException extends JMemberLookupException {
@Override
@Nonnull
public String getMessage() {
- return "Failed to lookup field " + Jack.getUserFriendlyFormatter().getName(getDeclaringClass())
- + '.' + fieldName + " of type " + Jack.getUserFriendlyFormatter().getName(fieldType);
+ return "Field '" + fieldName + "' of type '"
+ + Jack.getUserFriendlyFormatter().getName(fieldType) + "' not found in type '"
+ + Jack.getUserFriendlyFormatter().getName(getDeclaringClass()) + "'";
}
}
diff --git a/jack/src/com/android/jack/lookup/JMethodLookupException.java b/jack/src/com/android/jack/lookup/JMethodLookupException.java
index 2f68605..d27c3d3 100644
--- a/jack/src/com/android/jack/lookup/JMethodLookupException.java
+++ b/jack/src/com/android/jack/lookup/JMethodLookupException.java
@@ -37,8 +37,8 @@ public abstract class JMethodLookupException extends JMemberLookupException {
@Override
@Nonnull
public String getMessage() {
- return "Failed to lookup method " + Jack.getUserFriendlyFormatter().getName(getDeclaringClass())
- + '.' + getMethodString();
+ return "Method '" + getMethodString() + "' not found in type '"
+ + Jack.getUserFriendlyFormatter().getName(getDeclaringClass()) + "'";
}
@Nonnull