From 14a8536234a9c4cb66225c816787641fc611b00a Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 15 Apr 2011 18:19:13 +0400 Subject: [PATCH] cleanup --- .../codeInspection/reference/RefJavaElementImpl.java | 8 -------- .../codeInspection/reference/RefElementImpl.java | 11 ++--------- .../vfs/impl/VirtualFilePointerContainerImpl.java | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java index f31d782b96c9..7c0ad3f80ebf 100644 --- a/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java @@ -76,14 +76,6 @@ public abstract class RefJavaElementImpl extends RefElementImpl implements RefJa setIsFinal(elem.hasModifierProperty(PsiModifier.FINAL)); } - protected SmartPsiElementPointer createPointer(final PsiElement element, final RefManager manager) { - if (element instanceof JspHolderMethod || element instanceof JspClass) { - return SmartPointerManager.getInstance(manager.getProject()).createSmartPsiElementPointer(element); - } - - return super.createPointer(element, manager); - } - @NotNull public Collection getOutTypeReferences() { if (myOutTypeReferences == null){ diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java index c90fdfcf13a6..3355a1df76cb 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java @@ -73,23 +73,16 @@ public abstract class RefElementImpl extends RefEntityImpl implements RefElement } protected RefElementImpl(PsiFile file, RefManager manager) { - super(file.getName(), manager); - myID = SmartPointerManager.getInstance(manager.getProject()).createSmartPsiElementPointer(file); - myFlags = 0; - myModule = ModuleUtil.findModuleForPsiElement(file); + this(file.getName(), file, manager); } protected RefElementImpl(String name, PsiElement element, RefManager manager) { super(name, manager); - myID = createPointer(element, manager); + myID = SmartPointerManager.getInstance(manager.getProject()).createSmartPsiElementPointer(element); myFlags = 0; myModule = ModuleUtil.findModuleForPsiElement(element); } - protected SmartPsiElementPointer createPointer(final PsiElement element, final RefManager manager) { - return SmartPointerManager.getInstance(manager.getProject()).createLazyPointer(element); - } - public boolean isValid() { if (myIsDeleted) return false; final PsiElement element = getElement(); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java index 9a3525cd1a6b..0b9a52a0d16f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java @@ -125,7 +125,7 @@ public class VirtualFilePointerContainerImpl implements VirtualFilePointerContai @NotNull public List getList() { - assert !myDisposed; + assert !myDisposed; return myReadOnlyList; }