--- a/dwtx/jface/text/source/SourceViewer.d	Sun Aug 24 02:22:48 2008 +0200
+++ b/dwtx/jface/text/source/SourceViewer.d	Sun Aug 24 02:26:23 2008 +0200
@@ -584,7 +584,7 @@
             if (getDocument() !is null)
                 fVisualAnnotationModel.disconnect(getDocument());
         
-            if ( fVisualAnnotationModel instanceof IAnnotationModelExtension)
+            if ( cast(IAnnotationModelExtension)fVisualAnnotationModel )
                 (cast(IAnnotationModelExtension)fVisualAnnotationModel).removeAnnotationModel(MODEL_ANNOTATION_MODEL);
             
             fVisualAnnotationModel= null;
@@ -618,7 +618,7 @@
      * @see ISourceViewer#getAnnotationModel()
      */
     public IAnnotationModel getAnnotationModel() {
-        if (fVisualAnnotationModel instanceof IAnnotationModelExtension) {
+        if ( cast(IAnnotationModelExtension)fVisualAnnotationModel ) {
             IAnnotationModelExtension extension= cast(IAnnotationModelExtension) fVisualAnnotationModel;
             return extension.getAnnotationModel(MODEL_ANNOTATION_MODEL);
         }
@@ -890,7 +890,7 @@
                     IFormattingContext context= null;
                     DocumentRewriteSession rewriteSession= null;
 
-                    if (document instanceof IDocumentExtension4) {
+                    if ( cast(IDocumentExtension4)document ) {
                         IDocumentExtension4 extension= cast(IDocumentExtension4) document;
                         DocumentRewriteSessionType type= selection.y is 0 || selection.y > 1000 ? DocumentRewriteSessionType.SEQUENTIAL : DocumentRewriteSessionType.UNRESTRICTED_SMALL;
                         rewriteSession= extension.startRewriteSession(type);
@@ -905,7 +905,7 @@
 
                         try {
 
-                            if (fContentFormatter instanceof IContentFormatterExtension) {
+                            if ( cast(IContentFormatterExtension)fContentFormatter ) {
                                 final IContentFormatterExtension extension= cast(IContentFormatterExtension) fContentFormatter;
                                 context= createFormattingContext();
                                 if (selection.y is 0) {
@@ -938,7 +938,7 @@
 
                     } finally {
 
-                        if (document instanceof IDocumentExtension4) {
+                        if ( cast(IDocumentExtension4)document ) {
                             IDocumentExtension4 extension= cast(IDocumentExtension4) document;
                             extension.stopRewriteSession(rewriteSession);
                         } else {
@@ -966,7 +966,7 @@
      */
     protected void updateSlaveDocuments(IDocument masterDocument) {
         ISlaveDocumentManager manager= getSlaveDocumentManager();
-        if (manager instanceof ISlaveDocumentManagerExtension) {
+        if ( cast(ISlaveDocumentManagerExtension)manager ) {
             ISlaveDocumentManagerExtension extension= cast(ISlaveDocumentManagerExtension) manager;
             IDocument[] slaves= extension.getSlaveDocuments(masterDocument);
             if (slaves !is null) {
@@ -1099,10 +1099,10 @@
      * @since 3.3
      */
     private bool isVerticalRulerOnlyShowingAnnotations() {
-        if (fVerticalRuler instanceof VerticalRuler)
+        if ( cast(VerticalRuler)fVerticalRuler )
             return true;
         
-        if (fVerticalRuler instanceof CompositeRuler) {
+        if ( cast(CompositeRuler)fVerticalRuler ) {
             Iterator iter= (cast(CompositeRuler)fVerticalRuler).getDecoratorIterator();
             return iter.hasNext() && iter.next() instanceof AnnotationRulerColumn && !iter.hasNext();
         }