# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1219610105 -7200
# Node ID 000f9136b8f7f2bf477a393e60731a111f1354a9
# Parent  75302ef3f92f2feb723313b3ed12bfb6658e7370
final

diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/InformationControlReplacer.d
--- a/dwtx/jface/internal/text/InformationControlReplacer.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/InformationControlReplacer.d	Sun Aug 24 22:35:05 2008 +0200
@@ -48,11 +48,11 @@
     /**
      * Minimal width in pixels.
      */
-    private static final int MIN_WIDTH= 80;
+    private static const int MIN_WIDTH= 80;
     /**
      * Minimal height in pixels.
      */
-    private static final int MIN_HEIGHT= 50;
+    private static const int MIN_HEIGHT= 50;
     
     /**
      * Default control creator.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/StickyHoverManager.d
--- a/dwtx/jface/internal/text/StickyHoverManager.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/StickyHoverManager.d	Sun Aug 24 22:35:05 2008 +0200
@@ -74,7 +74,7 @@
      * -5 as value has been chosen in order to be beaten by the hovers of TextViewerHoverManager.
      * </p>
      */
-    private static final int WIDGET_PRIORITY= -5;
+    private static const int WIDGET_PRIORITY= -5;
 
 
     /**
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/TableOwnerDrawSupport.d
--- a/dwtx/jface/internal/text/TableOwnerDrawSupport.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/TableOwnerDrawSupport.d	Sun Aug 24 22:35:05 2008 +0200
@@ -41,7 +41,7 @@
  */
 public class TableOwnerDrawSupport : Listener {
     
-    private static final String STYLED_RANGES_KEY= "styled_ranges"; //$NON-NLS-1$
+    private static const String STYLED_RANGES_KEY= "styled_ranges"; //$NON-NLS-1$
     
     private TextLayout fLayout;
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/html/BrowserInformationControl.d
--- a/dwtx/jface/internal/text/html/BrowserInformationControl.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/html/BrowserInformationControl.d	Sun Aug 24 22:35:05 2008 +0200
@@ -120,8 +120,8 @@
      * Minimal size constraints.
      * @since 3.2
      */
-    private static final int MIN_WIDTH= 80;
-    private static final int MIN_HEIGHT= 50;
+    private static const int MIN_WIDTH= 80;
+    private static const int MIN_HEIGHT= 50;
 
     
     /**
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/html/HTML2TextReader.d
--- a/dwtx/jface/internal/text/html/HTML2TextReader.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/html/HTML2TextReader.d	Sun Aug 24 22:35:05 2008 +0200
@@ -45,9 +45,9 @@
  */
 public class HTML2TextReader : SubstitutionTextReader {
 
-    private static final String EMPTY_STRING= ""; //$NON-NLS-1$
-    private static final Map fgEntityLookup;
-    private static final Set fgTags;
+    private static const String EMPTY_STRING= ""; //$NON-NLS-1$
+    private static const Map fgEntityLookup;
+    private static const Set fgTags;
 
     static {
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/html/HTMLMessages.d
--- a/dwtx/jface/internal/text/html/HTMLMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/html/HTMLMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -37,7 +37,7 @@
  */
 class HTMLMessages {
 
-    private static final String RESOURCE_BUNDLE= HTMLMessages.class.getName();
+    private static const String RESOURCE_BUNDLE= HTMLMessages.class.getName();
 
     private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/html/HTMLTextPresenter.d
--- a/dwtx/jface/internal/text/html/HTMLTextPresenter.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/html/HTMLTextPresenter.d	Sun Aug 24 22:35:05 2008 +0200
@@ -45,7 +45,7 @@
  */
 public class HTMLTextPresenter : DefaultInformationControl.IInformationPresenter, DefaultInformationControl.IInformationPresenterExtension {
 
-    private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+    private static const String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 
     private int fCounter;
     private bool fEnforceUpperLineLimit;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/link/contentassist/ContentAssistMessages.d
--- a/dwtx/jface/internal/text/link/contentassist/ContentAssistMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/link/contentassist/ContentAssistMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -39,7 +39,7 @@
  */
 class ContentAssistMessages {
 
-    private static final String RESOURCE_BUNDLE= ContentAssistMessages.class.getName();
+    private static const String RESOURCE_BUNDLE= ContentAssistMessages.class.getName();
 
     private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/link/contentassist/ContentAssistant2.d
--- a/dwtx/jface/internal/text/link/contentassist/ContentAssistant2.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/link/contentassist/ContentAssistant2.d	Sun Aug 24 22:35:05 2008 +0200
@@ -675,10 +675,10 @@
      *
      * @since 3.0
      */
-    public static final int WIDGET_PRIORITY= 10;
+    public static const int WIDGET_PRIORITY= 10;
 
 
-    private static final int DEFAULT_AUTO_ACTIVATION_DELAY= 500;
+    private static const int DEFAULT_AUTO_ACTIVATION_DELAY= 500;
 
     private IInformationControlCreator fInformationControlCreator;
     private int fAutoActivationDelay= DEFAULT_AUTO_ACTIVATION_DELAY;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/revisions/LineIndexOutOfBoundsException.d
--- a/dwtx/jface/internal/text/revisions/LineIndexOutOfBoundsException.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/revisions/LineIndexOutOfBoundsException.d	Sun Aug 24 22:35:05 2008 +0200
@@ -31,7 +31,7 @@
  * @since 3.2
  */
 public final class LineIndexOutOfBoundsException : IndexOutOfBoundsException {
-    private static final long serialVersionUID= 1L;
+    private static const long serialVersionUID= 1L;
 
     /**
      * Constructs an <code>LineIndexOutOfBoundsException</code> with no detail message.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/internal/text/revisions/RevisionPainter.d
--- a/dwtx/jface/internal/text/revisions/RevisionPainter.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/internal/text/revisions/RevisionPainter.d	Sun Aug 24 22:35:05 2008 +0200
@@ -106,8 +106,8 @@
     private static bool DEBUG= "true".equalsIgnoreCase(Platform.getDebugOption("dwtx.jface.text.source/debug/RevisionRulerColumn")); //$NON-NLS-1$//$NON-NLS-2$
 
     // RGBs provided by UI Designer
-    private static final RGB BY_DATE_START_COLOR= new RGB(199, 134, 57);
-    private static final RGB BY_DATE_END_COLOR= new RGB(241, 225, 206);
+    private static const RGB BY_DATE_START_COLOR= new RGB(199, 134, 57);
+    private static const RGB BY_DATE_END_COLOR= new RGB(241, 225, 206);
 
     
     /**
@@ -129,20 +129,20 @@
          * revision color perceived as light such as yellow will be darkened, while colors perceived
          * as dark such as blue will be lightened up.
          */
-        private static final float AVERAGE_INTENSITY= 0.5f;
+        private static const float AVERAGE_INTENSITY= 0.5f;
         /**
          * The maximum shading in [0, 1] - this is the shade that the most recent revision will
          * receive.
          */
-        private static final float MAX_SHADING= 0.7f;
+        private static const float MAX_SHADING= 0.7f;
         /**
          * The minimum shading in [0, 1] - this is the shade that the oldest revision will receive.
          */
-        private static final float MIN_SHADING= 0.2f;
+        private static const float MIN_SHADING= 0.2f;
         /**
          * The shade for the focus boxes.
          */
-        private static final float FOCUS_COLOR_SHADING= 1f;
+        private static const float FOCUS_COLOR_SHADING= 1f;
 
 
         /**
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/AbstractDocument.d
--- a/dwtx/jface/text/AbstractDocument.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/AbstractDocument.d	Sun Aug 24 22:35:05 2008 +0200
@@ -204,7 +204,7 @@
      * Tells whether this class is in debug mode.
      * @since 3.1
      */
-    private static final bool DEBUG= false;
+    private static const bool DEBUG= false;
 
 
     /**
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/AbstractHoverInformationControlManager.d
--- a/dwtx/jface/text/AbstractHoverInformationControlManager.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/AbstractHoverInformationControlManager.d	Sun Aug 24 22:35:05 2008 +0200
@@ -765,7 +765,7 @@
      * the hover is enriched when the mouse has stopped moving inside the hover.
      * @since 3.4
      */
-    private static final long HOVER_AUTO_REPLACING_DELAY= 200;
+    private static const long HOVER_AUTO_REPLACING_DELAY= 200;
 
     /** The mouse tracker on the subject control */
     private MouseTracker fMouseTracker= new MouseTracker();
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/AbstractInformationControlManager.d
--- a/dwtx/jface/text/AbstractInformationControlManager.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/AbstractInformationControlManager.d	Sun Aug 24 22:35:05 2008 +0200
@@ -340,22 +340,22 @@
      * Dialog store constant for the location's x-coordinate.
      * @since 3.0
      */
-    public static final String STORE_LOCATION_X= "location.x"; //$NON-NLS-1$
+    public static const String STORE_LOCATION_X= "location.x"; //$NON-NLS-1$
     /**
      * Dialog store constant for the location's y-coordinate.
      * @since 3.0
      */
-    public static final String STORE_LOCATION_Y= "location.y"; //$NON-NLS-1$
+    public static const String STORE_LOCATION_Y= "location.y"; //$NON-NLS-1$
     /**
      * Dialog store constant for the size's width.
      * @since 3.0
      */
-    public static final String STORE_SIZE_WIDTH= "size.width"; //$NON-NLS-1$
+    public static const String STORE_SIZE_WIDTH= "size.width"; //$NON-NLS-1$
     /**
      * Dialog store constant for the size's height.
      * @since 3.0
      */
-    public static final String STORE_SIZE_HEIGHT= "size.height"; //$NON-NLS-1$
+    public static const String STORE_SIZE_HEIGHT= "size.height"; //$NON-NLS-1$
 
     /**
      * Tells whether this class and its subclasses are in debug mode.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/AbstractLineTracker.d
--- a/dwtx/jface/text/AbstractLineTracker.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/AbstractLineTracker.d	Sun Aug 24 22:35:05 2008 +0200
@@ -183,7 +183,7 @@
      *
      * @since 3.1
      */
-    private static final bool DEBUG= false;
+    private static const bool DEBUG= false;
 
     /**
      * Combines the information of the occurrence of a line delimiter. <code>delimiterIndex</code>
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/Assert.d
--- a/dwtx/jface/text/Assert.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/Assert.d	Sun Aug 24 22:35:05 2008 +0200
@@ -200,7 +200,7 @@
              * </p>
              * @since 3.1
              */
-            private static final long serialVersionUID= 3689918374733886002L;
+            private static const long serialVersionUID= 3689918374733886002L;
 
             /**
              * Constructs a new exception.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/BadLocationException.d
--- a/dwtx/jface/text/BadLocationException.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/BadLocationException.d	Sun Aug 24 22:35:05 2008 +0200
@@ -174,7 +174,7 @@
      * </p>
      * @since 3.1
      */
-    private static final long serialVersionUID= 3257281452776370224L;
+    private static const long serialVersionUID= 3257281452776370224L;
 
     /**
      * Creates a new bad location exception.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/BadPartitioningException.d
--- a/dwtx/jface/text/BadPartitioningException.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/BadPartitioningException.d	Sun Aug 24 22:35:05 2008 +0200
@@ -175,7 +175,7 @@
      * </p>
      * @since 3.1
      */
-    private static final long serialVersionUID= 3256439205327876408L;
+    private static const long serialVersionUID= 3256439205327876408L;
 
     /**
      * Creates a new bad partitioning exception.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/BadPositionCategoryException.d
--- a/dwtx/jface/text/BadPositionCategoryException.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/BadPositionCategoryException.d	Sun Aug 24 22:35:05 2008 +0200
@@ -176,7 +176,7 @@
      * </p>
      * @since 3.1
      */
-    private static final long serialVersionUID= 3761405300745713206L;
+    private static const long serialVersionUID= 3761405300745713206L;
 
     /**
      * Creates a new bad position category exception.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/DefaultInformationControl.d
--- a/dwtx/jface/text/DefaultInformationControl.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/DefaultInformationControl.d	Sun Aug 24 22:35:05 2008 +0200
@@ -251,7 +251,7 @@
      * Inner border thickness in pixels.
      * @since 3.1
      */
-    private static final int INNER_BORDER= 1;
+    private static const int INNER_BORDER= 1;
 
     /** The control's text widget */
     private StyledText fText;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/DocumentEvent.d
--- a/dwtx/jface/text/DocumentEvent.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/DocumentEvent.d	Sun Aug 24 22:35:05 2008 +0200
@@ -177,7 +177,7 @@
      * 
      * @since 3.3
      */
-    private static final bool ASSERT_TEXT_NOT_NULL= Boolean.getBoolean("dwtx.text/debug/DocumentEvent/assertTextNotNull"); //$NON-NLS-1$
+    private static const bool ASSERT_TEXT_NOT_NULL= Boolean.getBoolean("dwtx.text/debug/DocumentEvent/assertTextNotNull"); //$NON-NLS-1$
 
     /** The changed document */
     public IDocument fDocument;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/FindReplaceDocumentAdapter.d
--- a/dwtx/jface/text/FindReplaceDocumentAdapter.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/FindReplaceDocumentAdapter.d	Sun Aug 24 22:35:05 2008 +0200
@@ -183,19 +183,19 @@
     }
 
     // Find/replace operation codes.
-    private static final FindReplaceOperationCode FIND_FIRST= new FindReplaceOperationCode();
-    private static final FindReplaceOperationCode FIND_NEXT= new FindReplaceOperationCode();
-    private static final FindReplaceOperationCode REPLACE= new FindReplaceOperationCode();
-    private static final FindReplaceOperationCode REPLACE_FIND_NEXT= new FindReplaceOperationCode();
+    private static const FindReplaceOperationCode FIND_FIRST= new FindReplaceOperationCode();
+    private static const FindReplaceOperationCode FIND_NEXT= new FindReplaceOperationCode();
+    private static const FindReplaceOperationCode REPLACE= new FindReplaceOperationCode();
+    private static const FindReplaceOperationCode REPLACE_FIND_NEXT= new FindReplaceOperationCode();
 
     /**
      * Retain case mode constants.
      * @since 3.4
      */
-    private static final int RC_MIXED= 0;
-    private static final int RC_UPPER= 1;
-    private static final int RC_LOWER= 2;
-    private static final int RC_FIRSTUPPER= 3;
+    private static const int RC_MIXED= 0;
+    private static const int RC_UPPER= 1;
+    private static const int RC_LOWER= 2;
+    private static const int RC_FIRSTUPPER= 3;
 
 
     /**
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/ITextViewerExtension8.d
--- a/dwtx/jface/text/ITextViewerExtension8.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/ITextViewerExtension8.d	Sun Aug 24 22:35:05 2008 +0200
@@ -201,21 +201,21 @@
          * 
          * @see ITextViewerExtension8#setHoverEnrichMode(dwtx.jface.text.ITextViewerExtension8.EnrichMode)
          */
-        public static final EnrichMode AFTER_DELAY= new EnrichMode("after delay"); //$NON-NLS-1$
+        public static const EnrichMode AFTER_DELAY= new EnrichMode("after delay"); //$NON-NLS-1$
 
         /**
          * Enrich the hover immediately when the mouse is moved into it.
          * 
          * @see ITextViewerExtension8#setHoverEnrichMode(dwtx.jface.text.ITextViewerExtension8.EnrichMode)
          */
-        public static final EnrichMode IMMEDIATELY= new EnrichMode("immediately"); //$NON-NLS-1$
+        public static const EnrichMode IMMEDIATELY= new EnrichMode("immediately"); //$NON-NLS-1$
 
         /**
          * Enrich the hover on explicit mouse click.
          * 
          * @see ITextViewerExtension8#setHoverEnrichMode(dwtx.jface.text.ITextViewerExtension8.EnrichMode)
          */
-        public static final EnrichMode ON_CLICK= new EnrichMode("on click"); //$NON-NLS-1$;
+        public static const EnrichMode ON_CLICK= new EnrichMode("on click"); //$NON-NLS-1$;
 
         
         private String fName;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/JFaceTextMessages.d
--- a/dwtx/jface/text/JFaceTextMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/JFaceTextMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -161,7 +161,7 @@
 
 class JFaceTextMessages {
 
-    private static final String RESOURCE_BUNDLE= "dwtx.jface.text.JFaceTextMessages";//$NON-NLS-1$
+    private static const String RESOURCE_BUNDLE= "dwtx.jface.text.JFaceTextMessages";//$NON-NLS-1$
 
     private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/RewriteSessionEditProcessor.d
--- a/dwtx/jface/text/RewriteSessionEditProcessor.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/RewriteSessionEditProcessor.d	Sun Aug 24 22:35:05 2008 +0200
@@ -174,7 +174,7 @@
  */
 public final class RewriteSessionEditProcessor : TextEditProcessor {
     /** The threshold for <em>large</em> text edits. */
-    private static final int THRESHOLD= 1000;
+    private static const int THRESHOLD= 1000;
 
     /**
      * Text edit visitor that estimates the compound size of an edit tree in characters.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/SequentialRewriteTextStore.d
--- a/dwtx/jface/text/SequentialRewriteTextStore.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/SequentialRewriteTextStore.d	Sun Aug 24 22:35:05 2008 +0200
@@ -194,7 +194,7 @@
     /** The source text store */
     private ITextStore fSource;
     /** A flag to enforce sequential access. */
-    private static final bool ASSERT_SEQUENTIALITY= false;
+    private static const bool ASSERT_SEQUENTIALITY= false;
 
 
     /**
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/TextAttribute.d
--- a/dwtx/jface/text/TextAttribute.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/TextAttribute.d	Sun Aug 24 22:35:05 2008 +0200
@@ -175,14 +175,14 @@
      * (value <code>1 << 29</code>).
      * @since 3.1
      */
-    public static final int STRIKETHROUGH= 1 << 29;
+    public static const int STRIKETHROUGH= 1 << 29;
 
     /**
      * Text attribute for underline style.
      * (value <code>1 << 30</code>)
      * @since 3.1
      */
-    public static final int UNDERLINE= 1 << 30;
+    public static const int UNDERLINE= 1 << 30;
 
 
     /** Foreground color */
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/TextMessages.d
--- a/dwtx/jface/text/TextMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/TextMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -168,9 +168,9 @@
  * @since 3.4
  */
 class TextMessages {
-//     private static final String BUNDLE_NAME= "dwtx.jface.text.TextMessages"; //$NON-NLS-1$
+//     private static const String BUNDLE_NAME= "dwtx.jface.text.TextMessages"; //$NON-NLS-1$
 
-    private static final ResourceBundle RESOURCE_BUNDLE;//= ResourceBundle.getBundle(BUNDLE_NAME);
+    private static const ResourceBundle RESOURCE_BUNDLE;//= ResourceBundle.getBundle(BUNDLE_NAME);
 
     static this() {
         RESOURCE_BUNDLE = ResourceBundle.getBundle(
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/TextViewer.d
--- a/dwtx/jface/text/TextViewer.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/TextViewer.d	Sun Aug 24 22:35:05 2008 +0200
@@ -249,20 +249,20 @@
                     IWidgetTokenOwner, IWidgetTokenOwnerExtension, IPostSelectionProvider {
 
     /** Internal flag to indicate the debug state. */
-    public static final bool TRACE_ERRORS= false;
+    public static const bool TRACE_ERRORS= false;
     /** Internal flag to indicate the debug state. */
-    private static final bool TRACE_DOUBLE_CLICK= false;
+    private static const bool TRACE_DOUBLE_CLICK= false;
 
     /**
      * Width constraint for text hovers (in characters).
      * @since 3.4
      */
-    private static final int TEXT_HOVER_WIDTH_CHARS= 100; //used to be 60 (text font)
+    private static const int TEXT_HOVER_WIDTH_CHARS= 100; //used to be 60 (text font)
     /**
      * Height constraint for text hovers (in characters).
      * @since 3.4
      */
-    private static final int TEXT_HOVER_HEIGHT_CHARS= 12; //used to be 10 (text font)
+    private static const int TEXT_HOVER_HEIGHT_CHARS= 12; //used to be 10 (text font)
 
     /**
      * Represents a replace command that brings the text viewer's text widget
@@ -1597,7 +1597,7 @@
      * Base position category name used by the selection updater
      * @since 3.1
      */
-    private static final String SELECTION_POSITION_CATEGORY= "_textviewer_selection_category"; //$NON-NLS-1$
+    private static const String SELECTION_POSITION_CATEGORY= "_textviewer_selection_category"; //$NON-NLS-1$
     /** The viewer's text widget */
     private StyledText fTextWidget;
     /** The viewer's input document */
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/TreeLineTracker.d
--- a/dwtx/jface/text/TreeLineTracker.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/TreeLineTracker.d	Sun Aug 24 22:35:05 2008 +0200
@@ -222,13 +222,13 @@
      * Turns assertions on/off. Don't make this a a debug option for performance reasons - this way
      * the compiler can optimize the asserts away.
      */
-    private static final bool ASSERT= false;
+    private static const bool ASSERT= false;
 
     /**
      * The empty delimiter of the last line. The last line and only the last line must have this
      * zero-length delimiter.
      */
-    private static final String NO_DELIM= ""; //$NON-NLS-1$
+    private static const String NO_DELIM= ""; //$NON-NLS-1$
 
     /**
      * A node represents one line. Its character and line offsets are 0-based and relative to the
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/WhitespaceCharacterPainter.d
--- a/dwtx/jface/text/WhitespaceCharacterPainter.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/WhitespaceCharacterPainter.d	Sun Aug 24 22:35:05 2008 +0200
@@ -177,11 +177,11 @@
  */
 public class WhitespaceCharacterPainter : IPainter, PaintListener {
 
-    private static final char SPACE_SIGN= '\u00b7';
-    private static final char IDEOGRAPHIC_SPACE_SIGN= '\u00b0';
-    private static final char TAB_SIGN= '\u00bb';
-    private static final char CARRIAGE_RETURN_SIGN= '\u00a4';
-    private static final char LINE_FEED_SIGN= '\u00b6';
+    private static const char SPACE_SIGN= '\u00b7';
+    private static const char IDEOGRAPHIC_SPACE_SIGN= '\u00b0';
+    private static const char TAB_SIGN= '\u00bb';
+    private static const char CARRIAGE_RETURN_SIGN= '\u00a4';
+    private static const char LINE_FEED_SIGN= '\u00b6';
     
     /** Indicates whether this painter is active. */
     private bool fIsActive= false;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/contentassist/AdditionalInfoController.d
--- a/dwtx/jface/text/contentassist/AdditionalInfoController.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/contentassist/AdditionalInfoController.d	Sun Aug 24 22:35:05 2008 +0200
@@ -86,7 +86,7 @@
      * @since 3.2
      */
     private static abstract class Timer {
-        private static final int DELAY_UNTIL_JOB_IS_SCHEDULED= 50;
+        private static const int DELAY_UNTIL_JOB_IS_SCHEDULED= 50;
 
         /**
          * A <code>Task</code> is {@link Task#run() run} when {@link #delay()} milliseconds have
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/contentassist/CompletionProposalPopup.d
--- a/dwtx/jface/text/contentassist/CompletionProposalPopup.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/contentassist/CompletionProposalPopup.d	Sun Aug 24 22:35:05 2008 +0200
@@ -132,7 +132,7 @@
      *      More details see also: https://bugs.eclipse.org/bugs/show_bug.cgi?id=98585#c36
      * @since 3.1
      */
-    private static final bool USE_VIRTUAL= !"motif".equals(DWT.getPlatform()); //$NON-NLS-1$
+    private static const bool USE_VIRTUAL= !"motif".equals(DWT.getPlatform()); //$NON-NLS-1$
 
 
     /**
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/contentassist/ContentAssistant.d
--- a/dwtx/jface/text/contentassist/ContentAssistant.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/contentassist/ContentAssistant.d	Sun Aug 24 22:35:05 2008 +0200
@@ -117,13 +117,13 @@
      * 
      * @since 3.4
      */
-    public static final String SELECT_NEXT_PROPOSAL_COMMAND_ID= "dwtx.ui.edit.text.contentAssist.selectNextProposal"; //$NON-NLS-1$
+    public static const String SELECT_NEXT_PROPOSAL_COMMAND_ID= "dwtx.ui.edit.text.contentAssist.selectNextProposal"; //$NON-NLS-1$
     /**
      * Content assist command identifier for 'select previous proposal'.
      * 
      * @since 3.4
      */
-    public static final String SELECT_PREVIOUS_PROPOSAL_COMMAND_ID= "dwtx.ui.edit.text.contentAssist.selectPreviousProposal"; //$NON-NLS-1$
+    public static const String SELECT_PREVIOUS_PROPOSAL_COMMAND_ID= "dwtx.ui.edit.text.contentAssist.selectPreviousProposal"; //$NON-NLS-1$
     
 
     /**
@@ -871,8 +871,8 @@
      *
      * @since 3.0
      */
-    public static final String STORE_SIZE_X= "size.x"; //$NON-NLS-1$
-    public static final String STORE_SIZE_Y= "size.y"; //$NON-NLS-1$
+    public static const String STORE_SIZE_X= "size.x"; //$NON-NLS-1$
+    public static const String STORE_SIZE_Y= "size.y"; //$NON-NLS-1$
 
     // Content-Assist Listener types
     final static int CONTEXT_SELECTOR= 0;
@@ -885,9 +885,9 @@
      *
      * @since 3.0
      */
-    public static final int WIDGET_PRIORITY= 20;
+    public static const int WIDGET_PRIORITY= 20;
 
-    private static final int DEFAULT_AUTO_ACTIVATION_DELAY= 500;
+    private static const int DEFAULT_AUTO_ACTIVATION_DELAY= 500;
 
     private IInformationControlCreator fInformationControlCreator;
     private int fAutoActivationDelay= DEFAULT_AUTO_ACTIVATION_DELAY;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/contentassist/JFaceTextMessages.d
--- a/dwtx/jface/text/contentassist/JFaceTextMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/contentassist/JFaceTextMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -55,7 +55,7 @@
  */
 class JFaceTextMessages {
 
-//     private static final String RESOURCE_BUNDLE= JFaceTextMessages.class.getName();
+//     private static const String RESOURCE_BUNDLE= JFaceTextMessages.class.getName();
 
     private static ResourceBundle fgResourceBundle;//= ResourceBundle.getBundle(RESOURCE_BUNDLE);
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/formatter/FormattingContextProperties.d
--- a/dwtx/jface/text/formatter/FormattingContextProperties.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/formatter/FormattingContextProperties.d	Sun Aug 24 22:35:05 2008 +0200
@@ -45,7 +45,7 @@
      * <p>
      * Value: <code>"formatting.context.document"</code>
      */
-    public static final String CONTEXT_DOCUMENT= "formatting.context.document"; //$NON-NLS-1$
+    public static const String CONTEXT_DOCUMENT= "formatting.context.document"; //$NON-NLS-1$
 
     /**
      * Property key of the partition property. The property must implement
@@ -54,7 +54,7 @@
      * <p>
      * Value: <code>"formatting.context.partition"</code>
      */
-    public static final String CONTEXT_PARTITION= "formatting.context.partition"; //$NON-NLS-1$
+    public static const String CONTEXT_PARTITION= "formatting.context.partition"; //$NON-NLS-1$
 
     /**
      * Property key of the preferences property. The property must implement
@@ -63,7 +63,7 @@
      * <p>
      * Value: <code>"formatting.context.preferences"</code>
      */
-    public static final String CONTEXT_PREFERENCES= "formatting.context.preferences"; //$NON-NLS-1$
+    public static const String CONTEXT_PREFERENCES= "formatting.context.preferences"; //$NON-NLS-1$
 
     /**
      * Property key of the region property. The property must implement <code>dwtx.jface.text#IRegion</code>.
@@ -72,7 +72,7 @@
      * <p>
      * Value: <code>"formatting.context.region"</code>
      */
-    public static final String CONTEXT_REGION= "formatting.context.region"; //$NON-NLS-1$
+    public static const String CONTEXT_REGION= "formatting.context.region"; //$NON-NLS-1$
 
     /**
      * Property key of the medium property. The property must implement <code>dwtx.jface.text#IDocument</code>.
@@ -80,7 +80,7 @@
      * <p>
      * Value: <code>"formatting.context.medium"</code>
      */
-    public static final String CONTEXT_MEDIUM= "formatting.context.medium"; //$NON-NLS-1$
+    public static const String CONTEXT_MEDIUM= "formatting.context.medium"; //$NON-NLS-1$
 
     /**
      * Ensure that this class cannot be instantiated.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/hyperlink/HyperlinkManager.d
--- a/dwtx/jface/text/hyperlink/HyperlinkManager.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/hyperlink/HyperlinkManager.d	Sun Aug 24 22:35:05 2008 +0200
@@ -89,7 +89,7 @@
      * hyperlink presenter and no further detector
      * is consulted.
      */
-    public static final DETECTION_STRATEGY FIRST= new DETECTION_STRATEGY("first"); //$NON-NLS-1$
+    public static const DETECTION_STRATEGY FIRST= new DETECTION_STRATEGY("first"); //$NON-NLS-1$
 
     /**
      * All detected hyperlinks from all detectors are collected
@@ -99,7 +99,7 @@
      * returns <code>true</code>.
      * </p>
      */
-    public static final DETECTION_STRATEGY ALL= new DETECTION_STRATEGY("all"); //$NON-NLS-1$
+    public static const DETECTION_STRATEGY ALL= new DETECTION_STRATEGY("all"); //$NON-NLS-1$
 
     /**
      * All detected hyperlinks from all detectors are collected
@@ -110,14 +110,14 @@
      * returns <code>true</code>.
      * </p>
      */
-    public static final DETECTION_STRATEGY LONGEST_REGION_ALL= new DETECTION_STRATEGY("all with same longest region"); //$NON-NLS-1$
+    public static const DETECTION_STRATEGY LONGEST_REGION_ALL= new DETECTION_STRATEGY("all with same longest region"); //$NON-NLS-1$
 
     /**
      * All detected hyperlinks from all detectors are collected
      * and form all those with the longest region only the first
      * one is passed to the hyperlink presenter.
      */
-    public static final DETECTION_STRATEGY LONGEST_REGION_FIRST= new DETECTION_STRATEGY("first with longest region"); //$NON-NLS-1$
+    public static const DETECTION_STRATEGY LONGEST_REGION_FIRST= new DETECTION_STRATEGY("first with longest region"); //$NON-NLS-1$
 
 
     /** The text viewer on which this hyperlink manager works. */
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/hyperlink/HyperlinkMessages.d
--- a/dwtx/jface/text/hyperlink/HyperlinkMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/hyperlink/HyperlinkMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -38,9 +38,9 @@
  * @since 3.4
  */
 class HyperlinkMessages {
-//     private static final String BUNDLE_NAME= HyperlinkMessages.class.getName();
+//     private static const String BUNDLE_NAME= HyperlinkMessages.class.getName();
 
-    private static final ResourceBundle RESOURCE_BUNDLE;//= ResourceBundle.getBundle(BUNDLE_NAME);
+    private static const ResourceBundle RESOURCE_BUNDLE;//= ResourceBundle.getBundle(BUNDLE_NAME);
 
     static this() {
         RESOURCE_BUNDLE = ResourceBundle.getBundle(
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/hyperlink/MultipleHyperlinkPresenter.d
--- a/dwtx/jface/text/hyperlink/MultipleHyperlinkPresenter.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/hyperlink/MultipleHyperlinkPresenter.d	Sun Aug 24 22:35:05 2008 +0200
@@ -507,7 +507,7 @@
          * Default value: One higher then for the hovers
          * managed by TextViewerHoverManager.
          */
-        private static final int WIDGET_TOKEN_PRIORITY= 1;
+        private static const int WIDGET_TOKEN_PRIORITY= 1;
 
         private const MultipleHyperlinkHover fHover;
         private const ITextViewer fTextViewer;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/information/InformationPresenter.d
--- a/dwtx/jface/text/information/InformationPresenter.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/information/InformationPresenter.d	Sun Aug 24 22:35:05 2008 +0200
@@ -81,7 +81,7 @@
     /*
      * 5 as value has been chosen in order to beat the hovers of {@link dwtx.jface.text.TextViewerHoverManager}
      */
-    public static final int WIDGET_PRIORITY= 5;
+    public static const int WIDGET_PRIORITY= 5;
 
 
     /**
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/link/LinkedModeUI.d
--- a/dwtx/jface/text/link/LinkedModeUI.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/link/LinkedModeUI.d	Sun Aug 24 22:35:05 2008 +0200
@@ -100,17 +100,17 @@
      * Constant indicating that this UI should never cycle from the last
      * position to the first and vice versa.
      */
-    public static final Object CYCLE_NEVER= new Object();
+    public static const Object CYCLE_NEVER= new Object();
     /**
      * Constant indicating that this UI should always cycle from the last
      * position to the first and vice versa.
      */
-    public static final Object CYCLE_ALWAYS= new Object();
+    public static const Object CYCLE_ALWAYS= new Object();
     /**
      * Constant indicating that this UI should cycle from the last position to
      * the first and vice versa if its model is not nested.
      */
-    public static final Object CYCLE_WHEN_NO_PARENT= new Object();
+    public static const Object CYCLE_WHEN_NO_PARENT= new Object();
 
     /**
      * Listener that gets notified when the linked mode UI switches its focus position.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/link/LinkedPositionAnnotations.d
--- a/dwtx/jface/text/link/LinkedPositionAnnotations.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/link/LinkedPositionAnnotations.d	Sun Aug 24 22:35:05 2008 +0200
@@ -47,10 +47,10 @@
 final class LinkedPositionAnnotations : AnnotationModel {
 
     /* annotation types */
-    private static final String TARGET_ANNOTATION_TYPE= "dwtx.ui.internal.workbench.texteditor.link.target"; //$NON-NLS-1$
-    private static final String SLAVE_ANNOTATION_TYPE= "dwtx.ui.internal.workbench.texteditor.link.slave"; //$NON-NLS-1$
-    private static final String FOCUS_ANNOTATION_TYPE= "dwtx.ui.internal.workbench.texteditor.link.master"; //$NON-NLS-1$
-    private static final String EXIT_ANNOTATION_TYPE= "dwtx.ui.internal.workbench.texteditor.link.exit"; //$NON-NLS-1$
+    private static const String TARGET_ANNOTATION_TYPE= "dwtx.ui.internal.workbench.texteditor.link.target"; //$NON-NLS-1$
+    private static const String SLAVE_ANNOTATION_TYPE= "dwtx.ui.internal.workbench.texteditor.link.slave"; //$NON-NLS-1$
+    private static const String FOCUS_ANNOTATION_TYPE= "dwtx.ui.internal.workbench.texteditor.link.master"; //$NON-NLS-1$
+    private static const String EXIT_ANNOTATION_TYPE= "dwtx.ui.internal.workbench.texteditor.link.exit"; //$NON-NLS-1$
 
     /* configuration */
     private bool fMarkTargets= true;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/link/LinkedPositionGroup.d
--- a/dwtx/jface/text/link/LinkedPositionGroup.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/link/LinkedPositionGroup.d	Sun Aug 24 22:35:05 2008 +0200
@@ -66,7 +66,7 @@
 public class LinkedPositionGroup {
 
     /** Sequence constant declaring that a position should not be stopped by. */
-    public static final int NO_STOP= -1;
+    public static const int NO_STOP= -1;
 
     /* members */
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/link/TabStopIterator.d
--- a/dwtx/jface/text/link/TabStopIterator.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/link/TabStopIterator.d	Sun Aug 24 22:35:05 2008 +0200
@@ -70,7 +70,7 @@
     }
 
     /** The comparator to sort the list of positions. */
-    private static final Comparator fComparator= new SequenceComparator();
+    private static const Comparator fComparator= new SequenceComparator();
 
     /** The iteration sequence. */
     private const ArrayList fList;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/projection/ProjectionMapping.d
--- a/dwtx/jface/text/projection/ProjectionMapping.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/projection/ProjectionMapping.d	Sun Aug 24 22:35:05 2008 +0200
@@ -52,9 +52,9 @@
  */
 public class ProjectionMapping : IDocumentInformationMapping , IDocumentInformationMappingExtension, IDocumentInformationMappingExtension2, IMinimalMapping {
 
-    private static final int LEFT=  -1;
-    private static final int NONE=   0;
-    private static final int RIGHT= +1;
+    private static const int LEFT=  -1;
+    private static const int NONE=   0;
+    private static const int RIGHT= +1;
 
     /** The master document */
     private IDocument fMasterDocument;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/rules/FastPartitioner.d
--- a/dwtx/jface/text/rules/FastPartitioner.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/rules/FastPartitioner.d	Sun Aug 24 22:35:05 2008 +0200
@@ -89,7 +89,7 @@
     /**
      * The position category this partitioner uses to store the document's partitioning information.
      */
-    private static final String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$
+    private static const String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$
     /** The partitioner's scanner */
     protected final IPartitionTokenScanner fScanner;
     /** The legal content types of this partitioner */
@@ -124,7 +124,7 @@
      */
     private Position[] fCachedPositions= null;
     /** Debug option for cache consistency checking. */
-    private static final bool CHECK_CACHE_CONSISTENCY= "true".equalsIgnoreCase(Platform.getDebugOption("dwtx.jface.text/debug/FastPartitioner/PositionCache"));  //$NON-NLS-1$//$NON-NLS-2$;
+    private static const bool CHECK_CACHE_CONSISTENCY= "true".equalsIgnoreCase(Platform.getDebugOption("dwtx.jface.text/debug/FastPartitioner/PositionCache"));  //$NON-NLS-1$//$NON-NLS-2$;
 
     /**
      * Creates a new partitioner that uses the given scanner and may return
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/rules/ICharacterScanner.d
--- a/dwtx/jface/text/rules/ICharacterScanner.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/rules/ICharacterScanner.d	Sun Aug 24 22:35:05 2008 +0200
@@ -51,7 +51,7 @@
     /**
      * The value returned when this scanner has read EOF.
      */
-    public static final int EOF= -1;
+    public static const int EOF= -1;
 
     /**
      * Provides rules access to the legal line delimiters. The returned
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/rules/Token.d
--- a/dwtx/jface/text/rules/Token.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/rules/Token.d	Sun Aug 24 22:35:05 2008 +0200
@@ -50,33 +50,33 @@
 public class Token : IToken {
 
     /** Internal token type: Undefined */
-    private static final int T_UNDEFINED= 0;
+    private static const int T_UNDEFINED= 0;
     /** Internal token type: EOF */
-    private static final int T_EOF= 1;
+    private static const int T_EOF= 1;
     /** Internal token type: Whitespace */
-    private static final int T_WHITESPACE= 2;
+    private static const int T_WHITESPACE= 2;
     /** Internal token type: Others */
-    private static final int T_OTHER=   3;
+    private static const int T_OTHER=   3;
 
 
     /**
      * Standard token: Undefined.
      */
-    public static final IToken UNDEFINED= new Token(T_UNDEFINED);
+    public static const IToken UNDEFINED= new Token(T_UNDEFINED);
     /**
      * Standard token: End Of File.
      */
-    public static final IToken EOF= new Token(T_EOF);
+    public static const IToken EOF= new Token(T_EOF);
     /**
      * Standard token: Whitespace.
      */
-    public static final IToken WHITESPACE= new Token(T_WHITESPACE);
+    public static const IToken WHITESPACE= new Token(T_WHITESPACE);
 
     /**
      * Standard token: Neither {@link #UNDEFINED}, {@link #WHITESPACE}, nor {@link #EOF}.
      * @deprecated will be removed
      */
-    public static final IToken OTHER= new Token(T_OTHER);
+    public static const IToken OTHER= new Token(T_OTHER);
 
     /** The type of this token */
     private int fType;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/source/AbstractRulerColumn.d
--- a/dwtx/jface/text/source/AbstractRulerColumn.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/source/AbstractRulerColumn.d	Sun Aug 24 22:35:05 2008 +0200
@@ -138,8 +138,8 @@
  * @since 3.3
  */
 public abstract class AbstractRulerColumn : IVerticalRulerColumn, IVerticalRulerInfo, IVerticalRulerInfoExtension {
-    private static final int DEFAULT_WIDTH= 12;
-    private static final int DEFAULT_TEXT_INSET= 2;
+    private static const int DEFAULT_WIDTH= 12;
+    private static const int DEFAULT_TEXT_INSET= 2;
 
     /**
      * Handles all the mouse interaction in this line number ruler column.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/source/AnnotationPainter.d
--- a/dwtx/jface/text/source/AnnotationPainter.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/source/AnnotationPainter.d	Sun Aug 24 22:35:05 2008 +0200
@@ -352,7 +352,7 @@
      * The squiggly painter strategy.
      * @since 3.0
      */
-    private static final IDrawingStrategy SQUIGGLES_STRATEGY= new SquigglesStrategy();
+    private static const IDrawingStrategy SQUIGGLES_STRATEGY= new SquigglesStrategy();
 
     /**
      * This strategy is used to mark the <code>null</code> value in the chache
@@ -360,25 +360,25 @@
      *
      * @since 3.4
      */
-    private static final IDrawingStrategy NULL_STRATEGY= new NullStrategy();
+    private static const IDrawingStrategy NULL_STRATEGY= new NullStrategy();
     /**
      * The squiggles painter id.
      * @since 3.0
      */
-    private static final Object SQUIGGLES= new Object();
+    private static const Object SQUIGGLES= new Object();
     /**
      * The squiggly painter strategy.
      *
      * @since 3.4
      */
-    private static final ITextStyleStrategy HIGHLIGHTING_STRATEGY= new HighlightingStrategy();
+    private static const ITextStyleStrategy HIGHLIGHTING_STRATEGY= new HighlightingStrategy();
 
     /**
      * The highlighting text style strategy id.
      *
      * @since 3.4
      */
-    private static final Object HIGHLIGHTING= new Object();
+    private static const Object HIGHLIGHTING= new Object();
 
     /**
      * The presentation information (decoration) for an annotation.  Each such
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/source/IChangeRulerColumn.d
--- a/dwtx/jface/text/source/IChangeRulerColumn.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/source/IChangeRulerColumn.d	Sun Aug 24 22:35:05 2008 +0200
@@ -87,7 +87,7 @@
 public interface IChangeRulerColumn : IVerticalRulerColumn, IVerticalRulerInfoExtension {
 
     /** The ID under which the quick diff model is registered with a document's annotation model. */
-    public static final String QUICK_DIFF_MODEL_ID= "diff"; //$NON-NLS-1$
+    public static const String QUICK_DIFF_MODEL_ID= "diff"; //$NON-NLS-1$
 
     /**
      * Sets the hover of this ruler column.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/source/JFaceTextMessages.d
--- a/dwtx/jface/text/source/JFaceTextMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/source/JFaceTextMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -91,7 +91,7 @@
 class JFaceTextMessages {
 
     /** The resource bundle name. */
-    private static final String RESOURCE_BUNDLE= "dwtx.jface.text.JFaceTextMessages";//$NON-NLS-1$
+    private static const String RESOURCE_BUNDLE= "dwtx.jface.text.JFaceTextMessages";//$NON-NLS-1$
 
     /** The resource bundle. */
     private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/source/OverviewRuler.d
--- a/dwtx/jface/text/source/OverviewRuler.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/source/OverviewRuler.d	Sun Aug 24 22:35:05 2008 +0200
@@ -352,8 +352,8 @@
         }
     }
 
-    private static final int INSET= 2;
-    private static final int ANNOTATION_HEIGHT= 4;
+    private static const int INSET= 2;
+    private static const int ANNOTATION_HEIGHT= 4;
     private static bool ANNOTATION_HEIGHT_SCALABLE= true;
 
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/source/projection/ProjectionAnnotation.d
--- a/dwtx/jface/text/source/projection/ProjectionAnnotation.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/source/projection/ProjectionAnnotation.d	Sun Aug 24 22:35:05 2008 +0200
@@ -73,10 +73,10 @@
     /**
      * The type of projection annotations.
      */
-    public static final String TYPE= "dwtx.projection"; //$NON-NLS-1$
+    public static const String TYPE= "dwtx.projection"; //$NON-NLS-1$
 
 
-    private static final int COLOR= DWT.COLOR_GRAY;
+    private static const int COLOR= DWT.COLOR_GRAY;
     private static Image fgCollapsedImage;
     private static Image fgExpandedImage;
 
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/source/projection/ProjectionViewer.d
--- a/dwtx/jface/text/source/projection/ProjectionViewer.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/source/projection/ProjectionViewer.d	Sun Aug 24 22:35:05 2008 +0200
@@ -87,22 +87,22 @@
  */
 public class ProjectionViewer : SourceViewer , ITextViewerExtension5 {
 
-    private static final int BASE= INFORMATION; // see ISourceViewer.INFORMATION
+    private static const int BASE= INFORMATION; // see ISourceViewer.INFORMATION
 
     /** Operation constant for the expand operation. */
-    public static final int EXPAND= BASE + 1;
+    public static const int EXPAND= BASE + 1;
     /** Operation constant for the collapse operation. */
-    public static final int COLLAPSE= BASE + 2;
+    public static const int COLLAPSE= BASE + 2;
     /** Operation constant for the toggle projection operation. */
-    public static final int TOGGLE= BASE + 3;
+    public static const int TOGGLE= BASE + 3;
     /** Operation constant for the expand all operation. */
-    public static final int EXPAND_ALL= BASE + 4;
+    public static const int EXPAND_ALL= BASE + 4;
     /**
      * Operation constant for the collapse all operation.
      *
      * @since 3.2
      */
-    public static final int COLLAPSE_ALL= BASE + 5;
+    public static const int COLLAPSE_ALL= BASE + 5;
 
     /**
      * Internal listener to changes of the annotation model.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/templates/GlobalTemplateVariables.d
--- a/dwtx/jface/text/templates/GlobalTemplateVariables.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/templates/GlobalTemplateVariables.d	Sun Aug 24 22:35:05 2008 +0200
@@ -49,7 +49,7 @@
 public class GlobalTemplateVariables {
 
     /** The type of the selection variables. */
-    public static final String SELECTION= "selection"; //$NON-NLS-1$
+    public static const String SELECTION= "selection"; //$NON-NLS-1$
 
     /**
      * The cursor variable determines the cursor placement after template edition.
@@ -57,7 +57,7 @@
     public static class Cursor : SimpleTemplateVariableResolver {
 
         /** Name of the cursor variable, value= {@value} */
-        public static final String NAME= "cursor"; //$NON-NLS-1$
+        public static const String NAME= "cursor"; //$NON-NLS-1$
 
         /**
          * Creates a new cursor variable
@@ -75,7 +75,7 @@
     public static class WordSelection : SimpleTemplateVariableResolver {
 
         /** Name of the word selection variable, value= {@value} */
-        public static final String NAME= "word_selection"; //$NON-NLS-1$
+        public static const String NAME= "word_selection"; //$NON-NLS-1$
 
         /**
          * Creates a new word selection variable
@@ -98,7 +98,7 @@
     public static class LineSelection : SimpleTemplateVariableResolver {
 
         /** Name of the line selection variable, value= {@value} */
-        public static final String NAME= "line_selection"; //$NON-NLS-1$
+        public static const String NAME= "line_selection"; //$NON-NLS-1$
 
         /**
          * Creates a new line selection variable
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/templates/JFaceTextTemplateMessages.d
--- a/dwtx/jface/text/templates/JFaceTextTemplateMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/templates/JFaceTextTemplateMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -44,7 +44,7 @@
  */
 class JFaceTextTemplateMessages {
 
-//     private static final String RESOURCE_BUNDLE= JFaceTextTemplateMessages.class.getName();
+//     private static const String RESOURCE_BUNDLE= JFaceTextTemplateMessages.class.getName();
     private static ResourceBundle fgResourceBundle;//= ResourceBundle.getBundle(RESOURCE_BUNDLE);
 
     static this() {
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/templates/TemplateCompletionProcessor.d
--- a/dwtx/jface/text/templates/TemplateCompletionProcessor.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/templates/TemplateCompletionProcessor.d	Sun Aug 24 22:35:05 2008 +0200
@@ -67,7 +67,7 @@
         }
     }
 
-    private static final Comparator fgProposalComparator= new ProposalComparator();
+    private static const Comparator fgProposalComparator= new ProposalComparator();
 
     /*
      * @see dwtx.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(dwtx.jface.text.ITextViewer,
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/templates/TemplateException.d
--- a/dwtx/jface/text/templates/TemplateException.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/templates/TemplateException.d	Sun Aug 24 22:35:05 2008 +0200
@@ -56,7 +56,7 @@
      * </p>
      * @since 3.1
      */
-    private static final long serialVersionUID= 3906362710416699442L;
+    private static const long serialVersionUID= 3906362710416699442L;
 
     /**
      * Creates a new template exception.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/templates/TemplateTranslator.d
--- a/dwtx/jface/text/templates/TemplateTranslator.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/templates/TemplateTranslator.d	Sun Aug 24 22:35:05 2008 +0200
@@ -71,25 +71,25 @@
      * Regex pattern for qualifiedname
      * @since 3.4
      */
-    private static final String QUALIFIED_NAME= "(?:\\w++\\.)*\\w++"; //$NON-NLS-1$
+    private static const String QUALIFIED_NAME= "(?:\\w++\\.)*\\w++"; //$NON-NLS-1$
 
     /**
      * Regex pattern for argumenttext
      * @since 3.4
      */
-    private static final String ARGUMENT_TEXT= "'(?:(?:'')|(?:[^']))*'"; //$NON-NLS-1$
+    private static const String ARGUMENT_TEXT= "'(?:(?:'')|(?:[^']))*'"; //$NON-NLS-1$
 
     /**
      * Regex pattern for argument
      * @since 3.4
      */
-    private static final String ARGUMENT= "(?:" + QUALIFIED_NAME + ")|(?:" + ARGUMENT_TEXT + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    private static const String ARGUMENT= "(?:" + QUALIFIED_NAME + ")|(?:" + ARGUMENT_TEXT + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     /**
      * Precompiled regex pattern for qualified names.
      * @since 3.3
      */
-    private static final Pattern PARAM_PATTERN= Pattern.compile(ARGUMENT);
+    private static const Pattern PARAM_PATTERN= Pattern.compile(ARGUMENT);
     /**
      * Precompiled regex pattern for valid dollar escapes (dollar literals and variables) and
      * (invalid) single dollars.
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/templates/TextTemplateMessages.d
--- a/dwtx/jface/text/templates/TextTemplateMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/templates/TextTemplateMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -44,7 +44,7 @@
  */
 class TextTemplateMessages {
 
-    private static final String RESOURCE_BUNDLE= TextTemplateMessages.class.getName();
+    private static const String RESOURCE_BUNDLE= TextTemplateMessages.class.getName();
     private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
 
     private this() {
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/jface/text/templates/persistence/TemplatePersistenceMessages.d
--- a/dwtx/jface/text/templates/persistence/TemplatePersistenceMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/jface/text/templates/persistence/TemplatePersistenceMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -29,7 +29,7 @@
  */
 class TemplatePersistenceMessages {
 
-    private static final String RESOURCE_BUNDLE= TemplatePersistenceMessages.class.getName();
+    private static const String RESOURCE_BUNDLE= TemplatePersistenceMessages.class.getName();
     private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
 
     private this() {
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/text/edits/MalformedTreeException.d
--- a/dwtx/text/edits/MalformedTreeException.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/text/edits/MalformedTreeException.d	Sun Aug 24 22:35:05 2008 +0200
@@ -53,7 +53,7 @@
 public class MalformedTreeException : RuntimeException {
 
     // Not intended to be serialized
-    private static final long serialVersionUID= 1L;
+    private static const long serialVersionUID= 1L;
 
     private TextEdit fParent;
     private TextEdit fChild;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/text/edits/TextEdit.d
--- a/dwtx/text/edits/TextEdit.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/text/edits/TextEdit.d	Sun Aug 24 22:35:05 2008 +0200
@@ -105,7 +105,7 @@
      * Flags indicating that neither <code>CREATE_UNDO</code> nor
      * <code>UPDATE_REGIONS</code> is set.
      */
-    public static final int NONE= 0;
+    public static const int NONE= 0;
 
     /**
      * Flags indicating that applying an edit tree to a document
@@ -113,7 +113,7 @@
      * specified <code>null</code> is returned from method <code>
      * apply</code>.
      */
-    public static final int CREATE_UNDO= 1 << 0;
+    public static const int CREATE_UNDO= 1 << 0;
 
     /**
      * Flag indicating that the edit's region will be updated to
@@ -122,7 +122,7 @@
      * be arbitrary. It is even not guaranteed that the tree is still
      * well formed.
      */
-    public static final int UPDATE_REGIONS= 1 << 1;
+    public static const int UPDATE_REGIONS= 1 << 1;
 
     private static class InsertionComparator : Comparator {
         public int compare(Object o1, Object o2)  {
@@ -150,10 +150,10 @@
         }
     }
 
-    private static final TextEdit[] EMPTY_ARRAY= new TextEdit[0];
-    private static final InsertionComparator INSERTION_COMPARATOR= new InsertionComparator();
+    private static const TextEdit[] EMPTY_ARRAY= new TextEdit[0];
+    private static const InsertionComparator INSERTION_COMPARATOR= new InsertionComparator();
 
-    private static final int DELETED_VALUE= -1;
+    private static const int DELETED_VALUE= -1;
 
     private int fOffset;
     private int fLength;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/text/edits/TextEditMessages.d
--- a/dwtx/text/edits/TextEditMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/text/edits/TextEditMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -44,9 +44,9 @@
 
 class TextEditMessages {
 
-    private static final String BUNDLE_NAME= "dwtx.text.edits.Messages"; //$NON-NLS-1$
+    private static const String BUNDLE_NAME= "dwtx.text.edits.Messages"; //$NON-NLS-1$
 
-    private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
+    private static const ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
 
     private this() {
     }
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/text/undo/DocumentUndoEvent.d
--- a/dwtx/text/undo/DocumentUndoEvent.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/text/undo/DocumentUndoEvent.d	Sun Aug 24 22:35:05 2008 +0200
@@ -44,29 +44,29 @@
      * Indicates that the described document event is about to be
      * undone.
      */
-    public static final int ABOUT_TO_UNDO= 1 << 0;
+    public static const int ABOUT_TO_UNDO= 1 << 0;
 
     /**
      * Indicates that the described document event is about to be
      * redone.
      */
-    public static final int ABOUT_TO_REDO= 1 << 1;
+    public static const int ABOUT_TO_REDO= 1 << 1;
 
     /**
      * Indicates that the described document event has been undone.
      */
-    public static final int UNDONE= 1 << 2;
+    public static const int UNDONE= 1 << 2;
 
     /**
      * Indicates that the described document event has been redone.
      */
-    public static final int REDONE= 1 << 3;
+    public static const int REDONE= 1 << 3;
 
     /**
      * Indicates that the described document event is a compound undo
      * or redo event.
      */
-    public static final int COMPOUND= 1 << 4;
+    public static const int COMPOUND= 1 << 4;
 
     /** The changed document. */
     private IDocument fDocument;
diff -r 75302ef3f92f -r 000f9136b8f7 dwtx/text/undo/UndoMessages.d
--- a/dwtx/text/undo/UndoMessages.d	Sun Aug 24 22:34:04 2008 +0200
+++ b/dwtx/text/undo/UndoMessages.d	Sun Aug 24 22:35:05 2008 +0200
@@ -33,9 +33,9 @@
  */
 final class UndoMessages {
 
-    private static final String BUNDLE_NAME= "dwtx.text.undo.UndoMessages"; //$NON-NLS-1$
+    private static const String BUNDLE_NAME= "dwtx.text.undo.UndoMessages"; //$NON-NLS-1$
 
-    private static final ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
+    private static const ResourceBundle RESOURCE_BUNDLE= ResourceBundle.getBundle(BUNDLE_NAME);
 
     private this() {
     }