--- a/dwtx/jface/text/contentassist/ContentAssistant.d	Sun Aug 24 02:22:48 2008 +0200
+++ b/dwtx/jface/text/contentassist/ContentAssistant.d	Sun Aug 24 02:26:23 2008 +0200
@@ -1535,16 +1535,16 @@
         switch (type) {
             case CONTEXT_SELECTOR:
             case PROPOSAL_SELECTOR:
-                if (fContentAssistSubjectControl instanceof IWidgetTokenOwnerExtension) {
+                if ( cast(IWidgetTokenOwnerExtension)fContentAssistSubjectControl ) {
                     IWidgetTokenOwnerExtension extension= cast(IWidgetTokenOwnerExtension) fContentAssistSubjectControl;
                     return extension.requestWidgetToken(this, WIDGET_PRIORITY);
-                } else if (fContentAssistSubjectControl instanceof IWidgetTokenOwner) {
+                } else if ( cast(IWidgetTokenOwner)fContentAssistSubjectControl ) {
                     IWidgetTokenOwner owner= cast(IWidgetTokenOwner) fContentAssistSubjectControl;
                     return owner.requestWidgetToken(this);
-                } else if (fViewer instanceof IWidgetTokenOwnerExtension) {
+                } else if ( cast(IWidgetTokenOwnerExtension)fViewer ) {
                     IWidgetTokenOwnerExtension extension= cast(IWidgetTokenOwnerExtension) fViewer;
                     return extension.requestWidgetToken(this, WIDGET_PRIORITY);
-                } else if (fViewer instanceof IWidgetTokenOwner) {
+                } else if ( cast(IWidgetTokenOwner)fViewer ) {
                     IWidgetTokenOwner owner= cast(IWidgetTokenOwner) fViewer;
                     return owner.requestWidgetToken(this);
                 }
@@ -1625,9 +1625,9 @@
     private void releaseWidgetToken(int type) {
         if (fListeners[CONTEXT_SELECTOR] is null && fListeners[PROPOSAL_SELECTOR] is null) {
             IWidgetTokenOwner owner= null;
-            if (fContentAssistSubjectControl instanceof IWidgetTokenOwner)
+            if ( cast(IWidgetTokenOwner)fContentAssistSubjectControl )
                 owner= cast(IWidgetTokenOwner) fContentAssistSubjectControl;
-            else if (fViewer instanceof IWidgetTokenOwner)
+            else if ( cast(IWidgetTokenOwner)fViewer )
                 owner= cast(IWidgetTokenOwner) fViewer;
             if (owner !is null)
                 owner.releaseWidgetToken(this);
@@ -1842,7 +1842,7 @@
         ICompletionProposal[] result= null;
 
         IContentAssistProcessor p= getProcessor(contentAssistSubjectControl, offset);
-        if (p instanceof ISubjectControlContentAssistProcessor) {
+        if ( cast(ISubjectControlContentAssistProcessor)p ) {
             result= (cast(ISubjectControlContentAssistProcessor) p).computeCompletionProposals(contentAssistSubjectControl, offset);
             fLastErrorMessage= p.getErrorMessage();
         }
@@ -1914,7 +1914,7 @@
         IContextInformation[] result= null;
 
         IContentAssistProcessor p= getProcessor(contentAssistSubjectControl, offset);
-        if (p instanceof ISubjectControlContentAssistProcessor) {
+        if ( cast(ISubjectControlContentAssistProcessor)p ) {
             result= (cast(ISubjectControlContentAssistProcessor) p).computeContextInformation(contentAssistSubjectControl, offset);
             fLastErrorMessage= p.getErrorMessage();
         }
@@ -1965,7 +1965,7 @@
      */
     IContextInformationPresenter getContextInformationPresenter(ITextViewer viewer, int offset) {
         IContextInformationValidator validator= getContextInformationValidator(viewer, offset);
-        if (validator instanceof IContextInformationPresenter)
+        if ( cast(IContextInformationPresenter)validator )
             return cast(IContextInformationPresenter) validator;
         return null;
     }
@@ -1981,7 +1981,7 @@
      */
     IContextInformationPresenter getContextInformationPresenter(IContentAssistSubjectControl contentAssistSubjectControl, int offset) {
         IContextInformationValidator validator= getContextInformationValidator(contentAssistSubjectControl, offset);
-        if (validator instanceof IContextInformationPresenter)
+        if ( cast(IContextInformationPresenter)validator )
             return cast(IContextInformationPresenter) validator;
         return null;
     }
@@ -2265,7 +2265,7 @@
             Object[] listeners= fCompletionListeners.getListeners();
             for (int i= 0; i < listeners.length; i++) {
                 ICompletionListener listener= cast(ICompletionListener)listeners[i];
-                if (listener instanceof ICompletionListenerExtension)
+                if ( cast(ICompletionListenerExtension)listener )
                     (cast(ICompletionListenerExtension)listener).assistSessionRestarted(event);
             }
         }