From 73957bf57a88633ef61acc10ab90b04b92ebf55b Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 20 Jan 2005 15:36:11 +0300 Subject: [PATCH] removed check for Project presence --- .../ide/impl/dataRules/NavigatableRule.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/source/com/intellij/ide/impl/dataRules/NavigatableRule.java b/source/com/intellij/ide/impl/dataRules/NavigatableRule.java index 798162c51450..c5b4632e4d27 100644 --- a/source/com/intellij/ide/impl/dataRules/NavigatableRule.java +++ b/source/com/intellij/ide/impl/dataRules/NavigatableRule.java @@ -1,29 +1,23 @@ package com.intellij.ide.impl.dataRules; -import com.intellij.ide.DataManager; import com.intellij.ide.util.EditSourceUtil; import com.intellij.openapi.actionSystem.DataConstants; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.fileEditor.OpenFileDescriptor; -import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import java.awt.*; - public class NavigatableRule implements GetDataRule { public Object getData(DataProvider dataProvider) { - OpenFileDescriptor openFileDescriptor = (OpenFileDescriptor)dataProvider.getData(DataConstants.OPEN_FILE_DESCRIPTOR); - if (openFileDescriptor != null) return openFileDescriptor; - - Project project = (Project)dataProvider.getData(DataConstants.PROJECT); - if (project == null && dataProvider instanceof Component){ - project = (Project)DataManager.getInstance().getDataContext((Component)dataProvider).getData(DataConstants.PROJECT); + final OpenFileDescriptor openFileDescriptor = (OpenFileDescriptor)dataProvider.getData(DataConstants.OPEN_FILE_DESCRIPTOR); + if (openFileDescriptor != null) { + return openFileDescriptor; } - if (project == null) { return null; } - PsiElement element = (PsiElement)dataProvider.getData(DataConstants.PSI_ELEMENT); - if (element == null) return null; + final PsiElement element = (PsiElement)dataProvider.getData(DataConstants.PSI_ELEMENT); + if (element != null) { + return EditSourceUtil.getDescriptor(element); + } - return EditSourceUtil.getDescriptor(element); + return null; } }