From 9577a3c9494bf9eb613aeba7377bfbb98dc257aa Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 23 Nov 2010 17:47:24 +0300 Subject: [PATCH] cleanup --- .../src/com/intellij/codeInspection/ProblemsHolder.java | 3 +-- .../com/intellij/codeInsight/daemon/impl/FileStatusMap.java | 1 - .../codeInsight/folding/impl/CodeFoldingManagerImpl.java | 2 +- .../intellij/openapi/progress/ProcessCanceledException.java | 1 + .../util/src/com/intellij/util/containers/ContainerUtil.java | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java b/platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java index 42c38ab7626f..801d47e345a8 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java @@ -174,8 +174,7 @@ public class ProblemsHolder { @Nullable public ProblemDescriptor[] getResultsArray() { - final List problems = myProblems; - myProblems = null; + final List problems = getResults(); return problems == null ? null : problems.toArray(new ProblemDescriptor[problems.size()]); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/FileStatusMap.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/FileStatusMap.java index d89fb0377d99..c67285dcf5bb 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/FileStatusMap.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/FileStatusMap.java @@ -26,7 +26,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.RangeMarker; -import com.intellij.openapi.editor.ex.RangeMarkerEx; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiDocumentManager; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java index 890e15da0981..2cd30bfbe867 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java @@ -61,7 +61,7 @@ public class CodeFoldingManagerImpl extends CodeFoldingManager implements Projec myProject = project; project.getMessageBus().connect().subscribe(DocumentBulkUpdateListener.TOPIC, new DocumentBulkUpdateListener.Adapter() { public void updateStarted(final Document doc) { - resetFoldingInfo(doc); //TODO RangeMarkers tree convert + resetFoldingInfo(doc); } }); } diff --git a/platform/util/src/com/intellij/openapi/progress/ProcessCanceledException.java b/platform/util/src/com/intellij/openapi/progress/ProcessCanceledException.java index 6f322791f3b3..b7c95c87d4c4 100644 --- a/platform/util/src/com/intellij/openapi/progress/ProcessCanceledException.java +++ b/platform/util/src/com/intellij/openapi/progress/ProcessCanceledException.java @@ -17,6 +17,7 @@ package com.intellij.openapi.progress; public class ProcessCanceledException extends RuntimeException { public ProcessCanceledException() { + int i = 0; } public ProcessCanceledException(Throwable cause) { diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index f93ee99c1d88..cffa2990143a 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -782,7 +782,7 @@ public class ContainerUtil { @NotNull public static List map(@NotNull T[] arr, @NotNull Function mapping) { - List result = new ArrayList(); + List result = new ArrayList(arr.length); for (T t : arr) { result.add(mapping.fun(t)); }