--- a/langtools/test/tools/javac/treeannotests/TestProcessor.java Wed Jan 23 20:57:40 2013 +0000
+++ b/langtools/test/tools/javac/treeannotests/TestProcessor.java Wed Jan 23 13:27:24 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -203,13 +203,16 @@
* expression <i>name</i>=<i>value</i>.
*/
String getStringValue(JCExpression e) {
- if (e.getTag() == JCTree.ASSIGN) {
+ if (e.hasTag(JCTree.Tag.ASSIGN)) {
JCAssign a = (JCAssign) e;
JCExpression rhs = a.rhs;
- if (rhs.getTag() == JCTree.LITERAL) {
+ if (rhs.hasTag(JCTree.Tag.LITERAL)) {
JCLiteral l = (JCLiteral) rhs;
return (String) l.value;
}
+ } else if (e.hasTag(JCTree.Tag.LITERAL)) {
+ JCLiteral l = (JCLiteral) e;
+ return (String) l.value;
}
throw new IllegalArgumentException(e.toString());
}