diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml index 57ccd16f4282..c59f71e664b7 100644 --- a/plugins/devkit/resources/META-INF/plugin.xml +++ b/plugins/devkit/resources/META-INF/plugin.xml @@ -81,12 +81,6 @@ groupKey="inspections.group.name" enabledByDefault="true" level="ERROR" implementationClass="org.jetbrains.idea.devkit.inspections.RegistrationProblemsInspection"/> - - - org.jetbrains.idea.devkit.inspections.AnnotateCapitalizationIntention - I18N - - diff --git a/plugins/devkit/resources/inspectionDescriptions/DialogTitleCapitalization.html b/plugins/devkit/resources/inspectionDescriptions/DialogTitleCapitalization.html deleted file mode 100644 index 5aad538184c0..000000000000 --- a/plugins/devkit/resources/inspectionDescriptions/DialogTitleCapitalization.html +++ /dev/null @@ -1,4 +0,0 @@ - -This inspections checks that titles of dialogs implemented using the DialogWrapper class, as well as messages displayed using the Messages -class, use title capitalization, which is required by most platform UI guidelines. - \ No newline at end of file diff --git a/plugins/java-i18n/java-i18n.iml b/plugins/java-i18n/java-i18n.iml index 08852084e604..6cc212d8a002 100644 --- a/plugins/java-i18n/java-i18n.iml +++ b/plugins/java-i18n/java-i18n.iml @@ -5,6 +5,7 @@ + @@ -22,5 +23,4 @@ - - + \ No newline at end of file diff --git a/plugins/java-i18n/resources/inspectionDescriptions/DialogTitleCapitalization.html b/plugins/java-i18n/resources/inspectionDescriptions/DialogTitleCapitalization.html new file mode 100644 index 000000000000..640b6d765308 --- /dev/null +++ b/plugins/java-i18n/resources/inspectionDescriptions/DialogTitleCapitalization.html @@ -0,0 +1,4 @@ + +This inspection checks strings in method parameters and return values annotated with @Nls annotation with "capitalization" parameter +to confirm with capitalization rules, which is required by most platform UI guidelines. + \ No newline at end of file diff --git a/plugins/devkit/resources/intentionDescriptions/AnnotateCapitalizationIntention/after.java.template b/plugins/java-i18n/resources/intentionDescriptions/AnnotateCapitalizationIntention/after.java.template similarity index 100% rename from plugins/devkit/resources/intentionDescriptions/AnnotateCapitalizationIntention/after.java.template rename to plugins/java-i18n/resources/intentionDescriptions/AnnotateCapitalizationIntention/after.java.template diff --git a/plugins/devkit/resources/intentionDescriptions/AnnotateCapitalizationIntention/before.java.template b/plugins/java-i18n/resources/intentionDescriptions/AnnotateCapitalizationIntention/before.java.template similarity index 100% rename from plugins/devkit/resources/intentionDescriptions/AnnotateCapitalizationIntention/before.java.template rename to plugins/java-i18n/resources/intentionDescriptions/AnnotateCapitalizationIntention/before.java.template diff --git a/plugins/devkit/resources/intentionDescriptions/AnnotateCapitalizationIntention/description.html b/plugins/java-i18n/resources/intentionDescriptions/AnnotateCapitalizationIntention/description.html similarity index 100% rename from plugins/devkit/resources/intentionDescriptions/AnnotateCapitalizationIntention/description.html rename to plugins/java-i18n/resources/intentionDescriptions/AnnotateCapitalizationIntention/description.html diff --git a/plugins/java-i18n/src/META-INF/plugin.xml b/plugins/java-i18n/src/META-INF/plugin.xml index dca09990aeac..c3e2c5aab225 100644 --- a/plugins/java-i18n/src/META-INF/plugin.xml +++ b/plugins/java-i18n/src/META-INF/plugin.xml @@ -47,6 +47,19 @@ key="inspection.duplicates.display.name" groupName="Internationalization issues" enabledByDefault="false" level="WARNING" implementationClass="com.intellij.codeInspection.duplicateStringLiteral.DuplicateStringLiteralInspection"/> + + + + + com.intellij.codeInspection.capitalization.AnnotateCapitalizationIntention + I18N + + diff --git a/plugins/devkit/src/inspections/AnnotateCapitalizationIntention.java b/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/AnnotateCapitalizationIntention.java similarity index 98% rename from plugins/devkit/src/inspections/AnnotateCapitalizationIntention.java rename to plugins/java-i18n/src/com/intellij/codeInspection/capitalization/AnnotateCapitalizationIntention.java index 45ebf47b036c..83daebe38f02 100644 --- a/plugins/devkit/src/inspections/AnnotateCapitalizationIntention.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/AnnotateCapitalizationIntention.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.inspections; +package com.intellij.codeInspection.capitalization; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.intention.AddAnnotationFix; diff --git a/plugins/devkit/src/inspections/TitleCapitalizationInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java similarity index 99% rename from plugins/devkit/src/inspections/TitleCapitalizationInspection.java rename to plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java index 507f9f679e74..f22ebf8460c2 100644 --- a/plugins/devkit/src/inspections/TitleCapitalizationInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.inspections; +package com.intellij.codeInspection.capitalization; import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInspection.*; diff --git a/plugins/devkit/testSources/inspections/CapitalizationInspectionTest.java b/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationInspectionTest.java similarity index 93% rename from plugins/devkit/testSources/inspections/CapitalizationInspectionTest.java rename to plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationInspectionTest.java index 1c4b0b8e718c..8f478184aa77 100644 --- a/plugins/devkit/testSources/inspections/CapitalizationInspectionTest.java +++ b/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationInspectionTest.java @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.inspections; +package com.intellij.codeInspection; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.codeInspection.capitalization.AnnotateCapitalizationIntention; +import com.intellij.codeInspection.capitalization.TitleCapitalizationInspection; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;