Merge remote branch 'origin/master'

2011-12-09 13:51:52 +04:00
parent 744253bcd3 81feca7bfd
commit 88d831de62
2 changed files with 6 additions and 3 deletions
@@ -45,8 +45,9 @@ public class SignatureUtil {
        }
        else {
            sb.append("T");
-            sb.append(descriptor.getContainingDeclaration().getName());
-            sb.append(";");
+            JetType defaultType = ((ClassDescriptor) descriptor.getContainingDeclaration()).getDefaultType();
+            Type type = typeMapper.mapType(defaultType, OwnerKind.IMPLEMENTATION);
+            sb.append(type.getDescriptor());
            sb.append(descriptor.getName());
            sb.append(";");
        }