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

remove some more usages of commons-lang

Browse Source
This commit is contained in:
peter
2018-11-23 19:57:50 +01:00
parent 859340db17
commit 7ae4c8efb1
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/lambdaToExplicit/ExplicitArgumentCanBeLambdaInspection.java
+2 -2
View File
@@ -7,9 +7,9 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.source.tree.java.PsiEmptyExpressionImpl;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ObjectUtils;
import com.siyeh.ig.psiutils.ExpressionUtils;
import org.apache.commons.lang.ArrayUtils;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -66,7 +66,7 @@ public class ExplicitArgumentCanBeLambdaInspection extends AbstractBaseJavaLocal
PsiMethodCallExpression call = PsiTreeUtil.getParentOfType(arg, PsiMethodCallExpression.class);
if (call == null) return;
PsiExpression[] args = call.getArgumentList().getExpressions();
int idx = ArrayUtils.indexOf(args, arg);
int idx = ArrayUtil.indexOf(args, arg);
if(idx < 0) return;
ExpressionUtils.bindCallTo(call, myName);
String lambdaText = myInfo.makeLambda(arg);
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SingleClassHierarchy.java
+2 -3
View File
@@ -25,12 +25,12 @@ import com.intellij.psi.stubsHierarchy.SmartClassAnchor;
import com.intellij.psi.stubsHierarchy.impl.Symbol.ClassSymbol;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import org.apache.commons.lang.ArrayUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.BitSet;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -189,8 +189,7 @@ public class SingleClassHierarchy extends ClassHierarchy {
private int[] mkByFileId() {
// using a boxed array since there seems to be no easy way to sort int[] with custom comparator
Integer[] ids = getAnchorsFromDistinctFiles();
Arrays.sort(ids, (a1, a2) -> Integer.compare(myClassAnchors.getFileId(a1), myClassAnchors.getFileId(a2)));
return ArrayUtils.toPrimitive(ids);
return Arrays.stream(ids).sorted(Comparator.comparingInt(myClassAnchors::getFileId)).mapToInt(Integer::intValue).toArray();
}
private void connectSubTypes(ClassSymbol[] classSymbols) {
java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
+1 -2
View File
@@ -61,7 +61,6 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.MultiMap;
import com.intellij.util.ui.tree.TreeUtil;
import one.util.streamex.StreamEx;
import org.apache.commons.lang.ArrayUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -484,7 +483,7 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
try {
PsiAnnotation newContract =
ContractConverter.convertContract(method, StreamEx.of(parameterList.getParameters()).map(PsiParameter::getName).toArray(
ArrayUtils.EMPTY_STRING_ARRAY), info);
ArrayUtil.EMPTY_STRING_ARRAY), info);
if (newContract != null && newContract != contract) {
contract.replace(newContract);
}