From 7d78ad3f5579c8f9d986db5300036e1dce2d78a5 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 5 Mar 2014 10:56:51 +0100 Subject: [PATCH] cleanup --- .../intellij/debugger/ui/impl/DebuggerTreePanel.java | 2 +- .../intellij/debugger/ui/impl/FrameVariablesTree.java | 10 +++++++++- .../src/com/intellij/debugger/ui/impl/FramesList.java | 3 +++ .../intellij/debugger/ui/impl/FramesListRenderer.java | 5 +++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java index 25cc97222726..c04f1bf63d67 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java @@ -93,7 +93,7 @@ public abstract class DebuggerTreePanel extends UpdatableDebuggerView implements getTree().rebuild(context); } } - catch (VMDisconnectedException e) { + catch (VMDisconnectedException ignored) { // ignored } } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java index 30306a49ae84..788cb17b477e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java @@ -83,11 +83,13 @@ public class FrameVariablesTree extends DebuggerTree { } } + @Override protected void build(DebuggerContextImpl context) { myAnyNewLocals = false; buildWhenPaused(context, new RefreshFrameTreeCommand(context)); } + @Override public void restoreNodeState(DebuggerTreeNodeImpl node) { if (myAnyNewLocals) { final NodeDescriptorImpl descriptor = node.getDescriptor(); @@ -107,6 +109,7 @@ public class FrameVariablesTree extends DebuggerTree { } + @Override protected DebuggerCommandImpl getBuildNodeCommand(final DebuggerTreeNodeImpl node) { if (node.getDescriptor() instanceof StackFrameDescriptorImpl) { return new BuildFrameTreeVariablesCommand(node); @@ -119,6 +122,7 @@ public class FrameVariablesTree extends DebuggerTree { super(stackNode); } + @Override protected void buildVariables(final StackFrameDescriptorImpl stackDescriptor, final EvaluationContextImpl evaluationContext) throws EvaluateException { final DebuggerContextImpl debuggerContext = getDebuggerContext(); final SourcePosition sourcePosition = debuggerContext.getSourcePosition(); @@ -135,6 +139,7 @@ public class FrameVariablesTree extends DebuggerTree { final EvaluationContextImpl evalContext = debuggerContext.createEvaluationContext(); final Pair, Set> usedVars = ApplicationManager.getApplication().runReadAction(new Computable, Set>>() { + @Override public Pair, Set> compute() { return findReferencedVars(visibleVariables.keySet(), sourcePosition, evalContext); } @@ -396,6 +401,7 @@ public class FrameVariablesTree extends DebuggerTree { super(context); } + @Override public void contextAction() throws Exception { DebuggerTreeNodeImpl rootNode; @@ -433,7 +439,7 @@ public class FrameVariablesTree extends DebuggerTree { rootNode.add(MessageDescriptor.THREAD_IS_RUNNING); } } - catch (ObjectCollectedException e) { + catch (ObjectCollectedException ignored) { rootNode.add(new MessageDescriptor(DebuggerBundle.message("label.thread.node.thread.collected", currentThread.name()))); } } @@ -448,12 +454,14 @@ public class FrameVariablesTree extends DebuggerTree { final DebuggerTreeNodeImpl rootNode1 = rootNode; DebuggerInvocationUtil.swingInvokeLater(getProject(), new Runnable() { + @Override public void run() { getMutableModel().setRoot(rootNode1); treeChanged(); final TreeModel model = getModel(); model.addTreeModelListener(new TreeModelAdapter() { + @Override public void treeStructureChanged(TreeModelEvent e) { final Object[] path = e.getPath(); if (path.length > 0 && path[path.length - 1] == rootNode1) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/FramesList.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/FramesList.java index 9967b70eb485..d0d25f1808b5 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/FramesList.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/FramesList.java @@ -35,15 +35,18 @@ public class FramesList extends DebuggerFramesList { doInit(); } + @Override protected FramesListRenderer createListRenderer() { return new FramesListRenderer(); } + @Override protected void onFrameChanged(final Object selectedValue) { final StackFrameDescriptorImpl descriptor = selectedValue instanceof StackFrameDescriptorImpl? (StackFrameDescriptorImpl)selectedValue : null; final Method newMethod = descriptor != null? descriptor.getMethod() : null; if (!Comparing.equal(mySelectedMethod, newMethod)) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { repaint(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/FramesListRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/FramesListRenderer.java index c6e62281b143..c3368cd5c4f9 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/FramesListRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/FramesListRenderer.java @@ -16,14 +16,14 @@ package com.intellij.debugger.ui.impl; import com.intellij.debugger.ui.impl.watch.StackFrameDescriptorImpl; -import com.intellij.ui.JBColor; -import com.intellij.xdebugger.impl.ui.tree.ValueMarkup; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.util.Comparing; import com.intellij.ui.ColoredListCellRenderer; +import com.intellij.ui.JBColor; import com.intellij.ui.SimpleTextAttributes; import com.intellij.util.ui.UIUtil; +import com.intellij.xdebugger.impl.ui.tree.ValueMarkup; import com.intellij.xdebugger.ui.DebuggerColors; import com.sun.jdi.Method; @@ -38,6 +38,7 @@ class FramesListRenderer extends ColoredListCellRenderer { myColorScheme = EditorColorsManager.getInstance().getGlobalScheme(); } + @Override protected void customizeCellRenderer(final JList list, final Object item, final int index, final boolean selected, final boolean hasFocus) { if (!(item instanceof StackFrameDescriptorImpl)) { append(item.toString(), SimpleTextAttributes.GRAYED_ATTRIBUTES);