Author: vrubezhny
Date: 2008-04-30 05:33:44 -0400 (Wed, 30 Apr 2008)
New Revision: 7901
Modified:
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2121 Different behavior(result) of actions Find
Seam Declarations and Find Seam References when call them using hot keys or selection from
Navigate menu.
Find Seam Declarations/References actions enablement is modified.
Fixed for branch 2.1.x
Modified:
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java
===================================================================
---
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-04-30
09:29:20 UTC (rev 7900)
+++
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindSeamAction.java 2008-04-30
09:33:44 UTC (rev 7901)
@@ -32,20 +32,14 @@
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IActionDelegate2;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPageListener;
import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWindowListener;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchListener;
-import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
@@ -53,8 +47,6 @@
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.progress.IProgressService;
import org.eclipse.ui.texteditor.AbstractTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
import org.jboss.tools.common.model.ui.texteditors.xmleditor.XMLTextEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
@@ -63,15 +55,10 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.el.ELOperandToken;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
-import org.jboss.tools.seam.internal.core.el.SeamELOperandTokenizer;
-import org.jboss.tools.seam.internal.core.el.SeamELOperandTokenizerForward;
-import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.jboss.tools.seam.ui.search.SeamSearchQuery;
import org.jboss.tools.seam.ui.search.SeamSearchScope;
-import com.mchange.v2.async.StrandedTaskReporting;
-
/**
* Base class for Seam Find actions
*
@@ -452,33 +439,8 @@
}
}
- /*
- * Updates availability on the action delegate
- *
- * @param part
- * @param selection
- */
- private void update(IWorkbenchPart part, ISelection selection) {
- boolean enabled = false;
- try {
- if (!(part instanceof IEditorPart))
- return;
-
- ISourceViewer viewer = getEditorViewer((IEditorPart)part);
- if (viewer == null)
- return;
-
- enabled = (getTextSelection(selection) != null);
- } finally {
- setEnabled(enabled);
- if (fDelegatorAction != null) {
- fDelegatorAction.setEnabled(enabled);
- }
- }
- }
-
// ISelectionListener
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- update(selection);
+ update(getTextSelection(getEditorViewer(part)));
}
}