From b9bc882bf94ac1f26d5f682838dd9b66f32d9835 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Wed, 22 Feb 2012 22:10:58 +0400 Subject: [PATCH] useless constructor modality parameter --- .../src/org/jetbrains/jet/codegen/CodegenContext.java | 2 +- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 8 ++++---- .../jet/lang/descriptors/ConstructorDescriptorImpl.java | 4 ++-- .../jetbrains/jet/lang/resolve/DescriptorResolver.java | 3 +-- .../jetbrains/jet/lang/resolve/TypeHierarchyResolver.java | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java index 8edec05f39c..c8745e1ab98 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java @@ -139,7 +139,7 @@ public abstract class CodegenContext { public ConstructorContext intoConstructor(ConstructorDescriptor descriptor, JetTypeMapper typeMapper) { if(descriptor == null) { descriptor = new ConstructorDescriptorImpl(getThisDescriptor(), Collections.emptyList(), true) - .initialize(Collections.emptyList(), Collections.emptyList(), Modality.OPEN, Visibility.PUBLIC); + .initialize(Collections.emptyList(), Collections.emptyList(), Visibility.PUBLIC); } return new ConstructorContext(descriptor, getContextKind(), this, typeMapper); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 9716a73520c..6a7c3a07992 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -332,7 +332,7 @@ public class JavaDescriptorResolver { classData.classDescriptor, Collections.emptyList(), false); - constructorDescriptor.initialize(typeParameters, Collections.emptyList(), Modality.FINAL, classData.classDescriptor.getVisibility()); + constructorDescriptor.initialize(typeParameters, Collections.emptyList(), classData.classDescriptor.getVisibility()); constructorDescriptor.setReturnType(classData.classDescriptor.getDefaultType()); classData.classDescriptor.addConstructor(constructorDescriptor, null); semanticServices.getTrace().record(BindingContext.CONSTRUCTOR, psiClass, constructorDescriptor); @@ -373,7 +373,7 @@ public class JavaDescriptorResolver { } } - constructorDescriptor.initialize(typeParameters, valueParameters, Modality.FINAL, classData.classDescriptor.getVisibility()); + constructorDescriptor.initialize(typeParameters, valueParameters, classData.classDescriptor.getVisibility()); constructorDescriptor.setReturnType(classData.classDescriptor.getDefaultType()); classData.classDescriptor.addConstructor(constructorDescriptor, null); semanticServices.getTrace().record(BindingContext.CONSTRUCTOR, psiClass, constructorDescriptor); @@ -398,8 +398,8 @@ public class JavaDescriptorResolver { if (valueParameterDescriptors.receiverType != null) { throw new IllegalStateException(); } - constructorDescriptor.initialize(typeParameters, valueParameterDescriptors.descriptors, Modality.FINAL, - resolveVisibilityFromPsiModifiers(psiConstructor)); + constructorDescriptor.initialize(typeParameters, valueParameterDescriptors.descriptors, + resolveVisibilityFromPsiModifiers(psiConstructor)); constructorDescriptor.setReturnType(classData.classDescriptor.getDefaultType()); classData.classDescriptor.addConstructor(constructorDescriptor, null); semanticServices.getTrace().record(BindingContext.CONSTRUCTOR, psiConstructor, constructorDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java index 8e98996d7d1..5f93d341953 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptorImpl.java @@ -52,8 +52,8 @@ public class ConstructorDescriptorImpl extends FunctionDescriptorImpl implements return (ConstructorDescriptorImpl) super.initialize(null, expectedThisObject, typeParameters, unsubstitutedValueParameters, unsubstitutedReturnType, modality, visibility); } - public ConstructorDescriptorImpl initialize(@NotNull List typeParameters, @NotNull List unsubstitutedValueParameters, Modality modality, Visibility visibility) { - super.initialize(null, getExpectedThisObject(getContainingDeclaration()), typeParameters, unsubstitutedValueParameters, null, modality, visibility); + public ConstructorDescriptorImpl initialize(@NotNull List typeParameters, @NotNull List unsubstitutedValueParameters, Visibility visibility) { + super.initialize(null, getExpectedThisObject(getContainingDeclaration()), typeParameters, unsubstitutedValueParameters, null, Modality.FINAL, visibility); return this; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index b25be29a9dd..da45d15ff67 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -823,8 +823,7 @@ public class DescriptorResolver { constructorDescriptor, parameterScope, valueParameters), - Modality.FINAL, - resolveVisibilityFromModifiers(modifierList)); + resolveVisibilityFromModifiers(modifierList)); } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index 8fe8c8e8eba..98f2d922e1f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -157,7 +157,7 @@ public class TypeHierarchyResolver { private void createPrimaryConstructorForObject(@Nullable JetDeclaration object, MutableClassDescriptor mutableClassDescriptor) { ConstructorDescriptorImpl constructorDescriptor = new ConstructorDescriptorImpl(mutableClassDescriptor, Collections.emptyList(), true); constructorDescriptor.initialize(Collections.emptyList(), Collections.emptyList(), - Modality.FINAL, Visibility.INTERNAL);//TODO check set mutableClassDescriptor.getVisibility() + Visibility.INTERNAL);//TODO check set mutableClassDescriptor.getVisibility() // TODO : make the constructor private? mutableClassDescriptor.setPrimaryConstructor(constructorDescriptor, context.getTrace()); if (object != null) {