diff options
Diffstat (limited to 'java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java')
| -rw-r--r-- | java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java | 13 |
1 files changed, 5 insertions, 8 deletions
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 ed08349519a7..0cc9819c4574 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java @@ -30,10 +30,7 @@ import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; -import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.TextRange; +import com.intellij.openapi.util.*; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -1045,13 +1042,13 @@ public class RefactoringUtil { } public static void fixJavadocsForParams(PsiMethod method, Set<PsiParameter> newParameters) throws IncorrectOperationException { - fixJavadocsForParams(method, newParameters, Condition.FALSE); + fixJavadocsForParams(method, newParameters, Conditions.<Pair<PsiParameter,String>>alwaysFalse()); } public static void fixJavadocsForParams(PsiMethod method, Set<PsiParameter> newParameters, Condition<Pair<PsiParameter, String>> eqCondition) throws IncorrectOperationException { - fixJavadocsForParams(method, newParameters, eqCondition, Condition.TRUE); + fixJavadocsForParams(method, newParameters, eqCondition, Conditions.<String>alwaysTrue()); } public static void fixJavadocsForParams(PsiMethod method, @@ -1245,7 +1242,7 @@ public class RefactoringUtil { @Nullable public static PsiTypeParameterList createTypeParameterListWithUsedTypeParameters(@Nullable final PsiTypeParameterList fromList, @NotNull final PsiElement... elements) { - return createTypeParameterListWithUsedTypeParameters(fromList, Condition.TRUE, elements); + return createTypeParameterListWithUsedTypeParameters(fromList, Conditions.<PsiTypeParameter>alwaysTrue(), elements); } @Nullable @@ -1290,7 +1287,7 @@ public class RefactoringUtil { } public static void collectTypeParameters(final Set<PsiTypeParameter> used, final PsiElement element) { - collectTypeParameters(used, element, Condition.TRUE); + collectTypeParameters(used, element, Conditions.<PsiTypeParameter>alwaysTrue()); } public static void collectTypeParameters(final Set<PsiTypeParameter> used, final PsiElement element, final Condition<PsiTypeParameter> filter) { |