@@ -526,7 +526,7 @@ public boolean visit(ClassInstanceCreation node) {
526526
527527 private void addConstructor (Type type , IMethodBinding constructorMethodBinding , List <?> arguments ,
528528 int lambdaArity ) {
529- String javaClassName = getClassJavaNameForClass (type );
529+ String javaClassName = getClassJavaNameForType (type );
530530 if ("java.lang.Object" .equals (javaClassName )) {
531531 buffer .append (" Clazz.new_()" );
532532 return ;
@@ -603,19 +603,19 @@ private void openNew(String javaClassName, String anonJavaName, IMethodBinding c
603603 * @param type
604604 * @return
605605 */
606- private String getClassJavaNameForClass (Type type ) {
606+ private String getClassJavaNameForType (Type type ) {
607607 if (type instanceof QualifiedType ) {
608608 QualifiedType qualType = (QualifiedType ) type ;
609- return getClassJavaNameForClass (qualType .getQualifier ()) + "." + qualType .getName ().getIdentifier ();
609+ return getClassJavaNameForType (qualType .getQualifier ()) + "." + qualType .getName ().getIdentifier ();
610610 }
611611// if (type instanceof NameQualifiedType) {
612612// NameQualifiedType nType = (NameQualifiedType) type;
613613// return getClassJavaNameForClass(nType.getQualifier()) + "." + nType.getName().getIdentifier();
614614// }
615615 if (type instanceof ArrayType )
616- return getClassJavaNameForClass (((ArrayType ) type ).getElementType ());
616+ return getClassJavaNameForType (((ArrayType ) type ).getElementType ());
617617 if (type instanceof ParameterizedType )
618- return getClassJavaNameForClass (((ParameterizedType ) type ).getType ());
618+ return getClassJavaNameForType (((ParameterizedType ) type ).getType ());
619619 if (type instanceof SimpleType ) {
620620 ITypeBinding binding = ((SimpleType ) type ).resolveBinding ();
621621 return getJavaClassNameQualified (binding );
@@ -1515,7 +1515,7 @@ public boolean visit(TryStatement node) {
15151515 }
15161516 buffer .append (haveType ? " || " : "if (" );
15171517 buffer .append ("Clazz.exceptionOf(" + catchEName + ",\" " );
1518- type . accept ( this );
1518+ buffer . append ( getFinalJ2SClassName ( getClassJavaNameForType ( type ), FINAL_RAW ) );
15191519 buffer .append ("\" )" );
15201520 haveType = true ;
15211521 }
0 commit comments