not-nulls and cosmetics

This commit is contained in:
Anton Makeev
2011-12-21 16:54:48 +01:00
parent e9c6c27f48
commit a258ab75f6
2 changed files with 17 additions and 10 deletions
@@ -65,11 +65,15 @@ import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.FocusManager;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -612,10 +616,10 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
});
}
public static void printToConsole(final LanguageConsoleImpl console,
final String string,
final ConsoleViewContentType mainType,
ConsoleViewContentType additionalType) {
public static void printToConsole(@NotNull final LanguageConsoleImpl console,
@NotNull final String string,
@NotNull final ConsoleViewContentType mainType,
@Nullable ConsoleViewContentType additionalType) {
final TextAttributes mainAttributes = mainType.getAttributes();
final TextAttributes attributes;
if (additionalType == null) {
@@ -166,19 +166,19 @@ public class XDebuggerTestUtil {
assertVariableValue(findVar(vars, name), name, value);
}
public static void assertVariableValueMatches(Collection<XValue> vars,
public static void assertVariableValueMatches(@NotNull Collection<XValue> vars,
@Nullable String name,
@Nullable String valuePattern) throws InterruptedException {
assertVariableValueMatches(findVar(vars, name), name, valuePattern);
}
public static void assertVariableValueMatches(XValue var,
public static void assertVariableValueMatches(@NotNull XValue var,
@Nullable String name,
@Nullable String valuePattern) throws InterruptedException {
assertVariableValueMatches(var, name, null, valuePattern);
}
public static void assertVariableValueMatches(XValue var,
public static void assertVariableValueMatches(@NotNull XValue var,
@Nullable String name,
@Nullable String type,
@Nullable String valuePattern) throws InterruptedException {
@@ -190,7 +190,9 @@ public class XDebuggerTestUtil {
}
}
public static void assertVariableTypeMatches(XValue var, String name, @Language("RegExp") String typePattern) throws InterruptedException {
public static void assertVariableTypeMatches(@NotNull XValue var,
@Nullable String name,
@Nullable @Language("RegExp") String typePattern) throws InterruptedException {
XTestValueNode node = computePresentation(var);
if (name != null) {
Assert.assertEquals(name, node.myName);
@@ -200,7 +202,8 @@ public class XDebuggerTestUtil {
}
}
public static void assertVariableFullValue(XValue var, @Nullable String value) throws InterruptedException {
public static void assertVariableFullValue(@NotNull XValue var,
@Nullable String value) throws InterruptedException {
XTestValueNode node = computePresentation(var);
final String[] result = new String[1];