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

guave type migration: remove method reference in not need for Predicate

Browse Source
This commit is contained in:
Dmitry Batkovich
2015-11-19 19:26:42 +03:00
parent fe19cbc20b
commit 59537adb7f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicateConversionRule.java
+2 -1
View File
@@ -31,6 +31,7 @@ import java.util.Map;
*/
public class GuavaPredicateConversionRule extends BaseGuavaTypeConversionRule {
public static final String GUAVA_PREDICATE = "com.google.common.base.Predicate";
public static final String JAVA_PREDICATE = "java.util.function.Predicate";
@Override
protected void fillSimpleDescriptors(Map<String, TypeConversionDescriptorBase> descriptorsMap) {
@@ -53,6 +54,6 @@ public class GuavaPredicateConversionRule extends BaseGuavaTypeConversionRule {
@NotNull
@Override
public String ruleToClass() {
return "java.util.function.Predicate";
return JAVA_PREDICATE;
}
}
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/LambdaParametersTypeConversionDescriptor.java
+2 -1
View File
@@ -85,7 +85,8 @@ public class LambdaParametersTypeConversionDescriptor extends TypeConversionDesc
final PsiClass qualifierClass = PsiTypesUtil.getPsiClass(qualifierType);
if (qualifierClass != null && (Comparing.equal(qualifierClass.getQualifiedName(), GuavaFunctionConversionRule.JAVA_UTIL_FUNCTION_FUNCTION) ||
Comparing.equal(qualifierClass.getQualifiedName(), GuavaOptionalConversionRule.JAVA_OPTIONAL) ||
Comparing.equal(qualifierClass.getQualifiedName(), GuavaSupplierConversionRule.JAVA_SUPPLIER)))
Comparing.equal(qualifierClass.getQualifiedName(), GuavaSupplierConversionRule.JAVA_SUPPLIER) ||
Comparing.equal(qualifierClass.getQualifiedName(), GuavaPredicateConversionRule.JAVA_PREDICATE)))
return (PsiExpression)expression.replace(qualifier);
}
}