true iff the Java element contains the offset
+ */
+ private boolean containsOffset(IJavaElement element, int offset) {
+ int elementOffset = getOffset(element);
+ int elementLength = getLength(element);
+ return (elementOffset > -1 && elementLength > -1) ? (offset >= elementOffset && offset < elementOffset + elementLength)
+ : false;
+ }
+
+ /**
+ * Returns the offset of the given Java element.
+ *
+ * @param element
+ * Java element
+ * @return Offset of the given Java element
+ */
+ private int getOffset(IJavaElement element) {
+ if (element instanceof ISourceReference) {
+ ISourceReference sr = (ISourceReference) element;
+ try {
+ ISourceRange srcRange = sr.getSourceRange();
+ if (srcRange != null)
+ return srcRange.getOffset();
+ } catch (JavaModelException e) {
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * Returns the length of the given Java element.
+ *
+ * @param element
+ * Java element
+ * @return Length of the given Java element
+ */
+ private int getLength(IJavaElement element) {
+ if (element instanceof ISourceReference) {
+ ISourceReference sr = (ISourceReference) element;
+ try {
+ ISourceRange srcRange = sr.getSourceRange();
+ if (srcRange != null)
+ return srcRange.getLength();
+ } catch (JavaModelException e) {
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * Returns the updated java element for the old java element.
+ *
+ * @param element
+ * Old Java element
+ * @return Updated Java element
+ */
+ private IJavaElement findElement(IJavaElement element) {
+
+ if (element == null)
+ return null;
+
+ IWorkingCopyManager manager = PHPeclipsePlugin.getDefault().getWorkingCopyManager();
+ ICompilationUnit unit = manager.getWorkingCopy(getEditorInput());
+
+ if (unit != null) {
+ try {
+
+ synchronized (unit) {
+ // unit.reconcile(ICompilationUnit.NO_AST, false, null, null);
+ 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;
+ }
+
+ }
static class TabConverter implements ITextConverter {
private int fTabRatio;
@@ -531,8 +821,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
return remainder;
}
- public void customizeDocumentCommand(IDocument document,
- DocumentCommand command) {
+ public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
String text = command.text;
if (text == null)
return;
@@ -548,8 +837,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
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();
@@ -581,12 +869,10 @@ public class PHPUnitEditor extends PHPEditor { //implements
* @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);
}
@@ -615,11 +901,12 @@ public class PHPUnitEditor extends PHPEditor { //implements
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 fCloseStringsPHPDQ = true;
+
+ private boolean fCloseStringsPHPSQ = true;
private boolean fCloseBracketsHTML = true;
@@ -633,8 +920,12 @@ public class PHPUnitEditor extends PHPEditor { //implements
fCloseBracketsPHP = enabled;
}
- public void setCloseStringsPHPEnabled(boolean enabled) {
- fCloseStringsPHP = enabled;
+ public void setCloseStringsPHPDQEnabled(boolean enabled) {
+ fCloseStringsPHPDQ = enabled;
+ }
+
+ public void setCloseStringsPHPSQEnabled(boolean enabled) {
+ fCloseStringsPHPSQ = enabled;
}
public void setCloseBracketsHTMLEnabled(boolean enabled) {
@@ -652,8 +943,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
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;
@@ -665,18 +955,15 @@ public class PHPUnitEditor extends PHPEditor { //implements
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);
@@ -704,7 +991,8 @@ public class PHPUnitEditor extends PHPEditor { //implements
try {
ITypedRegion partition = document.getPartition(offset);
String type = partition.getType();
- if (type.equals(IPHPPartitions.PHP_PARTITIONING)) {
+ if (type.equals(IPHPPartitions.PHP_PARTITIONING) || type.equals(IDocument.DEFAULT_CONTENT_TYPE)) {
+ // you will get IDocument.DEFAULT_CONTENT_TYPE for both PHP and HTML area
switch (event.character) {
case '(':
if (hasCharacterToTheRight(document, offset + length, '('))
@@ -718,7 +1006,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
// fall through
case '"':
if (event.character == '"') {
- if (!fCloseStringsPHP)
+ if (!fCloseStringsPHPDQ)
return;
// changed for statements like echo "" print ""
// if (hasIdentifierToTheLeft(document, offset)
@@ -735,46 +1023,36 @@ public class PHPUnitEditor extends PHPEditor { //implements
// &&
// (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);
- manager.addPosition(offset + 1, 0);
+ final char characterDQ = event.character;
+ final char closingCharacterDQ = getPeerCharacter(characterDQ);
+ final StringBuffer bufferDQ = new StringBuffer();
+ bufferDQ.append(characterDQ);
+ bufferDQ.append(closingCharacterDQ);
+ document.replace(offset, length, bufferDQ.toString());
+ LinkedPositionManager managerDQ = new LinkedPositionManager(document);
+ managerDQ.addPosition(offset + 1, 0);
fOffset = offset;
fLength = 2;
- 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());
+ LinkedPositionUI editorDQ = new LinkedPositionUI(sourceViewer, managerDQ);
+ editorDQ.setCancelListener(this);
+ editorDQ.setExitPolicy(new ExitPolicy(closingCharacterDQ));
+ editorDQ.setFinalCaretOffset(offset + 2);
+ editorDQ.enter();
+ IRegion newSelectionDQ = editorDQ.getSelectedRegion();
+ sourceViewer.setSelectedRange(newSelectionDQ.getOffset(), newSelectionDQ.getLength());
event.doit = false;
- }
- } else if (type.equals(IPHPPartitions.HTML)
- || type.equals(IDocument.DEFAULT_CONTENT_TYPE)) {
- switch (event.character) {
- case '(':
- if (hasCharacterToTheRight(document, offset + length, '('))
- return;
- // fall through
- case '[':
- if (!fCloseBracketsHTML)
- return;
- if (hasIdentifierToTheRight(document, offset + length))
- return;
- // fall through
- case '"':
- if (event.character == '"') {
- if (!fCloseStringsHTML)
+ break;
+ // fall through
+ case '\'':
+ if (event.character == '\'') {
+ if (!fCloseStringsPHPSQ)
return;
- 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=
@@ -784,28 +1062,75 @@ public class PHPUnitEditor extends PHPEditor { //implements
// &&
// (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);
- manager.addPosition(offset + 1, 0);
+ final char characterSQ = event.character;
+ final char closingCharacterSQ = getPeerCharacter(characterSQ);
+ final StringBuffer bufferSQ = new StringBuffer();
+ bufferSQ.append(characterSQ);
+ bufferSQ.append(closingCharacterSQ);
+ document.replace(offset, length, bufferSQ.toString());
+ LinkedPositionManager managerSQ = new LinkedPositionManager(document);
+ managerSQ.addPosition(offset + 1, 0);
fOffset = offset;
fLength = 2;
- 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());
+ LinkedPositionUI editorSQ = new LinkedPositionUI(sourceViewer, managerSQ);
+ editorSQ.setCancelListener(this);
+ editorSQ.setExitPolicy(new ExitPolicy(closingCharacterSQ));
+ editorSQ.setFinalCaretOffset(offset + 2);
+ editorSQ.enter();
+ IRegion newSelectionSQ = editorSQ.getSelectedRegion();
+ sourceViewer.setSelectedRange(newSelectionSQ.getOffset(), newSelectionSQ.getLength());
event.doit = false;
}
}
+ // } else if (type.equals(IPHPPartitions.HTML)) {
+ // switch (event.character) {
+ // case '(':
+ // if (hasCharacterToTheRight(document, offset + length, '('))
+ // return;
+ // // fall through
+ // case '[':
+ // if (!fCloseBracketsHTML)
+ // return;
+ // if (hasIdentifierToTheRight(document, offset + length))
+ // return;
+ // // fall through
+ // case '"':
+ // if (event.character == '"') {
+ // if (!fCloseStringsHTML)
+ // return;
+ // 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))
+ // // 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);
+ // manager.addPosition(offset + 1, 0);
+ // fOffset = offset;
+ // fLength = 2;
+ // 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());
+ // event.doit = false;
+ // }
+ // }
} catch (BadLocationException e) {
}
}
@@ -830,24 +1155,23 @@ public class PHPUnitEditor extends PHPEditor { //implements
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 */
- private BracketPainter fBracketPainter;
+// private BracketPainter fBracketPainter;
/** The editor's bracket matcher */
private PHPPairMatcher fBracketMatcher;
/** The editor's line painter */
- private LinePainter fLinePainter;
+// private LinePainter fLinePainter;
/** The editor's print margin ruler painter */
- private PrintMarginPainter fPrintMarginPainter;
+// private PrintMarginPainter fPrintMarginPainter;
/** The editor's problem painter */
// private ProblemPainter fProblemPainter;
@@ -862,8 +1186,12 @@ public class PHPUnitEditor extends PHPEditor { //implements
/** The remembered java element */
private IJavaElement fRememberedElement;
- /** The remembered selection */
- private ITextSelection fRememberedSelection;
+ /**
+ * The remembered selection.
+ *
+ * @since 3.0
+ */
+ private RememberedSelection fRememberedSelection = new RememberedSelection();
/** The remembered php element offset */
private int fRememberedElementOffset;
@@ -890,25 +1218,25 @@ public class PHPUnitEditor extends PHPEditor { //implements
private final static String CODE_FORMATTER_TAB_SIZE = JavaCore.FORMATTER_TAB_SIZE;
/** Preference key for matching brackets */
- private final static String MATCHING_BRACKETS = PreferenceConstants.EDITOR_MATCHING_BRACKETS;
+// private final static String MATCHING_BRACKETS = PreferenceConstants.EDITOR_MATCHING_BRACKETS;
/** Preference key for matching brackets color */
- private final static String MATCHING_BRACKETS_COLOR = PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR;
+// private final static String MATCHING_BRACKETS_COLOR = PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR;
/** Preference key for highlighting current line */
- private final static String CURRENT_LINE = PreferenceConstants.EDITOR_CURRENT_LINE;
+// private final static String CURRENT_LINE = PreferenceConstants.EDITOR_CURRENT_LINE;
/** Preference key for highlight color of current line */
- private final static String CURRENT_LINE_COLOR = PreferenceConstants.EDITOR_CURRENT_LINE_COLOR;
+// private final static String CURRENT_LINE_COLOR = PreferenceConstants.EDITOR_CURRENT_LINE_COLOR;
/** Preference key for showing print marging ruler */
- private final static String PRINT_MARGIN = PreferenceConstants.EDITOR_PRINT_MARGIN;
+// private final static String PRINT_MARGIN = PreferenceConstants.EDITOR_PRINT_MARGIN;
/** Preference key for print margin ruler color */
- private final static String PRINT_MARGIN_COLOR = PreferenceConstants.EDITOR_PRINT_MARGIN_COLOR;
+// private final static String PRINT_MARGIN_COLOR = PreferenceConstants.EDITOR_PRINT_MARGIN_COLOR;
/** Preference key for print margin ruler column */
- private final static String PRINT_MARGIN_COLUMN = PreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN;
+// private final static String PRINT_MARGIN_COLUMN = PreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN;
/** Preference key for inserting spaces rather than tabs */
private final static String SPACES_FOR_TABS = PreferenceConstants.EDITOR_SPACES_FOR_TABS;
@@ -973,11 +1301,14 @@ public class PHPUnitEditor extends PHPEditor { //implements
/** 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;
- /** Preference key for automatically closing strings */
- private final static String CLOSE_STRINGS_PHP = PreferenceConstants.EDITOR_CLOSE_STRINGS_PHP;
+ /** Preference key for automatically closing double quoted strings */
+ private final static String CLOSE_STRINGS_DQ_PHP = PreferenceConstants.EDITOR_CLOSE_STRINGS_DQ_PHP;
+
+ /** Preference key for automatically closing single quoted strings */
+ private final static String CLOSE_STRINGS_SQ_PHP = PreferenceConstants.EDITOR_CLOSE_STRINGS_SQ_PHP;
/** Preference key for automatically wrapping Java strings */
- private final static String WRAP_STRINGS = PreferenceConstants.EDITOR_WRAP_STRINGS;
+// private final static String WRAP_STRINGS = PreferenceConstants.EDITOR_WRAP_STRINGS_DQ;
/** Preference key for automatically closing brackets and parenthesis */
private final static String CLOSE_BRACKETS_PHP = PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP;
@@ -989,7 +1320,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
private final static String ADD_JAVADOC_TAGS = PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS;
/** Preference key for automatically formatting phpdocs */
- private final static String FORMAT_JAVADOCS = PreferenceConstants.EDITOR_FORMAT_JAVADOCS;
+// private final static String FORMAT_JAVADOCS = PreferenceConstants.EDITOR_FORMAT_JAVADOCS;
/** Preference key for automatically closing strings */
private final static String CLOSE_STRINGS_HTML = PreferenceConstants.EDITOR_CLOSE_STRINGS_HTML;
@@ -1060,10 +1391,25 @@ public class PHPUnitEditor extends PHPEditor { //implements
/**
* Creates a new php unit editor.
*/
+
+ /**
+ * Reconciling listeners.
+ *
+ * @since 3.0
+ */
+ private ListenerList fReconcilingListeners = new ListenerList();
+
+ /**
+ * Mutex for the reconciler. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=63898 for a description of the problem.
+ * + * TODO remove once the underlying problem is solved. + *
+ */ + private final Object fReconcilerLock = new Object(); + 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$ @@ -1088,10 +1434,8 @@ public class PHPUnitEditor extends PHPEditor { //implements // //$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); + 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, @@ -1116,52 +1460,48 @@ public class PHPUnitEditor extends PHPEditor { //implements // //$NON-NLS-1$ //// WorkbenchHelp.setHelp(action, // IJavaHelpContextIds.PARAMETER_HINTS_ACTION); - action = new TextOperationAction(PHPEditorMessages.getResourceBundle(), - "Comment.", this, ITextOperationTarget.PREFIX); //$NON-NLS-1$ + 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 = 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); //$NON-NLS-1$ + action = new ToggleCommentAction(PHPEditorMessages.getResourceBundle(), "ToggleComment.", this); //$NON-NLS-1$ action.setActionDefinitionId(PHPEditorActionDefinitionIds.TOGGLE_COMMENT); setAction("ToggleComment", action); //$NON-NLS-1$ markAsStateDependentAction("ToggleComment", true); //$NON-NLS-1$ //WorkbenchHelp.setHelp(action, // IJavaHelpContextIds.TOGGLE_COMMENT_ACTION); configureToggleCommentAction(); - - action = new TextOperationAction(PHPEditorMessages.getResourceBundle(), - "Format.", this, ISourceViewer.FORMAT); //$NON-NLS-1$ + + 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$ + // 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(), @@ -1178,24 +1518,51 @@ public class PHPUnitEditor extends PHPEditor { //implements // markAsStateDependentAction("IndentOnTab", true); //$NON-NLS-1$ // markAsSelectionDependentAction("IndentOnTab", true); //$NON-NLS-1$ // + + 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.REMOVE_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)}); + fGenerateActionGroup= new GenerateActionGroup(this, ITextEditorActionConstants.GROUP_EDIT); +// ActionGroup rg= new RefactorActionGroup(this, ITextEditorActionConstants.GROUP_EDIT); + +// fActionGroups.addGroup(rg); + fActionGroups.addGroup(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) + }); } @@ -1207,11 +1574,9 @@ public class PHPUnitEditor extends PHPEditor { //implements } /** - * 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
@@ -1219,8 +1584,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
* 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 {
@@ -1257,15 +1621,14 @@ public class PHPUnitEditor extends PHPEditor { //implements
// 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();
+// if (isBracketHighlightingEnabled())
+// startBracketHighlighting();
+// if (isLineHighlightingEnabled())
+// startLineHighlighting();
+// if (isPrintMarginVisible())
+// showPrintMargin();
// Iterator e = ANNOTATION_MAP.keySet().iterator();
// while (e.hasNext()) {
// AnnotationType type = (AnnotationType) e.next();
@@ -1282,17 +1645,18 @@ public class PHPUnitEditor extends PHPEditor { //implements
// preferences.addPropertyChangeListener(fPropertyChangeListener);
IPreferenceStore preferenceStore = getPreferenceStore();
boolean closeBracketsPHP = preferenceStore.getBoolean(CLOSE_BRACKETS_PHP);
- boolean closeStringsPHP = preferenceStore.getBoolean(CLOSE_STRINGS_PHP);
+ boolean closeStringsPHPDQ = preferenceStore.getBoolean(CLOSE_STRINGS_DQ_PHP);
+ boolean closeStringsPHPSQ = preferenceStore.getBoolean(CLOSE_STRINGS_SQ_PHP);
boolean closeBracketsHTML = preferenceStore.getBoolean(CLOSE_BRACKETS_HTML);
boolean closeStringsHTML = preferenceStore.getBoolean(CLOSE_STRINGS_HTML);
fBracketInserter.setCloseBracketsPHPEnabled(closeBracketsPHP);
- fBracketInserter.setCloseStringsPHPEnabled(closeStringsPHP);
+ fBracketInserter.setCloseStringsPHPDQEnabled(closeStringsPHPDQ);
+ fBracketInserter.setCloseStringsPHPSQEnabled(closeStringsPHPSQ);
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) {
@@ -1307,157 +1671,85 @@ public class PHPUnitEditor extends PHPEditor { //implements
return '[';
case '"':
return character;
+ case '\'':
+ return character;
default:
throw new IllegalArgumentException();
}
}
- private void startBracketHighlighting() {
- if (fBracketPainter == null) {
- ISourceViewer sourceViewer = getSourceViewer();
- fBracketPainter = new BracketPainter(sourceViewer);
- fBracketPainter.setHighlightColor(getColor(MATCHING_BRACKETS_COLOR));
- // fPaintManager.addPainter(fBracketPainter);
- }
- }
-
- private void stopBracketHighlighting() {
- if (fBracketPainter != null) {
- // fPaintManager.removePainter(fBracketPainter);
- fBracketPainter.deactivate(true);
- fBracketPainter.dispose();
- fBracketPainter = null;
- }
- }
-
- private boolean isBracketHighlightingEnabled() {
- IPreferenceStore store = getPreferenceStore();
- return store.getBoolean(MATCHING_BRACKETS);
- }
-
- private void startLineHighlighting() {
- if (fLinePainter == null) {
- ISourceViewer sourceViewer = getSourceViewer();
- fLinePainter = new LinePainter(sourceViewer);
- fLinePainter.setHighlightColor(getColor(CURRENT_LINE_COLOR));
- // fPaintManager.addPainter(fLinePainter);
- }
- }
-
- private void stopLineHighlighting() {
- if (fLinePainter != null) {
- // fPaintManager.removePainter(fLinePainter);
- fLinePainter.deactivate(true);
- fLinePainter.dispose();
- 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));
- // fPaintManager.addPainter(fPrintMarginPainter);
- }
- }
+// private void startBracketHighlighting() {
+// if (fBracketPainter == null) {
+// ISourceViewer sourceViewer = getSourceViewer();
+// fBracketPainter = new BracketPainter(sourceViewer);
+// fBracketPainter.setHighlightColor(getColor(MATCHING_BRACKETS_COLOR));
+// // fPaintManager.addPainter(fBracketPainter);
+// }
+// }
+//
+// private void stopBracketHighlighting() {
+// if (fBracketPainter != null) {
+// // fPaintManager.removePainter(fBracketPainter);
+// fBracketPainter.deactivate(true);
+// fBracketPainter.dispose();
+// fBracketPainter = null;
+// }
+// }
+
+// private boolean isBracketHighlightingEnabled() {
+// IPreferenceStore store = getPreferenceStore();
+// return store.getBoolean(MATCHING_BRACKETS);
+// }
+
+// private void startLineHighlighting() {
+// if (fLinePainter == null) {
+// ISourceViewer sourceViewer = getSourceViewer();
+// fLinePainter = new LinePainter(sourceViewer);
+// fLinePainter.setHighlightColor(getColor(CURRENT_LINE_COLOR));
+// // fPaintManager.addPainter(fLinePainter);
+// }
+// }
+
+// private void stopLineHighlighting() {
+// if (fLinePainter != null) {
+// // fPaintManager.removePainter(fLinePainter);
+// fLinePainter.deactivate(true);
+// fLinePainter.dispose();
+// 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));
+// // fPaintManager.addPainter(fPrintMarginPainter);
+// }
+// }
+
+// private void hidePrintMargin() {
+// if (fPrintMarginPainter != null) {
+// // fPaintManager.removePainter(fPrintMarginPainter);
+// fPrintMarginPainter.deactivate(true);
+// fPrintMarginPainter.dispose();
+// fPrintMarginPainter = null;
+// }
+// }
+
+// private boolean isPrintMarginVisible() {
+// IPreferenceStore store = getPreferenceStore();
+// return store.getBoolean(PRINT_MARGIN);
+// }
- private void hidePrintMargin() {
- if (fPrintMarginPainter != null) {
- // fPaintManager.removePainter(fPrintMarginPainter);
- fPrintMarginPainter.deactivate(true);
- fPrintMarginPainter.dispose();
- 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);
- // }
- // fProblemPainter.setColor(annotationType, getColor(annotationType));
- // fProblemPainter.paintAnnotations(annotationType, true);
- // fProblemPainter.paint(IPainter.CONFIGURATION);
- // }
- //
- // private void shutdownAnnotationIndication() {
- // if (fProblemPainter != null) {
- //
- // if (!fProblemPainter.isPaintingAnnotations()) {
- //// fPaintManager.removePainter(fProblemPainter);
- // fProblemPainter.deactivate(true);
- // fProblemPainter.dispose();
- // fProblemPainter = null;
- // } else {
- // fProblemPainter.paint(IPainter.CONFIGURATION);
- // }
- // }
- // }
- //
- // private void stopAnnotationIndication(AnnotationType annotationType) {
- // if (fProblemPainter != null) {
- // fProblemPainter.paintAnnotations(annotationType, false);
- // shutdownAnnotationIndication();
- // }
- // }
- //
- // private boolean isAnnotationIndicationEnabled(AnnotationType
- // annotationType) {
- // IPreferenceStore store = getPreferenceStore();
- // AnnotationInfo info = (AnnotationInfo)
- // ANNOTATION_MAP.get(annotationType);
- // if (info != null)
- // return store.getBoolean(info.fEditorPreference);
- // return false;
- // }
- //
- // private boolean
- // isAnnotationIndicationInOverviewRulerEnabled(AnnotationType
- // annotationType) {
- // IPreferenceStore store = getPreferenceStore();
- // AnnotationInfo info = (AnnotationInfo)
- // ANNOTATION_MAP.get(annotationType);
- // if (info != null)
- // return store.getBoolean(info.fOverviewRulerPreference);
- // return false;
- // }
- //
- // private void showAnnotationIndicationInOverviewRuler(AnnotationType
- // annotationType, boolean show) {
- // AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer();
- // OverviewRuler ruler = asv.getOverviewRuler();
- // if (ruler != null) {
- // ruler.setColor(annotationType, getColor(annotationType));
- // ruler.showAnnotation(annotationType, show);
- // ruler.update();
- // }
- // }
- //
- // private void setColorInOverviewRuler(AnnotationType annotationType, Color
- // color) {
- // AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer();
- // OverviewRuler ruler = asv.getOverviewRuler();
- // if (ruler != null) {
- // ruler.setColor(annotationType, color);
- // ruler.update();
- // }
- // }
private int getTabSize() {
- Preferences preferences = PHPeclipsePlugin.getDefault()
- .getPluginPreferences();
+ Preferences preferences = PHPeclipsePlugin.getDefault().getPluginPreferences();
return preferences.getInt(CODE_FORMATTER_TAB_SIZE);
}
@@ -1466,30 +1758,6 @@ public class PHPUnitEditor extends PHPEditor { //implements
return store.getBoolean(SPACES_FOR_TABS);
}
- // private void showOverviewRuler() {
- // AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer();
- // asv.showOverviewRuler();
- //
- // OverviewRuler overviewRuler = asv.getOverviewRuler();
- // if (overviewRuler != null) {
- // for (int i = 0; i < ANNOTATION_LAYERS.length; i++) {
- // AnnotationType type = ANNOTATION_LAYERS[i];
- // overviewRuler.setLayer(type, i);
- // if (isAnnotationIndicationInOverviewRulerEnabled(type))
- // showAnnotationIndicationInOverviewRuler(type, true);
- // }
- // }
- // }
- //
- // private void hideOverviewRuler() {
- // AdaptedSourceViewer asv = (AdaptedSourceViewer) getSourceViewer();
- // asv.hideOverviewRuler();
- // }
- //
- // private boolean isOverviewRulerVisible() {
- // IPreferenceStore store = getPreferenceStore();
- // return store.getBoolean(OVERVIEW_RULER);
- // }
private Color getColor(String key) {
RGB rgb = PreferenceConverter.getColor(getPreferenceStore(), key);
return getColor(rgb);
@@ -1510,8 +1778,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
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();
@@ -1558,23 +1825,23 @@ public class PHPUnitEditor extends PHPEditor { //implements
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_DQ_PHP.equals(p)) {
+ fBracketInserter.setCloseStringsPHPDQEnabled(getPreferenceStore().getBoolean(p));
return;
}
- if (CLOSE_STRINGS_PHP.equals(p)) {
- fBracketInserter.setCloseStringsPHPEnabled(getPreferenceStore()
- .getBoolean(p));
+ if (CLOSE_STRINGS_SQ_PHP.equals(p)) {
+ fBracketInserter.setCloseStringsPHPSQEnabled(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)) {
@@ -1584,52 +1851,49 @@ public class PHPUnitEditor extends PHPEditor { //implements
stopTabConversion();
return;
}
- if (MATCHING_BRACKETS.equals(p)) {
- if (isBracketHighlightingEnabled())
- startBracketHighlighting();
- else
- stopBracketHighlighting();
- return;
- }
- if (MATCHING_BRACKETS_COLOR.equals(p)) {
- if (fBracketPainter != null)
- fBracketPainter
- .setHighlightColor(getColor(MATCHING_BRACKETS_COLOR));
- return;
- }
- if (CURRENT_LINE.equals(p)) {
- if (isLineHighlightingEnabled())
- startLineHighlighting();
- else
- stopLineHighlighting();
- return;
- }
- if (CURRENT_LINE_COLOR.equals(p)) {
- if (fLinePainter != null) {
- stopLineHighlighting();
- startLineHighlighting();
- }
- return;
- }
- if (PRINT_MARGIN.equals(p)) {
- if (isPrintMarginVisible())
- showPrintMargin();
- else
- hidePrintMargin();
- return;
- }
- if (PRINT_MARGIN_COLOR.equals(p)) {
- if (fPrintMarginPainter != null)
- fPrintMarginPainter
- .setMarginRulerColor(getColor(PRINT_MARGIN_COLOR));
- return;
- }
- if (PRINT_MARGIN_COLUMN.equals(p)) {
- if (fPrintMarginPainter != null)
- fPrintMarginPainter.setMarginRulerColumn(getPreferenceStore()
- .getInt(PRINT_MARGIN_COLUMN));
- return;
- }
+// if (MATCHING_BRACKETS.equals(p)) {
+// if (isBracketHighlightingEnabled())
+// startBracketHighlighting();
+// else
+// stopBracketHighlighting();
+// return;
+// }
+// if (MATCHING_BRACKETS_COLOR.equals(p)) {
+// if (fBracketPainter != null)
+// fBracketPainter.setHighlightColor(getColor(MATCHING_BRACKETS_COLOR));
+// return;
+// }
+// if (CURRENT_LINE.equals(p)) {
+// if (isLineHighlightingEnabled())
+// startLineHighlighting();
+// else
+// stopLineHighlighting();
+// return;
+// }
+// if (CURRENT_LINE_COLOR.equals(p)) {
+// if (fLinePainter != null) {
+// stopLineHighlighting();
+// startLineHighlighting();
+// }
+// return;
+// }
+// if (PRINT_MARGIN.equals(p)) {
+// if (isPrintMarginVisible())
+// showPrintMargin();
+// else
+// hidePrintMargin();
+// return;
+// }
+// if (PRINT_MARGIN_COLOR.equals(p)) {
+// if (fPrintMarginPainter != null)
+// fPrintMarginPainter.setMarginRulerColor(getColor(PRINT_MARGIN_COLOR));
+// return;
+// }
+// if (PRINT_MARGIN_COLUMN.equals(p)) {
+// if (fPrintMarginPainter != null)
+// fPrintMarginPainter.setMarginRulerColumn(getPreferenceStore().getInt(PRINT_MARGIN_COLUMN));
+// return;
+// }
// if (OVERVIEW_RULER.equals(p)) {
// if (isOverviewRulerVisible())
// showOverviewRuler();
@@ -1670,8 +1934,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
// }
IContentAssistant c = asv.getContentAssistant();
if (c instanceof ContentAssistant)
- ContentAssistPreference.changeConfiguration((ContentAssistant) c,
- getPreferenceStore(), event);
+ ContentAssistPreference.changeConfiguration((ContentAssistant) c, getPreferenceStore(), event);
}
} finally {
super.handlePreferenceStoreChanged(event);
@@ -1679,10 +1942,9 @@ public class PHPUnitEditor extends PHPEditor { //implements
}
/*
- * @see org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#handlePreferencePropertyChanged(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
+ * @see net.sourceforge.phpdt.internal.ui.javaeditor.JavaEditor#handlePreferencePropertyChanged(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
*/
- 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();
@@ -1696,8 +1958,8 @@ public class PHPUnitEditor extends PHPEditor { //implements
}
/**
- * 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
@@ -1716,15 +1978,12 @@ public class PHPUnitEditor extends PHPEditor { //implements
// }
// }
/*
- * @see org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#createJavaSourceViewer(org.eclipse.swt.widgets.Composite,
- * org.eclipse.jface.text.source.IVerticalRuler,
- * org.eclipse.jface.text.source.IOverviewRuler, boolean, int)
+ * @see net.sourceforge.phpdt.internal.ui.javaeditor.JavaEditor#createJavaSourceViewer(org.eclipse.swt.widgets.Composite,
+ * org.eclipse.jface.text.source.IVerticalRuler, org.eclipse.jface.text.source.IOverviewRuler, boolean, int)
*/
- protected ISourceViewer createJavaSourceViewer(Composite parent,
- IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
+ protected ISourceViewer createJavaSourceViewer(Composite parent, IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
boolean isOverviewRulerVisible, int styles, IPreferenceStore store) {
- return new AdaptedSourceViewer(parent, verticalRuler, overviewRuler,
- isOverviewRulerVisible, styles, store);
+ return new AdaptedSourceViewer(parent, verticalRuler, overviewRuler, isOverviewRulerVisible, styles, store);
}
// protected ISourceViewer createJavaSourceViewer(Composite parent,
@@ -1738,48 +1997,25 @@ public class PHPUnitEditor extends PHPEditor { //implements
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)
+ * @see net.sourceforge.phpdt.internal.ui.javaeditor.JavaEditor#getInputElement()
*/
- protected boolean canHandleMove(IEditorInput originalElement,
- IEditorInput movedElement) {
- String oldExtension = ""; //$NON-NLS-1$
- if (originalElement instanceof IFileEditorInput) {
- IFile file = ((IFileEditorInput) originalElement).getFile();
- if (file != null) {
- String ext = file.getFileExtension();
- if (ext != null)
- 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);
+ protected IJavaElement getInputJavaElement() {
+ return PHPeclipsePlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditorInput());
}
- /*
- * @see org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#getInputElement()
- */
- protected IJavaElement getInputJavaElement() {
- return PHPeclipsePlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditorInput());
- }
+
/*
* @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);
@@ -1790,15 +2026,13 @@ public class PHPUnitEditor extends PHPEditor { //implements
*/
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) {
@@ -1833,25 +2067,21 @@ public class PHPUnitEditor extends PHPEditor { //implements
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);
} else {
/*
- * 1GF5YOX: ITPJUI:ALL - Save of delete file claims it's still there
- * Missing resources.
+ * 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$
+ PHPEditorMessages.getString("PHPUnitEditor.error.saving.title1"), PHPEditorMessages.getString("PHPUnitEditor.error.saving.message1")); //$NON-NLS-1$ //$NON-NLS-2$
}
} else {
@@ -1861,8 +2091,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
updateState(getEditorInput());
validateState(getEditorInput());
- IWorkingCopyManager manager = PHPeclipsePlugin.getDefault()
- .getWorkingCopyManager();
+ IWorkingCopyManager manager = PHPeclipsePlugin.getDefault().getWorkingCopyManager();
ICompilationUnit unit = manager.getWorkingCopy(getEditorInput());
if (unit != null) {
@@ -1872,10 +2101,6 @@ public class PHPUnitEditor extends PHPEditor { //implements
} else
performSave(false, progressMonitor);
}
- ShowExternalPreviewAction a = ShowExternalPreviewAction.getInstance();
- if (a != null) {
- a.refresh();
- }
}
public boolean isSaveAsAllowed() {
@@ -1883,10 +2108,8 @@ public class PHPUnitEditor extends PHPEditor { //implements
}
/**
- * 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
*
* @param progressMonitor
* the progress monitor
@@ -1898,9 +2121,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
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);
@@ -1913,9 +2134,8 @@ public class PHPUnitEditor extends PHPEditor { //implements
}
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);
}
@@ -1941,8 +2161,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
try {
provider.aboutToChange(newInput);
- getDocumentProvider().saveDocument(progressMonitor, newInput,
- getDocumentProvider().getDocument(getEditorInput()), true);
+ getDocumentProvider().saveDocument(progressMonitor, newInput, getDocumentProvider().getDocument(getEditorInput()), true);
success = true;
} catch (CoreException x) {
@@ -1951,8 +2170,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
ErrorDialog
.openError(
shell,
- PHPEditorMessages
- .getString("CompilationUnitEditor.error.saving.title2"), PHPEditorMessages.getString("CompilationUnitEditor.error.saving.message2"), x.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
+ PHPEditorMessages.getString("CompilationUnitEditor.error.saving.title2"), PHPEditorMessages.getString("CompilationUnitEditor.error.saving.message2"), x.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
} finally {
provider.changed(newInput);
if (success)
@@ -1974,7 +2192,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
// /*
// * @see
- // org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#installOverrideIndicator(boolean)
+ // net.sourceforge.phpdt.internal.ui.javaeditor.JavaEditor#installOverrideIndicator(boolean)
// * @since 3.0
// */
// protected void installOverrideIndicator(boolean waitForReconcilation) {
@@ -1996,7 +2214,7 @@ public class PHPUnitEditor extends PHPEditor { //implements
//
// /*
// * @see
- // org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#uninstallOverrideIndicator()
+ // net.sourceforge.phpdt.internal.ui.javaeditor.JavaEditor#uninstallOverrideIndicator()
// * @since 3.0
// */
// protected void uninstallOverrideIndicator() {
@@ -2019,16 +2237,24 @@ public class PHPUnitEditor extends PHPEditor { //implements
}
}
- private void configureTabConverter() {
- if (fTabConverter != null) {
- IDocumentProvider provider = getDocumentProvider();
- if (provider instanceof PHPDocumentProvider) {
- PHPDocumentProvider cup = (PHPDocumentProvider) provider;
- fTabConverter.setLineTracker(cup.createLineTracker(getEditorInput()));
- }
- }
- }
-
+ // private void configureTabConverter() {
+ // if (fTabConverter != null) {
+ // IDocumentProvider provider = getDocumentProvider();
+ // if (provider instanceof PHPDocumentProvider) {
+ // PHPDocumentProvider cup = (PHPDocumentProvider) provider;
+ // fTabConverter.setLineTracker(cup.createLineTracker(getEditorInput()));
+ // }
+ // }
+ // }
+ private void configureTabConverter() {
+ if (fTabConverter != null) {
+ IDocumentProvider provider= getDocumentProvider();
+ if (provider instanceof ICompilationUnitDocumentProvider) {
+ ICompilationUnitDocumentProvider cup= (ICompilationUnitDocumentProvider) provider;
+ fTabConverter.setLineTracker(cup.createLineTracker(getEditorInput()));
+ }
+ }
+ }
private void startTabConversion() {
if (fTabConverter == null) {
fTabConverter = new TabConverter();
@@ -2052,23 +2278,36 @@ public class PHPUnitEditor extends PHPEditor { //implements
}
/*
- * @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();
- if (p instanceof PHPDocumentProvider) {
- PHPDocumentProvider cp = (PHPDocumentProvider) p;
- cp.setSavePolicy(fSavePolicy);
- }
- try {
- super.performSave(overwrite, progressMonitor);
- } finally {
- if (p instanceof PHPDocumentProvider) {
- PHPDocumentProvider cp = (PHPDocumentProvider) p;
- cp.setSavePolicy(null);
- }
- }
+// IDocumentProvider p = getDocumentProvider();
+// if (p instanceof PHPDocumentProvider) {
+// PHPDocumentProvider cp = (PHPDocumentProvider) p;
+// cp.setSavePolicy(fSavePolicy);
+// }
+// try {
+// super.performSave(overwrite, progressMonitor);
+// } finally {
+// if (p instanceof PHPDocumentProvider) {
+// PHPDocumentProvider cp = (PHPDocumentProvider) p;
+// cp.setSavePolicy(null);
+// }
+// }
+
+ IDocumentProvider p= getDocumentProvider();
+ if (p instanceof ICompilationUnitDocumentProvider) {
+ ICompilationUnitDocumentProvider cp= (ICompilationUnitDocumentProvider) p;
+ cp.setSavePolicy(fSavePolicy);
+ }
+ try {
+ super.performSave(overwrite, progressMonitor);
+ } finally {
+ if (p instanceof ICompilationUnitDocumentProvider) {
+ ICompilationUnitDocumentProvider cp= (ICompilationUnitDocumentProvider) p;
+ cp.setSavePolicy(null);
+ }
+ }
}
/*
@@ -2094,21 +2333,14 @@ public class PHPUnitEditor extends PHPEditor { //implements
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);
}
}
@@ -2116,39 +2348,54 @@ public class PHPUnitEditor extends PHPEditor { //implements
}
/*
- * @see IReconcilingParticipant#reconciled()
+ * @see net.sourceforge.phpdt.internal.ui.text.java.IJavaReconcilingListener#aboutToBeReconciled()
+ * @since 3.0
+ */
+ public void aboutToBeReconciled() {
+
+ // Notify AST provider
+ // PHPeclipsePlugin.getDefault().getASTProvider().aboutToBeReconciled(getInputJavaElement());
+
+ // Notify listeners
+ Object[] listeners = fReconcilingListeners.getListeners();
+ for (int i = 0, length = listeners.length; i < length; ++i)
+ ((IJavaReconcilingListener) listeners[i]).aboutToBeReconciled();
+ }
+
+ /*
+ * @see net.sourceforge.phpdt.internal.ui.text.java.IJavaReconcilingListener#reconciled(CompilationUnit, boolean, IProgressMonitor)
+ * @since 3.0
*/
- public void reconciled() {
- if (synchronizeOutlineOnCursorMove()) {
+ public void reconciled(CompilationUnit ast, boolean forced, IProgressMonitor progressMonitor) {
+
+ // Always notify AST provider
+ // PHPeclipsePlugin.getDefault().getASTProvider().reconciled(ast, getInputJavaElement());
+
+ // Notify listeners
+ // Object[] listeners = fReconcilingListeners.getListeners();
+ // for (int i = 0, length= listeners.length; i < length; ++i)
+ // ((IJavaReconcilingListener)listeners[i]).reconciled(ast, forced, progressMonitor);
+
+ // Update Java Outline page selection
+ if (!forced && !progressMonitor.isCanceled()) {
Shell shell = getSite().getShell();
if (shell != null && !shell.isDisposed()) {
shell.getDisplay().asyncExec(new Runnable() {
public void run() {
- synchronizeOutlinePageSelection();
+ selectionChanged();
}
});
}
}
}
- 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 {
@@ -2183,85 +2430,156 @@ public class PHPUnitEditor extends PHPEditor { //implements
}
/*
+ * @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());
+ // } finally {
+ // fRememberedSelection = null;
+ // fRememberedElement = null;
+ // fRememberedElementOffset = -1;
+ // }
+ // }
+ /**
+ * Tells whether this is the active editor in the active page.
+ *
+ * @return true if this is the active editor in the active page
+ * @see IWorkbenchPage#getActiveEditor();
+ */
+ protected final boolean isActiveEditor() {
+ IWorkbenchWindow window = getSite().getWorkbenchWindow();
+ IWorkbenchPage page = window.getActivePage();
+ if (page == null)
+ return false;
+ IEditorPart activeEditor = page.getActiveEditor();
+ return activeEditor != null && activeEditor.equals(this);
+ }
+
+ /**
+ * Adds the given listener. Has no effect if an identical listener was not already registered.
+ *
+ * @param listener
+ * The reconcile listener to be added
+ * @since 3.0
+ */
+ final void addReconcileListener(IJavaReconcilingListener listener) {
+ synchronized (fReconcilingListeners) {
+ fReconcilingListeners.add(listener);
+ }
+ }
+
+ /**
+ * Removes the given listener. Has no effect if an identical listener was not already registered.
+ *
+ * @param listener
+ * the reconcile listener to be removed
+ * @since 3.0
+ */
+ final void removeReconcileListener(IJavaReconcilingListener listener) {
+ synchronized (fReconcilingListeners) {
+ fReconcilingListeners.remove(listener);
+ }
+ }
+
+ protected void updateStateDependentActions() {
+ super.updateStateDependentActions();
+ fGenerateActionGroup.editorStateChanged();
+ }
+
+ /*
* @see AbstractTextEditor#rememberSelection()
*/
protected void rememberSelection() {
- ISelectionProvider sp = getSelectionProvider();
- fRememberedSelection = (sp == null ? null : (ITextSelection) sp
- .getSelection());
- if (fRememberedSelection != null) {
- fRememberedElement = getElementAt(fRememberedSelection.getOffset(), true);
- fRememberedElementOffset = getOffset(fRememberedElement);
- }
+ fRememberedSelection.remember();
}
/*
* @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());
- } finally {
- fRememberedSelection = null;
- fRememberedElement = null;
- fRememberedElementOffset = -1;
+ fRememberedSelection.restore();
+ }
+
+ /*
+ * @see AbstractTextEditor#canHandleMove(IEditorInput, IEditorInput)
+ */
+ protected boolean canHandleMove(IEditorInput originalElement, IEditorInput movedElement) {
+
+ String oldExtension = ""; //$NON-NLS-1$
+ if (originalElement instanceof IFileEditorInput) {
+ IFile file = ((IFileEditorInput) originalElement).getFile();
+ if (file != null) {
+ String ext = file.getFileExtension();
+ if (ext != null)
+ 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
- // org.eclipse.jdt.internal.ui.text.java.IJavaReconcilingListener#aboutToBeReconciled()
- // * @since 3.0
- // */
- // public void aboutToBeReconciled() {
- //
- // // Notify AST provider
- // PHPeclipsePlugin.getDefault().getASTProvider().aboutToBeReconciled(getInputJavaElement());
- //
- // // Notify listeners
- // Object[] listeners = fReconcilingListeners.getListeners();
- // for (int i = 0, length= listeners.length; i < length; ++i)
- // ((IJavaReconcilingListener)listeners[i]).aboutToBeReconciled();
- // }
- //
- // /*
- // * @see
- // org.eclipse.jdt.internal.ui.text.java.IJavaReconcilingListener#reconciled(CompilationUnit,
- // boolean, IProgressMonitor)
- // * @since 3.0
- // */
- // public void reconciled(net.sourceforge.phpdt.core.dom.CompilationUnit
- // ast, boolean forced, IProgressMonitor progressMonitor) {
- //
- // // Always notify AST provider
- // PHPeclipsePlugin.getDefault().getASTProvider().reconciled(ast,
- // getInputJavaElement());
- //
- // // Notify listeners
- // Object[] listeners = fReconcilingListeners.getListeners();
- // for (int i = 0, length= listeners.length; i < length; ++i)
- // ((IJavaReconcilingListener)listeners[i]).reconciled(ast, forced,
- // progressMonitor);
- //
- // // Update Java Outline page selection
- // if (!forced && !progressMonitor.isCanceled()) {
- // Shell shell= getSite().getShell();
- // if (shell != null && !shell.isDisposed()) {
- // shell.getDisplay().asyncExec(new Runnable() {
- // public void run() {
- // selectionChanged();
- // }
- // });
- // }
- // }
- // }
+ /*
+ * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#isPrefQuickDiffAlwaysOn()
+ */
+ protected boolean isPrefQuickDiffAlwaysOn() {
+ // reestablishes the behaviour from AbstractDecoratedTextEditor which was hacked by JavaEditor
+ // to disable the change bar for the class file (attached source) java editor.
+ IPreferenceStore store = getPreferenceStore();
+ return store.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.QUICK_DIFF_ALWAYS_ON);
+ }
+
+ /*
+ * @see net.sourceforge.phpdt.internal.ui.javaeditor.JavaEditor#getAdapter(java.lang.Class)
+ */
+ public Object getAdapter(Class required) {
+ if (SmartBackspaceManager.class.equals(required)) {
+ if (getSourceViewer() instanceof JavaSourceViewer) {
+ return ((JavaSourceViewer) getSourceViewer()).getBackspaceManager();
+ }
+ }
+
+ return super.getAdapter(required);
+ }
+
+ /**
+ * Returns the mutex for the reconciler. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=63898 for a description of the problem.
+ * + * TODO remove once the underlying problem is solved. + *
+ * + * @return the lock reconcilers may use to synchronize on + */ + public Object getReconcilerLock() { + return fReconcilerLock; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.texteditor.AbstractTextEditor#editorSaved() + */ + protected void editorSaved() { + super.editorSaved(); + ShowExternalPreviewAction a = ShowExternalPreviewAction.getInstance(); + if (a != null) { + a.refresh(ShowExternalPreviewAction.PHP_TYPE); + } + } } \ No newline at end of file