diff dwtx/jface/text/source/projection/ProjectionViewer.d @ 162:1a5b8f8129df

...
author Frank Benoit <benoit@tionex.de>
date Mon, 08 Sep 2008 00:51:37 +0200
parents 7926b636c282
children c3583c6ec027
line wrap: on
line diff
--- a/dwtx/jface/text/source/projection/ProjectionViewer.d	Wed Aug 27 14:49:30 2008 +0200
+++ b/dwtx/jface/text/source/projection/ProjectionViewer.d	Mon Sep 08 00:51:37 2008 +0200
@@ -25,8 +25,8 @@
 
 
 import dwt.dwthelper.utils;
-
 import dwtx.dwtxhelper.Collection;
+import tango.core.Exception;
 
 
 
@@ -87,6 +87,34 @@
  */
 public class ProjectionViewer : SourceViewer , ITextViewerExtension5 {
 
+    public override IRegion getModelCoverage() {
+        return super.getModelCoverage();
+    }
+    public override int modelLine2WidgetLine(int modelLine) {
+        return super.modelLine2WidgetLine(modelLine);
+    }
+    public override int modelOffset2WidgetOffset(int modelOffset) {
+        return super.modelOffset2WidgetOffset(modelOffset);
+    }
+    public override IRegion modelRange2WidgetRange(IRegion modelRange) {
+        return super.modelRange2WidgetRange(modelRange);
+    }
+    protected override IRegion modelRange2WidgetRange(Position modelPosition) {
+        return super.modelRange2WidgetRange(modelPosition);
+    }
+    public override int widgetOffset2ModelOffset(int widgetOffset) {
+        return super.widgetOffset2ModelOffset(widgetOffset);
+    }
+    public override IRegion widgetRange2ModelRange(IRegion widgetRange) {
+        return super.widgetRange2ModelRange(widgetRange);
+    }
+    public int widgetLine2ModelLine(int widgetLine) {
+        return super.widgetLine2ModelLine(widgetLine);
+    }
+    public int widgetLineOfWidgetOffset(int widgetOffset) {
+        return super.widgetLineOfWidgetOffset(widgetOffset);
+    }
+
     private static const int BASE= INFORMATION; // see ISourceViewer.INFORMATION
 
     /** Operation constant for the expand operation. */
@@ -186,9 +214,9 @@
      */
     private static class ProjectionCommand {
 
-        final static int ADD= 0;
-        final static int REMOVE= 1;
-        final static int INVALIDATE_PRESENTATION= 2;
+        const static int ADD= 0;
+        const static int REMOVE= 1;
+        const static int INVALIDATE_PRESENTATION= 2;
 
         ProjectionDocument fProjection;
         int fType;
@@ -240,9 +268,12 @@
         final static int REDRAW_COSTS= 15;
         final static int INVALIDATION_COSTS= 10;
 
-        List fList= new ArrayList(15);
+        List fList;
         int fExpectedExecutionCosts= -1;
 
+        this(){
+            fList= new ArrayList(15);
+        }
 
         void add(ProjectionCommand command) {
             fList.add(command);
@@ -460,13 +491,13 @@
      */
     public void addProjectionListener(IProjectionListener listener) {
 
-        Assert.isNotNull(listener);
+        Assert.isNotNull(cast(Object)listener);
 
         if (fProjectionListeners is null)
             fProjectionListeners= new ArrayList();
 
-        if (!fProjectionListeners.contains(listener))
-            fProjectionListeners.add(listener);
+        if (!fProjectionListeners.contains(cast(Object)listener))
+            fProjectionListeners.add(cast(Object)listener);
     }
 
     /**
@@ -478,10 +509,10 @@
      */
     public void removeProjectionListener(IProjectionListener listener) {
 
-        Assert.isNotNull(listener);
+        Assert.isNotNull(cast(Object)listener);
 
         if (fProjectionListeners !is null) {
-            fProjectionListeners.remove(listener);
+            fProjectionListeners.remove(cast(Object)listener);
             if (fProjectionListeners.size() is 0)
                 fProjectionListeners= null;
         }
@@ -888,7 +919,7 @@
                 try {
                     catchupWithProjectionAnnotationModel(event);
                 } catch (BadLocationException x) {
-                    throw new IllegalArgumentException();
+                    throw new IllegalArgumentException(null);
                 }
 
             } else
@@ -927,7 +958,7 @@
                                     try {
                                         catchupWithProjectionAnnotationModel(null);
                                     } catch (BadLocationException x1) {
-                                        throw new IllegalArgumentException();
+                                        throw new IllegalArgumentException(null);
                                     } finally {
                                         synchronized (fLock) {
                                             fPendingRequests.clear();
@@ -1548,7 +1579,7 @@
         IDocument document= getDocument();
         int length= document is null ? 0 : document.getLength();
         IRegion visible= getModelCoverage();
-        bool isSegmented= visible !is null && !visible.equals(new Region(0, length));
+        bool isSegmented= visible !is null && !(cast(Object)visible).opEquals(new Region(0, length));
         return isSegmented;
     }