X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java index 442e5ce..df0ea7e 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java @@ -1,5 +1,4 @@ package net.sourceforge.phpeclipse.phpeditor; - import java.lang.reflect.InvocationTargetException; import java.text.MessageFormat; import java.util.ArrayList; @@ -10,19 +9,23 @@ import net.sourceforge.phpdt.core.ICompilationUnit; import net.sourceforge.phpdt.core.IJavaElement; import net.sourceforge.phpdt.core.ISourceRange; import net.sourceforge.phpdt.core.ISourceReference; -import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.core.JavaCore; +import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.internal.compiler.parser.Scanner; +import net.sourceforge.phpdt.internal.ui.actions.AddBlockCommentAction; +import net.sourceforge.phpdt.internal.ui.actions.CompositeActionGroup; +import net.sourceforge.phpdt.internal.ui.actions.RemoveBlockCommentAction; import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference; +import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions; import net.sourceforge.phpdt.internal.ui.text.PHPPairMatcher; import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionManager; import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI; import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI.ExitFlags; import net.sourceforge.phpdt.ui.IWorkingCopyManager; import net.sourceforge.phpdt.ui.PreferenceConstants; +import net.sourceforge.phpdt.ui.actions.GenerateActionGroup; import net.sourceforge.phpdt.ui.text.JavaTextTools; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpeclipse.phpeditor.php.IPHPPartitionScannerConstants; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspace; @@ -31,6 +34,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Preferences; +import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; @@ -44,6 +48,7 @@ import org.eclipse.jface.text.DocumentCommand; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ILineTracker; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextOperationTarget; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITextViewerExtension; import org.eclipse.jface.text.ITypedRegion; @@ -56,6 +61,7 @@ import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.swt.SWT; import org.eclipse.swt.custom.VerifyKeyListener; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.graphics.Color; @@ -67,33 +73,32 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.actions.ActionContext; +import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.ui.dialogs.SaveAsDialog; import org.eclipse.ui.editors.text.IStorageDocumentProvider; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.texteditor.ContentAssistAction; import org.eclipse.ui.texteditor.IDocumentProvider; - -/********************************************************************** -Copyright (c) 2000, 2002 IBM Corp. and others. -All rights reserved. This program and the accompanying materials -are made available under the terms of the Common Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/cpl-v10.html - -Contributors: - IBM Corporation - Initial implementation - Klaus Hartlage - www.eclipseproject.de -**********************************************************************/ +import org.eclipse.ui.texteditor.ITextEditorActionConstants; +import org.eclipse.ui.texteditor.TextOperationAction; +/******************************************************************************* + * Copyright (c) 2000, 2002 IBM Corp. and others. All rights reserved. This + * program and the accompanying materials are made available under the terms of + * the Common Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: IBM Corporation - Initial implementation Klaus Hartlage - + * www.eclipseproject.de + ******************************************************************************/ /** * PHP specific text editor. */ public class PHPUnitEditor extends PHPEditor { - interface ITextConverter { void customizeDocumentCommand(IDocument document, DocumentCommand command); }; - // class AdaptedRulerLayout extends Layout { // // protected int fGap; @@ -104,9 +109,11 @@ public class PHPUnitEditor extends PHPEditor { // fAdaptedSourceViewer = asv; // } // - // protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { + // protected Point computeSize(Composite composite, int wHint, int hHint, + // boolean flushCache) { // Control[] children = composite.getChildren(); - // Point s = children[children.length - 1].computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache); + // Point s = children[children.length - 1].computeSize(SWT.DEFAULT, + // SWT.DEFAULT, flushCache); // if (fAdaptedSourceViewer.isVerticalRulerVisible()) // s.x += fAdaptedSourceViewer.getVerticalRuler().getWidth() + fGap; // return s; @@ -127,10 +134,12 @@ public class PHPUnitEditor extends PHPEditor { // if (fAdaptedSourceViewer.isOverviewRulerVisible()) { // OverviewRuler or = fAdaptedSourceViewer.getOverviewRuler(); // orWidth = or.getWidth(); - // or.getControl().setBounds(clArea.width - orWidth, scrollbarHeight, orWidth, clArea.height - 3 * scrollbarHeight); + // or.getControl().setBounds(clArea.width - orWidth, scrollbarHeight, + // orWidth, clArea.height - 3 * scrollbarHeight); // } // - // textWidget.setBounds(vrWidth + fGap, 0, clArea.width - vrWidth - orWidth - 2 * fGap, clArea.height); + // textWidget.setBounds(vrWidth + fGap, 0, clArea.width - vrWidth - orWidth - + // 2 * fGap, clArea.height); // vr.getControl().setBounds(0, 0, vrWidth, clArea.height - scrollbarHeight); // // } else { @@ -140,21 +149,24 @@ public class PHPUnitEditor extends PHPEditor { // } // }; // - // class AdaptedSourceViewer extends SourceViewer { // extends JavaCorrectionSourceViewer { + // class AdaptedSourceViewer extends SourceViewer { // extends + // JavaCorrectionSourceViewer { // // private List fTextConverters; // // private OverviewRuler fOverviewRuler; // private boolean fIsOverviewRulerVisible; // /** The viewer's overview ruler hovering controller */ - // private AbstractHoverInformationControlManager fOverviewRulerHoveringController; + // private AbstractHoverInformationControlManager + // fOverviewRulerHoveringController; // // private boolean fIgnoreTextConverters = false; // // private IVerticalRuler fCachedVerticalRuler; // private boolean fCachedIsVerticalRulerVisible; // - // public AdaptedSourceViewer(Composite parent, IVerticalRuler ruler, int styles) { + // public AdaptedSourceViewer(Composite parent, IVerticalRuler ruler, int + // styles) { // super(parent, ruler, styles); //, CompilationUnitEditor.this); // // fCachedVerticalRuler = ruler; @@ -169,7 +181,7 @@ public class PHPUnitEditor extends PHPEditor { // */ // public void showAnnotations(boolean show) { // fCachedIsVerticalRulerVisible = (show && fCachedVerticalRuler != null); - // // super.showAnnotations(show); + // // super.showAnnotations(show); // } // // public IContentAssistant getContentAssistant() { @@ -227,7 +239,8 @@ public class PHPUnitEditor extends PHPEditor { // super.customizeDocumentCommand(command); // if (!fIgnoreTextConverters && fTextConverters != null) { // for (Iterator e = fTextConverters.iterator(); e.hasNext();) - // ((ITextConverter) e.next()).customizeDocumentCommand(getDocument(), command); + // ((ITextConverter) e.next()).customizeDocumentCommand(getDocument(), + // command); // } // fIgnoreTextConverters = false; // } @@ -262,11 +275,12 @@ public class PHPUnitEditor extends PHPEditor { // fOverviewRuler.createControl(composite, this); // } // } - // protected void ensureOverviewHoverManagerInstalled() { - // if (fOverviewRulerHoveringController == null && fAnnotationHover != null && fHoverControlCreator != null) { + // if (fOverviewRulerHoveringController == null && fAnnotationHover != null + // && fHoverControlCreator != null) { // fOverviewRulerHoveringController = - // new OverviewRulerHoverManager(fOverviewRuler, this, fAnnotationHover, fHoverControlCreator); + // new OverviewRulerHoverManager(fOverviewRuler, this, fAnnotationHover, + // fHoverControlCreator); // fOverviewRulerHoveringController.install(fOverviewRuler.getControl()); // } // } @@ -306,7 +320,8 @@ public class PHPUnitEditor extends PHPEditor { // IAnnotationModel annotationModel, // int visibleRegionOffset, // int visibleRegionLength) { - // super.setDocument(document, annotationModel, visibleRegionOffset, visibleRegionLength); + // super.setDocument(document, annotationModel, visibleRegionOffset, + // visibleRegionLength); // fOverviewRuler.setModel(annotationModel); // } // @@ -331,11 +346,13 @@ public class PHPUnitEditor extends PHPEditor { // } // // /* - // * @see org.eclipse.jface.text.source.ISourceViewer#configure(org.eclipse.jface.text.source.SourceViewerConfiguration) + // * @see + // org.eclipse.jface.text.source.ISourceViewer#configure(org.eclipse.jface.text.source.SourceViewerConfiguration) // */ // public void configure(SourceViewerConfiguration configuration) { // super.configure(configuration); - // // prependAutoEditStrategy(new SmartBracesAutoEditStrategy(this), IDocument.DEFAULT_CONTENT_TYPE); + // // prependAutoEditStrategy(new SmartBracesAutoEditStrategy(this), + // IDocument.DEFAULT_CONTENT_TYPE); // } // // protected void handleDispose() { @@ -350,42 +367,33 @@ public class PHPUnitEditor extends PHPEditor { // } // // }; - class AdaptedSourceViewer extends JavaSourceViewer { - private List fTextConverters; private boolean fIgnoreTextConverters = false; // private JavaCorrectionAssistant fCorrectionAssistant; - - public AdaptedSourceViewer( - Composite parent, - IVerticalRuler verticalRuler, - IOverviewRuler overviewRuler, - boolean showAnnotationsOverview, - int styles) { - super(parent, verticalRuler, overviewRuler, showAnnotationsOverview, styles); + public AdaptedSourceViewer(Composite parent, IVerticalRuler verticalRuler, + IOverviewRuler overviewRuler, boolean showAnnotationsOverview, + int styles) { + super(parent, verticalRuler, overviewRuler, showAnnotationsOverview, + styles); } - public IContentAssistant getContentAssistant() { return fContentAssistant; } - /* * @see ITextOperationTarget#doOperation(int) */ public void doOperation(int operation) { - if (getTextWidget() == null) return; - switch (operation) { case CONTENTASSIST_PROPOSALS : String msg = fContentAssistant.showPossibleCompletions(); setStatusLineErrorMessage(msg); return; - // case CORRECTIONASSIST_PROPOSALS: - // fCorrectionAssistant.showPossibleCompletions(); - // return; + // case CORRECTIONASSIST_PROPOSALS: + // fCorrectionAssistant.showPossibleCompletions(); + // return; case UNDO : fIgnoreTextConverters = true; break; @@ -393,10 +401,8 @@ public class PHPUnitEditor extends PHPEditor { fIgnoreTextConverters = true; break; } - super.doOperation(operation); } - /* * @see ITextOperationTarget#canDoOperation(int) */ @@ -405,7 +411,6 @@ public class PHPUnitEditor extends PHPEditor { // return isEditable(); return super.canDoOperation(operation); } - /* * @see TextViewer#handleDispose() */ @@ -416,11 +421,9 @@ public class PHPUnitEditor extends PHPEditor { // } super.handleDispose(); } - public void insertTextConverter(ITextConverter textConverter, int index) { throw new UnsupportedOperationException(); } - public void addTextConverter(ITextConverter textConverter) { if (fTextConverters == null) { fTextConverters = new ArrayList(1); @@ -428,7 +431,6 @@ public class PHPUnitEditor extends PHPEditor { } else if (!fTextConverters.contains(textConverter)) fTextConverters.add(textConverter); } - public void removeTextConverter(ITextConverter textConverter) { if (fTextConverters != null) { fTextConverters.remove(textConverter); @@ -436,7 +438,6 @@ public class PHPUnitEditor extends PHPEditor { fTextConverters = null; } } - /* * @see TextViewer#customizeDocumentCommand(DocumentCommand) */ @@ -444,11 +445,11 @@ public class PHPUnitEditor extends PHPEditor { super.customizeDocumentCommand(command); if (!fIgnoreTextConverters && fTextConverters != null) { for (Iterator e = fTextConverters.iterator(); e.hasNext();) - ((ITextConverter) e.next()).customizeDocumentCommand(getDocument(), command); + ((ITextConverter) e.next()).customizeDocumentCommand(getDocument(), + command); } fIgnoreTextConverters = false; } - // http://dev.eclipse.org/bugs/show_bug.cgi?id=19270 public void updateIndentationPrefixes() { SourceViewerConfiguration configuration = getSourceViewerConfiguration(); @@ -459,7 +460,6 @@ public class PHPUnitEditor extends PHPEditor { setIndentPrefixes(prefixes, types[i]); } } - /* * @see IWidgetTokenOwner#requestWidgetToken(IWidgetTokenKeeper) */ @@ -468,73 +468,60 @@ public class PHPUnitEditor extends PHPEditor { return false; return super.requestWidgetToken(requester); } - /* * @see org.eclipse.jface.text.source.ISourceViewer#configure(org.eclipse.jface.text.source.SourceViewerConfiguration) */ public void configure(SourceViewerConfiguration configuration) { super.configure(configuration); - // fCorrectionAssistant= new JavaCorrectionAssistant(CompilationUnitEditor.this); + // fCorrectionAssistant= new + // JavaCorrectionAssistant(CompilationUnitEditor.this); // fCorrectionAssistant.install(this); //TODO install SmartBracesAutoEditStrategy - // prependAutoEditStrategy(new SmartBracesAutoEditStrategy(this), IDocument.DEFAULT_CONTENT_TYPE); + // prependAutoEditStrategy(new SmartBracesAutoEditStrategy(this), + // IDocument.DEFAULT_CONTENT_TYPE); } }; static class TabConverter implements ITextConverter { - private int fTabRatio; private ILineTracker fLineTracker; - public TabConverter() { } - public void setNumberOfSpacesPerTab(int ratio) { fTabRatio = ratio; } - public void setLineTracker(ILineTracker lineTracker) { fLineTracker = lineTracker; } - private int insertTabString(StringBuffer buffer, int offsetInLine) { - if (fTabRatio == 0) return 0; - int remainder = offsetInLine % fTabRatio; remainder = fTabRatio - remainder; for (int i = 0; i < remainder; i++) buffer.append(' '); return remainder; } - - public void customizeDocumentCommand(IDocument document, DocumentCommand command) { + public void customizeDocumentCommand(IDocument document, + DocumentCommand command) { String text = command.text; if (text == null) return; - int index = text.indexOf('\t'); if (index > -1) { - StringBuffer buffer = new StringBuffer(); - fLineTracker.set(command.text); int lines = fLineTracker.getNumberOfLines(); - try { - for (int i = 0; i < lines; i++) { - int offset = fLineTracker.getLineOffset(i); int endOffset = offset + fLineTracker.getLineLength(i); String line = text.substring(offset, endOffset); - int position = 0; if (i == 0) { - IRegion firstLine = document.getLineInformationOfOffset(command.offset); + IRegion firstLine = document + .getLineInformationOfOffset(command.offset); position = command.offset - firstLine.getOffset(); } - int length = line.length(); for (int j = 0; j < length; j++) { char c = line.charAt(j); @@ -545,88 +532,73 @@ public class PHPUnitEditor extends PHPEditor { ++position; } } - } - command.text = buffer.toString(); - } catch (BadLocationException x) { } } } }; - private static class ExitPolicy implements LinkedPositionUI.ExitPolicy { - final char fExitCharacter; - public ExitPolicy(char exitCharacter) { fExitCharacter = exitCharacter; } - /* - * @see org.phpeclipse.phpdt.internal.ui.text.link.LinkedPositionUI.ExitPolicy#doExit(org.phpeclipse.phpdt.internal.ui.text.link.LinkedPositionManager, org.eclipse.swt.events.VerifyEvent, int, int) + * @see org.phpeclipse.phpdt.internal.ui.text.link.LinkedPositionUI.ExitPolicy#doExit(org.phpeclipse.phpdt.internal.ui.text.link.LinkedPositionManager, + * org.eclipse.swt.events.VerifyEvent, int, int) */ - public ExitFlags doExit(LinkedPositionManager manager, VerifyEvent event, int offset, int length) { - + public ExitFlags doExit(LinkedPositionManager manager, VerifyEvent event, + int offset, int length) { if (event.character == fExitCharacter) { if (manager.anyPositionIncludes(offset, length)) - return new ExitFlags(LinkedPositionUI.COMMIT | LinkedPositionUI.UPDATE_CARET, false); + return new ExitFlags(LinkedPositionUI.COMMIT + | LinkedPositionUI.UPDATE_CARET, false); else return new ExitFlags(LinkedPositionUI.COMMIT, true); } - switch (event.character) { case '\b' : if (manager.getFirstPosition().length == 0) return new ExitFlags(0, false); else return null; - case '\n' : case '\r' : return new ExitFlags(LinkedPositionUI.COMMIT, true); - default : return null; } } - } - private static class BracketLevel { int fOffset; int fLength; LinkedPositionManager fManager; LinkedPositionUI fEditor; }; - - private class BracketInserter implements VerifyKeyListener, LinkedPositionUI.ExitListener { - + private class BracketInserter + implements + VerifyKeyListener, + LinkedPositionUI.ExitListener { private boolean fCloseBracketsPHP = true; private boolean fCloseStringsPHP = true; private boolean fCloseBracketsHTML = true; private boolean fCloseStringsHTML = true; - private int fOffset; private int fLength; - public void setCloseBracketsPHPEnabled(boolean enabled) { fCloseBracketsPHP = enabled; } - public void setCloseStringsPHPEnabled(boolean enabled) { fCloseStringsPHP = enabled; } - public void setCloseBracketsHTMLEnabled(boolean enabled) { fCloseBracketsHTML = enabled; } - public void setCloseStringsHTMLEnabled(boolean enabled) { fCloseStringsHTML = enabled; } - private boolean hasIdentifierToTheRight(IDocument document, int offset) { try { int end = offset; @@ -634,186 +606,162 @@ public class PHPUnitEditor extends PHPEditor { int maxEnd = endLine.getOffset() + endLine.getLength(); while (end != maxEnd && Character.isWhitespace(document.getChar(end))) ++end; - - return end != maxEnd && Scanner.isPHPIdentifierPart(document.getChar(end)); - + return end != maxEnd + && Scanner.isPHPIdentifierPart(document.getChar(end)); } catch (BadLocationException e) { // be conservative return true; } } - private boolean hasIdentifierToTheLeft(IDocument document, int offset) { try { int start = offset; IRegion startLine = document.getLineInformationOfOffset(start); int minStart = startLine.getOffset(); - while (start != minStart && Character.isWhitespace(document.getChar(start - 1))) + while (start != minStart + && Character.isWhitespace(document.getChar(start - 1))) --start; - - return start != minStart && Scanner.isPHPIdentifierPart(document.getChar(start - 1)); - + return start != minStart + && Scanner.isPHPIdentifierPart(document.getChar(start - 1)); } catch (BadLocationException e) { return true; } } - - private boolean hasCharacterToTheRight(IDocument document, int offset, char character) { + private boolean hasCharacterToTheRight(IDocument document, int offset, + char character) { try { int end = offset; IRegion endLine = document.getLineInformationOfOffset(end); int maxEnd = endLine.getOffset() + endLine.getLength(); while (end != maxEnd && Character.isWhitespace(document.getChar(end))) ++end; - return end != maxEnd && document.getChar(end) == character; - } catch (BadLocationException e) { // be conservative return true; } } - /* * @see org.eclipse.swt.custom.VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent) */ public void verifyKey(VerifyEvent event) { - if (!event.doit) return; - final ISourceViewer sourceViewer = getSourceViewer(); IDocument document = sourceViewer.getDocument(); - final Point selection = sourceViewer.getSelectedRange(); final int offset = selection.x; final int length = selection.y; - try { ITypedRegion partition = document.getPartition(offset); String type = partition.getType(); - if (type.equals(IPHPPartitionScannerConstants.PHP)) { + if (type.equals(IPHPPartitions.PHP_PARTITIONING)) { switch (event.character) { case '(' : if (hasCharacterToTheRight(document, offset + length, '(')) return; - - // fall through - + // fall through case '[' : if (!fCloseBracketsPHP) return; if (hasIdentifierToTheRight(document, offset + length)) return; - - // fall through - + // fall through case '"' : if (event.character == '"') { if (!fCloseStringsPHP) return; - // changed for statements like echo "" print "" - // if (hasIdentifierToTheLeft(document, offset) || hasIdentifierToTheRight(document, offset + length)) + // changed for statements like echo "" print "" + // if (hasIdentifierToTheLeft(document, offset) || + // hasIdentifierToTheRight(document, offset + length)) if (hasIdentifierToTheRight(document, offset + length)) return; } - // ITypedRegion partition= document.getPartition(offset); - // if (! IDocument.DEFAULT_CONTENT_TYPE.equals(partition.getType()) && (partition.getOffset() != offset)) + // if (! + // IDocument.DEFAULT_CONTENT_TYPE.equals(partition.getType()) && + // (partition.getOffset() != offset)) // return; - final char character = event.character; final char closingCharacter = getPeerCharacter(character); final StringBuffer buffer = new StringBuffer(); buffer.append(character); buffer.append(closingCharacter); - document.replace(offset, length, buffer.toString()); - - LinkedPositionManager manager = new LinkedPositionManager(document); + LinkedPositionManager manager = new LinkedPositionManager( + document); manager.addPosition(offset + 1, 0); - fOffset = offset; fLength = 2; - - LinkedPositionUI editor = new LinkedPositionUI(sourceViewer, manager); + LinkedPositionUI editor = new LinkedPositionUI(sourceViewer, + manager); editor.setCancelListener(this); editor.setExitPolicy(new ExitPolicy(closingCharacter)); editor.setFinalCaretOffset(offset + 2); editor.enter(); - IRegion newSelection = editor.getSelectedRegion(); - sourceViewer.setSelectedRange(newSelection.getOffset(), newSelection.getLength()); - + sourceViewer.setSelectedRange(newSelection.getOffset(), + newSelection.getLength()); event.doit = false; } - } else if (type.equals(IPHPPartitionScannerConstants.HTML) || type.equals(IDocument.DEFAULT_CONTENT_TYPE)) { + } else if (type.equals(IPHPPartitions.HTML) + || type.equals(IDocument.DEFAULT_CONTENT_TYPE)) { switch (event.character) { case '(' : if (hasCharacterToTheRight(document, offset + length, '(')) return; - - // fall through - + // fall through case '[' : if (!fCloseBracketsHTML) return; if (hasIdentifierToTheRight(document, offset + length)) return; - - // fall through - + // fall through case '"' : if (event.character == '"') { if (!fCloseStringsHTML) return; - - if (hasIdentifierToTheLeft(document, offset) || hasIdentifierToTheRight(document, offset + length)) + if (hasIdentifierToTheLeft(document, offset) + || hasIdentifierToTheRight(document, offset + length)) return; } - // ITypedRegion partition= document.getPartition(offset); - // if (! IDocument.DEFAULT_CONTENT_TYPE.equals(partition.getType()) && (partition.getOffset() != offset)) + // if (! + // IDocument.DEFAULT_CONTENT_TYPE.equals(partition.getType()) && + // (partition.getOffset() != offset)) // return; - final char character = event.character; final char closingCharacter = getPeerCharacter(character); final StringBuffer buffer = new StringBuffer(); buffer.append(character); buffer.append(closingCharacter); - document.replace(offset, length, buffer.toString()); - - LinkedPositionManager manager = new LinkedPositionManager(document); + LinkedPositionManager manager = new LinkedPositionManager( + document); manager.addPosition(offset + 1, 0); - fOffset = offset; fLength = 2; - - LinkedPositionUI editor = new LinkedPositionUI(sourceViewer, manager); + LinkedPositionUI editor = new LinkedPositionUI(sourceViewer, + manager); editor.setCancelListener(this); editor.setExitPolicy(new ExitPolicy(closingCharacter)); editor.setFinalCaretOffset(offset + 2); editor.enter(); - IRegion newSelection = editor.getSelectedRegion(); - sourceViewer.setSelectedRange(newSelection.getOffset(), newSelection.getLength()); - + sourceViewer.setSelectedRange(newSelection.getOffset(), + newSelection.getLength()); event.doit = false; } } } catch (BadLocationException e) { } - } - /* * @see org.phpeclipse.phpdt.internal.ui.text.link.LinkedPositionUI.ExitListener#exit(boolean) */ public void exit(boolean accept) { if (accept) return; - // remove brackets try { final ISourceViewer sourceViewer = getSourceViewer(); @@ -822,14 +770,14 @@ public class PHPUnitEditor extends PHPEditor { } catch (BadLocationException e) { } } - } - /** The editor's save policy */ protected ISavePolicy fSavePolicy; - /** Listener to annotation model changes that updates the error tick in the tab image */ + /** + * Listener to annotation model changes that updates the error tick in the + * tab image + */ private JavaEditorErrorTickUpdater fJavaEditorErrorTickUpdater; - /** The editor's paint manager */ // private PaintManager fPaintManager; /** The editor's bracket painter */ @@ -846,9 +794,9 @@ public class PHPUnitEditor extends PHPEditor { private TabConverter fTabConverter; /** History for structure select action */ //private SelectionHistory fSelectionHistory; - /** The preference property change listener for php core. */ - // private IPropertyChangeListener fPropertyChangeListener = new PropertyChangeListener(); + // private IPropertyChangeListener fPropertyChangeListener = new + // PropertyChangeListener(); /** The remembered java element */ private IJavaElement fRememberedElement; /** The remembered selection */ @@ -857,12 +805,17 @@ public class PHPUnitEditor extends PHPEditor { private int fRememberedElementOffset; /** The bracket inserter. */ private BracketInserter fBracketInserter = new BracketInserter(); - + + /** The standard action groups added to the menu */ + private GenerateActionGroup fGenerateActionGroup; + private CompositeActionGroup fContextMenuGroup; // private class PropertyChangeListener implements IPropertyChangeListener { // /* // * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) // */ - // public void propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent event) { + // public void + // propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent + // event) { // handlePreferencePropertyChanged(event); // } // } @@ -885,13 +838,17 @@ public class PHPUnitEditor extends PHPEditor { /** Preference key for inserting spaces rather than tabs */ private final static String SPACES_FOR_TABS = PreferenceConstants.EDITOR_SPACES_FOR_TABS; /** Preference key for error indication */ -// private final static String ERROR_INDICATION = PreferenceConstants.EDITOR_PROBLEM_INDICATION; + // private final static String ERROR_INDICATION = + // PreferenceConstants.EDITOR_PROBLEM_INDICATION; /** Preference key for error color */ -// private final static String ERROR_INDICATION_COLOR = PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR; + // private final static String ERROR_INDICATION_COLOR = + // PreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR; /** Preference key for warning indication */ -// private final static String WARNING_INDICATION = PreferenceConstants.EDITOR_WARNING_INDICATION; + // private final static String WARNING_INDICATION = + // PreferenceConstants.EDITOR_WARNING_INDICATION; /** Preference key for warning color */ -// private final static String WARNING_INDICATION_COLOR = PreferenceConstants.EDITOR_WARNING_INDICATION_COLOR; + // private final static String WARNING_INDICATION_COLOR = + // PreferenceConstants.EDITOR_WARNING_INDICATION_COLOR; /** Preference key for task indication */ private final static String TASK_INDICATION = PreferenceConstants.EDITOR_TASK_INDICATION; /** Preference key for task color */ @@ -912,23 +869,18 @@ public class PHPUnitEditor extends PHPEditor { private final static String LINKED_POSITION_COLOR = PreferenceConstants.EDITOR_LINKED_POSITION_COLOR; /** Preference key for shwoing the overview ruler */ private final static String OVERVIEW_RULER = PreferenceConstants.EDITOR_OVERVIEW_RULER; - /** Preference key for error indication in overview ruler */ private final static String ERROR_INDICATION_IN_OVERVIEW_RULER = PreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER; /** Preference key for warning indication in overview ruler */ - private final static String WARNING_INDICATION_IN_OVERVIEW_RULER = - PreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER; + private final static String WARNING_INDICATION_IN_OVERVIEW_RULER = PreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER; /** Preference key for task indication in overview ruler */ private final static String TASK_INDICATION_IN_OVERVIEW_RULER = PreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER; /** Preference key for bookmark indication in overview ruler */ - private final static String BOOKMARK_INDICATION_IN_OVERVIEW_RULER = - PreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER; + private final static String BOOKMARK_INDICATION_IN_OVERVIEW_RULER = PreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER; /** Preference key for search result indication in overview ruler */ - private final static String SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER = - PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER; + private final static String SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER = PreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER; /** Preference key for unknown annotation indication in overview ruler */ - private final static String UNKNOWN_INDICATION_IN_OVERVIEW_RULER = - PreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER; + private final static String UNKNOWN_INDICATION_IN_OVERVIEW_RULER = PreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER; /** Preference key for automatically closing strings */ private final static String CLOSE_STRINGS_PHP = PreferenceConstants.EDITOR_CLOSE_STRINGS_PHP; /** Preference key for automatically wrapping Java strings */ @@ -945,7 +897,6 @@ public class PHPUnitEditor extends PHPEditor { private final static String CLOSE_STRINGS_HTML = PreferenceConstants.EDITOR_CLOSE_STRINGS_HTML; /** Preference key for automatically closing brackets and parenthesis */ private final static String CLOSE_BRACKETS_HTML = PreferenceConstants.EDITOR_CLOSE_BRACKETS_HTML; - /** Preference key for smart paste */ private final static String SMART_PASTE = PreferenceConstants.EDITOR_SMART_PASTE; // private final static class AnnotationInfo { @@ -953,7 +904,6 @@ public class PHPUnitEditor extends PHPEditor { // public String fOverviewRulerPreference; // public String fEditorPreference; // }; - // private final static Map ANNOTATION_MAP; // static { // @@ -986,7 +936,8 @@ public class PHPUnitEditor extends PHPEditor { // // info = new AnnotationInfo(); // info.fColorPreference = SEARCH_RESULT_INDICATION_COLOR; - // info.fOverviewRulerPreference = SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER; + // info.fOverviewRulerPreference = + // SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER; // info.fEditorPreference = SEARCH_RESULT_INDICATION; // ANNOTATION_MAP.put(AnnotationType.SEARCH, info); // @@ -1010,36 +961,153 @@ public class PHPUnitEditor extends PHPEditor { */ public PHPUnitEditor() { super(); - setDocumentProvider(PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider()); + setDocumentProvider(PHPeclipsePlugin.getDefault() + .getCompilationUnitDocumentProvider()); setEditorContextMenuId("#PHPEditorContext"); //$NON-NLS-1$ setRulerContextMenuId("#PHPRulerContext"); //$NON-NLS-1$ setOutlinerContextMenuId("#PHPOutlinerContext"); //$NON-NLS-1$ // don't set help contextId, we install our own help context fSavePolicy = null; - fJavaEditorErrorTickUpdater = new JavaEditorErrorTickUpdater(this); } - /* - * @see JavaEditor#getElementAt(int) - */ + * @see AbstractTextEditor#createActions() + */ + protected void createActions() { + super.createActions(); + Action action; + // Action action= new + // TextOperationAction(PHPEditorMessages.getResourceBundle(), + // "CorrectionAssistProposal.", this, CORRECTIONASSIST_PROPOSALS); + // //$NON-NLS-1$ + // action.setActionDefinitionId(PHPEditorActionDefinitionIds.CORRECTION_ASSIST_PROPOSALS); + // setAction("CorrectionAssistProposal", action); //$NON-NLS-1$ + // markAsStateDependentAction("CorrectionAssistProposal", true); + // //$NON-NLS-1$ + //// WorkbenchHelp.setHelp(action, IJavaHelpContextIds.QUICK_FIX_ACTION); + action = new ContentAssistAction(PHPEditorMessages.getResourceBundle(), + "ContentAssistProposal.", this); //$NON-NLS-1$ + action + .setActionDefinitionId(PHPEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS); + setAction("ContentAssistProposal", action); //$NON-NLS-1$ + markAsStateDependentAction("ContentAssistProposal", true); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(action, + // IJavaHelpContextIds.CONTENT_ASSIST_ACTION); + action = new TextOperationAction(PHPEditorMessages.getResourceBundle(), + "ContentAssistContextInformation.", this, + ISourceViewer.CONTENTASSIST_CONTEXT_INFORMATION); //$NON-NLS-1$ + action + .setActionDefinitionId(PHPEditorActionDefinitionIds.CONTENT_ASSIST_CONTEXT_INFORMATION); + setAction("ContentAssistContextInformation", action); //$NON-NLS-1$ + markAsStateDependentAction("ContentAssistContextInformation", true); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(action, + // IJavaHelpContextIds.PARAMETER_HINTS_ACTION); + // action= new TextOperationAction(PHPEditorMessages.getResourceBundle(), + // "ContentAssistCompletePrefix.", this, CONTENTASSIST_COMPLETE_PREFIX); + // //$NON-NLS-1$ + // action.setActionDefinitionId(PHPEditorActionDefinitionIds.CONTENT_ASSIST_COMPLETE_PREFIX); + // setAction("ContentAssistCompletePrefix", action); //$NON-NLS-1$ + // markAsStateDependentAction("ContentAssistCompletePrefix", true); + // //$NON-NLS-1$ + //// WorkbenchHelp.setHelp(action, + // IJavaHelpContextIds.PARAMETER_HINTS_ACTION); + action = new TextOperationAction(PHPEditorMessages.getResourceBundle(), + "Comment.", this, ITextOperationTarget.PREFIX); //$NON-NLS-1$ + action.setActionDefinitionId(PHPEditorActionDefinitionIds.COMMENT); + setAction("Comment", action); //$NON-NLS-1$ + markAsStateDependentAction("Comment", true); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(action, IJavaHelpContextIds.COMMENT_ACTION); + action = new TextOperationAction(PHPEditorMessages.getResourceBundle(), + "Uncomment.", this, ITextOperationTarget.STRIP_PREFIX); //$NON-NLS-1$ + action.setActionDefinitionId(PHPEditorActionDefinitionIds.UNCOMMENT); + setAction("Uncomment", action); //$NON-NLS-1$ + markAsStateDependentAction("Uncomment", true); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(action, IJavaHelpContextIds.UNCOMMENT_ACTION); + action = new ToggleCommentAction(PHPEditorMessages.getResourceBundle(), + "ToggleComment.", this, getSourceViewerConfiguration() + .getDefaultPrefixes(getSourceViewer(), "")); //$NON-NLS-1$ //$NON-NLS-2$ + action.setActionDefinitionId(PHPEditorActionDefinitionIds.TOGGLE_COMMENT); + setAction("ToggleComment", action); //$NON-NLS-1$ + markAsStateDependentAction("ToggleComment", true); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(action, + // IJavaHelpContextIds.TOGGLE_COMMENT_ACTION); + action = new TextOperationAction(PHPEditorMessages.getResourceBundle(), + "Format.", this, ISourceViewer.FORMAT); //$NON-NLS-1$ + action.setActionDefinitionId(PHPEditorActionDefinitionIds.FORMAT); + setAction("Format", action); //$NON-NLS-1$ + markAsStateDependentAction("Format", true); //$NON-NLS-1$ + markAsSelectionDependentAction("Format", true); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(action, IJavaHelpContextIds.FORMAT_ACTION); + action = new AddBlockCommentAction(PHPEditorMessages.getResourceBundle(), + "AddBlockComment.", this); //$NON-NLS-1$ + action + .setActionDefinitionId(PHPEditorActionDefinitionIds.ADD_BLOCK_COMMENT); + setAction("AddBlockComment", action); //$NON-NLS-1$ + markAsStateDependentAction("AddBlockComment", true); //$NON-NLS-1$ + markAsSelectionDependentAction("AddBlockComment", true); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(action, + // IJavaHelpContextIds.ADD_BLOCK_COMMENT_ACTION); + action = new RemoveBlockCommentAction( + PHPEditorMessages.getResourceBundle(), "RemoveBlockComment.", this); //$NON-NLS-1$ + action + .setActionDefinitionId(PHPEditorActionDefinitionIds.REMOVE_BLOCK_COMMENT); + setAction("RemoveBlockComment", action); //$NON-NLS-1$ + markAsStateDependentAction("RemoveBlockComment", true); //$NON-NLS-1$ + markAsSelectionDependentAction("RemoveBlockComment", true); //$NON-NLS-1$ + // WorkbenchHelp.setHelp(action, + // IJavaHelpContextIds.ADD_BLOCK_COMMENT_ACTION); + // action= new IndentAction(PHPEditorMessages.getResourceBundle(), + // "Indent.", this, false); //$NON-NLS-1$ + // action.setActionDefinitionId(PHPEditorActionDefinitionIds.INDENT); + // setAction("Indent", action); //$NON-NLS-1$ + // markAsStateDependentAction("Indent", true); //$NON-NLS-1$ + // markAsSelectionDependentAction("Indent", true); //$NON-NLS-1$ + //// WorkbenchHelp.setHelp(action, IJavaHelpContextIds.INDENT_ACTION); + // + // action= new IndentAction(PHPEditorMessages.getResourceBundle(), + // "Indent.", this, true); //$NON-NLS-1$ + // setAction("IndentOnTab", action); //$NON-NLS-1$ + // markAsStateDependentAction("IndentOnTab", true); //$NON-NLS-1$ + // markAsSelectionDependentAction("IndentOnTab", true); //$NON-NLS-1$ + // + if (getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_SMART_TAB)) { + // don't replace Shift Right - have to make sure their enablement is + // mutually exclusive + // removeActionActivationCode(ITextEditorActionConstants.SHIFT_RIGHT); + setActionActivationCode("IndentOnTab", '\t', -1, SWT.NONE); //$NON-NLS-1$ + } + fGenerateActionGroup = new GenerateActionGroup(this, + ITextEditorActionConstants.GROUP_EDIT); + fActionGroups = new CompositeActionGroup( + new ActionGroup[]{fGenerateActionGroup}); + // We have to keep the context menu group separate to have better control + // over positioning + fContextMenuGroup = new CompositeActionGroup(new ActionGroup[] { fGenerateActionGroup }); + // rg, + // new LocalHistoryActionGroup(this, ITextEditorActionConstants.GROUP_EDIT)}); + + } + /* + * @see JavaEditor#getElementAt(int) + */ protected IJavaElement getElementAt(int offset) { return getElementAt(offset, true); } - /** - * Returns the most narrow element including the given offset. If reconcile - * is true the editor's input element is reconciled in advance. If it is - * false this method only returns a result if the editor's input element - * does not need to be reconciled. + * Returns the most narrow element including the given offset. If reconcile + * is true the editor's input element is reconciled in + * advance. If it is false this method only returns a result + * if the editor's input element does not need to be reconciled. * - * @param offset the offset included by the retrieved element - * @param reconcile true if working copy should be reconciled + * @param offset + * the offset included by the retrieved element + * @param reconcile + * true if working copy should be reconciled */ protected IJavaElement getElementAt(int offset, boolean reconcile) { - IWorkingCopyManager manager = PHPeclipsePlugin.getDefault().getWorkingCopyManager(); + IWorkingCopyManager manager = PHPeclipsePlugin.getDefault() + .getWorkingCopyManager(); ICompilationUnit unit = manager.getWorkingCopy(getEditorInput()); - if (unit != null) { try { if (reconcile) { @@ -1049,16 +1117,13 @@ public class PHPUnitEditor extends PHPEditor { return unit.getElementAt(offset); } else if (unit.isConsistent()) return unit.getElementAt(offset); - } catch (JavaModelException x) { PHPeclipsePlugin.log(x.getStatus()); // nothing found, be tolerant and go on } } - return null; } - /* * @see JavaEditor#getCorrespondingElement(IJavaElement) */ @@ -1071,157 +1136,138 @@ public class PHPUnitEditor extends PHPEditor { } return null; } - public void createPartControl(Composite parent) { super.createPartControl(parent); - // fPaintManager = new PaintManager(getSourceViewer()); - LinePainter linePainter; linePainter = new LinePainter(getSourceViewer()); - - linePainter.setHighlightColor(new Color(Display.getCurrent(), 225, 235, 224)); - + linePainter + .setHighlightColor(new Color(Display.getCurrent(), 225, 235, 224)); // fPaintManager.addPainter(linePainter); - if (isBracketHighlightingEnabled()) startBracketHighlighting(); if (isLineHighlightingEnabled()) startLineHighlighting(); if (isPrintMarginVisible()) showPrintMargin(); - // Iterator e = ANNOTATION_MAP.keySet().iterator(); // while (e.hasNext()) { // AnnotationType type = (AnnotationType) e.next(); // if (isAnnotationIndicationEnabled(type)) // startAnnotationIndication(type); // } - if (isTabConversionEnabled()) startTabConversion(); - // if (isOverviewRulerVisible()) // showOverviewRuler(); // - // Preferences preferences = PHPeclipsePlugin.getDefault().getPluginPreferences(); + // Preferences preferences = + // PHPeclipsePlugin.getDefault().getPluginPreferences(); // preferences.addPropertyChangeListener(fPropertyChangeListener); - IPreferenceStore preferenceStore = getPreferenceStore(); boolean closeBracketsPHP = preferenceStore.getBoolean(CLOSE_BRACKETS_PHP); boolean closeStringsPHP = preferenceStore.getBoolean(CLOSE_STRINGS_PHP); boolean closeBracketsHTML = preferenceStore.getBoolean(CLOSE_BRACKETS_HTML); boolean closeStringsHTML = preferenceStore.getBoolean(CLOSE_STRINGS_HTML); - fBracketInserter.setCloseBracketsPHPEnabled(closeBracketsPHP); fBracketInserter.setCloseStringsPHPEnabled(closeStringsPHP); fBracketInserter.setCloseBracketsHTMLEnabled(closeBracketsHTML); fBracketInserter.setCloseStringsHTMLEnabled(closeStringsHTML); - ISourceViewer sourceViewer = getSourceViewer(); if (sourceViewer instanceof ITextViewerExtension) - ((ITextViewerExtension) sourceViewer).prependVerifyKeyListener(fBracketInserter); - + ((ITextViewerExtension) sourceViewer) + .prependVerifyKeyListener(fBracketInserter); } - private static char getPeerCharacter(char character) { switch (character) { case '(' : return ')'; - case ')' : return '('; - case '[' : return ']'; - case ']' : return '['; - case '"' : return character; - default : throw new IllegalArgumentException(); } } /** - * The compilation unit editor implementation of this AbstractTextEditor - * method asks the user for the workspace path of a file resource and saves the document - * there. See http://dev.eclipse.org/bugs/show_bug.cgi?id=6295 - */ + * The compilation unit editor implementation of this AbstractTextEditor + * method asks the user for the workspace path of a file resource and saves + * the document there. See http://dev.eclipse.org/bugs/show_bug.cgi?id=6295 + */ protected void performSaveAs(IProgressMonitor progressMonitor) { - Shell shell = getSite().getShell(); IEditorInput input = getEditorInput(); - SaveAsDialog dialog = new SaveAsDialog(shell); - - IFile original = (input instanceof IFileEditorInput) ? ((IFileEditorInput) input).getFile() : null; + IFile original = (input instanceof IFileEditorInput) + ? ((IFileEditorInput) input).getFile() + : null; if (original != null) dialog.setOriginalFile(original); - dialog.create(); - IDocumentProvider provider = getDocumentProvider(); if (provider == null) { // editor has been programmatically closed while the dialog was open return; } - if (provider.isDeleted(input) && original != null) { - String message = PHPEditorMessages.getFormattedString("CompilationUnitEditor.warning.save.delete", new Object[] { original.getName()}); //$NON-NLS-1$ + String message = PHPEditorMessages.getFormattedString( + "CompilationUnitEditor.warning.save.delete", new Object[]{original + .getName()}); //$NON-NLS-1$ dialog.setErrorMessage(null); dialog.setMessage(message, IMessageProvider.WARNING); } - if (dialog.open() == Dialog.CANCEL) { if (progressMonitor != null) progressMonitor.setCanceled(true); return; } - IPath filePath = dialog.getResult(); if (filePath == null) { if (progressMonitor != null) progressMonitor.setCanceled(true); return; } - IWorkspace workspace = ResourcesPlugin.getWorkspace(); IFile file = workspace.getRoot().getFile(filePath); final IEditorInput newInput = new FileEditorInput(file); - WorkspaceModifyOperation op = new WorkspaceModifyOperation() { public void execute(final IProgressMonitor monitor) throws CoreException { - getDocumentProvider().saveDocument(monitor, newInput, getDocumentProvider().getDocument(getEditorInput()), true); + getDocumentProvider().saveDocument(monitor, newInput, + getDocumentProvider().getDocument(getEditorInput()), true); } }; - boolean success = false; try { - provider.aboutToChange(newInput); new ProgressMonitorDialog(shell).run(false, true, op); success = true; - } catch (InterruptedException x) { } catch (InvocationTargetException x) { - Throwable t = x.getTargetException(); if (t instanceof CoreException) { CoreException cx = (CoreException) t; - ErrorDialog.openError(shell, PHPEditorMessages.getString("CompilationUnitEditor.error.saving.title2"), PHPEditorMessages.getString("CompilationUnitEditor.error.saving.message2"), cx.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ + ErrorDialog.openError(shell, PHPEditorMessages + .getString("CompilationUnitEditor.error.saving.title2"), + PHPEditorMessages + .getString("CompilationUnitEditor.error.saving.message2"), cx + .getStatus()); //$NON-NLS-1$ //$NON-NLS-2$ } else { - MessageDialog.openError(shell, PHPEditorMessages.getString("CompilationUnitEditor.error.saving.title3"), PHPEditorMessages.getString("CompilationUnitEditor.error.saving.message3") + t.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(shell, PHPEditorMessages + .getString("CompilationUnitEditor.error.saving.title3"), + PHPEditorMessages + .getString("CompilationUnitEditor.error.saving.message3") + + t.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ } - } finally { provider.changed(newInput); if (success) setInput(newInput); } - if (progressMonitor != null) progressMonitor.setCanceled(!success); } @@ -1232,7 +1278,6 @@ public class PHPUnitEditor extends PHPEditor { super.doSetInput(input); configureTabConverter(); } - private void startBracketHighlighting() { if (fBracketPainter == null) { ISourceViewer sourceViewer = getSourceViewer(); @@ -1241,7 +1286,6 @@ public class PHPUnitEditor extends PHPEditor { // fPaintManager.addPainter(fBracketPainter); } } - private void stopBracketHighlighting() { if (fBracketPainter != null) { // fPaintManager.removePainter(fBracketPainter); @@ -1250,12 +1294,10 @@ public class PHPUnitEditor extends PHPEditor { fBracketPainter = null; } } - private boolean isBracketHighlightingEnabled() { IPreferenceStore store = getPreferenceStore(); return store.getBoolean(MATCHING_BRACKETS); } - private void startLineHighlighting() { if (fLinePainter == null) { ISourceViewer sourceViewer = getSourceViewer(); @@ -1264,7 +1306,6 @@ public class PHPUnitEditor extends PHPEditor { // fPaintManager.addPainter(fLinePainter); } } - private void stopLineHighlighting() { if (fLinePainter != null) { // fPaintManager.removePainter(fLinePainter); @@ -1273,21 +1314,19 @@ public class PHPUnitEditor extends PHPEditor { fLinePainter = null; } } - private boolean isLineHighlightingEnabled() { IPreferenceStore store = getPreferenceStore(); return store.getBoolean(CURRENT_LINE); } - private void showPrintMargin() { if (fPrintMarginPainter == null) { fPrintMarginPainter = new PrintMarginPainter(getSourceViewer()); fPrintMarginPainter.setMarginRulerColor(getColor(PRINT_MARGIN_COLOR)); - fPrintMarginPainter.setMarginRulerColumn(getPreferenceStore().getInt(PRINT_MARGIN_COLUMN)); + fPrintMarginPainter.setMarginRulerColumn(getPreferenceStore().getInt( + PRINT_MARGIN_COLUMN)); // fPaintManager.addPainter(fPrintMarginPainter); } } - private void hidePrintMargin() { if (fPrintMarginPainter != null) { // fPaintManager.removePainter(fPrintMarginPainter); @@ -1296,16 +1335,14 @@ public class PHPUnitEditor extends PHPEditor { fPrintMarginPainter = null; } } - private boolean isPrintMarginVisible() { IPreferenceStore store = getPreferenceStore(); return store.getBoolean(PRINT_MARGIN); } - // private void startAnnotationIndication(AnnotationType annotationType) { // if (fProblemPainter == null) { // fProblemPainter = new ProblemPainter(this, getSourceViewer()); - //// fPaintManager.addPainter(fProblemPainter); + //// fPaintManager.addPainter(fProblemPainter); // } // fProblemPainter.setColor(annotationType, getColor(annotationType)); // fProblemPainter.paintAnnotations(annotationType, true); @@ -1316,7 +1353,7 @@ public class PHPUnitEditor extends PHPEditor { // if (fProblemPainter != null) { // // if (!fProblemPainter.isPaintingAnnotations()) { - //// fPaintManager.removePainter(fProblemPainter); + //// fPaintManager.removePainter(fProblemPainter); // fProblemPainter.deactivate(true); // fProblemPainter.dispose(); // fProblemPainter = null; @@ -1333,7 +1370,8 @@ public class PHPUnitEditor extends PHPEditor { // } // } // - // private boolean isAnnotationIndicationEnabled(AnnotationType annotationType) { + // private boolean isAnnotationIndicationEnabled(AnnotationType + // annotationType) { // IPreferenceStore store = getPreferenceStore(); // AnnotationInfo info = (AnnotationInfo) ANNOTATION_MAP.get(annotationType); // if (info != null) @@ -1341,7 +1379,9 @@ public class PHPUnitEditor extends PHPEditor { // return false; // } // - // private boolean isAnnotationIndicationInOverviewRulerEnabled(AnnotationType annotationType) { + // private boolean + // isAnnotationIndicationInOverviewRulerEnabled(AnnotationType + // annotationType) { // IPreferenceStore store = getPreferenceStore(); // AnnotationInfo info = (AnnotationInfo) ANNOTATION_MAP.get(annotationType); // if (info != null) @@ -1349,7 +1389,8 @@ public class PHPUnitEditor extends PHPEditor { // return false; // } // - // private void showAnnotationIndicationInOverviewRuler(AnnotationType annotationType, boolean show) { + // private void showAnnotationIndicationInOverviewRuler(AnnotationType + // annotationType, boolean show) { // AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer(); // OverviewRuler ruler = asv.getOverviewRuler(); // if (ruler != null) { @@ -1359,7 +1400,8 @@ public class PHPUnitEditor extends PHPEditor { // } // } // - // private void setColorInOverviewRuler(AnnotationType annotationType, Color color) { + // private void setColorInOverviewRuler(AnnotationType annotationType, Color + // color) { // AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer(); // OverviewRuler ruler = asv.getOverviewRuler(); // if (ruler != null) { @@ -1367,7 +1409,6 @@ public class PHPUnitEditor extends PHPEditor { // ruler.update(); // } // } - private void configureTabConverter() { if (fTabConverter != null) { IDocumentProvider provider = getDocumentProvider(); @@ -1377,12 +1418,11 @@ public class PHPUnitEditor extends PHPEditor { } } } - private int getTabSize() { - Preferences preferences = PHPeclipsePlugin.getDefault().getPluginPreferences(); + Preferences preferences = PHPeclipsePlugin.getDefault() + .getPluginPreferences(); return preferences.getInt(CODE_FORMATTER_TAB_SIZE); } - private void startTabConversion() { if (fTabConverter == null) { fTabConverter = new TabConverter(); @@ -1394,7 +1434,6 @@ public class PHPUnitEditor extends PHPEditor { asv.updateIndentationPrefixes(); } } - private void stopTabConversion() { if (fTabConverter != null) { AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer(); @@ -1404,12 +1443,10 @@ public class PHPUnitEditor extends PHPEditor { fTabConverter = null; } } - private boolean isTabConversionEnabled() { IPreferenceStore store = getPreferenceStore(); return store.getBoolean(SPACES_FOR_TABS); } - // private void showOverviewRuler() { // AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer(); // asv.showOverviewRuler(); @@ -1434,56 +1471,47 @@ public class PHPUnitEditor extends PHPEditor { // IPreferenceStore store = getPreferenceStore(); // return store.getBoolean(OVERVIEW_RULER); // } - private Color getColor(String key) { RGB rgb = PreferenceConverter.getColor(getPreferenceStore(), key); return getColor(rgb); } - private Color getColor(RGB rgb) { JavaTextTools textTools = PHPeclipsePlugin.getDefault().getJavaTextTools(); return textTools.getColorManager().getColor(rgb); } - // private Color getColor(AnnotationType annotationType) { // AnnotationInfo info = (AnnotationInfo) ANNOTATION_MAP.get(annotationType); // if (info != null) // return getColor(info.fColorPreference); // return null; // } - public void dispose() { ISourceViewer sourceViewer = getSourceViewer(); if (sourceViewer instanceof ITextViewerExtension) - ((ITextViewerExtension) sourceViewer).removeVerifyKeyListener(fBracketInserter); - + ((ITextViewerExtension) sourceViewer) + .removeVerifyKeyListener(fBracketInserter); // if (fPropertyChangeListener != null) { - // Preferences preferences = PHPeclipsePlugin.getDefault().getPluginPreferences(); + // Preferences preferences = + // PHPeclipsePlugin.getDefault().getPluginPreferences(); // preferences.removePropertyChangeListener(fPropertyChangeListener); // fPropertyChangeListener = null; // } - if (fJavaEditorErrorTickUpdater != null) { fJavaEditorErrorTickUpdater.dispose(); fJavaEditorErrorTickUpdater = null; } - // if (fSelectionHistory != null) // fSelectionHistory.dispose(); - // if (fPaintManager != null) { // fPaintManager.dispose(); // fPaintManager = null; // } - if (fActionGroups != null) { fActionGroups.dispose(); fActionGroups = null; } - super.dispose(); } - // protected AnnotationType getAnnotationType(String preferenceKey) { // Iterator e = ANNOTATION_MAP.keySet().iterator(); // while (e.hasNext()) { @@ -1498,39 +1526,34 @@ public class PHPUnitEditor extends PHPEditor { // } // return null; // } - /* * @see AbstractTextEditor#handlePreferenceStoreChanged(PropertyChangeEvent) */ protected void handlePreferenceStoreChanged(PropertyChangeEvent event) { - try { - AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer(); if (asv != null) { - String p = event.getProperty(); - if (CLOSE_BRACKETS_PHP.equals(p)) { - fBracketInserter.setCloseBracketsPHPEnabled(getPreferenceStore().getBoolean(p)); + fBracketInserter.setCloseBracketsPHPEnabled(getPreferenceStore() + .getBoolean(p)); return; } - if (CLOSE_STRINGS_PHP.equals(p)) { - fBracketInserter.setCloseStringsPHPEnabled(getPreferenceStore().getBoolean(p)); + fBracketInserter.setCloseStringsPHPEnabled(getPreferenceStore() + .getBoolean(p)); return; } - if (CLOSE_BRACKETS_HTML.equals(p)) { - fBracketInserter.setCloseBracketsHTMLEnabled(getPreferenceStore().getBoolean(p)); + fBracketInserter.setCloseBracketsHTMLEnabled(getPreferenceStore() + .getBoolean(p)); return; } - if (CLOSE_STRINGS_HTML.equals(p)) { - fBracketInserter.setCloseStringsHTMLEnabled(getPreferenceStore().getBoolean(p)); + fBracketInserter.setCloseStringsHTMLEnabled(getPreferenceStore() + .getBoolean(p)); return; } - if (SPACES_FOR_TABS.equals(p)) { if (isTabConversionEnabled()) startTabConversion(); @@ -1538,7 +1561,6 @@ public class PHPUnitEditor extends PHPEditor { stopTabConversion(); return; } - if (MATCHING_BRACKETS.equals(p)) { if (isBracketHighlightingEnabled()) startBracketHighlighting(); @@ -1546,13 +1568,12 @@ public class PHPUnitEditor extends PHPEditor { stopBracketHighlighting(); return; } - if (MATCHING_BRACKETS_COLOR.equals(p)) { if (fBracketPainter != null) - fBracketPainter.setHighlightColor(getColor(MATCHING_BRACKETS_COLOR)); + fBracketPainter + .setHighlightColor(getColor(MATCHING_BRACKETS_COLOR)); return; } - if (CURRENT_LINE.equals(p)) { if (isLineHighlightingEnabled()) startLineHighlighting(); @@ -1560,7 +1581,6 @@ public class PHPUnitEditor extends PHPEditor { stopLineHighlighting(); return; } - if (CURRENT_LINE_COLOR.equals(p)) { if (fLinePainter != null) { stopLineHighlighting(); @@ -1568,7 +1588,6 @@ public class PHPUnitEditor extends PHPEditor { } return; } - if (PRINT_MARGIN.equals(p)) { if (isPrintMarginVisible()) showPrintMargin(); @@ -1576,19 +1595,18 @@ public class PHPUnitEditor extends PHPEditor { hidePrintMargin(); return; } - if (PRINT_MARGIN_COLOR.equals(p)) { if (fPrintMarginPainter != null) - fPrintMarginPainter.setMarginRulerColor(getColor(PRINT_MARGIN_COLOR)); + fPrintMarginPainter + .setMarginRulerColor(getColor(PRINT_MARGIN_COLOR)); return; } - if (PRINT_MARGIN_COLUMN.equals(p)) { if (fPrintMarginPainter != null) - fPrintMarginPainter.setMarginRulerColumn(getPreferenceStore().getInt(PRINT_MARGIN_COLUMN)); + fPrintMarginPainter.setMarginRulerColumn(getPreferenceStore() + .getInt(PRINT_MARGIN_COLUMN)); return; } - // if (OVERVIEW_RULER.equals(p)) { // if (isOverviewRulerVisible()) // showOverviewRuler(); @@ -1596,7 +1614,6 @@ public class PHPUnitEditor extends PHPEditor { // hideOverviewRuler(); // return; // } - // AnnotationType type = getAnnotationType(p); // if (type != null) { // @@ -1627,21 +1644,20 @@ public class PHPUnitEditor extends PHPEditor { // return; // } // } - IContentAssistant c = asv.getContentAssistant(); if (c instanceof ContentAssistant) - ContentAssistPreference.changeConfiguration((ContentAssistant) c, getPreferenceStore(), event); + ContentAssistPreference.changeConfiguration((ContentAssistant) c, + getPreferenceStore(), event); } - } finally { super.handlePreferenceStoreChanged(event); } } - /* - * @see org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#handlePreferencePropertyChanged(org.eclipse.core.runtime.Preferences.PropertyChangeEvent) - */ - protected void handlePreferencePropertyChanged(org.eclipse.core.runtime.Preferences.PropertyChangeEvent event) { + * @see org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#handlePreferencePropertyChanged(org.eclipse.core.runtime.Preferences.PropertyChangeEvent) + */ + protected void handlePreferencePropertyChanged( + org.eclipse.core.runtime.Preferences.PropertyChangeEvent event) { AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer(); if (asv != null) { String p = event.getProperty(); @@ -1653,15 +1669,16 @@ public class PHPUnitEditor extends PHPEditor { } super.handlePreferencePropertyChanged(event); } - /** - * Handles a property change event describing a change - * of the php core's preferences and updates the preference - * related editor properties. + * Handles a property change event describing a change of the php core's + * preferences and updates the preference related editor properties. * - * @param event the property change event + * @param event + * the property change event */ - // protected void handlePreferencePropertyChanged(org.eclipse.core.runtime.Preferences.PropertyChangeEvent event) { + // protected void + // handlePreferencePropertyChanged(org.eclipse.core.runtime.Preferences.PropertyChangeEvent + // event) { // AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer(); // if (asv != null) { // String p = event.getProperty(); @@ -1672,22 +1689,19 @@ public class PHPUnitEditor extends PHPEditor { // } // } // } - /* * @see PHPEditor#createJavaSourceViewer(Composite, IVerticalRuler, int) */ - protected ISourceViewer createJavaSourceViewer( - Composite parent, - IVerticalRuler verticalRuler, - IOverviewRuler overviewRuler, - boolean isOverviewRulerVisible, - int styles) { - return new AdaptedSourceViewer(parent, verticalRuler, overviewRuler, isOverviewRulerVisible, styles); + protected ISourceViewer createJavaSourceViewer(Composite parent, + IVerticalRuler verticalRuler, IOverviewRuler overviewRuler, + boolean isOverviewRulerVisible, int styles) { + return new AdaptedSourceViewer(parent, verticalRuler, overviewRuler, + isOverviewRulerVisible, styles); } - // protected ISourceViewer createJavaSourceViewer(Composite parent, IVerticalRuler ruler, int styles) { + // protected ISourceViewer createJavaSourceViewer(Composite parent, + // IVerticalRuler ruler, int styles) { // return new AdaptedSourceViewer(parent, ruler, styles); // } - private boolean isValidSelection(int offset, int length) { IDocumentProvider provider = getDocumentProvider(); if (provider != null) { @@ -1695,17 +1709,17 @@ public class PHPUnitEditor extends PHPEditor { if (document != null) { int end = offset + length; int documentLength = document.getLength(); - return 0 <= offset && offset <= documentLength && 0 <= end && end <= documentLength; + return 0 <= offset && offset <= documentLength && 0 <= end + && end <= documentLength; } } return false; } - /* * @see AbstractTextEditor#canHandleMove(IEditorInput, IEditorInput) */ - protected boolean canHandleMove(IEditorInput originalElement, IEditorInput movedElement) { - + protected boolean canHandleMove(IEditorInput originalElement, + IEditorInput movedElement) { String oldExtension = ""; //$NON-NLS-1$ if (originalElement instanceof IFileEditorInput) { IFile file = ((IFileEditorInput) originalElement).getFile(); @@ -1715,73 +1729,71 @@ public class PHPUnitEditor extends PHPEditor { oldExtension = ext; } } - String newExtension = ""; //$NON-NLS-1$ if (movedElement instanceof IFileEditorInput) { IFile file = ((IFileEditorInput) movedElement).getFile(); if (file != null) newExtension = file.getFileExtension(); } - return oldExtension.equals(newExtension); } - /* * @see AbstractTextEditor#editorContextMenuAboutToShow(IMenuManager) */ public void editorContextMenuAboutToShow(IMenuManager menu) { super.editorContextMenuAboutToShow(menu); - - ActionContext context = new ActionContext(getSelectionProvider().getSelection()); + ActionContext context = new ActionContext(getSelectionProvider() + .getSelection()); fContextMenuGroup.setContext(context); fContextMenuGroup.fillContextMenu(menu); fContextMenuGroup.setContext(null); } - /* * @see JavaEditor#setOutlinePageInput(JavaOutlinePage, IEditorInput) */ protected void setOutlinePageInput(JavaOutlinePage page, IEditorInput input) { if (page != null) { - IWorkingCopyManager manager = PHPeclipsePlugin.getDefault().getWorkingCopyManager(); + IWorkingCopyManager manager = PHPeclipsePlugin.getDefault() + .getWorkingCopyManager(); page.setInput(manager.getWorkingCopy(input)); } } - /* - * @see AbstractTextEditor#performSaveOperation(WorkspaceModifyOperation, IProgressMonitor) + * @see AbstractTextEditor#performSaveOperation(WorkspaceModifyOperation, + * IProgressMonitor) */ -// protected void performSaveOperation(WorkspaceModifyOperation operation, IProgressMonitor progressMonitor) { -// IDocumentProvider p = getDocumentProvider(); -// if (p instanceof PHPDocumentProvider) { -// PHPDocumentProvider cp = (PHPDocumentProvider) p; -// cp.setSavePolicy(fSavePolicy); -// } -// -// try { -// super.performSaveOperation(operation, progressMonitor); -// } finally { -// if (p instanceof PHPDocumentProvider) { -// PHPDocumentProvider cp = (PHPDocumentProvider) p; -// cp.setSavePolicy(null); -// } -// } -// } - + // protected void performSaveOperation(WorkspaceModifyOperation operation, + // IProgressMonitor progressMonitor) { + // IDocumentProvider p = getDocumentProvider(); + // if (p instanceof PHPDocumentProvider) { + // PHPDocumentProvider cp = (PHPDocumentProvider) p; + // cp.setSavePolicy(fSavePolicy); + // } + // + // try { + // super.performSaveOperation(operation, progressMonitor); + // } finally { + // if (p instanceof PHPDocumentProvider) { + // PHPDocumentProvider cp = (PHPDocumentProvider) p; + // cp.setSavePolicy(null); + // } + // } + // } /* - * @see org.eclipse.ui.texteditor.AbstractTextEditor#performSave(boolean, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.ui.texteditor.AbstractTextEditor#performSave(boolean, + * org.eclipse.core.runtime.IProgressMonitor) */ protected void performSave(boolean overwrite, IProgressMonitor progressMonitor) { - IDocumentProvider p= getDocumentProvider(); + IDocumentProvider p = getDocumentProvider(); if (p instanceof PHPDocumentProvider) { - PHPDocumentProvider cp= (PHPDocumentProvider) p; + PHPDocumentProvider cp = (PHPDocumentProvider) p; cp.setSavePolicy(fSavePolicy); } try { super.performSave(overwrite, progressMonitor); } finally { if (p instanceof PHPDocumentProvider) { - PHPDocumentProvider cp= (PHPDocumentProvider) p; + PHPDocumentProvider cp = (PHPDocumentProvider) p; cp.setSavePolicy(null); } } @@ -1794,63 +1806,58 @@ public class PHPUnitEditor extends PHPEditor { super.doSaveAs(); } } - /* - * @see AbstractTextEditor#doSave(IProgressMonitor) - */ + * @see AbstractTextEditor#doSave(IProgressMonitor) + */ public void doSave(IProgressMonitor progressMonitor) { - IDocumentProvider p = getDocumentProvider(); if (p == null) { // editor has been closed return; } - if (!askIfNonWorkbenchEncodingIsOk()) { progressMonitor.setCanceled(true); return; } - if (p.isDeleted(getEditorInput())) { - if (isSaveAsAllowed()) { - /* - * 1GEUSSR: ITPUI:ALL - User should never loose changes made in the editors. - * Changed Behavior to make sure that if called inside a regular save (because - * of deletion of input element) there is a way to report back to the caller. + * 1GEUSSR: ITPUI:ALL - User should never loose changes made in the + * editors. Changed Behavior to make sure that if called inside a + * regular save (because of deletion of input element) there is a way + * to report back to the caller. */ // performSaveAs(progressMonitor); super.doSave(progressMonitor); } else { - - /* + /* * 1GF5YOX: ITPJUI:ALL - Save of delete file claims it's still there * Missing resources. */ Shell shell = getSite().getShell(); - MessageDialog.openError(shell, PHPEditorMessages.getString("PHPUnitEditor.error.saving.title1"), PHPEditorMessages.getString("PHPUnitEditor.error.saving.message1")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog.openError(shell, PHPEditorMessages + .getString("PHPUnitEditor.error.saving.title1"), PHPEditorMessages + .getString("PHPUnitEditor.error.saving.message1")); //$NON-NLS-1$ //$NON-NLS-2$ } - } else { - setStatusLineErrorMessage(null); super.doSave(progressMonitor); - - // IWorkingCopyManager manager= JavaPlugin.getDefault().getWorkingCopyManager(); + // IWorkingCopyManager manager= + // JavaPlugin.getDefault().getWorkingCopyManager(); // ICompilationUnit unit= manager.getWorkingCopy(getEditorInput()); // // if (unit != null) { - // synchronized (unit) { - // performSaveOperation(createSaveOperation(false), progressMonitor); + // synchronized (unit) { + // performSaveOperation(createSaveOperation(false), progressMonitor); // } - // } else + // } else // performSaveOperation(createSaveOperation(false), progressMonitor); } } /** * Asks the user if it is ok to store in non-workbench encoding. - * @return if the user wants to continue + * + * @return if the user wants to continue */ private boolean askIfNonWorkbenchEncodingIsOk() { IDocumentProvider provider = getDocumentProvider(); @@ -1861,20 +1868,29 @@ public class PHPUnitEditor extends PHPEditor { String defaultEncoding = storageProvider.getDefaultEncoding(); if (encoding != null && !encoding.equals(defaultEncoding)) { Shell shell = getSite().getShell(); - String title = PHPEditorMessages.getString("PHPUnitEditor.warning.save.nonWorkbenchEncoding.title"); //$NON-NLS-1$ + String title = PHPEditorMessages + .getString("PHPUnitEditor.warning.save.nonWorkbenchEncoding.title"); //$NON-NLS-1$ String msg; if (input != null) - msg = MessageFormat.format(PHPEditorMessages.getString("PHPUnitEditor.warning.save.nonWorkbenchEncoding.message1"), new String[] { input.getName(), encoding }); //$NON-NLS-1$ + msg = MessageFormat + .format( + PHPEditorMessages + .getString("PHPUnitEditor.warning.save.nonWorkbenchEncoding.message1"), + new String[]{input.getName(), encoding}); //$NON-NLS-1$ else - msg = MessageFormat.format(PHPEditorMessages.getString("PHPUnitEditor.warning.save.nonWorkbenchEncoding.message2"), new String[] { encoding }); //$NON-NLS-1$ + msg = MessageFormat + .format( + PHPEditorMessages + .getString("PHPUnitEditor.warning.save.nonWorkbenchEncoding.message2"), + new String[]{encoding}); //$NON-NLS-1$ return MessageDialog.openQuestion(shell, title, msg); } } return true; } /* - * @see IReconcilingParticipant#reconciled() - */ + * @see IReconcilingParticipant#reconciled() + */ public void reconciled() { if (synchronizeOutlineOnCursorMove()) { Shell shell = getSite().getShell(); @@ -1887,45 +1903,41 @@ public class PHPUnitEditor extends PHPEditor { } } } - - private boolean synchronizeOutlineOnCursorMove() { - return PreferenceConstants.getPreferenceStore().getBoolean(PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE); - } + protected void updateStateDependentActions() { super.updateStateDependentActions(); fGenerateActionGroup.editorStateChanged(); } + + private boolean synchronizeOutlineOnCursorMove() { + return PreferenceConstants.getPreferenceStore().getBoolean( + PreferenceConstants.EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE); + } /** * Returns the updated java element for the old java element. */ private IJavaElement findElement(IJavaElement element) { - if (element == null) return null; - - IWorkingCopyManager manager = PHPeclipsePlugin.getDefault().getWorkingCopyManager(); + IWorkingCopyManager manager = PHPeclipsePlugin.getDefault() + .getWorkingCopyManager(); ICompilationUnit unit = manager.getWorkingCopy(getEditorInput()); - if (unit != null) { try { - synchronized (unit) { unit.reconcile(); } IJavaElement[] findings = unit.findElements(element); if (findings != null && findings.length > 0) return findings[0]; - } catch (JavaModelException x) { PHPeclipsePlugin.log(x.getStatus()); // nothing found, be tolerant and go on } } - return null; } - /** * Returns the offset of the given Java element. */ @@ -1941,40 +1953,37 @@ public class PHPUnitEditor extends PHPEditor { } return -1; } - /* * @see AbstractTextEditor#rememberSelection() */ protected void rememberSelection() { ISelectionProvider sp = getSelectionProvider(); - fRememberedSelection = (sp == null ? null : (ITextSelection) sp.getSelection()); + fRememberedSelection = (sp == null ? null : (ITextSelection) sp + .getSelection()); if (fRememberedSelection != null) { fRememberedElement = getElementAt(fRememberedSelection.getOffset(), true); fRememberedElementOffset = getOffset(fRememberedElement); } } - /* * @see AbstractTextEditor#restoreSelection() */ protected void restoreSelection() { - try { - if (getSourceViewer() == null || fRememberedSelection == null) return; - IJavaElement newElement = findElement(fRememberedElement); int newOffset = getOffset(newElement); - int delta = (newOffset > -1 && fRememberedElementOffset > -1) ? newOffset - fRememberedElementOffset : 0; - if (isValidSelection(delta + fRememberedSelection.getOffset(), fRememberedSelection.getLength())) - selectAndReveal(delta + fRememberedSelection.getOffset(), fRememberedSelection.getLength()); - + int delta = (newOffset > -1 && fRememberedElementOffset > -1) ? newOffset + - fRememberedElementOffset : 0; + if (isValidSelection(delta + fRememberedSelection.getOffset(), + fRememberedSelection.getLength())) + selectAndReveal(delta + fRememberedSelection.getOffset(), + fRememberedSelection.getLength()); } finally { fRememberedSelection = null; fRememberedElement = null; fRememberedElementOffset = -1; } } - }