cleanup

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;
     }
   }

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<PositionManagerFactory> EP_NAME = ExtensionPointName.create("com.intellij.debugger.positionManagerFactory");
 
   @Nullable
-  public abstract PositionManager createPositionManager(DebugProcess process);
+  public abstract PositionManager createPositionManager(@NotNull DebugProcess process);
 }

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();
 }

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);
   }
 }

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());