diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java index b01ca0a8039b..b611619f7aad 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-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. @@ -65,7 +65,7 @@ public class UnusedDeclarationInspection extends UnusedDeclarationInspectionBase gc.fill = GridBagConstraints.HORIZONTAL; gc.anchor = GridBagConstraints.NORTHWEST; - myMainsCheckbox = new JCheckBox(InspectionsBundle.message("inspection.dead.code.option")); + myMainsCheckbox = new JCheckBox(InspectionsBundle.message("inspection.dead.code.option.main")); myMainsCheckbox.setSelected(ADD_MAINS_TO_ENTRIES); myMainsCheckbox.addActionListener(new ActionListener() { @Override @@ -77,7 +77,7 @@ public class UnusedDeclarationInspection extends UnusedDeclarationInspectionBase gc.gridy = 0; add(myMainsCheckbox, gc); - myAppletToEntries = new JCheckBox(InspectionsBundle.message("inspection.dead.code.option3")); + myAppletToEntries = new JCheckBox(InspectionsBundle.message("inspection.dead.code.option.applet")); myAppletToEntries.setSelected(ADD_APPLET_TO_ENTRIES); myAppletToEntries.addActionListener(new ActionListener() { @Override @@ -88,7 +88,7 @@ public class UnusedDeclarationInspection extends UnusedDeclarationInspectionBase gc.gridy++; add(myAppletToEntries, gc); - myServletToEntries = new JCheckBox(InspectionsBundle.message("inspection.dead.code.option4")); + myServletToEntries = new JCheckBox(InspectionsBundle.message("inspection.dead.code.option.servlet")); myServletToEntries.setSelected(ADD_SERVLET_TO_ENTRIES); myServletToEntries.addActionListener(new ActionListener(){ @Override @@ -115,7 +115,7 @@ public class UnusedDeclarationInspection extends UnusedDeclarationInspectionBase } myNonJavaCheckbox = - new JCheckBox(InspectionsBundle.message("inspection.dead.code.option5")); + new JCheckBox(InspectionsBundle.message("inspection.dead.code.option.external")); myNonJavaCheckbox.setSelected(ADD_NONJAVA_TO_ENTRIES); myNonJavaCheckbox.addActionListener(new ActionListener() { @Override diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties index dc4b136b6f09..d0e5098debe5 100644 --- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties +++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties @@ -379,11 +379,10 @@ inspection.comparing.references.use.quickfix=Use equals() inspection.comparing.references.problem.descriptor=Suspicious comparison #ref #loc inspection.dead.code.display.name=Unused declaration -inspection.dead.code.option=void main(String args[]) methods -inspection.dead.code.option2=JUnit testcases -inspection.dead.code.option3=Applets -inspection.dead.code.option4=Servlets -inspection.dead.code.option5=Classes that have usages in non-java files +inspection.dead.code.option.main=void main(String args[]) methods +inspection.dead.code.option.applet=Applets +inspection.dead.code.option.servlet=Servlets +inspection.dead.code.option.external=Classes with usages in non-Java files inspection.export.results.dead.code=unused declaration inspection.dead.code.comment=// --Commented out by Inspection inspection.dead.code.date.comment=// --Commented out by Inspection ({0}): diff --git a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java index 6af45ca987ae..7e28a1862985 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java +++ b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-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. @@ -20,7 +20,6 @@ */ package com.intellij.execution.junit2.inspection; -import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.reference.EntryPoint; import com.intellij.codeInspection.reference.RefElement; import com.intellij.execution.junit.JUnitUtil; @@ -43,7 +42,7 @@ public class JUnitEntryPoint extends EntryPoint { @NotNull public String getDisplayName() { - return InspectionsBundle.message("inspection.dead.code.option2"); + return "JUnit test cases"; } public boolean isEntryPoint(@NotNull RefElement refElement, @NotNull PsiElement psiElement) { diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGEntryPoint.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGEntryPoint.java index 784da489907d..efea37e0b229 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGEntryPoint.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGEntryPoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-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. @@ -45,7 +45,7 @@ public class TestNGEntryPoint extends EntryPoint { @NotNull public String getDisplayName() { - return "Automatically add all TestNG classes/methods/etc. to entry points"; + return "TestNG test cases"; } public boolean isEntryPoint(@NotNull RefElement refElement, @NotNull PsiElement psiElement) {