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

removed deprecated usage

Browse Source
This commit is contained in:
Egor.Ushakov
2017-06-27 14:54:03 +03:00
parent 19a14ecf3f
commit a637e03280
12 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/actions/JavaReferringObjectsValue.java
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package com.intellij.debugger.actions;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.debugger.DebuggerContext;
import com.intellij.debugger.engine.JavaValue;
import com.intellij.debugger.engine.SuspendContextImpl;
import com.intellij.debugger.engine.evaluation.EvaluateException;
import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
import com.intellij.debugger.engine.events.SuspendContextCommandImpl;
@@ -70,7 +71,7 @@ public class JavaReferringObjectsValue extends JavaValue {
}
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
final XValueChildrenList children = new XValueChildrenList();
Value value = getDescriptor().getValue();
java/debugger/impl/src/com/intellij/debugger/actions/JumpToObjectAction.java
+3 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.debugger.actions;
import com.intellij.debugger.SourcePosition;
import com.intellij.debugger.engine.DebugProcessImpl;
import com.intellij.debugger.engine.JVMNameUtil;
import com.intellij.debugger.engine.SuspendContextImpl;
import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
import com.intellij.debugger.engine.events.SuspendContextCommandImpl;
import com.intellij.debugger.impl.DebuggerContextImpl;
@@ -32,6 +33,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.PsiClass;
import com.intellij.util.containers.ContainerUtil;
import com.sun.jdi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class JumpToObjectAction extends DebuggerAction{
@@ -177,7 +179,7 @@ public class JumpToObjectAction extends DebuggerAction{
}
@Override
public final void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
try {
doAction(calcPosition(myDescriptor, myDebugProcess));
}
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java
+2 -1
View File
@@ -51,6 +51,7 @@ import com.sun.jdi.request.EventRequestManager;
import com.sun.jdi.request.ThreadDeathRequest;
import com.sun.jdi.request.ThreadStartRequest;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
@@ -459,7 +460,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
//this is especially necessary if a method is breakpoint condition
getManagerThread().schedule(new SuspendContextCommandImpl(suspendContext) {
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
final SuspendManager suspendManager = getSuspendManager();
SuspendContextImpl evaluatingContext = SuspendManagerUtil.getEvaluatingContext(suspendManager, suspendContext.getThread());
java/debugger/impl/src/com/intellij/debugger/engine/DebuggerManagerThreadImpl.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -214,7 +214,7 @@ public class DebuggerManagerThreadImpl extends InvokeAndWaitThread<DebuggerComma
SuspendContextCommand suspendContextCommand = (SuspendContextCommand)command;
schedule(new SuspendContextCommandImpl((SuspendContextImpl)suspendContextCommand.getSuspendContext()) {
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
command.action();
}
java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
+1 -1
View File
@@ -118,7 +118,7 @@ public class JavaDebugProcess extends XDebugProcess {
(shouldApplyContext(newContext) || event == DebuggerSession.Event.REFRESH_WITH_STACK)) {
process.getManagerThread().schedule(new SuspendContextCommandImpl(newSuspendContext) {
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
ThreadReferenceProxyImpl threadProxy = newContext.getThreadProxy();
newSuspendContext.initExecutionStacks(threadProxy);
java/debugger/impl/src/com/intellij/debugger/engine/JavaStaticGroup.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public class JavaStaticGroup extends XValueGroup implements NodeDescriptorProvid
public void computeChildren(@NotNull final XCompositeNode node) {
JavaValue.scheduleCommand(myEvaluationContext, node, new SuspendContextCommandImpl(myEvaluationContext.getSuspendContext()) {
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
final XValueChildrenList children = new XValueChildrenList();
final ReferenceType refType = myStaticDescriptor.getType();
java/debugger/impl/src/com/intellij/debugger/engine/JavaValueModifier.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ public abstract class JavaValueModifier extends XValueModifier {
}
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
callback.setValue(
StringUtil.wrapWithDoubleQuote(DebuggerUtils.translateStringValue(DebuggerUtils.getValueAsString(evaluationContext, value))));
}
java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -243,7 +243,7 @@ public abstract class SuspendContextImpl extends XSuspendContext implements Susp
public void computeExecutionStacks(final XExecutionStackContainer container) {
myDebugProcess.getManagerThread().schedule(new SuspendContextCommandImpl(this) {
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
List<JavaExecutionStack> res = new ArrayList<>();
Collection<ThreadReferenceProxyImpl> threads = getDebugProcess().getVirtualMachineProxy().allThreads();
JavaExecutionStack currentStack = null;
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
+2 -2
View File
@@ -192,7 +192,7 @@ public class DebuggerSession implements AbstractDebuggerSession {
}
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
context.initCaches();
DebuggerInvocationUtil.swingInvokeLater(getProject(), setStateRunnable);
}
@@ -495,7 +495,7 @@ public class DebuggerSession implements AbstractDebuggerSession {
notification.expire();
getProcess().getManagerThread().schedule(new SuspendContextCommandImpl(suspendContext) {
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
final DebuggerContextImpl debuggerContext =
DebuggerContextUtil.createDebuggerContext(DebuggerSession.this, suspendContext);
java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java
+2 -1
View File
@@ -48,6 +48,7 @@ import com.intellij.xdebugger.impl.XDebugSessionImpl;
import com.sun.jdi.*;
import one.util.streamex.IntStreamEx;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import java.util.List;
@@ -76,7 +77,7 @@ public class SourceCodeChecker {
}
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
try {
StackFrameProxyImpl frameProxy = debuggerContext.getFrameProxy();
if (frameProxy == null) {
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -159,7 +159,7 @@ public abstract class ValueDescriptorImpl extends NodeDescriptorImpl implements
semaphore.down();
evalContext.getDebugProcess().getManagerThread().invoke(new SuspendContextCommandImpl(evalContext.getSuspendContext()) {
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
// re-setting the context will cause value recalculation
try {
setContext(myStoredEvaluationContext);
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/IconObjectRenderer.java
+4 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package com.intellij.debugger.ui.tree.render;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.debugger.engine.DebugProcessImpl;
import com.intellij.debugger.engine.FullValueEvaluatorProvider;
import com.intellij.debugger.engine.SuspendContextImpl;
import com.intellij.debugger.engine.evaluation.EvaluateException;
import com.intellij.debugger.engine.evaluation.EvaluationContext;
import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
@@ -29,6 +30,7 @@ import com.intellij.debugger.ui.tree.ValueDescriptor;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.xdebugger.frame.XFullValueEvaluator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -50,7 +52,7 @@ class IconObjectRenderer extends CompoundReferenceRenderer implements FullValueE
debugProcess.getManagerThread().schedule(new SuspendContextCommandImpl(evalContext.getSuspendContext()) {
@Override
public void contextAction() throws Exception {
public void contextAction(@NotNull SuspendContextImpl suspendContext) throws Exception {
String getterName = AllIcons.Debugger.Value.getIconHeight() <= 16 ? "iconToBytesPreviewNormal" : "iconToBytesPreviewRetina";
descriptor.setValueIcon(ImageObjectRenderer.getIcon(evaluationContext, descriptor.getValue(), getterName));
listener.labelChanged();