diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/ActionHint.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/ActionHint.java
index 897d79453bd4..15d0e5636a05 100644
--- a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/ActionHint.java
+++ b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/ActionHint.java
@@ -40,9 +40,9 @@ import static org.junit.Assert.fail;
  * @author Tagir Valeev
  */
 public class ActionHint {
-  final String myExpectedText;
-  final boolean myShouldPresent;
-  final ProblemHighlightType myHighlightType;
+  private final String myExpectedText;
+  private final boolean myShouldPresent;
+  private final ProblemHighlightType myHighlightType;
 
   private ActionHint(String expectedText, boolean shouldPresent, ProblemHighlightType severity) {
     myExpectedText = expectedText;
@@ -67,7 +67,7 @@ public class ActionHint {
    * @return true if this ActionHint checks that some action should be present
    * or false if it checks that some action should be absent
    */
-  public boolean shouldPresent() {
+  boolean shouldPresent() {
     return myShouldPresent;
   }
 
diff --git a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionActionBean.java b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionActionBean.java
index 5f08b7cd1c62..9d5a4f9c533a 100644
--- a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionActionBean.java
+++ b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionActionBean.java
@@ -22,12 +22,11 @@ import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.CustomLoadingExtensionPointBean;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xmlb.annotations.Tag;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Locale;
 import java.util.ResourceBundle;
 
 public class IntentionActionBean extends CustomLoadingExtensionPointBean {
@@ -67,6 +66,7 @@ public class IntentionActionBean extends CustomLoadingExtensionPointBean {
     return descriptionDirectoryName;
   }
 
+  @NotNull
   public IntentionAction instantiate() throws ClassNotFoundException {
     return (IntentionAction)instantiateExtension(className, ApplicationManager.getApplication().getPicoContainer());
   }