platform icons

This commit is contained in:
Konstantin Bulenkov
2011-06-22 23:16:54 +04:00
parent 4e588474ef
commit 1b11e99f70
9 changed files with 26 additions and 26 deletions
@@ -1,6 +1,6 @@
package com.jetbrains.python.console.pydev;
import com.intellij.util.Icons;
import com.intellij.util.PlatformIcons;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -16,12 +16,12 @@ public class PyCodeCompletionImages {
public static Icon getImageForType(int type){
switch (type) {
case IToken.TYPE_CLASS:
return Icons.CLASS_ICON;
return PlatformIcons.CLASS_ICON;
case IToken.TYPE_FUNCTION:
return Icons.METHOD_ICON;
return PlatformIcons.METHOD_ICON;
default:
return null;
}
}
}
}
@@ -9,7 +9,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
import com.intellij.psi.filters.position.FilterPattern;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Icons;
import com.intellij.util.PlatformIcons;
import com.intellij.util.ProcessingContext;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.PythonLanguage;
@@ -121,7 +121,7 @@ public class PyDictKeyNamesCompletionContributor extends PySeeingOriginalComplet
item = LookupElementBuilder
.create("'" + ((PyKeywordArgument)argument).getKeyword() + "'")
.setTypeText("dict key")
.setIcon(Icons.PARAMETER_ICON);
.setIcon(PlatformIcons.PARAMETER_ICON);
result.addElement(item);
}
}
@@ -149,7 +149,7 @@ public class PyDictKeyNamesCompletionContributor extends PySeeingOriginalComplet
item = LookupElementBuilder
.create(key.getText())
.setTypeText("dict key")
.setIcon(Icons.PARAMETER_ICON);
.setIcon(PlatformIcons.PARAMETER_ICON);
result.addElement(item);
}
}
@@ -168,7 +168,7 @@ public class PyDictKeyNamesCompletionContributor extends PySeeingOriginalComplet
item = LookupElementBuilder
.create(expression.getKey().getText())
.setTypeText("dict key")
.setIcon(Icons.PARAMETER_ICON);
.setIcon(PlatformIcons.PARAMETER_ICON);
result.addElement(item);
}
}
@@ -21,10 +21,7 @@ import com.intellij.psi.*;
import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Icons;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.SmartList;
import com.intellij.util.*;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashSet;
import com.jetbrains.python.PyNames;
@@ -677,7 +674,7 @@ public class PyUtil {
}
public static LookupElement createNamedParameterLookup(String name) {
LookupElementBuilder lookupElementBuilder = LookupElementBuilder.create(name + "=").setIcon(Icons.PARAMETER_ICON);
LookupElementBuilder lookupElementBuilder = LookupElementBuilder.create(name + "=").setIcon(PlatformIcons.PARAMETER_ICON);
return PrioritizedLookupElement.withGrouping(lookupElementBuilder, 1);
}
@@ -95,7 +95,7 @@ public class PyClassImpl extends PyPresentableElementImpl<PyClassStub> implement
@Override
public Icon getIcon(int flags) {
return Icons.CLASS_ICON;
return PlatformIcons.CLASS_ICON;
}
@Override
@@ -12,8 +12,8 @@ import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Icons;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.PlatformIcons;
import com.jetbrains.python.PyElementTypes;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.PyTokenTypes;
@@ -30,7 +30,10 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.*;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* Implements PyFunction.
@@ -69,7 +72,7 @@ public class PyFunctionImpl extends PyPresentableElementImpl<PyFunctionStub> imp
@Override
public Icon getIcon(int flags) {
return Icons.METHOD_ICON;
return PlatformIcons.METHOD_ICON;
}
@Nullable
@@ -6,8 +6,8 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Icons;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.PlatformIcons;
import com.jetbrains.python.PyElementTypes;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.documentation.StructuredDocString;
@@ -128,7 +128,7 @@ public class PyNamedParameterImpl extends PyPresentableElementImpl<PyNamedParame
}
public Icon getIcon(final int flags) {
return Icons.PARAMETER_ICON;
return PlatformIcons.PARAMETER_ICON;
}
public PyNamedParameter getAsNamed() {
@@ -11,8 +11,8 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.PsiManagerImpl;
import com.intellij.psi.impl.source.resolve.ResolveCache;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Icons;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.PlatformIcons;
import com.intellij.util.ProcessingContext;
import com.intellij.util.containers.SortedList;
import com.jetbrains.django.util.PythonDataflowUtil;
@@ -418,7 +418,7 @@ public class PyReferenceImpl implements PsiReferenceEx, PsiPolyVariantReference
PsiFile f = realContext.getContainingFile();
if (f instanceof PyFile) {
for (String name : PyModuleType.getPossibleInstanceMembers()) {
ret.add(LookupElementBuilder.create(name).setIcon(Icons.FIELD_ICON));
ret.add(LookupElementBuilder.create(name).setIcon(PlatformIcons.FIELD_ICON));
}
}
}
@@ -14,8 +14,8 @@ import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Icons;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.PlatformIcons;
import com.jetbrains.python.PyElementTypes;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.PyTokenTypes;
@@ -285,9 +285,9 @@ public class PyTargetExpressionImpl extends PyPresentableElementImpl<PyTargetExp
public Icon getIcon(final int flags) {
if (getQualifier() != null || PsiTreeUtil.<PsiElement>getParentOfType(this, PyFunction.class, PyClass.class) instanceof PyClass) {
return Icons.FIELD_ICON;
return PlatformIcons.FIELD_ICON;
}
return Icons.VARIABLE_ICON;
return PlatformIcons.VARIABLE_ICON;
}
@Nullable
@@ -8,7 +8,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.ui.LayeredIcon;
import com.intellij.util.Function;
import com.intellij.util.Icons;
import com.intellij.util.PlatformIcons;
import com.jetbrains.python.PyIcons;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.psi.*;
@@ -99,7 +99,7 @@ public class PyStructureViewElement implements StructureViewTreeElement {
final PyClass cls = (PyClass)element;
for (PyClass anc : cls.iterateAncestorClasses()) {
if (anc == the_exception) {
e.setIcon(Icons.EXCEPTION_CLASS_ICON);
e.setIcon(PlatformIcons.EXCEPTION_CLASS_ICON);
break;
}
}