From 5ac6d6f8b751a09f0fee4c02a67523bc9f3adb02 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 6 Mar 2014 19:18:01 +0100 Subject: [PATCH] cleanup --- .../intellij/debugger/jdi/ObjectReferenceProxyImpl.java | 7 ++++--- .../src/com/intellij/debugger/PositionManagerFactory.java | 3 ++- .../src/com/intellij/debugger/engine/SuspendContext.java | 2 +- .../groovy/debugger/GroovyPositionManagerFactory.java | 3 ++- .../springloaded/SpringLoadedPositionManagerFactory.java | 3 ++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java index 4e395995fe5d..373404b9a0a7 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java @@ -87,7 +87,7 @@ public class ObjectReferenceProxyImpl extends JdiProxy { try { myIsCollected = Boolean.valueOf(VirtualMachineProxyImpl.isCollected(myObjectReference)); } - catch (VMDisconnectedException e) { + catch (VMDisconnectedException ignored) { myIsCollected = Boolean.TRUE; } } @@ -128,7 +128,7 @@ public class ObjectReferenceProxyImpl extends JdiProxy { if(this == o) return true; ObjectReference ref = myObjectReference; - return ref != null && ref.equals(((ObjectReferenceProxyImpl)o).myObjectReference); + return ref.equals(((ObjectReferenceProxyImpl)o).myObjectReference); } @@ -139,9 +139,10 @@ public class ObjectReferenceProxyImpl extends JdiProxy { /** * The advice to the proxy to clear cached data. */ + @Override protected void clearCaches() { if (Boolean.FALSE.equals(myIsCollected)) { - // clearing cache makes sence only if the object has not been collected yet + // clearing cache makes sense only if the object has not been collected yet myIsCollected = null; } } diff --git a/java/debugger/openapi/src/com/intellij/debugger/PositionManagerFactory.java b/java/debugger/openapi/src/com/intellij/debugger/PositionManagerFactory.java index e89d423deef0..ff118b89c10c 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/PositionManagerFactory.java +++ b/java/debugger/openapi/src/com/intellij/debugger/PositionManagerFactory.java @@ -17,6 +17,7 @@ package com.intellij.debugger; import com.intellij.debugger.engine.DebugProcess; import com.intellij.openapi.extensions.ExtensionPointName; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -26,5 +27,5 @@ public abstract class PositionManagerFactory { public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.debugger.positionManagerFactory"); @Nullable - public abstract PositionManager createPositionManager(DebugProcess process); + public abstract PositionManager createPositionManager(@NotNull DebugProcess process); } diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/SuspendContext.java b/java/debugger/openapi/src/com/intellij/debugger/engine/SuspendContext.java index ae89344dec63..be2c891d5fd0 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/SuspendContext.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/SuspendContext.java @@ -18,7 +18,7 @@ package com.intellij.debugger.engine; import com.intellij.debugger.engine.jdi.ThreadReferenceProxy; public interface SuspendContext extends StackFrameContext { - public int getSuspendPolicy(); + int getSuspendPolicy(); ThreadReferenceProxy getThread(); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManagerFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManagerFactory.java index 12aaf2a53bad..200390323ba9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManagerFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManagerFactory.java @@ -18,13 +18,14 @@ package org.jetbrains.plugins.groovy.debugger; import com.intellij.debugger.PositionManager; import com.intellij.debugger.PositionManagerFactory; import com.intellij.debugger.engine.DebugProcess; +import org.jetbrains.annotations.NotNull; /** * @author peter */ public class GroovyPositionManagerFactory extends PositionManagerFactory { @Override - public PositionManager createPositionManager(DebugProcess process) { + public PositionManager createPositionManager(@NotNull DebugProcess process) { return new GroovyPositionManager(process); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManagerFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManagerFactory.java index a3a9611a85ea..11b1badda2b9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManagerFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/springloaded/SpringLoadedPositionManagerFactory.java @@ -6,6 +6,7 @@ import com.intellij.debugger.engine.DebugProcess; import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.JavaPsiFacade; +import org.jetbrains.annotations.NotNull; /** * Factory for position manager to debug classes reloaded by com.springsource.springloaded @@ -14,7 +15,7 @@ import com.intellij.psi.JavaPsiFacade; public class SpringLoadedPositionManagerFactory extends PositionManagerFactory { @Override - public PositionManager createPositionManager(final DebugProcess process) { + public PositionManager createPositionManager(@NotNull final DebugProcess process) { AccessToken accessToken = ApplicationManager.getApplication().acquireReadActionLock(); try { JavaPsiFacade facade = JavaPsiFacade.getInstance(process.getProject());