From d516dd3b1ce6a5d0db53e375c2f758cb7760fec2 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 7 Feb 2014 21:16:38 +0100
Subject: [PATCH] pull up: support static methods and interfaces for java 8

---
 .../memberPullUp/PullUpDialog.java            | 22 +++++++++----------
 .../refactoring/util/RefactoringUtil.java     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
index 0110c55d74bc..b92c5f52bfa9 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
@@ -180,11 +180,12 @@ public class PullUpDialog extends PullUpDialogBase<MemberInfoStorage, MemberInfo
 
     @Override
     public boolean isMemberEnabled(MemberInfo member) {
-      PsiClass currentSuperClass = getSuperClass();
+      final PsiClass currentSuperClass = getSuperClass();
       if(currentSuperClass == null) return true;
       if (myMemberInfoStorage.getDuplicatedMemberInfos(currentSuperClass).contains(member)) return false;
       if (myMemberInfoStorage.getExtending(currentSuperClass).contains(member.getMember())) return false;
-      if (!currentSuperClass.isInterface()) return true;
+      final boolean isInterface = currentSuperClass.isInterface();
+      if (!isInterface) return true;
 
       PsiElement element = member.getMember();
       if (element instanceof PsiClass && ((PsiClass) element).isInterface()) return true;
@@ -192,13 +193,11 @@ public class PullUpDialog extends PullUpDialogBase<MemberInfoStorage, MemberInfo
         return ((PsiModifierListOwner) element).hasModifierProperty(PsiModifier.STATIC);
       }
       if (element instanceof PsiMethod) {
-        if (currentSuperClass.isInterface()) {
-          final PsiSubstitutor superSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(currentSuperClass, myClass, PsiSubstitutor.EMPTY);
-          final MethodSignature signature = ((PsiMethod) element).getSignature(superSubstitutor);
-          final PsiMethod superClassMethod = MethodSignatureUtil.findMethodBySignature(currentSuperClass, signature, false);
-          if (superClassMethod != null) return false;
-        }
-        return !((PsiModifierListOwner) element).hasModifierProperty(PsiModifier.STATIC);
+        final PsiSubstitutor superSubstitutor = TypeConversionUtil.getSuperClassSubstitutor(currentSuperClass, myClass, PsiSubstitutor.EMPTY);
+        final MethodSignature signature = ((PsiMethod) element).getSignature(superSubstitutor);
+        final PsiMethod superClassMethod = MethodSignatureUtil.findMethodBySignature(currentSuperClass, signature, false);
+        if (superClassMethod != null) return false;
+        return !((PsiModifierListOwner) element).hasModifierProperty(PsiModifier.STATIC) || PsiUtil.isLanguageLevel8OrHigher(currentSuperClass);
       }
       return true;
     }
@@ -218,8 +217,9 @@ public class PullUpDialog extends PullUpDialogBase<MemberInfoStorage, MemberInfo
       PsiClass currentSuperClass = getSuperClass();
       if(currentSuperClass == null) return false;
       if (currentSuperClass.isInterface()) {
-        if (member.getMember() instanceof PsiMethod) {
-          return true;
+        final PsiMember psiMember = member.getMember();
+        if (psiMember instanceof PsiMethod) {
+          return !psiMember.hasModifierProperty(PsiModifier.STATIC);
         }
       }
       return false;
diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
index 60242005694c..3a9f796a4f0f 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -767,7 +767,7 @@ public class RefactoringUtil {
   }
 
   public static void makeMethodDefault(@NotNull PsiMethod method) throws IncorrectOperationException {
-    PsiUtil.setModifierProperty(method, PsiModifier.DEFAULT, true);
+    PsiUtil.setModifierProperty(method, PsiModifier.DEFAULT, !method.hasModifierProperty(PsiModifier.STATIC));
     PsiUtil.setModifierProperty(method, PsiModifier.ABSTRACT, false);
 
     prepareForInterface(method);