1.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Tue Feb 12 19:25:09 2013 +0000 1.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Tue Feb 12 17:15:29 2013 -0800 1.3 @@ -235,6 +235,7 @@ 1.4 switch(tree.getTag()) { 1.5 case TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty(); 1.6 case NEWCLASS: return isDiamond(((JCNewClass)tree).clazz); 1.7 + case ANNOTATED_TYPE: return isDiamond(((JCAnnotatedType)tree).underlyingType); 1.8 default: return false; 1.9 } 1.10 } 1.11 @@ -335,6 +336,8 @@ 1.12 case TYPEAPPLY: 1.13 case TYPEARRAY: 1.14 return true; 1.15 + case ANNOTATED_TYPE: 1.16 + return isStaticSelector(((JCAnnotatedType)base).underlyingType, names); 1.17 default: 1.18 return false; 1.19 }