Unified access to icons.jar resources

This commit is contained in:
Maxim Shafirov
2012-05-30 18:41:47 +04:00
parent 408ead64d7
commit ce21064639
497 changed files with 3278 additions and 1615 deletions
@@ -45,6 +45,7 @@ import com.intellij.execution.ui.ExecutionConsoleEx;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.execution.ui.actions.CloseAction;
import com.intellij.execution.ui.layout.PlaceInGrid;
import com.intellij.icons.AllIcons;
import com.intellij.ide.actions.ContextHelpAction;
import com.intellij.idea.ActionsBundle;
import com.intellij.openapi.Disposable;
@@ -53,7 +54,6 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.IconLoader;
import com.intellij.ui.content.AlertIcon;
import com.intellij.ui.content.Content;
import com.intellij.ui.content.ContentManagerAdapter;
@@ -74,8 +74,8 @@ import java.util.List;
public class DebuggerSessionTab extends DebuggerSessionTabBase implements Disposable {
private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.DebuggerSessionTab");
private static final Icon WATCH_RETURN_VALUES_ICON = IconLoader.getIcon("/debugger/watchLastReturnValue.png");
private static final Icon AUTO_VARS_ICONS = IconLoader.getIcon("/debugger/autoVariablesMode.png");
private static final Icon WATCH_RETURN_VALUES_ICON = AllIcons.Debugger.WatchLastReturnValue;
private static final Icon AUTO_VARS_ICONS = AllIcons.Debugger.AutoVariablesMode;
private final VariablesPanel myVariablesPanel;
private final MainWatchPanel myWatchPanel;
@@ -146,7 +146,7 @@ public class DebuggerSessionTab extends DebuggerSessionTabBase implements Dispos
myFramesPanel = new FramesPanel(getProject(), getContextManager());
final AlertIcon breakpointAlert = new AlertIcon(IconLoader.getIcon("/debugger/breakpointAlert.png"));
final AlertIcon breakpointAlert = new AlertIcon(AllIcons.Debugger.BreakpointAlert);
// watches
Content watches = myUi.createContent(DebuggerContentInfo.WATCHES_CONTENT, myWatchPanel, XDebuggerBundle.message("debugger.session.tab.watches.title"),
@@ -41,6 +41,7 @@ import com.intellij.debugger.ui.impl.watch.MethodsTracker;
import com.intellij.debugger.ui.impl.watch.StackFrameDescriptorImpl;
import com.intellij.debugger.ui.impl.watch.ThreadDescriptorImpl;
import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
import com.intellij.icons.AllIcons;
import com.intellij.ide.CommonActionsManager;
import com.intellij.ide.OccurenceNavigator;
import com.intellij.openapi.Disposable;
@@ -50,7 +51,6 @@ import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.ComboBoxWithWidePopup;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.IconLoader;
import com.intellij.ui.CaptionPanel;
import com.intellij.ui.PopupHandler;
import com.intellij.ui.ScrollPaneFactory;
@@ -76,7 +76,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
public class FramesPanel extends UpdatableDebuggerView {
private static final Icon FILTER_STACK_FRAMES_ICON = IconLoader.getIcon("/debugger/class_filter.png");
private static final Icon FILTER_STACK_FRAMES_ICON = AllIcons.Debugger.Class_filter;
private final JComboBox myThreadsCombo;
private final FramesList myFramesList;
@@ -29,12 +29,16 @@ import com.intellij.debugger.engine.evaluation.EvaluateException;
import com.intellij.debugger.engine.jdi.VirtualMachineProxy;
import com.intellij.debugger.engine.requests.RequestManagerImpl;
import com.intellij.debugger.impl.PositionUtil;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.psi.*;
@@ -62,18 +66,18 @@ public class FieldBreakpoint extends BreakpointWithHighlighter {
private boolean myIsStatic;
private String myFieldName;
public static Icon ICON = IconLoader.getIcon("/debugger/db_field_breakpoint.png");
public static Icon MUTED_ICON = IconLoader.getIcon("/debugger/db_muted_field_breakpoint.png");
public static Icon DISABLED_ICON = IconLoader.getIcon("/debugger/db_disabled_field_breakpoint.png");
public static Icon DISABLED_DEP_ICON = IconLoader.getIcon("/debugger/db_dep_field_breakpoint.png");
public static Icon MUTED_DISABLED_ICON = IconLoader.getIcon("/debugger/db_muted_disabled_field_breakpoint.png");
public static Icon MUTED_DISABLED_DEP_ICON = IconLoader.getIcon("/debugger/db_muted_dep_field_breakpoint.png");
private static final Icon ourInvalidIcon = IconLoader.getIcon("/debugger/db_invalid_field_breakpoint.png");
private static final Icon ourMutedInvalidIcon = IconLoader.getIcon("/debugger/db_muted_invalid_field_breakpoint.png");
private static final Icon ourVerifiedIcon = IconLoader.getIcon("/debugger/db_verified_field_breakpoint.png");
private static final Icon ourMutedVerifiedIcon = IconLoader.getIcon("/debugger/db_muted_verified_field_breakpoint.png");
private static final Icon ourVerifiedWarningIcon = IconLoader.getIcon("/debugger/db_field_warning_breakpoint.png");
private static final Icon ourMutedVerifiedWarningIcon = IconLoader.getIcon("/debugger/db_muted_field_warning_breakpoint.png");
public static Icon ICON = AllIcons.Debugger.Db_field_breakpoint;
public static Icon MUTED_ICON = AllIcons.Debugger.Db_muted_field_breakpoint;
public static Icon DISABLED_ICON = AllIcons.Debugger.Db_disabled_field_breakpoint;
public static Icon DISABLED_DEP_ICON = AllIcons.Debugger.Db_dep_field_breakpoint;
public static Icon MUTED_DISABLED_ICON = AllIcons.Debugger.Db_muted_disabled_field_breakpoint;
public static Icon MUTED_DISABLED_DEP_ICON = AllIcons.Debugger.Db_muted_dep_field_breakpoint;
private static final Icon ourInvalidIcon = AllIcons.Debugger.Db_invalid_field_breakpoint;
private static final Icon ourMutedInvalidIcon = AllIcons.Debugger.Db_muted_invalid_field_breakpoint;
private static final Icon ourVerifiedIcon = AllIcons.Debugger.Db_verified_field_breakpoint;
private static final Icon ourMutedVerifiedIcon = AllIcons.Debugger.Db_muted_verified_field_breakpoint;
private static final Icon ourVerifiedWarningIcon = AllIcons.Debugger.Db_field_warning_breakpoint;
private static final Icon ourMutedVerifiedWarningIcon = AllIcons.Debugger.Db_muted_field_warning_breakpoint;
@NonNls public static final Key<FieldBreakpoint> CATEGORY = BreakpointCategory.lookup("field_breakpoints");
protected FieldBreakpoint(Project project) {
@@ -30,6 +30,7 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.debugger.impl.PositionUtil;
import com.intellij.debugger.jdi.StackFrameProxyImpl;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
@@ -39,7 +40,6 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.VirtualFile;
@@ -71,7 +71,7 @@ public class LineBreakpoint extends BreakpointWithHighlighter {
public static final Icon MUTED_ICON = DebuggerIcons.MUTED_BREAKPOINT_ICON;
public static final Icon DISABLED_ICON = DebuggerIcons.DISABLED_BREAKPOINT_ICON;
public static final Icon MUTED_DISABLED_ICON = DebuggerIcons.MUTED_DISABLED_BREAKPOINT_ICON;
private static final Icon ourMutedVerifiedWarningsIcon = IconLoader.getIcon("/debugger/db_muted_verified_warning_breakpoint.png");
private static final Icon ourMutedVerifiedWarningsIcon = AllIcons.Debugger.Db_muted_verified_warning_breakpoint;
private String myMethodName;
public static final @NonNls Key<LineBreakpoint> CATEGORY = BreakpointCategory.lookup("line_breakpoints");
@@ -31,13 +31,13 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
import com.intellij.debugger.engine.requests.RequestManagerImpl;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.debugger.impl.PositionUtil;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Key;
import com.intellij.psi.*;
import com.intellij.util.StringBuilderSpinAllocator;
@@ -69,18 +69,18 @@ public class MethodBreakpoint extends BreakpointWithHighlighter {
@Nullable private JVMName mySignature;
private boolean myIsStatic;
@NotNull public static Icon ICON = IconLoader.getIcon("/debugger/db_method_breakpoint.png");
@NotNull public static Icon MUTED_ICON = IconLoader.getIcon("/debugger/db_muted_method_breakpoint.png");
@NotNull public static Icon DISABLED_ICON = IconLoader.getIcon("/debugger/db_disabled_method_breakpoint.png");
@NotNull public static Icon DISABLED_DEP_ICON = IconLoader.getIcon("/debugger/db_dep_method_breakpoint.png");
@NotNull public static Icon MUTED_DISABLED_ICON = IconLoader.getIcon("/debugger/db_muted_disabled_method_breakpoint.png");
@NotNull public static Icon MUTED_DISABLED_DEP_ICON = IconLoader.getIcon("/debugger/db_muted_dep_method_breakpoint.png");
private static final Icon ourInvalidIcon = IconLoader.getIcon("/debugger/db_invalid_method_breakpoint.png");
private static final Icon ourMutedInvalidIcon = IconLoader.getIcon("/debugger/db_muted_invalid_method_breakpoint.png");
private static final Icon ourVerifiedIcon = IconLoader.getIcon("/debugger/db_verified_method_breakpoint.png");
private static final Icon ourMutedVerifiedIcon = IconLoader.getIcon("/debugger/db_muted_verified_method_breakpoint.png");
private static final Icon ourVerifiedWarningIcon = IconLoader.getIcon("/debugger/db_method_warning_breakpoint.png");
private static final Icon ourMutedVerifiedWarningIcon = IconLoader.getIcon("/debugger/db_muted_method_warning_breakpoint.png");
@NotNull public static Icon ICON = AllIcons.Debugger.Db_method_breakpoint;
@NotNull public static Icon MUTED_ICON = AllIcons.Debugger.Db_muted_method_breakpoint;
@NotNull public static Icon DISABLED_ICON = AllIcons.Debugger.Db_disabled_method_breakpoint;
@NotNull public static Icon DISABLED_DEP_ICON = AllIcons.Debugger.Db_dep_method_breakpoint;
@NotNull public static Icon MUTED_DISABLED_ICON = AllIcons.Debugger.Db_muted_disabled_method_breakpoint;
@NotNull public static Icon MUTED_DISABLED_DEP_ICON = AllIcons.Debugger.Db_muted_dep_method_breakpoint;
private static final Icon ourInvalidIcon = AllIcons.Debugger.Db_invalid_method_breakpoint;
private static final Icon ourMutedInvalidIcon = AllIcons.Debugger.Db_muted_invalid_method_breakpoint;
private static final Icon ourVerifiedIcon = AllIcons.Debugger.Db_verified_method_breakpoint;
private static final Icon ourMutedVerifiedIcon = AllIcons.Debugger.Db_muted_verified_method_breakpoint;
private static final Icon ourVerifiedWarningIcon = AllIcons.Debugger.Db_method_warning_breakpoint;
private static final Icon ourMutedVerifiedWarningIcon = AllIcons.Debugger.Db_muted_method_warning_breakpoint;
public static final @NonNls Key<MethodBreakpoint> CATEGORY = BreakpointCategory.lookup("method_breakpoints");
protected MethodBreakpoint(@NotNull Project project) {
@@ -20,7 +20,7 @@ import com.intellij.debugger.impl.DebuggerContextImpl;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.debugger.ui.impl.watch.*;
import com.intellij.debugger.ui.tree.ValueDescriptor;
import com.intellij.openapi.util.IconLoader;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.ColoredTreeCellRenderer;
import com.intellij.ui.RowIcon;
@@ -36,11 +36,11 @@ import javax.swing.*;
import java.awt.*;
public class DebuggerTreeRenderer extends ColoredTreeCellRenderer {
private static final Icon myThreadGroupIcon = IconLoader.getIcon("/debugger/threadGroup.png");
private static final Icon myCurrentThreadGroupIcon = IconLoader.getIcon("/debugger/threadGroupCurrent.png");
private static final Icon myThreadGroupIcon = AllIcons.Debugger.ThreadGroup;
private static final Icon myCurrentThreadGroupIcon = AllIcons.Debugger.ThreadGroupCurrent;
private static final Icon myStaticFieldIcon = PlatformIcons.FIELD_ICON;
private static final Icon myStaticIcon = IconLoader.getIcon("/nodes/static.png");
private static final Icon myStaticIcon = AllIcons.Nodes.Static;
private static final SimpleTextAttributes DEFAULT_ATTRIBUTES = new SimpleTextAttributes(Font.PLAIN, null);
private static final SimpleTextAttributes SPECIAL_NODE_ATTRIBUTES = new SimpleTextAttributes(Font.PLAIN, Color.lightGray);
@@ -25,16 +25,16 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
import com.intellij.debugger.jdi.StackFrameProxyImpl;
import com.intellij.debugger.settings.ThreadsViewSettings;
import com.intellij.debugger.ui.tree.StackFrameDescriptor;
import com.intellij.xdebugger.impl.ui.tree.ValueMarkup;
import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.ui.FileColorManager;
import com.intellij.util.StringBuilderSpinAllocator;
import com.intellij.xdebugger.impl.ui.tree.ValueMarkup;
import com.intellij.xdebugger.ui.DebuggerIcons;
import com.sun.jdi.*;
import org.jetbrains.annotations.Nullable;
@@ -57,7 +57,7 @@ public class StackFrameDescriptorImpl extends NodeDescriptorImpl implements Stac
private ObjectReference myThisObject;
private Color myBackgroundColor;
private static final Icon myObsoleteFrameIcon = IconLoader.getIcon("/debugger/db_obsolete.png");
private static final Icon myObsoleteFrameIcon = AllIcons.Debugger.Db_obsolete;
private Icon myIcon = DebuggerIcons.STACK_FRAME_ICON;
public StackFrameDescriptorImpl(StackFrameProxyImpl frame, final MethodsTracker tracker) {
@@ -256,4 +256,4 @@ public class StackFrameDescriptorImpl extends NodeDescriptorImpl implements Stac
public Icon getIcon() {
return myIcon;
}
}
}
@@ -27,7 +27,7 @@ import com.intellij.debugger.jdi.ThreadGroupReferenceProxyImpl;
import com.intellij.debugger.jdi.ThreadReferenceProxyImpl;
import com.intellij.debugger.ui.tree.ThreadDescriptor;
import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
import com.intellij.openapi.util.IconLoader;
import com.intellij.icons.AllIcons;
import com.intellij.xdebugger.ui.DebuggerIcons;
import com.sun.jdi.ObjectCollectedException;
import com.sun.jdi.ThreadReference;
@@ -45,10 +45,10 @@ public class ThreadDescriptorImpl extends NodeDescriptorImpl implements ThreadDe
private boolean myIsAtBreakpoint;
private SuspendContextImpl mySuspendContext;
private static final Icon myRunningThreadIcon = IconLoader.getIcon("/debugger/threadRunning.png");
private static final Icon myCurrentThreadIcon = IconLoader.getIcon("/debugger/threadCurrent.png");
private static final Icon myThreadAtBreakpointIcon = IconLoader.getIcon("/debugger/threadAtBreakpoint.png");
private static final Icon myFrozenThreadIcon = IconLoader.getIcon("/debugger/threadFrozen.png");
private static final Icon myRunningThreadIcon = AllIcons.Debugger.ThreadRunning;
private static final Icon myCurrentThreadIcon = AllIcons.Debugger.ThreadCurrent;
private static final Icon myThreadAtBreakpointIcon = AllIcons.Debugger.ThreadAtBreakpoint;
private static final Icon myFrozenThreadIcon = AllIcons.Debugger.ThreadFrozen;
public ThreadDescriptorImpl(ThreadReferenceProxyImpl thread) {
myThread = thread;
@@ -170,4 +170,4 @@ public class ThreadDescriptorImpl extends NodeDescriptorImpl implements ThreadDe
}
return myRunningThreadIcon;
}
}
}