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

cleanup

Browse Source 
GitOrigin-RevId: 50bb4c7eabe50d645905092127dd7f98ac7a6631
This commit is contained in:
Alexey Kudravtsev
2019-05-27 14:11:41 +03:00
committed by intellij-monorepo-bot
parent a6d0b335f5
commit cba68688b7
9 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightVisitorBasedInspection.java
+1 -2
View File
@@ -16,7 +16,6 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.PsiFile;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.FilteringIterator;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -150,7 +149,7 @@ public abstract class DefaultHighlightVisitorBasedInspection extends GlobalSimpl
try {
TextEditorHighlightingPassRegistrarEx passRegistrarEx = TextEditorHighlightingPassRegistrarEx.getInstanceEx(project);
List<TextEditorHighlightingPass> passes = passRegistrarEx.instantiateMainPasses(file, document, HighlightInfoProcessor.getEmpty());
List<GeneralHighlightingPass> gpasses = ContainerUtil.collect(passes.iterator(), FilteringIterator.instanceOf(GeneralHighlightingPass.class));
List<GeneralHighlightingPass> gpasses = ContainerUtil.filterIsInstance(passes, GeneralHighlightingPass.class);
for (final GeneralHighlightingPass gpass : gpasses) {
gpass.setHighlightVisitorProducer(() -> {
gpass.incVisitorUsageCount(1);
platform/core-impl/src/com/intellij/openapi/editor/impl/event/DocumentEventImpl.java
+1
View File
@@ -125,6 +125,7 @@ public class DocumentEventImpl extends DocumentEvent {
return myOldTimeStamp;
}
@Override
@SuppressWarnings("HardCodedStringLiteral")
public String toString() {
return "DocumentEventImpl[myOffset=" + myOffset + ", myOldLength=" + myOldLength + ", myNewLength=" + myNewLength +
platform/platform-impl/src/com/intellij/externalDependencies/impl/ExternalDependenciesManagerImpl.java
+1 -2
View File
@@ -11,7 +11,6 @@ import com.intellij.openapi.project.DumbAwareRunnable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.startup.StartupManager;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.FilteringIterator;
import com.intellij.util.xmlb.annotations.Property;
import com.intellij.util.xmlb.annotations.XCollection;
import org.jetbrains.annotations.NotNull;
@@ -44,7 +43,7 @@ public class ExternalDependenciesManagerImpl extends ExternalDependenciesManager
@NotNull
@Override
public <T extends ProjectExternalDependency> List<T> getDependencies(@NotNull Class<T> aClass) {
return ContainerUtil.collect(myDependencies.iterator(), FilteringIterator.instanceOf(aClass));
return ContainerUtil.filterIsInstance(myDependencies, aClass);
}
@NotNull
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/LocalFileSystemRefreshWorker.java
+2 -2
View File
@@ -243,10 +243,10 @@ class LocalFileSystemRefreshWorker {
file.markDirty();
}
private static Consumer<VirtualFile> ourTestListener;
private static Consumer<? super VirtualFile> ourTestListener;
@TestOnly
static void setTestListener(@Nullable Consumer<VirtualFile> testListener) {
static void setTestListener(@Nullable Consumer<? super VirtualFile> testListener) {
ourTestListener = testListener;
}
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/RefreshWorker.java
+2 -2
View File
@@ -402,10 +402,10 @@ public class RefreshWorker {
}
}
private static Consumer<VirtualFile> ourTestListener;
private static Consumer<? super VirtualFile> ourTestListener;
@TestOnly
public static void setTestListener(@Nullable Consumer<VirtualFile> testListener) {
public static void setTestListener(@Nullable Consumer<? super VirtualFile> testListener) {
assert ApplicationManager.getApplication().isUnitTestMode();
ourTestListener = testListener;
LocalFileSystemRefreshWorker.setTestListener(testListener);
platform/platform-tests/testSrc/com/intellij/util/containers/ContainerUtilTest.java
+1 -1
View File
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertArrayEquals;
public class ContainerUtilTest extends TestCase {
public void testFindInstanceOf() {
Iterator<Object> iterator = Arrays.<Object>asList(1, new ArrayList(), "1").iterator();
String string = (String)ContainerUtil.find(iterator, FilteringIterator.instanceOf(String.class));
String string = ContainerUtil.findInstance(iterator, String.class);
assertEquals("1", string);
}
platform/util/src/com/intellij/openapi/util/objectTree/ThrowableInterner.java
+1 -2
View File
@@ -6,7 +6,6 @@ import com.intellij.openapi.util.SystemInfo;
import com.intellij.util.ReflectionUtil;
import com.intellij.util.concurrency.AtomicFieldUpdater;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.FilteringIterator;
import com.intellij.util.containers.Interner;
import com.intellij.util.containers.WeakInterner;
import gnu.trove.TObjectHashingStrategy;
@@ -36,7 +35,7 @@ public class ThrowableInterner {
}
Object[] backtrace = getBacktrace(throwable);
if (backtrace != null) {
Object[] stack = (Object[])ContainerUtil.find(backtrace, FilteringIterator.instanceOf(Object[].class));
Object[] stack = ContainerUtil.findInstance(backtrace, Object[].class);
return Arrays.hashCode(stack);
}
return Arrays.hashCode(throwable.getStackTrace());
plugins/java-i18n/src/com/intellij/refactoring/inline/InlinePropertyHandler.java
+1 -2
View File
@@ -19,7 +19,6 @@ import com.intellij.refactoring.listeners.RefactoringEventListener;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.RefactoringMessageDialog;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.FilteringIterator;
import org.jetbrains.annotations.Nullable;
import java.util.*;
@@ -35,7 +34,7 @@ public class InlinePropertyHandler extends JavaInlineActionHandler {
public boolean canInlineElement(PsiElement element) {
if (PsiUtil.isJavaToken(element, JavaTokenType.STRING_LITERAL)) {
PsiReference[] references = element.getParent().getReferences();
return ContainerUtil.find(references, FilteringIterator.instanceOf(PropertyReference.class)) != null;
return ContainerUtil.findInstance(references, PropertyReference.class) != null;
}
return element instanceof IProperty;
}
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryTreeNode.java
+1 -2
View File
@@ -6,7 +6,6 @@ import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.util.NotNullFunction;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.FilteringIterator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.svn.SvnVcs;
@@ -162,7 +161,7 @@ public class RepositoryTreeNode implements TreeNode, Disposable {
@NotNull
public List<RepositoryTreeNode> getAlreadyLoadedChildren() {
return ContainerUtil.collect(myChildren.iterator(), FilteringIterator.instanceOf(RepositoryTreeNode.class));
return ContainerUtil.filterIsInstance(myChildren, RepositoryTreeNode.class);
}
public boolean isDisposed() {