# HG changeset patch # User Frank Benoit # Date 1219537368 -7200 # Node ID 25170b5a8951ba00d7bcef8360d564589978fb1b # Parent 6dcb0baaa031383fbcc3aa230beb45bcbdb1d9b4 Regex this.outer change diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/AbstractHoverInformationControlManager.d --- a/dwtx/jface/text/AbstractHoverInformationControlManager.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/AbstractHoverInformationControlManager.d Sun Aug 24 02:22:48 2008 +0200 @@ -1121,7 +1121,7 @@ public InternalAccessor getInternalAccessor() { return new class() MyInternalAccessor { public void setHoverEnrichMode(EnrichMode mode) { - AbstractHoverInformationControlManager.this.setHoverEnrichMode(mode); + this.outer.setHoverEnrichMode(mode); } }; } diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/AbstractInformationControlManager.d --- a/dwtx/jface/text/AbstractInformationControlManager.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/AbstractInformationControlManager.d Sun Aug 24 02:22:48 2008 +0200 @@ -205,31 +205,31 @@ */ class MyInternalAccessor : InternalAccessor { public IInformationControl getCurrentInformationControl() { - return AbstractInformationControlManager.this.getCurrentInformationControl(); + return this.outer.getCurrentInformationControl(); } public void setInformationControlReplacer(InformationControlReplacer replacer) { - AbstractInformationControlManager.this.setInformationControlReplacer(replacer); + this.outer.setInformationControlReplacer(replacer); } public InformationControlReplacer getInformationControlReplacer() { - return AbstractInformationControlManager.this.getInformationControlReplacer(); + return this.outer.getInformationControlReplacer(); } public bool canReplace(IInformationControl control) { - return AbstractInformationControlManager.this.canReplace(control); + return this.outer.canReplace(control); } public bool isReplaceInProgress() { - return AbstractInformationControlManager.this.isReplaceInProgress(); + return this.outer.isReplaceInProgress(); } public void replaceInformationControl(bool takeFocus) { - AbstractInformationControlManager.this.replaceInformationControl(takeFocus); + this.outer.replaceInformationControl(takeFocus); } public void cropToClosestMonitor(Rectangle bounds) { - AbstractInformationControlManager.this.cropToClosestMonitor(bounds); + this.outer.cropToClosestMonitor(bounds); } public void setHoverEnrichMode(EnrichMode mode) { diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/AbstractLineTracker.d --- a/dwtx/jface/text/AbstractLineTracker.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/AbstractLineTracker.d Sun Aug 24 02:22:48 2008 +0200 @@ -242,11 +242,11 @@ */ private ILineTracker fDelegate= new class() ListLineTracker { public String[] getLegalLineDelimiters() { - return AbstractLineTracker.this.getLegalLineDelimiters(); + return this.outer.getLegalLineDelimiters(); } protected DelimiterInfo nextDelimiterInfo(String text, int offset) { - return AbstractLineTracker.this.nextDelimiterInfo(text, offset); + return this.outer.nextDelimiterInfo(text, offset); } }; /** @@ -372,11 +372,11 @@ fNeedsConversion= false; fDelegate= new class(cast(ListLineTracker) fDelegate) TreeLineTracker { protected DelimiterInfo nextDelimiterInfo(String text, int offset) { - return AbstractLineTracker.this.nextDelimiterInfo(text, offset); + return this.outer.nextDelimiterInfo(text, offset); } public String[] getLegalLineDelimiters() { - return AbstractLineTracker.this.getLegalLineDelimiters(); + return this.outer.getLegalLineDelimiters(); } }; } diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/DefaultUndoManager.d --- a/dwtx/jface/text/DefaultUndoManager.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/DefaultUndoManager.d Sun Aug 24 02:22:48 2008 +0200 @@ -509,7 +509,7 @@ protected bool attemptCommit() { pretendCommit(); if (isValid()) { - DefaultUndoManager.this.commit(); + this.outer.commit(); return true; } return false; diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/TextViewer.d --- a/dwtx/jface/text/TextViewer.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/TextViewer.d Sun Aug 24 02:22:48 2008 +0200 @@ -814,10 +814,10 @@ * viewer's document to maintain its own extent. */ public void install() { - TextViewer.this.addTextListener(this); + this.outer.addTextListener(this); fTextWidget.addLineBackgroundListener(this); - IDocument document= TextViewer.this.getDocument(); + IDocument document= this.outer.getDocument(); try { document.addPositionCategory(RANGE_CATEGORY); document.addPosition(RANGE_CATEGORY, fPosition); @@ -839,7 +839,7 @@ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=19612 - IDocument document= TextViewer.this.getDocument(); + IDocument document= this.outer.getDocument(); if (document !is null) { document.removePositionUpdater(this); document.removePosition(fPosition); @@ -848,7 +848,7 @@ if (fTextWidget !is null && !fTextWidget.isDisposed()) fTextWidget.removeLineBackgroundListener(this); - TextViewer.this.removeTextListener(this); + this.outer.removeTextListener(this); clear(); } @@ -930,10 +930,10 @@ * @see IFindReplaceTarget#getSelectionText() */ public String getSelectionText() { - Point s= TextViewer.this.getSelectedRange(); + Point s= this.outer.getSelectedRange(); if (s.x > -1 && s.y > -1) { try { - IDocument document= TextViewer.this.getDocument(); + IDocument document= this.outer.getDocument(); return document.get(s.x, s.y); } catch (BadLocationException x) { } @@ -952,16 +952,16 @@ * @see IFindReplaceTarget#replaceSelection(String) */ public void replaceSelection(String text, bool regExReplace) { - Point s= TextViewer.this.getSelectedRange(); + Point s= this.outer.getSelectedRange(); if (s.x > -1 && s.y > -1) { try { - IRegion matchRegion= TextViewer.this.getFindReplaceDocumentAdapter().replace(text, regExReplace); + IRegion matchRegion= this.outer.getFindReplaceDocumentAdapter().replace(text, regExReplace); int length= -1; if (matchRegion !is null) length= matchRegion.getLength(); if (text !is null && length > 0) - TextViewer.this.setSelectedRange(s.x, length); + this.outer.setSelectedRange(s.x, length); } catch (BadLocationException x) { } } @@ -971,14 +971,14 @@ * @see IFindReplaceTarget#isEditable() */ public bool isEditable() { - return TextViewer.this.isEditable(); + return this.outer.isEditable(); } /* * @see IFindReplaceTarget#getSelection() */ public Point getSelection() { - Point modelSelection= TextViewer.this.getSelectedRange(); + Point modelSelection= this.outer.getSelectedRange(); Point widgetSelection= modelSelection2WidgetSelection(modelSelection); return widgetSelection !is null ? widgetSelection : new Point(-1, -1); } @@ -1003,9 +1003,9 @@ if (fRange !is null) { IRegion range= fRange.getRange(); - modelOffset= TextViewer.this.findAndSelectInRange(modelOffset, findString, searchForward, caseSensitive, wholeWord, range.getOffset(), range.getLength(), regExSearch); + modelOffset= this.outer.findAndSelectInRange(modelOffset, findString, searchForward, caseSensitive, wholeWord, range.getOffset(), range.getLength(), regExSearch); } else { - modelOffset= TextViewer.this.findAndSelect(modelOffset, findString, searchForward, caseSensitive, wholeWord, regExSearch); + modelOffset= this.outer.findAndSelect(modelOffset, findString, searchForward, caseSensitive, wholeWord, regExSearch); } widgetOffset= modelOffset is -1 ? -1 : modelOffset2WidgetOffset(modelOffset); @@ -1016,7 +1016,7 @@ * @see IFindReplaceTarget#canPerformFind() */ public bool canPerformFind() { - return TextViewer.this.canPerformFind(); + return this.outer.canPerformFind(); } /* @@ -1051,10 +1051,10 @@ * @since 2.0 */ public Point getLineSelection() { - Point point= TextViewer.this.getSelectedRange(); + Point point= this.outer.getSelectedRange(); try { - IDocument document= TextViewer.this.getDocument(); + IDocument document= this.outer.getDocument(); // beginning of line int line= document.getLineOfOffset(point.x); @@ -1082,7 +1082,7 @@ * @since 2.0 */ public void setSelection(int modelOffset, int modelLength) { - TextViewer.this.setSelectedRange(modelOffset, modelLength); + this.outer.setSelectedRange(modelOffset, modelLength); } /* @@ -1121,7 +1121,7 @@ // http://bugs.eclipse.org/bugs/show_bug.cgi?id=18232 - IDocument document= TextViewer.this.getDocument(); + IDocument document= this.outer.getDocument(); if (replaceAll) { @@ -1129,8 +1129,8 @@ IDocumentExtension4 extension= cast(IDocumentExtension4) document; fRewriteSession= extension.startRewriteSession(DocumentRewriteSessionType.SEQUENTIAL); } else { - TextViewer.this.setRedraw(false); - TextViewer.this.startSequentialRewriteMode(false); + this.outer.setRedraw(false); + this.outer.startSequentialRewriteMode(false); if (fUndoManager !is null) fUndoManager.beginCompoundChange(); @@ -1144,8 +1144,8 @@ IDocumentExtension4 extension= cast(IDocumentExtension4) document; extension.stopRewriteSession(fRewriteSession); } else { - TextViewer.this.setRedraw(true); - TextViewer.this.stopSequentialRewriteMode(); + this.outer.setRedraw(true); + this.outer.stopSequentialRewriteMode(); if (fUndoManager !is null) fUndoManager.endCompoundChange(); @@ -1184,14 +1184,14 @@ * @see dwtx.jface.text.IRewriteTarget#getDocument() */ public IDocument getDocument() { - return TextViewer.this.getDocument(); + return this.outer.getDocument(); } /* * @see dwtx.jface.text.IRewriteTarget#setRedraw(bool) */ public void setRedraw(bool redraw) { - TextViewer.this.setRedraw(redraw); + this.outer.setRedraw(redraw); } } @@ -1541,7 +1541,7 @@ * @see dwtx.jface.text.IDocumentRewriteSessionListener#documentRewriteSessionChanged(dwtx.jface.text.DocumentRewriteSessionEvent) */ public void documentRewriteSessionChanged(DocumentRewriteSessionEvent event) { - IRewriteTarget target= TextViewer.this.getRewriteTarget(); + IRewriteTarget target= this.outer.getRewriteTarget(); // FIXME always use setRedraw to avoid flickering due to scrolling // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=158746 bool toggleRedraw= true || event.getSession().getSessionType() !is DocumentRewriteSessionType.UNRESTRICTED_SMALL; diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/contentassist/AdditionalInfoController.d --- a/dwtx/jface/text/contentassist/AdditionalInfoController.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/contentassist/AdditionalInfoController.d Sun Aug 24 02:22:48 2008 +0200 @@ -496,7 +496,7 @@ InformationControlReplacer replacer= getInternalAccessor().getInformationControlReplacer(); if (replacer !is null) replacer.hideInformationControl(); - AdditionalInfoController.this.showInformation(proposal, info); + this.outer.showInformation(proposal, info); } }; } diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/link/LinkedModeManager.d --- a/dwtx/jface/text/link/LinkedModeManager.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/link/LinkedModeManager.d Sun Aug 24 02:22:48 2008 +0200 @@ -55,7 +55,7 @@ * @see dwtx.jdt.internal.ui.text.link2.LinkedModeModel.ILinkedModeListener#left(dwtx.jdt.internal.ui.text.link2.LinkedModeModel, int) */ public void left(LinkedModeModel model, int flags) { - LinkedModeManager.this.left(model, flags); + this.outer.left(model, flags); } /* diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/link/LinkedModeModel.d --- a/dwtx/jface/text/link/LinkedModeModel.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/link/LinkedModeModel.d Sun Aug 24 02:22:48 2008 +0200 @@ -212,7 +212,7 @@ */ public void documentChanged(DocumentEvent event) { if (fExit) { - LinkedModeModel.this.exit(ILinkedModeListener.EXTERNAL_MODIFICATION); + this.outer.exit(ILinkedModeListener.EXTERNAL_MODIFICATION); return; } fExit= false; @@ -229,7 +229,7 @@ Map map= group.handleEvent(event); if (result !is null && map !is null) { // exit if more than one position was changed - LinkedModeModel.this.exit(ILinkedModeListener.EXTERNAL_MODIFICATION); + this.outer.exit(ILinkedModeListener.EXTERNAL_MODIFICATION); return; } if (map !is null) diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/source/AbstractRulerColumn.d --- a/dwtx/jface/text/source/AbstractRulerColumn.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/source/AbstractRulerColumn.d Sun Aug 24 02:22:48 2008 +0200 @@ -279,7 +279,7 @@ fCanvas.addPaintListener(new class() PaintListener { public void paintControl(PaintEvent event) { - AbstractRulerColumn.this.paintControl(event); + this.outer.paintControl(event); } }); diff -r 6dcb0baaa031 -r 25170b5a8951 dwtx/jface/text/source/AnnotationModel.d --- a/dwtx/jface/text/source/AnnotationModel.d Sun Aug 24 02:20:40 2008 +0200 +++ b/dwtx/jface/text/source/AnnotationModel.d Sun Aug 24 02:22:48 2008 +0200 @@ -317,14 +317,14 @@ * @see dwtx.jface.text.source.IAnnotationModelListener#modelChanged(dwtx.jface.text.source.IAnnotationModel) */ public void modelChanged(IAnnotationModel model) { - AnnotationModel.this.fireModelChanged(new AnnotationModelEvent(model, true)); + this.outer.fireModelChanged(new AnnotationModelEvent(model, true)); } /* * @see dwtx.jface.text.source.IAnnotationModelListenerExtension#modelChanged(dwtx.jface.text.source.AnnotationModelEvent) */ public void modelChanged(AnnotationModelEvent event) { - AnnotationModel.this.fireModelChanged(event); + this.outer.fireModelChanged(event); } }