move drools class (IDEA-95505)

(cherry-picked from 54dfa87)
This commit is contained in:
Serega Vasiliev
2012-12-05 10:44:58 +01:00
parent d76b142879
commit d62ef4a4ad
5 changed files with 70 additions and 12 deletions
@@ -0,0 +1,34 @@
/*
* Copyright 2000-2009 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.refactoring.move.moveClassesOrPackages;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.Map;
public abstract class MoveAllClassesInFileHandler {
public static ExtensionPointName<MoveAllClassesInFileHandler> EP_NAME = new ExtensionPointName<MoveAllClassesInFileHandler>("com.intellij.refactoring.moveAllClassesInFileHandler");
public abstract void processMoveAllClassesInFile(@NotNull Map<PsiClass, Boolean> allClasses, PsiClass psiClass, PsiElement... elementsToMove);
}
@@ -16,6 +16,7 @@
package com.intellij.refactoring.move.moveClassesOrPackages;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Comparing;
@@ -460,17 +461,8 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor {
if (allClasses.containsKey(psiClass)) {
continue;
}
final PsiClassOwner containingFile = (PsiClassOwner)element.getContainingFile();
final PsiClass[] classes = containingFile.getClasses();
boolean all = true;
for (PsiClass aClass : classes) {
if (ArrayUtil.find(myElementsToMove, aClass) == -1) {
all = false;
break;
}
}
for (PsiClass aClass : classes) {
allClasses.put(aClass, all);
for (MoveAllClassesInFileHandler fileHandler : Extensions.getExtensions(MoveAllClassesInFileHandler.EP_NAME)) {
fileHandler.processMoveAllClassesInFile(allClasses, psiClass, myElementsToMove);
}
}
}
@@ -523,7 +515,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor {
}
}
protected void performPsiSpoilingRefactoring() {
protected void performPsiSpoilingRefactoring() {
RenameUtil.renameNonCodeUsages(myProject, myNonCodeUsages);
if (myMoveCallback != null) {
if (myMoveCallback instanceof MoveClassesOrPackagesCallback) {
@@ -0,0 +1,30 @@
package com.intellij.refactoring.move.moveClassesOrPackages;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiClassOwner;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.light.LightClass;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import java.util.Map;
public class MoveJavaClassesInFileHandler extends MoveAllClassesInFileHandler {
@Override
public void processMoveAllClassesInFile(@NotNull Map<PsiClass, Boolean> allClasses, PsiClass psiClass, PsiElement... elementsToMove) {
if (psiClass instanceof LightClass) return;
final PsiClassOwner containingFile = (PsiClassOwner)psiClass.getContainingFile();
final PsiClass[] classes = containingFile.getClasses();
boolean all = true;
for (PsiClass aClass : classes) {
if (ArrayUtil.find(elementsToMove, aClass) == -1) {
all = false;
break;
}
}
for (PsiClass aClass : classes) {
allClasses.put(aClass, all);
}
}
}
@@ -250,6 +250,7 @@
<extensionPoint name="refactoring.moveHandler" interface="com.intellij.refactoring.move.MoveHandlerDelegate"/>
<extensionPoint name="refactoring.moveDirectoryWithClassesHelper" interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesHelper"/>
<extensionPoint name="refactoring.moveClassHandler" interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler"/>
<extensionPoint name="refactoring.moveAllClassesInFileHandler" interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveAllClassesInFileHandler"/>
<extensionPoint name="refactoring.moveClassToInnerHandler" interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerHandler"/>
<extensionPoint name="refactoring.moveMemberHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
<extensionPoint name="refactoring.moveInnerHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+1
View File
@@ -1112,6 +1112,7 @@
<refactoring.moveDirectoryWithClassesHelper implementation="com.intellij.refactoring.move.moveClassesOrPackages.JavaMoveDirectoryWithClassesHelper"/>
<moveFileHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaFileHandler" id="java"/>
<refactoring.moveAllClassesInFileHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaClassesInFileHandler" id="java"/>
<refactoring.moveClassHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaClassHandler" id="java"/>
<refactoring.moveClassToInnerHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.JavaMoveClassToInnerHandler" id="java"/>