From a8bfd9c147d8077d11c1cf3376fedc875a6eeb45 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Fri, 28 Mar 2014 16:39:14 +0400 Subject: [PATCH] added notnulls --- .../com/intellij/debugger/engine/PositionManagerImpl.java | 6 +++--- .../openapi/src/com/intellij/debugger/PositionManager.java | 6 +++--- .../com/intellij/debugger/engine/JSR45PositionManager.java | 6 +++--- .../plugins/groovy/debugger/GroovyPositionManager.java | 6 +++--- .../groovy/springloaded/SpringLoadedPositionManager.java | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java index b3e371d7e327..0e37ff354e47 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java @@ -59,7 +59,7 @@ public class PositionManagerImpl implements PositionManager { } @NotNull - public List locationsOfLine(ReferenceType type, SourcePosition position) throws NoDataException { + public List locationsOfLine(@NotNull ReferenceType type, @NotNull SourcePosition position) throws NoDataException { try { final int line = position.getLine() + 1; return type.locationsOfLine(DebugProcess.JAVA_STRATUM, null, line); @@ -69,7 +69,7 @@ public class PositionManagerImpl implements PositionManager { return Collections.emptyList(); } - public ClassPrepareRequest createPrepareRequest(final ClassPrepareRequestor requestor, final SourcePosition position) throws NoDataException { + public ClassPrepareRequest createPrepareRequest(@NotNull final ClassPrepareRequestor requestor, @NotNull final SourcePosition position) throws NoDataException { final Ref waitPrepareFor = new Ref(null); final Ref waitRequestor = new Ref(null); ApplicationManager.getApplication().runReadAction(new Runnable() { @@ -197,7 +197,7 @@ public class PositionManagerImpl implements PositionManager { } @NotNull - public List getAllClasses(final SourcePosition position) throws NoDataException { + public List getAllClasses(@NotNull final SourcePosition position) throws NoDataException { final Ref baseClassNameRef = new Ref(null); final Ref classAtPositionRef = new Ref(null); final Ref isLocalOrAnonymous = new Ref(Boolean.FALSE); diff --git a/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java b/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java index 5713483f6357..8b5c3d768c58 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java +++ b/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java @@ -50,7 +50,7 @@ public interface PositionManager { * @see com.intellij.debugger.engine.jdi.VirtualMachineProxy#classesByName */ @NotNull - List getAllClasses(SourcePosition classPosition) throws NoDataException; + List getAllClasses(@NotNull SourcePosition classPosition) throws NoDataException; /** * Returns the list of bytecode locations in a specific class corresponding to the specified position in the source code. @@ -62,7 +62,7 @@ public interface PositionManager { * @see ReferenceType#locationsOfLine(int) */ @NotNull - List locationsOfLine(ReferenceType type, SourcePosition position) throws NoDataException; + List locationsOfLine(@NotNull ReferenceType type, @NotNull SourcePosition position) throws NoDataException; /** * Called to request the JVM to notify the debugger engine when a class corresponding to a breakpoint location is loaded. @@ -75,5 +75,5 @@ public interface PositionManager { * @throws NoDataException if the position is not in the code managed by this {@code PositionManager} */ @Nullable - ClassPrepareRequest createPrepareRequest(ClassPrepareRequestor requestor, SourcePosition position) throws NoDataException; + ClassPrepareRequest createPrepareRequest(@NotNull ClassPrepareRequestor requestor, @NotNull SourcePosition position) throws NoDataException; } diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java b/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java index b200e0ef1829..f188409f607d 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java @@ -113,7 +113,7 @@ public abstract class JSR45PositionManager implements PositionManager { @Override @NotNull - public List getAllClasses(SourcePosition classPosition) throws NoDataException { + public List getAllClasses(@NotNull SourcePosition classPosition) throws NoDataException { checkSourcePositionFileType(classPosition); final List referenceTypes = myDebugProcess.getVirtualMachineProxy().allClasses(); @@ -142,7 +142,7 @@ public abstract class JSR45PositionManager implements PositionManager { @Override @NotNull - public List locationsOfLine(final ReferenceType type, final SourcePosition position) throws NoDataException { + public List locationsOfLine(@NotNull final ReferenceType type, @NotNull final SourcePosition position) throws NoDataException { List locations = locationsOfClassAt(type, position); return locations != null ? locations : Collections.emptyList(); @@ -204,7 +204,7 @@ public abstract class JSR45PositionManager implements PositionManager { } @Override - public ClassPrepareRequest createPrepareRequest(final ClassPrepareRequestor requestor, final SourcePosition position) + public ClassPrepareRequest createPrepareRequest(@NotNull final ClassPrepareRequestor requestor, @NotNull final SourcePosition position) throws NoDataException { checkSourcePositionFileType(position); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java index d7c6ab54ccd1..ac0658b9548a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java @@ -69,7 +69,7 @@ public class GroovyPositionManager implements PositionManager { } @NotNull - public List locationsOfLine(ReferenceType type, SourcePosition position) throws NoDataException { + public List locationsOfLine(@NotNull ReferenceType type, @NotNull SourcePosition position) throws NoDataException { try { int line = position.getLine() + 1; List locations = getDebugProcess().getVirtualMachineProxy().versionHigher("1.4") @@ -108,7 +108,7 @@ public class GroovyPositionManager implements PositionManager { } } - public ClassPrepareRequest createPrepareRequest(final ClassPrepareRequestor requestor, final SourcePosition position) + public ClassPrepareRequest createPrepareRequest(@NotNull final ClassPrepareRequestor requestor, @NotNull final SourcePosition position) throws NoDataException { String qName = getOuterClassName(position); if (qName != null) { @@ -271,7 +271,7 @@ public class GroovyPositionManager implements PositionManager { } @NotNull - public List getAllClasses(final SourcePosition position) throws NoDataException { + public List getAllClasses(@NotNull final SourcePosition position) throws NoDataException { List result = ApplicationManager.getApplication().runReadAction(new Computable>() { public List compute() { GroovyPsiElement sourceImage = findReferenceTypeSourceImage(position); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManager.java index b28550205628..0ad54ac0bf20 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManager.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManager.java @@ -52,7 +52,7 @@ public class SpringLoadedPositionManager implements PositionManager { @NotNull @Override - public List getAllClasses(final SourcePosition classPosition) throws NoDataException { + public List getAllClasses(@NotNull final SourcePosition classPosition) throws NoDataException { int line; String className; @@ -85,7 +85,7 @@ public class SpringLoadedPositionManager implements PositionManager { @NotNull @Override - public List locationsOfLine(ReferenceType type, SourcePosition position) throws NoDataException { + public List locationsOfLine(@NotNull ReferenceType type, @NotNull SourcePosition position) throws NoDataException { throw new NoDataException(); } @@ -146,7 +146,7 @@ public class SpringLoadedPositionManager implements PositionManager { } @Override - public ClassPrepareRequest createPrepareRequest(ClassPrepareRequestor requestor, SourcePosition position) throws NoDataException { + public ClassPrepareRequest createPrepareRequest(@NotNull ClassPrepareRequestor requestor, @NotNull SourcePosition position) throws NoDataException { String className = getOuterClassName(position); if (className == null) { throw new NoDataException();