From f7dc71134ff2ba62d53b2a5aa0058350a816ba8c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 22 Nov 2010 15:44:20 +0300 Subject: [PATCH] Cleanup --- .../debugger/engine/PositionManagerImpl.java | 25 ++++++++++--------- .../intellij/debugger/PositionManager.java | 7 +++--- 2 files changed, 16 insertions(+), 16 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 a877cd92f557..59d5cd78a61b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java @@ -15,6 +15,7 @@ */ package com.intellij.debugger.engine; +import com.intellij.debugger.NoDataException; import com.intellij.debugger.PositionManager; import com.intellij.debugger.SourcePosition; import com.intellij.debugger.engine.evaluation.EvaluateException; @@ -24,7 +25,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Computable; +import com.intellij.openapi.util.NullableComputable; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.Trinity; import com.intellij.psi.*; @@ -58,11 +59,11 @@ public class PositionManagerImpl implements PositionManager { } @NotNull - public List locationsOfLine(ReferenceType type, - SourcePosition position) { + public List locationsOfLine(ReferenceType type, SourcePosition position) throws NoDataException { try { int line = position.getLine() + 1; - List locs = (getDebugProcess().getVirtualMachineProxy().versionHigher("1.4") ? type.locationsOfLine(DebugProcessImpl.JAVA_STRATUM, null, line) : type.locationsOfLine(line)); + List locs = (getDebugProcess().getVirtualMachineProxy().versionHigher("1.4") + ? type.locationsOfLine(DebugProcessImpl.JAVA_STRATUM, null, line) : type.locationsOfLine(line)); if (locs.size() > 0) { return locs; } @@ -73,20 +74,20 @@ public class PositionManagerImpl implements PositionManager { return Collections.emptyList(); } - public ClassPrepareRequest createPrepareRequest(final ClassPrepareRequestor requestor, final SourcePosition position) { + public ClassPrepareRequest createPrepareRequest(final ClassPrepareRequestor requestor, final SourcePosition position) throws NoDataException { final Ref waitPrepareFor = new Ref(null); final Ref waitRequestor = new Ref(null); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { PsiClass psiClass = JVMNameUtil.getClassAt(position); - if(psiClass == null) { + if (psiClass == null) { return; } - if(PsiUtil.isLocalOrAnonymousClass(psiClass)) { + if (PsiUtil.isLocalOrAnonymousClass(psiClass)) { PsiClass parent = JVMNameUtil.getTopLevelParentClass(psiClass); - if(parent == null) { + if (parent == null) { return; } @@ -122,7 +123,7 @@ public class PositionManagerImpl implements PositionManager { return myDebugProcess.getRequestsManager().createClassPrepareRequest(waitRequestor.get(), waitPrepareFor.get()); } - public SourcePosition getSourcePosition(final Location location) { + public SourcePosition getSourcePosition(final Location location) throws NoDataException { DebuggerManagerThreadImpl.assertIsManagerThread(); if(location == null) { return null; @@ -204,7 +205,7 @@ public class PositionManagerImpl implements PositionManager { } @NotNull - public List getAllClasses(final SourcePosition classPosition) { + public List getAllClasses(final SourcePosition classPosition) throws NoDataException { final Trinity trinity = calcClassName(classPosition); if (trinity == null) { return Collections.emptyList(); @@ -231,7 +232,7 @@ public class PositionManagerImpl implements PositionManager { @Nullable private static Trinity calcClassName(final SourcePosition classPosition) { - return ApplicationManager.getApplication().runReadAction(new Computable> () { + return ApplicationManager.getApplication().runReadAction(new NullableComputable>() { public Trinity compute() { final PsiClass psiClass = JVMNameUtil.getClassAt(classPosition); @@ -296,7 +297,7 @@ public class PositionManagerImpl implements PositionManager { // First offsets belong to parent class, and offsets inside te substring "new Runnable(){" belong to anonymous runnable. final int finalRangeBegin = rangeBegin; final int finalRangeEnd = rangeEnd; - return ApplicationManager.getApplication().runReadAction(new Computable() { + return ApplicationManager.getApplication().runReadAction(new NullableComputable() { public ReferenceType compute() { final int line = Math.min(finalRangeBegin + 1, finalRangeEnd); final SourcePosition candidatePosition = SourcePosition.createFromLine(classToFind.getContainingFile(), line); diff --git a/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java b/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java index 25ae15040929..9abc634e8fe6 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java +++ b/java/debugger/openapi/src/com/intellij/debugger/PositionManager.java @@ -25,16 +25,15 @@ import org.jetbrains.annotations.Nullable; import java.util.List; public interface PositionManager { - @Nullable SourcePosition getSourcePosition(Location location) throws NoDataException; @NotNull List getAllClasses(SourcePosition classPosition) throws NoDataException; - + @NotNull - List locationsOfLine (ReferenceType type, SourcePosition position) throws NoDataException; + List locationsOfLine(ReferenceType type, SourcePosition position) throws NoDataException; @Nullable - ClassPrepareRequest createPrepareRequest(ClassPrepareRequestor requestor, SourcePosition position)throws NoDataException; + ClassPrepareRequest createPrepareRequest(ClassPrepareRequestor requestor, SourcePosition position) throws NoDataException; }