Snapshot dddb119296e7ee16fa8180784610b89b89112ebb from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I5fe892d3e4d06009445cc2270aa90bb57dea9d39

5 files changed, 12 insertions, 4 deletions

diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntention.java
index 157d49e3160a..d4007b28415a 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/annotation/AnnotateOverriddenMethodsIntention.java
@@ -15,8 +15,8 @@
  */
 package com.siyeh.ipp.annotation;
 
-import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.ExternalAnnotationsManager;
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.openapi.command.undo.UndoUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
@@ -144,8 +144,7 @@ public class AnnotateOverriddenMethodsIntention extends MutablyNamedIntention {
     else {
       final PsiFile containingFile =
         modifierListOwner.getContainingFile();
-      if (!CodeInsightUtilBase.preparePsiElementForWrite(
-        containingFile)) {
+      if (!FileModificationService.getInstance().preparePsiElementForWrite(containingFile)) {
         return;
       }
       final PsiAnnotation inserted =
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java
index d617479ac8f0..21c717174f42 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassIntention.java
@@ -90,7 +90,9 @@ public class ConvertInterfaceToClassIntention extends Intention {
       final PsiModifierList modifierList = innerClass.getModifierList();
       if (modifierList != null) {
         modifierList.setModifierProperty(PsiModifier.PUBLIC, true);
-        modifierList.setModifierProperty(PsiModifier.STATIC, true);
+        if (!innerClass.isInterface()) {
+          modifierList.setModifierProperty(PsiModifier.STATIC, true);
+        }
       }
     }
   }
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/interfaceToClass/InnerInterface.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/interfaceToClass/InnerInterface.java
new file mode 100644
index 000000000000..ea475f46cee7
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/interfaceToClass/InnerInterface.java
@@ -0,0 +1,3 @@
+interface Fo<caret>o {
+  interface Bar{}
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/interfaceToClass/InnerInterface_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/interfaceToClass/InnerInterface_after.java
new file mode 100644
index 000000000000..82d76148cfe5
--- /dev/null
+++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/interfaceToClass/InnerInterface_after.java
@@ -0,0 +1,3 @@
+abstract class Foo {
+  public interface Bar{}
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassTest.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassTest.java
index 001553b72131..5fca9200f366 100644
--- a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassTest.java
+++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/interfacetoclass/ConvertInterfaceToClassTest.java
@@ -21,6 +21,7 @@ import com.siyeh.ipp.IPPTestCase;
 public class ConvertInterfaceToClassTest extends IPPTestCase {
   public void testBasic() { doTest(); }
   public void testExtensionMethods() { doTest(); }
+  public void testInnerInterface() { doTest(); }
 
   @Override
   protected String getRelativePath() {