mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
don't return anything from SmartPointerManager.removePointer; it's not used anyway
This commit is contained in:
+3
-6
@@ -467,12 +467,10 @@ public class SmartPsiElementPointersTest extends CodeInsightTestCase {
|
||||
|
||||
assertNotNull(pointer1.getRange());
|
||||
|
||||
boolean removed2 = smartPointerManager.removePointer(pointer2);
|
||||
assertFalse(removed2);
|
||||
smartPointerManager.removePointer(pointer2);
|
||||
assertNotNull(pointer1.getRange());
|
||||
|
||||
boolean removed1 = smartPointerManager.removePointer(pointer1);
|
||||
assertTrue(removed1);
|
||||
smartPointerManager.removePointer(pointer1);
|
||||
assertNull(pointer1.getRange());
|
||||
}
|
||||
|
||||
@@ -494,8 +492,7 @@ public class SmartPsiElementPointersTest extends CodeInsightTestCase {
|
||||
assertEquals(Byte.MAX_VALUE, pointer1.incrementAndGetReferenceCount(0));
|
||||
|
||||
for (int i=0; i<1100; i++) {
|
||||
boolean removed1 = smartPointerManager.removePointer(pointer1);
|
||||
assertFalse(removed1);
|
||||
smartPointerManager.removePointer(pointer1);
|
||||
Assert.assertNotNull(pointer1.getRange());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,5 +69,10 @@ public abstract class SmartPointerManager {
|
||||
* @return true if both pointers point to the same PSI element.
|
||||
*/
|
||||
public abstract boolean pointToTheSameElement(@NotNull SmartPsiElementPointer pointer1, @NotNull SmartPsiElementPointer pointer2);
|
||||
public abstract boolean removePointer(@NotNull SmartPsiElementPointer pointer);
|
||||
|
||||
/**
|
||||
* Disposes a smart pointer and frees the resources associated with it. Calling this method is not obligatory: pointers are
|
||||
* freed correctly when they're not used anymore. But disposing the pointers explicitly might be beneficial for performance.
|
||||
*/
|
||||
public abstract void removePointer(@NotNull SmartPsiElementPointer pointer);
|
||||
}
|
||||
|
||||
+5
-7
@@ -180,9 +180,9 @@ public class SmartPointerManagerImpl extends SmartPointerManager {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean removePointer(@NotNull SmartPsiElementPointer pointer) {
|
||||
public void removePointer(@NotNull SmartPsiElementPointer pointer) {
|
||||
if (!(pointer instanceof SmartPsiElementPointerImpl)) {
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
PsiFile containingFile = pointer.getContainingFile();
|
||||
synchronized (lock) {
|
||||
@@ -196,18 +196,16 @@ public class SmartPointerManagerImpl extends SmartPointerManager {
|
||||
SmartPointerElementInfo info = ((SmartPsiElementPointerImpl)pointer).getElementInfo();
|
||||
info.cleanup();
|
||||
|
||||
if (containingFile == null) return false;
|
||||
if (containingFile == null) return;
|
||||
VirtualFile vFile = containingFile.getViewProvider().getVirtualFile();
|
||||
FilePointersList pointers = getPointers(vFile);
|
||||
if (pointers == null) return false;
|
||||
boolean result = pointers.remove(pointer);
|
||||
if (pointers == null) return;
|
||||
pointers.remove(pointer);
|
||||
if (pointers.isEmpty()) {
|
||||
vFile.putUserData(POINTERS_KEY, null);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
||||
Reference in New Issue
Block a user