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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
irengrig
2010-01-22 09:25:58 +03:00
parent 5f5abb6b2b 76f27efbbf
commit c51c524802
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileType.java
+1 -2
View File
@@ -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() {
plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyIconProvider.java
+1 -1
View File
@@ -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();
plugins/groovy/src/org/jetbrains/plugins/groovy/extensions/GroovyScriptType.java
+2 -2
View File
@@ -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
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java
+2 -1
View File
@@ -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) {