From 36a469ccd5ad97b7208d2efc40de4807fd6ec950 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 11 Jan 2015 04:16:34 +0300 Subject: [PATCH] Rename jet -> kotlin in idea: JetBundle --- .../intentions/JetSelfTargetingIntention.kt | 2 +- ...implifyNegatedBinaryExpressionIntention.kt | 3 +- .../quickfix/KotlinSuppressIntentionAction.kt | 2 +- .../{jet => kotlin}/plugin/JetBundle.java | 24 ++++++------- .../plugin/JetBundle.properties | 0 idea/resources/liveTemplates/Kotlin.xml | 36 +++++++++---------- .../JetAddFunctionToClassifierAction.java | 2 +- .../plugin/actions/JetAddImportAction.java | 2 +- .../plugin/actions/NewKotlinFileAction.java | 2 +- .../codeInsight/GotoSuperActionHandler.java | 2 +- .../codeInsight/ImplementMethodsHandler.java | 2 +- .../surroundWith/KotlinSurrounderUtils.java | 2 +- .../KotlinRuntimeTypeCastSurrounder.kt | 2 +- .../KotlinStringTemplateSurrounder.java | 2 +- .../expression/KotlinWhenSurrounder.java | 2 +- .../KotlinFunctionLiteralSurrounder.java | 2 +- .../unwrap/KotlinUnwrapRemoveBase.java | 2 +- .../KotlinCompilerConfigurableTab.form | 20 +++++------ .../KotlinCompilerConfigurableTab.java | 2 +- .../KotlinSteppingConfigurableUi.form | 2 +- .../plugin/findUsages/JetUsageTypeProvider.kt | 2 +- .../dialogs/KotlinFindClassUsagesDialog.java | 2 +- .../KotlinFindFunctionUsagesDialog.java | 3 +- .../KotlinFindPropertyUsagesDialog.java | 2 +- .../KotlinOverrideHierarchyBrowser.kt | 2 +- .../highlighter/JetColorSettingsPage.java | 2 +- .../markers/OverridenPropertyMarker.kt | 2 +- .../markers/SuperDeclarationMarker.kt | 2 +- ...atedExpressionWithDemorgansLawIntention.kt | 2 +- .../intentions/ConvertToBlockBodyAction.kt | 2 +- .../ConvertToExpressionBodyAction.kt | 2 +- .../ReconstructTypeInCastOrIsAction.java | 2 +- .../RemoveUnnecessaryParenthesesIntention.kt | 2 +- ...icitFunctionLiteralParamWithItIntention.kt | 2 +- ...thExplicitFunctionLiteralParamIntention.kt | 2 +- .../ReplaceWithInfixFunctionCallIntention.kt | 2 +- .../SpecifyTypeExplicitlyAction.java | 2 +- .../AttributeCallReplacementIntention.kt | 2 +- .../intentions/DoubleBangToIfThenIntention.kt | 2 +- .../intentions/IfThenToDoubleBangIntention.kt | 2 +- .../ConvertMemberToExtension.java | 2 +- .../KotlinSignatureAnnotationIntention.java | 2 +- .../macro/JetAnonymousSuperMacro.java | 2 +- .../macro/JetAnyVariableMacro.java | 2 +- .../macro/JetFunctionParametersMacro.java | 2 +- .../macro/JetIterableVariableMacro.java | 2 +- .../macro/JetSuggestVariableNameMacro.java | 2 +- .../plugin/quickfix/AddFunctionBodyFix.java | 2 +- .../quickfix/AddFunctionParametersFix.java | 2 +- .../quickfix/AddFunctionToSupertypeFix.java | 2 +- .../jet/plugin/quickfix/AddModifierFix.java | 2 +- .../plugin/quickfix/AddNameToArgumentFix.java | 2 +- .../AddOpenModifierToClassDeclarationFix.java | 2 +- ...ddOverrideToEqualsHashCodeToStringFix.java | 2 +- .../AddSemicolonAfterFunctionCallFix.java | 2 +- .../quickfix/AddStarProjectionsFix.java | 2 +- .../plugin/quickfix/AddWhenElseBranchFix.java | 2 +- .../jet/plugin/quickfix/AutoImportFix.kt | 2 +- .../plugin/quickfix/CastExpressionFix.java | 2 +- .../quickfix/ChangeAccessorTypeFix.java | 2 +- .../ChangeFunctionLiteralReturnTypeFix.java | 2 +- .../ChangeFunctionLiteralSignatureFix.java | 2 +- .../quickfix/ChangeFunctionReturnTypeFix.java | 2 +- .../quickfix/ChangeFunctionSignatureFix.java | 2 +- .../ChangeMemberFunctionSignatureFix.java | 2 +- .../quickfix/ChangeParameterTypeFix.java | 2 +- .../quickfix/ChangeToBackingFieldFix.java | 2 +- .../ChangeToConstructorInvocationFix.java | 2 +- .../ChangeToFunctionInvocationFix.java | 2 +- .../quickfix/ChangeToPropertyNameFix.java | 2 +- .../quickfix/ChangeToStarProjectionFix.java | 2 +- .../jet/plugin/quickfix/ChangeTypeFix.java | 2 +- .../quickfix/ChangeVariableMutabilityFix.java | 2 +- .../quickfix/ChangeVariableTypeFix.java | 2 +- .../quickfix/ChangeVisibilityModifierFix.java | 2 +- .../jet/plugin/quickfix/ExclExclCallFix.java | 2 +- .../MakeClassAnAnnotationClassFix.java | 2 +- .../quickfix/MakeOverriddenMemberOpenFix.java | 2 +- .../quickfix/MapPlatformClassToKotlinFix.java | 2 +- .../quickfix/MoveWhenElseBranchFix.java | 2 +- .../quickfix/RemoveFunctionBodyFix.java | 2 +- .../quickfix/RemoveFunctionParametersFix.java | 2 +- .../plugin/quickfix/RemoveModifierFix.java | 2 +- .../plugin/quickfix/RemoveNullableFix.java | 2 +- .../quickfix/RemovePartsFromPropertyFix.java | 2 +- .../quickfix/RemovePsiElementSimpleFix.java | 2 +- .../RemoveRightPartOfBinaryExpressionFix.java | 2 +- .../plugin/quickfix/RemoveSupertypeFix.java | 2 +- .../RemoveValVarFromParameterFix.java | 2 +- ...meParameterToMatchOverriddenMethodFix.java | 2 +- .../jet/plugin/quickfix/ReplaceCallFix.java | 2 +- .../plugin/quickfix/ReplaceInfixCallFix.java | 2 +- ...ReplaceOperationInBinaryExpressionFix.java | 2 +- .../quickfix/SpecifyTypeExplicitlyFix.java | 2 +- .../createFromUsage/CreateFromUsageFixBase.kt | 2 +- .../createClass/CreateClassFromUsageFix.kt | 2 +- .../createClass/createClassUtils.kt | 2 +- .../CreateCallableFromUsageFix.kt | 2 +- .../CreateLocalVariableActionFactory.kt | 2 +- .../CreateParameterFromUsageFix.kt | 2 +- .../refactoring/JetRefactoringUtil.java | 2 +- .../changeSignature/JetChangeSignature.kt | 2 +- .../rename/RenameJetClassProcessor.java | 2 +- .../safeDelete/KotlinOverridingDialog.java | 2 +- .../safeDelete/KotlinSafeDeleteProcessor.kt | 2 +- 105 files changed, 141 insertions(+), 143 deletions(-) rename idea/idea-analysis/src/org/jetbrains/{jet => kotlin}/plugin/JetBundle.java (66%) rename idea/idea-analysis/src/org/jetbrains/{jet => kotlin}/plugin/JetBundle.properties (100%) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt index ec1e0abdeaa..9140e16cc17 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiFile import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.plugin.JetBundle +import org.jetbrains.kotlin.plugin.JetBundle import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate import com.intellij.codeInsight.intention.IntentionAction diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt index d9195a3f8d4..ba8a0f92ec6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt @@ -27,9 +27,8 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetPsiUtil -import org.jetbrains.jet.plugin.JetBundle +import org.jetbrains.kotlin.plugin.JetBundle import org.jetbrains.kotlin.psi.JetPsiFactory -import com.intellij.psi.PsiElement public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention("simplify.negated.binary.expression", javaClass()) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt index fb454e444b6..e5c3ac36419 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.plugin.JetBundle +import org.jetbrains.kotlin.plugin.JetBundle import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.codeInspection.SuppressIntentionAction diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.java b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.java similarity index 66% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.java index 03f19a89c40..26de55c8e0f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.plugin; import com.intellij.CommonBundle; import org.jetbrains.annotations.NonNls; @@ -29,23 +29,23 @@ public class JetBundle { private static Reference ourBundle; @NonNls - private static final String BUNDLE = "org.jetbrains.jet.plugin.JetBundle"; + private static final String BUNDLE = "org.jetbrains.kotlin.plugin.JetBundle"; private JetBundle() { } @NotNull - public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE)String key, Object... params) { - return CommonBundle.message(getBundle(), key, params); + public static String message(@NonNls @PropertyKey(resourceBundle = BUNDLE) String key, Object... params) { + return CommonBundle.message(getBundle(), key, params); } private static ResourceBundle getBundle() { - ResourceBundle bundle = null; - if (ourBundle != null) bundle = ourBundle.get(); - if (bundle == null) { - bundle = ResourceBundle.getBundle(BUNDLE); - ourBundle = new SoftReference(bundle); - } - return bundle; + ResourceBundle bundle = null; + if (ourBundle != null) bundle = ourBundle.get(); + if (bundle == null) { + bundle = ResourceBundle.getBundle(BUNDLE); + ourBundle = new SoftReference(bundle); + } + return bundle; } } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.properties similarity index 100% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/JetBundle.properties rename to idea/idea-analysis/src/org/jetbrains/kotlin/plugin/JetBundle.properties diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml index f5f8feb7363..7c921c8f24c 100644 --- a/idea/resources/liveTemplates/Kotlin.xml +++ b/idea/resources/liveTemplates/Kotlin.xml @@ -1,6 +1,6 @@ - - - - - - - - - - - - - - - -