--- a/dwtx/jface/internal/text/source/DiffPainter.d	Wed Aug 27 14:49:30 2008 +0200
+++ b/dwtx/jface/internal/text/source/DiffPainter.d	Mon Sep 08 00:51:37 2008 +0200
@@ -343,7 +343,7 @@
     public void setModel(IAnnotationModel model) {
         IAnnotationModel newModel;
         if ( cast(IAnnotationModelExtension)model )
-            newModel= (cast(IAnnotationModelExtension) model).getAnnotationModel(IChangeRulerColumn.QUICK_DIFF_MODEL_ID);
+            newModel= (cast(IAnnotationModelExtension) model).getAnnotationModel(stringcast(IChangeRulerColumn.QUICK_DIFF_MODEL_ID));
         else
             newModel= model;
 
@@ -357,7 +357,7 @@
      */
     private void setDiffer(IAnnotationModel differ) {
         if ( cast(ILineDiffer)differ ) {
-            if (fLineDiffer !is differ) {
+            if ( cast(Object)fLineDiffer !is cast(Object)differ) {
                 if (fLineDiffer !is null)
                     (cast(IAnnotationModel) fLineDiffer).removeAnnotationModelListener(fAnnotationListener);
                 fLineDiffer= cast(ILineDiffer) differ;