continue firefox rdp — handle frameUpdate(destroyAll=true) event, init break support, handle newSource event

This commit is contained in:
Vladimir Krivosheev
2015-01-02 16:52:31 +01:00
parent d26effe73a
commit 4a0b740e80
5 changed files with 6 additions and 6 deletions
@@ -32,7 +32,7 @@ public interface SuspendContext {
* Call frames for the current suspended state (from the innermost (top) frame to the main (bottom) frame)
*/
@NotNull
Promise<CallFrame[]> getCallFrames();
Promise<CallFrame[]> getFrames();
/**
* @return a set of the breakpoints hit on VM suspension with which this
@@ -10,7 +10,7 @@ public interface SuspendContextManager<CALL_FRAME extends CallFrame> {
* will be called.
*/
@NotNull
Promise<Void> suspend();
Promise<?> suspend();
@Nullable
SuspendContext getContext();
@@ -43,7 +43,7 @@ public abstract class SuspendContextManagerBase<T extends SuspendContextBase, CA
@NotNull
@Override
public final Promise<Void> suspend() {
public final Promise<?> suspend() {
Promise<Void> callback = suspendCallback.get();
if (callback != null) {
return callback;
@@ -56,7 +56,7 @@ public abstract class SuspendContextManagerBase<T extends SuspendContextBase, CA
}
@NotNull
protected abstract Promise<Void> doSuspend();
protected abstract Promise<?> doSuspend();
@Override
public boolean isContextObsolete(@NotNull SuspendContext context) {
@@ -42,7 +42,7 @@ public class ExecutionStackImpl extends XExecutionStack {
return;
}
suspendContext.getCallFrames().done(new ContextDependentAsyncResultConsumer<CallFrame[]>(suspendContext) {
suspendContext.getFrames().done(new ContextDependentAsyncResultConsumer<CallFrame[]>(suspendContext) {
@Override
protected void consume(CallFrame[] frames, @NotNull Vm vm) {
int count = frames.length - firstFrameIndex;
@@ -67,7 +67,7 @@ final class FieldProcessor<T> {
if (method.getAnnotation(JsonNullable.class) != null) {
nullable = true;
}
else if (genericReturnType == String.class || genericReturnType == Enum.class) {
else if (genericReturnType == String.class || genericReturnType == Enum.class || (genericReturnType instanceof Class && !((Class)genericReturnType).isPrimitive())) {
JsonField jsonField = method.getAnnotation(JsonField.class);
if (jsonField != null) {
nullable = jsonField.optional() && !jsonField.allowAnyPrimitiveValue() && !jsonField.allowAnyPrimitiveValueAndMap();