diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java index aaf26215eef9..562d1be3f999 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java @@ -26,7 +26,6 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.Function; import com.intellij.util.containers.ArrayListSet; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Stack; @@ -92,14 +91,10 @@ public class MavenProjectsTree { try { try { if (!STORAGE_VERSION.equals(in.readUTF())) return null; - result.myManagedFilesPaths = readList(in); - result.myIgnoredFilesPaths = readList(in); - result.myIgnoredFilesPatterns = readList(in); - result.myExplicitProfiles = readCollection(in, new Function>() { - public Set fun(Integer integer) { - return new THashSet(); - } - }); + result.myManagedFilesPaths = readCollection(in, new ArrayList()); + result.myIgnoredFilesPaths = readCollection(in, new ArrayList()); + result.myIgnoredFilesPatterns = readCollection(in, new ArrayList()); + result.myExplicitProfiles = readCollection(in, new THashSet()); result.myRootProjects.addAll(readProjectsRecursively(in, result)); } catch (IOException e) { @@ -117,17 +112,8 @@ public class MavenProjectsTree { return result; } - private static List readList(DataInputStream in) throws IOException { - return readCollection(in, new Function>() { - public List fun(Integer integer) { - return new ArrayList(integer); - } - }); - } - - private static > T readCollection(DataInputStream in, Function factory) throws IOException { + private static > T readCollection(DataInputStream in, T result) throws IOException { int count = in.readInt(); - T result = factory.fun(count); while (count-- > 0) { result.add(in.readUTF()); }