--- 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;