MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

(no message)

Browse Source
This commit is contained in:
Eugene Vigdorchik
2005-01-26 20:01:50 +03:00
parent 54fa6662e0
commit c02a80e8d0
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java
+3 -4
View File
@@ -15,9 +15,8 @@ import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.ReadonlyStatusHandler;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.refactoring.HelpID;
import com.intellij.refactoring.MoveDestination;
@@ -167,7 +166,7 @@ public class MoveClassesOrPackagesImpl {
private static boolean successfullyCheckedOut(final Project project, final List<VirtualFile> readOnly) {
final ReadonlyStatusHandler.OperationStatus operationStatus = ReadonlyStatusHandler.getInstance(project)
.ensureFilesWritable((VirtualFile[])readOnly.toArray(new VirtualFile[readOnly.size()]));
.ensureFilesWritable(readOnly.toArray(new VirtualFile[readOnly.size()]));
return !operationStatus.hasReadonlyFiles();
}
@@ -372,7 +371,7 @@ public class MoveClassesOrPackagesImpl {
List<PsiDirectory> sourceRootDirectories = buildRearrangeTargetsList(project, directories);
DirectoryChooser chooser = new DirectoryChooser(project);
chooser.setTitle("Select source root");
chooser.fillList((PsiDirectory[])sourceRootDirectories.toArray(new PsiDirectory[sourceRootDirectories.size()]), null, project, "");
chooser.fillList(sourceRootDirectories.toArray(new PsiDirectory[sourceRootDirectories.size()]), null, project, "");
chooser.show();
if (!chooser.isOK()) return;
final PsiDirectory selectedTarget = chooser.getSelectedDirectory();
source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java
+2 -2
View File
@@ -38,7 +38,7 @@ public class MoveClassesOrPackagesUtil {
if (Comparing.equal(getQualfiedName(element), newQName)) return new UsageInfo[0];
ArrayList<UsageInfo> results = new ArrayList<UsageInfo>();
Set foundReferences = new HashSet();
Set<PsiReference> foundReferences = new HashSet<PsiReference>();
GlobalSearchScope projectScope = GlobalSearchScope.projectScope(manager.getProject());
PsiReference[] references = helper.findReferences(element, projectScope, false);
@@ -54,7 +54,7 @@ public class MoveClassesOrPackagesUtil {
findNonCodeUsages(searchInStringsAndComments, searchInNonJavaFiles, element, newQName, results);
return (UsageInfo[])results.toArray(new UsageInfo[results.size()]);
return results.toArray(new UsageInfo[results.size()]);
}
private static String getQualfiedName(final PsiElement element) {
source/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java
-1
View File
@@ -10,7 +10,6 @@ import com.intellij.refactoring.PackageWrapper;
import com.intellij.refactoring.util.RefactoringUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Collection;
/**
source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java
+3 -3
View File
@@ -60,13 +60,13 @@ public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor {
protected boolean preprocessUsages(UsageInfo[][] u) {
final UsageInfo[] usages = u[0];
ArrayList filteredUsages = new ArrayList();
ArrayList<UsageInfo> filteredUsages = new ArrayList<UsageInfo>();
for (int i = 0; i < usages.length; i++) {
UsageInfo usage = usages[i];
filteredUsages.add(usage);
}
u[0] = (UsageInfo[])filteredUsages.toArray(new UsageInfo[filteredUsages.size()]);
u[0] = filteredUsages.toArray(new UsageInfo[filteredUsages.size()]);
prepareSuccessful();
return true;
}
@@ -83,7 +83,7 @@ public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor {
}
protected void performRefactoring(UsageInfo[] usages) {
ArrayList arrayList = new ArrayList();
ArrayList<UsageInfo> arrayList = new ArrayList<UsageInfo>();
for (int i = 0; i < usages.length; i++) {
UsageInfo usage = usages[i];
arrayList.add(usage);
source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java
+1 -1
View File
@@ -178,7 +178,7 @@ public class MoveFilesOrDirectoriesUtil {
}
// the second 'for' statement is for effectivity - to prevent creation of the 'names' array
HashSet names = new HashSet();
HashSet<String> names = new HashSet<String>();
for (int i = 0; i < elements.length; i++) {
PsiFile file = (PsiFile)elements[i];
String name = file.getName();