X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java index a08966a..682852d 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java @@ -13,8 +13,6 @@ package net.sourceforge.phpdt.internal.ui.viewsupport; import java.util.HashMap; import java.util.Map; -import net.sourceforge.phpdt.core.IJavaElement; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; @@ -28,7 +26,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.ui.IEditorInput; import org.eclipse.ui.texteditor.ITextEditor; /** @@ -43,40 +40,45 @@ public class SelectionListenerWithASTManager { */ public static SelectionListenerWithASTManager getDefault() { if (fgDefault == null) { - fgDefault= new SelectionListenerWithASTManager(); + fgDefault = new SelectionListenerWithASTManager(); } return fgDefault; } - private final static class PartListenerGroup { private ITextEditor fPart; - private ISelectionChangedListener fSelectionListener, fPostSelectionListener; + + private ISelectionChangedListener fSelectionListener, + fPostSelectionListener; + private Job fCurrentJob; + private ListenerList fAstListeners; + /** - * Lock to avoid having more than one calculateAndInform job in parallel. - * Only jobs may synchronize on this as otherwise deadlocks are possible. + * Lock to avoid having more than one calculateAndInform job in + * parallel. Only jobs may synchronize on this as otherwise deadlocks + * are possible. */ - private final Object fJobLock= new Object(); + private final Object fJobLock = new Object(); public PartListenerGroup(ITextEditor part) { - fPart= part; - fCurrentJob= null; - fAstListeners= new ListenerList(); + fPart = part; + fCurrentJob = null; + fAstListeners = new ListenerList(); - fSelectionListener= new ISelectionChangedListener() { + fSelectionListener = new ISelectionChangedListener() { public void selectionChanged(SelectionChangedEvent event) { - ISelection selection= event.getSelection(); + ISelection selection = event.getSelection(); if (selection instanceof ITextSelection) { fireSelectionChanged((ITextSelection) selection); } } }; - fPostSelectionListener= new ISelectionChangedListener() { + fPostSelectionListener = new ISelectionChangedListener() { public void selectionChanged(SelectionChangedEvent event) { - ISelection selection= event.getSelection(); + ISelection selection = event.getSelection(); if (selection instanceof ITextSelection) { firePostSelectionChanged((ITextSelection) selection); } @@ -90,10 +92,13 @@ public class SelectionListenerWithASTManager { public void install(ISelectionListenerWithAST listener) { if (isEmpty()) { - ISelectionProvider selectionProvider= fPart.getSelectionProvider(); + ISelectionProvider selectionProvider = fPart + .getSelectionProvider(); if (selectionProvider instanceof IPostSelectionProvider) { - ((IPostSelectionProvider) selectionProvider).addPostSelectionChangedListener(fPostSelectionListener); - selectionProvider.addSelectionChangedListener(fSelectionListener); + ((IPostSelectionProvider) selectionProvider) + .addPostSelectionChangedListener(fPostSelectionListener); + selectionProvider + .addSelectionChangedListener(fSelectionListener); } } fAstListeners.add(listener); @@ -102,10 +107,13 @@ public class SelectionListenerWithASTManager { public void uninstall(ISelectionListenerWithAST listener) { fAstListeners.remove(listener); if (isEmpty()) { - ISelectionProvider selectionProvider= fPart.getSelectionProvider(); + ISelectionProvider selectionProvider = fPart + .getSelectionProvider(); if (selectionProvider instanceof IPostSelectionProvider) { - ((IPostSelectionProvider) selectionProvider).removePostSelectionChangedListener(fPostSelectionListener); - selectionProvider.removeSelectionChangedListener(fSelectionListener); + ((IPostSelectionProvider) selectionProvider) + .removePostSelectionChangedListener(fPostSelectionListener); + selectionProvider + .removeSelectionChangedListener(fSelectionListener); } } } @@ -120,18 +128,15 @@ public class SelectionListenerWithASTManager { if (fCurrentJob != null) { fCurrentJob.cancel(); } - final IJavaElement input= getJavaElement(); - if (input == null) { - return; - } - fCurrentJob= new Job("SelectionListenerWithASTManager Job") {//JavaUIMessages.SelectionListenerWithASTManager_job_title) { + fCurrentJob = new Job("SelectionListenerWithASTManager Job") {// JavaUIMessages.SelectionListenerWithASTManager_job_title) + // { public IStatus run(IProgressMonitor monitor) { if (monitor == null) { - monitor= new NullProgressMonitor(); + monitor = new NullProgressMonitor(); } synchronized (fJobLock) { - return calculateASTandInform(input, selection, monitor); + return calculateASTandInform(/*input,*/ selection, monitor); } } }; @@ -140,35 +145,31 @@ public class SelectionListenerWithASTManager { fCurrentJob.schedule(); } - private IJavaElement getJavaElement() { - IEditorInput editorInput= fPart.getEditorInput(); - if (editorInput != null) - return (IJavaElement)editorInput.getAdapter(IJavaElement.class); - - return null; - } - - protected IStatus calculateASTandInform(IJavaElement input, ITextSelection selection, IProgressMonitor monitor) { + protected IStatus calculateASTandInform(/*IJavaElement input,*/ + ITextSelection selection, IProgressMonitor monitor) { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; } // create AST try { -// CompilationUnit astRoot= PHPeclipsePlugin.getDefault().getASTProvider().getAST(input, ASTProvider.WAIT_ACTIVE_ONLY, monitor); - -// if (astRoot != null && !monitor.isCanceled()) { - Object[] listeners; - synchronized (PartListenerGroup.this) { - listeners= fAstListeners.getListeners(); - } - for (int i= 0; i < listeners.length; i++) { - ((ISelectionListenerWithAST) listeners[i]).selectionChanged(fPart, selection);//, astRoot); - if (monitor.isCanceled()) { - return Status.CANCEL_STATUS; - } + // CompilationUnit astRoot= + // PHPeclipsePlugin.getDefault().getASTProvider().getAST(input, + // ASTProvider.WAIT_ACTIVE_ONLY, monitor); + + // if (astRoot != null && !monitor.isCanceled()) { + Object[] listeners; + synchronized (PartListenerGroup.this) { + listeners = fAstListeners.getListeners(); + } + for (int i = 0; i < listeners.length; i++) { + ((ISelectionListenerWithAST) listeners[i]) + .selectionChanged(fPart, selection);// , astRoot); + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; } - return Status.OK_STATUS; -// } + } + return Status.OK_STATUS; + // } } catch (OperationCanceledException e) { // thrown when cancelling the AST creation } @@ -176,23 +177,26 @@ public class SelectionListenerWithASTManager { } } - private Map fListenerGroups; private SelectionListenerWithASTManager() { - fListenerGroups= new HashMap(); + fListenerGroups = new HashMap(); } /** * Registers a selection listener for the given editor part. - * @param part The editor part to listen to. - * @param listener The listener to register. + * + * @param part + * The editor part to listen to. + * @param listener + * The listener to register. */ public void addListener(ITextEditor part, ISelectionListenerWithAST listener) { synchronized (this) { - PartListenerGroup partListener= (PartListenerGroup) fListenerGroups.get(part); + PartListenerGroup partListener = (PartListenerGroup) fListenerGroups + .get(part); if (partListener == null) { - partListener= new PartListenerGroup(part); + partListener = new PartListenerGroup(part); fListenerGroups.put(part, partListener); } partListener.install(listener); @@ -201,12 +205,17 @@ public class SelectionListenerWithASTManager { /** * Unregisters a selection listener. - * @param part The editor part the listener was registered. - * @param listener The listener to unregister. + * + * @param part + * The editor part the listener was registered. + * @param listener + * The listener to unregister. */ - public void removeListener(ITextEditor part, ISelectionListenerWithAST listener) { + public void removeListener(ITextEditor part, + ISelectionListenerWithAST listener) { synchronized (this) { - PartListenerGroup partListener= (PartListenerGroup) fListenerGroups.get(part); + PartListenerGroup partListener = (PartListenerGroup) fListenerGroups + .get(part); if (partListener != null) { partListener.uninstall(listener); if (partListener.isEmpty()) { @@ -217,17 +226,22 @@ public class SelectionListenerWithASTManager { } /** - * Forces a selection changed event that is sent to all listeners registered to the given editor - * part. The event is sent from a background thread: this method call can return before the listeners - * are informed. - * @param part The editor part that has a changed selection - * @param selection The new text selection + * Forces a selection changed event that is sent to all listeners registered + * to the given editor part. The event is sent from a background thread: + * this method call can return before the listeners are informed. + * + * @param part + * The editor part that has a changed selection + * @param selection + * The new text selection */ public void forceSelectionChange(ITextEditor part, ITextSelection selection) { synchronized (this) { - PartListenerGroup partListener= (PartListenerGroup) fListenerGroups.get(part); + PartListenerGroup partListener = (PartListenerGroup) fListenerGroups + .get(part); if (partListener != null) { partListener.firePostSelectionChanged(selection); } } - }} + } +}