From 825451b7a143e8d8b5fbb7ff2b9b6bad46808f3e Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Wed, 18 Mar 2015 16:28:34 +0300 Subject: [PATCH] notnull added --- .../engine/evaluation/expression/AssignmentEvaluator.java | 3 ++- .../evaluation/expression/BinaryExpressionEvaluator.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/AssignmentEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/AssignmentEvaluator.java index 05104e250ef1..d4866f56fca9 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/AssignmentEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/AssignmentEvaluator.java @@ -20,6 +20,7 @@ import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil; import com.intellij.debugger.engine.evaluation.EvaluationContextImpl; import com.sun.jdi.*; +import org.jetbrains.annotations.NotNull; /** * @author lex @@ -28,7 +29,7 @@ public class AssignmentEvaluator implements Evaluator{ private final Evaluator myLeftEvaluator; private final Evaluator myRightEvaluator; - public AssignmentEvaluator(Evaluator leftEvaluator, Evaluator rightEvaluator) { + public AssignmentEvaluator(@NotNull Evaluator leftEvaluator, @NotNull Evaluator rightEvaluator) { myLeftEvaluator = leftEvaluator; myRightEvaluator = new DisableGC(rightEvaluator); } diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BinaryExpressionEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BinaryExpressionEvaluator.java index 14d46e7f361b..6970859ec25c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BinaryExpressionEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BinaryExpressionEvaluator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -31,6 +31,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.JavaTokenType; import com.intellij.psi.tree.IElementType; import com.sun.jdi.*; +import org.jetbrains.annotations.NotNull; class BinaryExpressionEvaluator implements Evaluator { private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.BinaryExpressionEvaluator"); @@ -39,7 +40,10 @@ class BinaryExpressionEvaluator implements Evaluator { private final IElementType myOpType; private final String myExpectedType; // a result of PsiType.getCanonicalText() - public BinaryExpressionEvaluator(Evaluator leftOperand, Evaluator rightOperand, IElementType opType, String expectedType) { + public BinaryExpressionEvaluator(@NotNull Evaluator leftOperand, + @NotNull Evaluator rightOperand, + @NotNull IElementType opType, + String expectedType) { myLeftOperand = new DisableGC(leftOperand); myRightOperand = new DisableGC(rightOperand); myOpType = opType;