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

...
author Frank Benoit <benoit@tionex.de>
date Mon, 08 Sep 2008 00:51:37 +0200
parents 7926b636c282
children
line wrap: on
line diff
--- a/dwtx/jface/text/source/OverviewRuler.d	Wed Aug 27 14:49:30 2008 +0200
+++ b/dwtx/jface/text/source/OverviewRuler.d	Mon Sep 08 00:51:37 2008 +0200
@@ -255,8 +255,8 @@
                     continue;
 
                 fNext= next;
-                Object annotationType= next.getType();
-                if (fType is null || fType.equals(annotationType) || !fConfiguredAnnotationTypes.contains(annotationType) && isSubtype(annotationType)) {
+                Object annotationType= stringcast(next.getType());
+                if (fType is null || fType.opEquals(annotationType) || !fConfiguredAnnotationTypes.contains(annotationType) && isSubtype(annotationType)) {
                     if (temp && pers) return;
                     if (pers && next.isPersistent()) return;
                     if (temp && !next.isPersistent()) return;
@@ -270,7 +270,7 @@
                 IAnnotationAccessExtension extension= cast(IAnnotationAccessExtension) fAnnotationAccess;
                 return extension.isSubtype(annotationType, fType);
             }
-            return fType.equals(annotationType);
+            return cast(bool) fType.opEquals(annotationType);
         }
 
         /*
@@ -1112,6 +1112,9 @@
     private bool skip(Object annotationType) {
         return !contains(annotationType, fAllowedAnnotationTypes, fConfiguredAnnotationTypes);
     }
+    private bool skip(String annotationType) {
+        return !contains(stringcast(annotationType), fAllowedAnnotationTypes, fConfiguredAnnotationTypes);
+    }
 
     /**
      * Returns whether the given annotation type should be skipped by the drawing routine of the header.
@@ -1428,8 +1431,8 @@
 
             if (annotationTypeLabel !is null) {
                 if (overview.length() > 0)
-                    overview += "\n"; //$NON-NLS-1$
-                overview += JFaceTextMessages.getFormattedString("OverviewRulerHeader.toolTipTextEntry", annotationTypeLabel, new Integer(count) ); //$NON-NLS-1$
+                    overview ~= "\n"; //$NON-NLS-1$
+                overview ~= JFaceTextMessages.getFormattedString("OverviewRulerHeader.toolTipTextEntry", stringcast(annotationTypeLabel), new Integer(count) ); //$NON-NLS-1$
             }
         }