From 76f27efbbfab697d2b1bc97a54c1a641419156a5 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 9 Dec 2009 15:14:40 +0000 Subject: [PATCH] lazier groovy icons loading --- .../src/org/jetbrains/plugins/groovy/GroovyFileType.java | 3 +-- .../src/org/jetbrains/plugins/groovy/GroovyIconProvider.java | 2 +- .../jetbrains/plugins/groovy/extensions/GroovyScriptType.java | 4 ++-- .../plugins/groovy/lang/psi/impl/GroovyFileImpl.java | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileType.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileType.java index 4408387c76bf..c3c6633a94bc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileType.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileType.java @@ -38,7 +38,6 @@ public class GroovyFileType extends LanguageFileType { public static final GroovyFileType GROOVY_FILE_TYPE = new GroovyFileType(); public static final Language GROOVY_LANGUAGE = GROOVY_FILE_TYPE.getLanguage(); - public static final Icon GROOVY_LOGO = GroovyIcons.GROOVY_ICON_16x16; @NonNls public static final String DEFAULT_EXTENSION = "groovy"; private GroovyFileType() { @@ -64,7 +63,7 @@ public class GroovyFileType extends LanguageFileType { } public Icon getIcon() { - return GROOVY_LOGO; + return GroovyIcons.GROOVY_ICON_16x16; } public boolean isJVMDebuggingSupported() { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIconProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIconProvider.java index 13fe248e6ebf..c9f86f15e299 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIconProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIconProvider.java @@ -40,7 +40,7 @@ public class GroovyIconProvider extends IconProvider implements DumbAware { if (typeDefinitions.length > 0) { return typeDefinitions[0].getIcon(flags); } - return GroovyFileType.GROOVY_LOGO; + return GroovyIcons.GROOVY_ICON_16x16; } return GroovyScriptType.getScriptType(file).getScriptIcon(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/extensions/GroovyScriptType.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/extensions/GroovyScriptType.java index f737d7d10e9d..7010ebd865d7 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/extensions/GroovyScriptType.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/extensions/GroovyScriptType.java @@ -20,7 +20,7 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.plugins.groovy.GroovyFileType; +import org.jetbrains.plugins.groovy.GroovyIcons; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.runner.GroovyScriptRunConfiguration; import org.jetbrains.plugins.groovy.runner.GroovyScriptRunner; @@ -44,7 +44,7 @@ public abstract class GroovyScriptType { @NotNull @Override public Icon getScriptIcon() { - return GroovyFileType.GROOVY_LOGO; + return GroovyIcons.GROOVY_ICON_16x16; } @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java index 95a470b7d738..5dfdad8d70ae 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java @@ -36,6 +36,7 @@ import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.GroovyFileType; +import org.jetbrains.plugins.groovy.GroovyIcons; import org.jetbrains.plugins.groovy.dsl.GroovyDslFileIndex; import org.jetbrains.plugins.groovy.dsl.GroovyScriptDescriptor; import org.jetbrains.plugins.groovy.extensions.GroovyScriptType; @@ -300,7 +301,7 @@ public class GroovyFileImpl extends GroovyFileBaseImpl implements GroovyFile { if (isScript()) { return GroovyScriptType.getScriptType(this).getScriptIcon(); } - return GroovyFileType.GROOVY_LOGO; + return GroovyIcons.GROOVY_ICON_16x16; } public GrImportStatement addImportForClass(PsiClass aClass) {