kill JavaNamespaceDescriptor

This commit is contained in:
Stepan Koltsov
2012-03-23 23:44:20 +04:00
parent 8517fe6878
commit 3c45a1d60e
13 changed files with 209 additions and 223 deletions
@@ -218,7 +218,11 @@ public class JetTypeMapper {
*
* @see DescriptorUtils#getFQName(DeclarationDescriptor)
*/
public String getFQName(DeclarationDescriptor descriptor) {
public String getFQName(@NotNull DeclarationDescriptor descriptor) {
if (descriptor instanceof ModuleDescriptor) {
throw new IllegalStateException("missed something");
}
descriptor = descriptor.getOriginal();
if(descriptor instanceof FunctionDescriptor) {
@@ -233,11 +237,8 @@ public class JetTypeMapper {
if(name.contains("/"))
return name;
if (container != null) {
if (container.getContainingDeclaration() instanceof ModuleDescriptor) {
return name;
}
if (container instanceof ModuleDescriptor) {
throw new IllegalStateException("missed something");
return "";
}
String baseName = getFQName(container);
if (!baseName.isEmpty()) {