From 360fa038400b08e5a84e5f40a8dada5e3331a76e Mon Sep 17 00:00:00 2001 From: greg Date: Tue, 25 Aug 2009 07:54:50 +0400 Subject: [PATCH] sql stubs --- lang-impl/src/com/intellij/psi/impl/source/DummyHolder.java | 4 ++++ .../src/com/intellij/psi/impl/source/DummyHolderFactory.java | 8 ++++++++ lang-impl/src/com/intellij/psi/impl/source/HolderFactory.java | 1 + source/com/intellij/psi/impl/source/JavaDummyHolderFactory.java | 5 +++++ util/src/com/intellij/util/containers/ContainerUtil.java | 5 +++++ 5 files changed, 23 insertions(+) diff --git a/lang-impl/src/com/intellij/psi/impl/source/DummyHolder.java b/lang-impl/src/com/intellij/psi/impl/source/DummyHolder.java index 990d336c80..01c8e2559c 100644 --- a/lang-impl/src/com/intellij/psi/impl/source/DummyHolder.java +++ b/lang-impl/src/com/intellij/psi/impl/source/DummyHolder.java @@ -56,6 +56,10 @@ public class DummyHolder extends PsiFileImpl { this(manager, null, null, table, null, language); } + public DummyHolder(final PsiManager manager, final Language language, final PsiElement context) { + this(manager, null, context, null, null, language); + } + public PsiElement getContext() { return myContext; } diff --git a/lang-impl/src/com/intellij/psi/impl/source/DummyHolderFactory.java b/lang-impl/src/com/intellij/psi/impl/source/DummyHolderFactory.java index 0be08f1941..ea304f6693 100644 --- a/lang-impl/src/com/intellij/psi/impl/source/DummyHolderFactory.java +++ b/lang-impl/src/com/intellij/psi/impl/source/DummyHolderFactory.java @@ -31,6 +31,10 @@ public class DummyHolderFactory { return INSTANCE.createHolder(manager, context); } + public static DummyHolder createHolder(@NotNull PsiManager manager, Language language, PsiElement context) { + return INSTANCE.createHolder(manager, language, context); + } + public static DummyHolder createHolder(@NotNull PsiManager manager, TreeElement contentElement, PsiElement context, CharTable table) { return INSTANCE.createHolder(manager, contentElement, context, table); } @@ -56,6 +60,10 @@ public class DummyHolderFactory { return new DummyHolder(manager, context); } + public DummyHolder createHolder(@NotNull final PsiManager manager, final Language language, final PsiElement context) { + return new DummyHolder(manager, language, context); + } + public DummyHolder createHolder(@NotNull PsiManager manager, TreeElement contentElement, PsiElement context, CharTable table) { return new DummyHolder(manager, contentElement, context, table); } diff --git a/lang-impl/src/com/intellij/psi/impl/source/HolderFactory.java b/lang-impl/src/com/intellij/psi/impl/source/HolderFactory.java index c5585210b1..c8d8392700 100644 --- a/lang-impl/src/com/intellij/psi/impl/source/HolderFactory.java +++ b/lang-impl/src/com/intellij/psi/impl/source/HolderFactory.java @@ -14,6 +14,7 @@ public interface HolderFactory { DummyHolder createHolder(@NotNull PsiManager manager, TreeElement contentElement, PsiElement context); DummyHolder createHolder(@NotNull PsiManager manager, CharTable table, boolean validity); DummyHolder createHolder(@NotNull PsiManager manager, PsiElement context); + DummyHolder createHolder(@NotNull PsiManager manager, Language language, PsiElement context); DummyHolder createHolder(@NotNull PsiManager manager, TreeElement contentElement, PsiElement context, CharTable table); DummyHolder createHolder(@NotNull PsiManager manager, PsiElement context, CharTable table); DummyHolder createHolder(@NotNull PsiManager manager, final CharTable table, final Language language); diff --git a/source/com/intellij/psi/impl/source/JavaDummyHolderFactory.java b/source/com/intellij/psi/impl/source/JavaDummyHolderFactory.java index 865b512914..b4525eb16a 100644 --- a/source/com/intellij/psi/impl/source/JavaDummyHolderFactory.java +++ b/source/com/intellij/psi/impl/source/JavaDummyHolderFactory.java @@ -4,6 +4,7 @@ package com.intellij.psi.impl.source; import com.intellij.lang.Language; +import com.intellij.lang.StdLanguages; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.source.tree.TreeElement; @@ -24,6 +25,10 @@ public class JavaDummyHolderFactory implements HolderFactory { return new JavaDummyHolder(manager, context); } + public DummyHolder createHolder(@NotNull final PsiManager manager, final Language language, final PsiElement context) { + return language == StdLanguages.JAVA? new JavaDummyHolder(manager, context) : new DummyHolder(manager, language, context); + } + public DummyHolder createHolder(@NotNull final PsiManager manager, final PsiElement context, final CharTable table) { return new JavaDummyHolder(manager, context, table); } diff --git a/util/src/com/intellij/util/containers/ContainerUtil.java b/util/src/com/intellij/util/containers/ContainerUtil.java index 1f9b2ce50e..cd57d966b4 100644 --- a/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/util/src/com/intellij/util/containers/ContainerUtil.java @@ -244,6 +244,11 @@ public class ContainerUtil { return list.toArray((V[])Array.newInstance(instanceOf, list.size())); } + public static V[] findAllAsArray(Collection collection, Class instanceOf) { + List list = findAll(collection, instanceOf); + return list.toArray((V[])Array.newInstance(instanceOf, list.size())); + } + public static List findAll(Collection collection, Class instanceOf) { final ArrayList result = new ArrayList(); for (final T t : collection) { -- 2.11.4.GIT