diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt index 8473ebf46fb..8b614aff38d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt @@ -86,7 +86,7 @@ class AddExclExclCallFix(val psiElement: PsiElement) : ExclExclCallFix() { modifiedExpression.replace(exclExclExpression) } - protected fun getExpressionForIntroduceCall(): KtExpression? { + private fun getExpressionForIntroduceCall(): KtExpression? { if (psiElement is LeafPsiElement && psiElement.elementType == KtTokens.DOT) { val sibling = psiElement.prevSibling if (sibling is KtExpression) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt index 9bc89049205..1376077f2d3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt @@ -146,7 +146,7 @@ class KotlinCallableDefinitionUsage( return true } - protected fun changeReturnTypeIfNeeded(changeInfo: KotlinChangeInfo, element: PsiElement) { + private fun changeReturnTypeIfNeeded(changeInfo: KotlinChangeInfo, element: PsiElement) { if (element !is KtCallableDeclaration) return if (element is KtConstructor<*>) return diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt index 5d4f3483108..ebfb01096a1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt @@ -107,7 +107,7 @@ class KotlinFunctionCallUsage( return resolvedCall?.resultingDescriptor is JavaMethodDescriptor } - protected fun changeNameIfNeeded(changeInfo: KotlinChangeInfo, element: KtCallElement) { + private fun changeNameIfNeeded(changeInfo: KotlinChangeInfo, element: KtCallElement) { if (!changeInfo.isNameChanged) return val callee = element.calleeExpression diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt index 369a628df7f..5cc9a5b294b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt @@ -74,7 +74,7 @@ class KotlinInplacePropertyIntroducer( private var replaceAll: Boolean = true - protected var property: KtProperty + private var property: KtProperty get() = myDeclaration set(value: KtProperty) { myDeclaration = value diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionPanel.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionPanel.kt index c243286567b..ef337c24d1e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionPanel.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionPanel.kt @@ -36,7 +36,7 @@ class KotlinMemberSelectionPanel(title: String, add(scrollPane, BorderLayout.CENTER) } - protected fun createMemberSelectionTable( + private fun createMemberSelectionTable( memberInfo: List, abstractColumnHeader: String? ): KotlinMemberSelectionTable { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt index bd4d02be2a2..085338221eb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt @@ -93,9 +93,9 @@ class KotlinPullUpDialog( } } - protected val memberInfoStorage: KotlinMemberInfoStorage get() = myMemberInfoStorage + private val memberInfoStorage: KotlinMemberInfoStorage get() = myMemberInfoStorage - protected val sourceClass: KtClassOrObject get() = myClass as KtClassOrObject + private val sourceClass: KtClassOrObject get() = myClass as KtClassOrObject override fun getDimensionServiceKey() = "#" + javaClass.name diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidLayoutXmlFileManager.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidLayoutXmlFileManager.kt index 148a4302979..42e648b7083 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidLayoutXmlFileManager.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidLayoutXmlFileManager.kt @@ -57,7 +57,7 @@ class CliAndroidLayoutXmlFileManager( return resources } - protected fun initSAX(): SAXParser { + private fun initSAX(): SAXParser { val saxFactory = SAXParserFactory.newInstance() saxFactory.isNamespaceAware = true return saxFactory.newSAXParser() diff --git a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.kt b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.kt index cd95e5a3d06..30865c5ebde 100755 --- a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.kt +++ b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.kt @@ -188,7 +188,7 @@ open class ApiDetector : Detector(), UastScanner { || fqName.startsWith("dalvik.") } - protected fun getMinSdk(context: UastAndroidContext): Int { + private fun getMinSdk(context: UastAndroidContext): Int { if (mMinApi == -1) { val minSdkVersion = context.lintContext.mainProject.minSdkVersion mMinApi = minSdkVersion.featureLevel