From e1d5dc3ac7ae645a6c9f140c961e51cc930cd4ec Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 18 Sep 2012 18:35:18 +0200
Subject: [PATCH] Cleanup

---
 .../ConvertToInstanceMethodProcessor.java                    | 4 ++--
 .../refactoring/memberPushDown/PushDownProcessor.java        | 5 ++---
 .../src/com/intellij/refactoring/util/RefactoringUtil.java   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
index ee35d83a111f..dd37101ea6d9 100644
--- a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -258,7 +258,7 @@ public class ConvertToInstanceMethodProcessor extends BaseRefactoringProcessor {
       modifierList.setModifierProperty(PsiModifier.PRIVATE, false);
       modifierList.setModifierProperty(PsiModifier.PUBLIC, false);
       modifierList.setModifierProperty(PsiModifier.PROTECTED, false);
-      RefactoringUtil.abstractizeMethod(myTargetClass, interfaceMethod);
+      RefactoringUtil.makeMethodAbstract(myTargetClass, interfaceMethod);
 
       for (final PsiClass psiClass : inheritors) {
         final PsiMethod newMethod = addMethodToClass(psiClass);
diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
index a3a95859fe06..825dcb979a70 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -309,7 +309,7 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
           if (method.hasModifierProperty(PsiModifier.PRIVATE)) {
             PsiUtil.setModifierProperty(method, PsiModifier.PROTECTED, true);
           }
-          RefactoringUtil.abstractizeMethod(myClass, method);
+          RefactoringUtil.makeMethodAbstract(myClass, method);
           myJavaDocPolicy.processOldJavaDoc(method.getDocComment());
         }
         else {
@@ -327,7 +327,6 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
     }
   }
 
-
   private void pushDownToClass(PsiClass targetClass) throws IncorrectOperationException {
     final PsiElementFactory factory = JavaPsiFacade.getInstance(myClass.getProject()).getElementFactory();
     final PsiSubstitutor substitutor = TypeConversionUtil.getSuperClassSubstitutor(myClass, targetClass, PsiSubstitutor.EMPTY);
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 da7a834e9230..2cdbdd9b441f 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -775,7 +775,6 @@ public class RefactoringUtil {
     throws IncorrectOperationException {
     PsiType initializerType = null;
     if (initializer != null) {
-//        initializerType = myExpresssion.getType();
       if (forcedType != null) {
         initializerType = forcedType;
       }
@@ -798,6 +797,7 @@ public class RefactoringUtil {
   }
 
   /** @deprecated use {@linkplain #makeMethodAbstract(com.intellij.psi.PsiClass, com.intellij.psi.PsiMethod)} (to remove in IDEA 13) */
+  @SuppressWarnings("UnusedDeclaration")
   public static void abstractizeMethod(PsiClass targetClass, PsiMethod method) throws IncorrectOperationException {
     makeMethodAbstract(targetClass, method);
   }