# HG changeset patch # User Frank Benoit # Date 1219606140 -7200 # Node ID 893c017bcdc535309b1a15f846d9d95ab70d1a51 # Parent ea8dd2e11034cbcb0c6b9f80d0c0ed0c0d2bb6f0 instanceof diff -r ea8dd2e11034 -r 893c017bcdc5 dwtx/jface/internal/text/revisions/RevisionPainter.d --- a/dwtx/jface/internal/text/revisions/RevisionPainter.d Sun Aug 24 21:25:28 2008 +0200 +++ b/dwtx/jface/internal/text/revisions/RevisionPainter.d Sun Aug 24 21:29:00 2008 +0200 @@ -818,7 +818,7 @@ * @param differ the line differ or null if none */ private void setDiffer(IAnnotationModel differ) { - if (differ instanceof ILineDiffer || differ is null) { + if ( cast(ILineDiffer)differ || differ is null) { if (fLineDiffer !is differ) { if (fLineDiffer !is null) (cast(IAnnotationModel) fLineDiffer).removeAnnotationModelListener(fAnnotationListener); diff -r ea8dd2e11034 -r 893c017bcdc5 dwtx/jface/text/AbstractHoverInformationControlManager.d --- a/dwtx/jface/text/AbstractHoverInformationControlManager.d Sun Aug 24 21:25:28 2008 +0200 +++ b/dwtx/jface/text/AbstractHoverInformationControlManager.d Sun Aug 24 21:29:00 2008 +0200 @@ -828,11 +828,11 @@ return true; IInformationControl iControl= getCurrentInformationControl(); - if ((iControl instanceof IInformationControlExtension5 && !(cast(IInformationControlExtension5) iControl).isVisible())) { + if (( cast(IInformationControlExtension5)iControl && !(cast(IInformationControlExtension5) iControl).isVisible())) { iControl= null; if (getInformationControlReplacer() !is null) { iControl= getInformationControlReplacer().getCurrentInformationControl2(); - if ((iControl instanceof IInformationControlExtension5 && !(cast(IInformationControlExtension5) iControl).isVisible())) { + if (( cast(IInformationControlExtension5)iControl && !(cast(IInformationControlExtension5) iControl).isVisible())) { return false; } } diff -r ea8dd2e11034 -r 893c017bcdc5 dwtx/jface/text/information/InformationPresenter.d --- a/dwtx/jface/text/information/InformationPresenter.d Sun Aug 24 21:25:28 2008 +0200 +++ b/dwtx/jface/text/information/InformationPresenter.d Sun Aug 24 21:29:00 2008 +0200 @@ -433,7 +433,7 @@ * @see AbstractInformationControlManager#showInformationControl(Rectangle) */ protected void showInformationControl(Rectangle subjectArea) { - if (fTextViewer instanceof IWidgetTokenOwnerExtension && fTextViewer instanceof IWidgetTokenOwner) { + if ( cast(IWidgetTokenOwnerExtension)fTextViewer && fTextViewer instanceof IWidgetTokenOwner) { IWidgetTokenOwnerExtension extension= cast(IWidgetTokenOwnerExtension) fTextViewer; if (extension.requestWidgetToken(this, WIDGET_PRIORITY)) super.showInformationControl(subjectArea); diff -r ea8dd2e11034 -r 893c017bcdc5 dwtx/jface/text/source/AnnotationBarHoverManager.d --- a/dwtx/jface/text/source/AnnotationBarHoverManager.d Sun Aug 24 21:25:28 2008 +0200 +++ b/dwtx/jface/text/source/AnnotationBarHoverManager.d Sun Aug 24 21:29:00 2008 +0200 @@ -646,7 +646,7 @@ CompositeRuler comp= cast(CompositeRuler) fVerticalRulerInfo; for (Iterator it= comp.getDecoratorIterator(); it.hasNext();) { Object o= it.next(); - if (o instanceof IVerticalRulerInfoExtension && o instanceof IVerticalRulerInfo) { + if ( cast(IVerticalRulerInfoExtension)o && o instanceof IVerticalRulerInfo) { if ((cast(IVerticalRulerInfo) o).getControl() is event.getSource()) { IAnnotationHover hover= (cast(IVerticalRulerInfoExtension) o).getHover(); if (hover !is null) diff -r ea8dd2e11034 -r 893c017bcdc5 dwtx/jface/text/source/CompositeRuler.d --- a/dwtx/jface/text/source/CompositeRuler.d Sun Aug 24 21:25:28 2008 +0200 +++ b/dwtx/jface/text/source/CompositeRuler.d Sun Aug 24 21:29:00 2008 +0200 @@ -670,7 +670,7 @@ parent= extension.getControl(); } - if (parent instanceof Composite && !parent.isDisposed()) + if ( cast(Composite)parent && !parent.isDisposed()) (cast(Composite) parent).layout(true); } diff -r ea8dd2e11034 -r 893c017bcdc5 dwtx/jface/text/source/LineNumberRulerColumn.d --- a/dwtx/jface/text/source/LineNumberRulerColumn.d Sun Aug 24 21:25:28 2008 +0200 +++ b/dwtx/jface/text/source/LineNumberRulerColumn.d Sun Aug 24 21:29:00 2008 +0200 @@ -599,7 +599,7 @@ if ( cast(ITextViewerExtension)fCachedTextViewer ) { ITextViewerExtension extension= cast(ITextViewerExtension) fCachedTextViewer; Control control= extension.getControl(); - if (control instanceof Composite && !control.isDisposed()) { + if ( cast(Composite)control && !control.isDisposed()) { Composite composite= cast(Composite) control; composite.layout(true); } diff -r ea8dd2e11034 -r 893c017bcdc5 dwtx/jface/text/source/SourceViewer.d --- a/dwtx/jface/text/source/SourceViewer.d Sun Aug 24 21:25:28 2008 +0200 +++ b/dwtx/jface/text/source/SourceViewer.d Sun Aug 24 21:29:00 2008 +0200 @@ -435,7 +435,7 @@ fContentAssistant= configuration.getContentAssistant(this); if (fContentAssistant !is null) { fContentAssistant.install(this); - if (fContentAssistant instanceof IContentAssistantExtension4 && fContentAssistant instanceof IContentAssistantExtension4) + if ( cast(IContentAssistantExtension4)fContentAssistant && fContentAssistant instanceof IContentAssistantExtension4) fContentAssistantFacade= new ContentAssistantFacade(fContentAssistant); fContentAssistantInstalled= true; } diff -r ea8dd2e11034 -r 893c017bcdc5 dwtx/jface/text/source/projection/ProjectionSummary.d --- a/dwtx/jface/text/source/projection/ProjectionSummary.d Sun Aug 24 21:25:28 2008 +0200 +++ b/dwtx/jface/text/source/projection/ProjectionSummary.d Sun Aug 24 21:29:00 2008 +0200 @@ -174,7 +174,7 @@ IDocument document= fProjectionViewer.getDocument(); - if (document instanceof ISynchronizable && fAnnotationModel instanceof ISynchronizable) { + if ( cast(ISynchronizable)document && fAnnotationModel instanceof ISynchronizable) { ISynchronizable sync= cast(ISynchronizable) fAnnotationModel; previousLockObject= sync.getLockObject(); sync.setLockObject((cast(ISynchronizable) document).getLockObject());