# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1219684004 -7200
# Node ID 7f75eaa8103ab85625890efea458bd0afe83e4e6
# Parent  a9566845f1cbbc47414a55388e2547fb161e90ab
volatile and cast Map.Entry

diff -r a9566845f1cb -r 7f75eaa8103a dwtx/jface/text/source/AnnotationModel.d
--- a/dwtx/jface/text/source/AnnotationModel.d	Mon Aug 25 19:03:46 2008 +0200
+++ b/dwtx/jface/text/source/AnnotationModel.d	Mon Aug 25 19:06:44 2008 +0200
@@ -477,7 +477,7 @@
         if (annotationsToAdd !is null) {
             Iterator iter= annotationsToAdd.entrySet().iterator();
             while (iter.hasNext()) {
-                Map.Entry mapEntry= (Map.Entry) iter.next();
+                Map.Entry mapEntry= cast(Map.Entry) iter.next();
                 Annotation annotation= cast(Annotation) mapEntry.getKey();
                 Position position= cast(Position) mapEntry.getValue();
                 addAnnotation(annotation, position, false);
diff -r a9566845f1cb -r 7f75eaa8103a dwtx/jface/text/source/AnnotationPainter.d
--- a/dwtx/jface/text/source/AnnotationPainter.d	Mon Aug 25 19:03:46 2008 +0200
+++ b/dwtx/jface/text/source/AnnotationPainter.d	Mon Aug 25 19:06:44 2008 +0200
@@ -408,7 +408,7 @@
     /** Indicates whether this painter is managing decorations */
     private bool fIsPainting= false;
     /** Indicates whether this painter is setting its annotation model */
-    private volatile bool  fIsSettingModel= false;
+    private /+volatile+/ bool  fIsSettingModel= false;
     /** The associated source viewer */
     private ISourceViewer fSourceViewer;
     /** The cached widget of the source viewer */
@@ -631,7 +631,7 @@
 
                 Iterator iter= decorationsMap.entrySet().iterator();
                 while (iter.hasNext()) {
-                    Map.Entry entry= (Map.Entry)iter.next();
+                    Map.Entry entry= cast(Map.Entry)iter.next();
                     Annotation annotation= cast(Annotation)entry.getKey();
                     Decoration decoration= cast(Decoration)entry.getValue();
                     drawDecoration(decoration, null, annotation, clippingRegion, document);
@@ -1053,7 +1053,7 @@
         for (int layer= 0, maxLayer= 1; layer < maxLayer; layer++) {
 
             for (Iterator iter= decorations.iterator(); iter.hasNext();) {
-                Map.Entry entry= (Map.Entry)iter.next();
+                Map.Entry entry= cast(Map.Entry)iter.next();
 
                 Annotation a= cast(Annotation)entry.getKey();
                 if (a.isMarkedDeleted())
@@ -1433,7 +1433,7 @@
          */
         ArrayList toBeDrawn= new ArrayList(10);
         for (Iterator e = decorations.iterator(); e.hasNext();) {
-            Map.Entry entry= (Map.Entry)e.next();
+            Map.Entry entry= cast(Map.Entry)e.next();
 
             Annotation a= cast(Annotation)entry.getKey();
             Decoration pp = cast(Decoration)entry.getValue();
@@ -1449,7 +1449,7 @@
         for (Iterator it= toBeDrawn.iterator(); it.hasNext();) {
             List layer= cast(List) it.next();
             for (Iterator e = layer.iterator(); e.hasNext();) {
-                Map.Entry entry= (Map.Entry)e.next();
+                Map.Entry entry= cast(Map.Entry)e.next();
                 Annotation a= cast(Annotation)entry.getKey();
                 Decoration pp = cast(Decoration)entry.getValue();
                 drawDecoration(pp, gc, a, clippingRegion, document);
diff -r a9566845f1cb -r 7f75eaa8103a dwtx/jface/text/source/projection/ProjectionSummary.d
--- a/dwtx/jface/text/source/projection/ProjectionSummary.d	Mon Aug 25 19:03:46 2008 +0200
+++ b/dwtx/jface/text/source/projection/ProjectionSummary.d	Mon Aug 25 19:06:44 2008 +0200
@@ -104,7 +104,7 @@
 
     private Object fLock= new Object();
     private IProgressMonitor fProgressMonitor;
-    private volatile Summarizer fSummarizer;
+    private /+volatile+/ Summarizer fSummarizer;
 
     /**
      * Creates a new projection summary.