nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java Wed Jan 07 14:02:30 2015 +0530
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/AdaptationResult.java Mon Jan 12 11:29:42 2015 +0100
@@ -48,28 +48,25 @@
ERROR_NO_ACCESSIBLE_CONSTRUCTOR,
ERROR_MULTIPLE_SUPERCLASSES,
ERROR_NO_COMMON_LOADER,
- ERROR_FINAL_FINALIZER
+ ERROR_FINAL_FINALIZER,
+ ERROR_OTHER
}
static final AdaptationResult SUCCESSFUL_RESULT = new AdaptationResult(Outcome.SUCCESS, "");
private final Outcome outcome;
- private final String classList;
+ private final String[] messageArgs;
- AdaptationResult(final Outcome outcome, final String classList) {
+ AdaptationResult(final Outcome outcome, final String... messageArgs) {
this.outcome = outcome;
- this.classList = classList;
+ this.messageArgs = messageArgs;
}
Outcome getOutcome() {
return outcome;
}
- String getClassList() {
- return classList;
- }
-
ECMAException typeError() {
- return ECMAErrors.typeError("extend." + outcome, classList);
+ return ECMAErrors.typeError("extend." + outcome, messageArgs);
}
}