From c02a80e8d0b27e3dd69fe826a5909d55bec7ec2e Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Wed, 26 Jan 2005 20:01:50 +0300 Subject: [PATCH] (no message) --- .../moveClassesOrPackages/MoveClassesOrPackagesImpl.java | 7 +++---- .../moveClassesOrPackages/MoveClassesOrPackagesUtil.java | 4 ++-- .../SingleSourceRootMoveDestination.java | 1 - .../MoveFilesOrDirectoriesProcessor.java | 6 +++--- .../moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java index cd49a59278e2..aa4e8f944309 100644 --- a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java +++ b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java @@ -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 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 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(); diff --git a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java index 7d87bbc3301a..5e33831c611e 100644 --- a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java +++ b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java @@ -38,7 +38,7 @@ public class MoveClassesOrPackagesUtil { if (Comparing.equal(getQualfiedName(element), newQName)) return new UsageInfo[0]; ArrayList results = new ArrayList(); - Set foundReferences = new HashSet(); + Set foundReferences = new HashSet(); 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) { diff --git a/source/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java b/source/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java index 6ea3a52e3235..b35ab734d624 100644 --- a/source/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java +++ b/source/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java @@ -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; /** diff --git a/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java b/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java index e2918c230194..958ec585129a 100644 --- a/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java +++ b/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java @@ -60,13 +60,13 @@ public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor { protected boolean preprocessUsages(UsageInfo[][] u) { final UsageInfo[] usages = u[0]; - ArrayList filteredUsages = new ArrayList(); + ArrayList filteredUsages = new ArrayList(); 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 arrayList = new ArrayList(); for (int i = 0; i < usages.length; i++) { UsageInfo usage = usages[i]; arrayList.add(usage); diff --git a/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java b/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java index 5c1cfe9bf646..5ec4c3e7fa2a 100644 --- a/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java +++ b/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java @@ -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 names = new HashSet(); for (int i = 0; i < elements.length; i++) { PsiFile file = (PsiFile)elements[i]; String name = file.getName();