Mercurial > projects > dwt-addons
changeset 146:75302ef3f92f
final
line wrap: on
line diff
--- a/dwtx/jface/internal/text/DelayedInputChangeListener.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/DelayedInputChangeListener.d Sun Aug 24 22:34:04 2008 +0200 @@ -32,8 +32,8 @@ */ public final class DelayedInputChangeListener : IInputChangedListener { - private final IDelayedInputChangeProvider fChangeProvider; - private final InformationControlReplacer fInformationControlReplacer; + private const IDelayedInputChangeProvider fChangeProvider; + private const InformationControlReplacer fInformationControlReplacer; /** * Creates a new listener.
--- a/dwtx/jface/internal/text/NonDeletingPositionUpdater.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/NonDeletingPositionUpdater.d Sun Aug 24 22:34:04 2008 +0200 @@ -38,7 +38,7 @@ */ public final class NonDeletingPositionUpdater : IPositionUpdater { /** The position category. */ - private final String fCategory; + private const String fCategory; /** * Creates a new updater for the given <code>category</code>.
--- a/dwtx/jface/internal/text/StickyHoverManager.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/StickyHoverManager.d Sun Aug 24 22:34:04 2008 +0200 @@ -281,7 +281,7 @@ } - private final TextViewer fTextViewer; + private const TextViewer fTextViewer; /**
--- a/dwtx/jface/internal/text/html/BrowserInformationControl.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/html/BrowserInformationControl.d Sun Aug 24 22:34:04 2008 +0200 @@ -170,7 +170,7 @@ * The symbolic name of the font used for size computations, or <code>null</code> to use dialog font. * @since 3.4 */ - private final String fSymbolicFontName; + private const String fSymbolicFontName; /**
--- a/dwtx/jface/internal/text/html/BrowserInput.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/html/BrowserInput.d Sun Aug 24 22:34:04 2008 +0200 @@ -36,7 +36,7 @@ */ public abstract class BrowserInput { - private final BrowserInput fPrevious; + private const BrowserInput fPrevious; private BrowserInput fNext; /**
--- a/dwtx/jface/internal/text/link/contentassist/AdditionalInfoController2.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/link/contentassist/AdditionalInfoController2.d Sun Aug 24 22:34:04 2008 +0200 @@ -80,9 +80,9 @@ /** Indicates whether the display delay has been reset */ private bool fIsReset= false; /** Object to synchronize display thread and table selection changes */ - private final Object fMutex= new Object(); + private const Object fMutex= new Object(); /** Thread access lock. */ - private final Object fThreadAccess= new Object(); + private const Object fThreadAccess= new Object(); /** Object to synchronize initial display of additional info */ private Object fStartSignal; /** The table selection listener */
--- a/dwtx/jface/internal/text/link/contentassist/ContentAssistant2.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/link/contentassist/ContentAssistant2.d Sun Aug 24 22:34:04 2008 +0200 @@ -240,8 +240,8 @@ private Object fMutex= new Object(); private int fShowStyle; - private final static int SHOW_PROPOSALS= 1; - private final static int SHOW_CONTEXT_INFO= 2; + private const static int SHOW_PROPOSALS= 1; + private const static int SHOW_CONTEXT_INFO= 2; protected this() { } @@ -354,11 +354,11 @@ // Presentation types. /** proposal selector */ - public final static int LAYOUT_PROPOSAL_SELECTOR= 0; + public const static int LAYOUT_PROPOSAL_SELECTOR= 0; /** context selector */ - public final static int LAYOUT_CONTEXT_SELECTOR= 1; + public const static int LAYOUT_CONTEXT_SELECTOR= 1; /** context info */ - public final static int LAYOUT_CONTEXT_INFO_POPUP= 2; + public const static int LAYOUT_CONTEXT_INFO_POPUP= 2; int fContextType= LAYOUT_CONTEXT_SELECTOR; Shell[] fShells= new Shell[3]; @@ -709,7 +709,7 @@ private int fCompletionPosition; private String[] fProposalStrings; private ICompletionProposal[] fProposals; - private final List fProposalListeners= new ArrayList(); + private const List fProposalListeners= new ArrayList(); /** * Tells whether colored label support is enabled.
--- a/dwtx/jface/internal/text/revisions/ChangeRegion.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/revisions/ChangeRegion.d Sun Aug 24 22:34:04 2008 +0200 @@ -40,9 +40,9 @@ * @since 3.2 */ public final class ChangeRegion { - private final Revision fRevision; - private final ILineRange fLines; - private final List fAdjusted= new LinkedList(); + private const Revision fRevision; + private const ILineRange fLines; + private const List fAdjusted= new LinkedList(); /** * Creates a new change region for the given revision and line range.
--- a/dwtx/jface/internal/text/revisions/Hunk.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/revisions/Hunk.d Sun Aug 24 22:34:04 2008 +0200 @@ -37,14 +37,14 @@ * <code>[0, numberOfLines]</code> – note the inclusive end; there may be a hunk with * <code>line is numberOfLines</code> to describe deleted lines at then end of the document. */ - public final int line; + public const int line; /** * The difference in lines compared to the corresponding line range in the original. Positive * for added lines, negative for deleted lines. */ - public final int delta; + public const int delta; /** The number of changed lines in this hunk, must be >= 0. */ - public final int changed; + public const int changed; /** * Creates a new hunk.
--- a/dwtx/jface/internal/text/revisions/RevisionPainter.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/revisions/RevisionPainter.d Sun Aug 24 22:34:04 2008 +0200 @@ -152,11 +152,11 @@ /** * The stored shaded colors. */ - private final Map fColors= new HashMap(); + private const Map fColors= new HashMap(); /** * The stored focus colors. */ - private final Map fFocusColors= new HashMap(); + private const Map fFocusColors= new HashMap(); /** * Sets the revision information, which is needed to compute the relative age of a revision. @@ -529,27 +529,27 @@ /* Listeners and helpers. */ /** The shared color provider. */ - private final ISharedTextColors fSharedColors; + private const ISharedTextColors fSharedColors; /** The color tool. */ - private final ColorTool fColorTool= new ColorTool(); + private const ColorTool fColorTool= new ColorTool(); /** The mouse handler. */ - private final MouseHandler fMouseHandler= new MouseHandler(); + private const MouseHandler fMouseHandler= new MouseHandler(); /** The hover. */ - private final RevisionHover fHover= new RevisionHover(); + private const RevisionHover fHover= new RevisionHover(); /** The annotation listener. */ - private final AnnotationListener fAnnotationListener= new AnnotationListener(); + private const AnnotationListener fAnnotationListener= new AnnotationListener(); /** The selection provider. */ - private final RevisionSelectionProvider fRevisionSelectionProvider= new RevisionSelectionProvider(this); + private const RevisionSelectionProvider fRevisionSelectionProvider= new RevisionSelectionProvider(this); /** * The list of revision listeners. * @since 3.3. */ - private final ListenerList fRevisionListeners= new ListenerList(ListenerList.IDENTITY); + private const ListenerList fRevisionListeners= new ListenerList(ListenerList.IDENTITY); /* The context - column and viewer we are connected to. */ /** The vertical ruler column that delegates painting to this painter. */ - private final IVerticalRulerColumn fColumn; + private const IVerticalRulerColumn fColumn; /** The parent ruler. */ private CompositeRuler fParentRuler; /** The column's control, typically a {@link Canvas}, possibly <code>null</code>. */
--- a/dwtx/jface/internal/text/revisions/RevisionSelectionProvider.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/revisions/RevisionSelectionProvider.d Sun Aug 24 22:34:04 2008 +0200 @@ -57,7 +57,7 @@ * with. */ private final class PostSelectionListener : ISelectionChangedListener { - private final IPostSelectionProvider fPostProvider; + private const IPostSelectionProvider fPostProvider; public this(IPostSelectionProvider postProvider) { postProvider.addPostSelectionChangedListener(this); @@ -79,8 +79,8 @@ } } - private final RevisionPainter fPainter; - private final ListenerList fListeners= new ListenerList(); + private const RevisionPainter fPainter; + private const ListenerList fListeners= new ListenerList(); /** * The text viewer once we are installed, <code>null</code> if not installed.
--- a/dwtx/jface/internal/text/source/DiffPainter.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/internal/text/source/DiffPainter.d Sun Aug 24 22:34:04 2008 +0200 @@ -66,7 +66,7 @@ } /** The vertical ruler column that delegates painting to this painter. */ - private final IVerticalRulerColumn fColumn; + private const IVerticalRulerColumn fColumn; /** The parent ruler. */ private CompositeRuler fParentRuler; /** The column's control, typically a {@link Canvas}, possibly <code>null</code>. */ @@ -88,9 +88,9 @@ /** The ruler's hover */ private IAnnotationHover fHover; /** The internal listener */ - private final AnnotationListener fAnnotationListener= new AnnotationListener(); + private const AnnotationListener fAnnotationListener= new AnnotationListener(); /** The shared color provider, possibly <code>null</code>. */ - private final ISharedTextColors fSharedColors; + private const ISharedTextColors fSharedColors; /** * Creates a new diff painter for a vertical ruler column.
--- a/dwtx/jface/text/AbstractHoverInformationControlManager.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/AbstractHoverInformationControlManager.d Sun Aug 24 22:34:04 2008 +0200 @@ -564,7 +564,7 @@ class MouseTracker : ShellAdapter , MouseTrackListener, MouseMoveListener { /** Margin around the original hover event location for computing the hover area. */ - private final static int EPSILON= 3; + private const static int EPSILON= 3; /** The area in which the original hover event occurred. */ private Rectangle fHoverArea;
--- a/dwtx/jface/text/AbstractInformationControl.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/AbstractInformationControl.d Sun Aug 24 22:34:04 2008 +0200 @@ -216,11 +216,11 @@ public abstract class AbstractInformationControl : IInformationControl, IInformationControlExtension, IInformationControlExtension3, IInformationControlExtension4, IInformationControlExtension5 { /** The information control's shell. */ - private final Shell fShell; + private const Shell fShell; /** Composite containing the content created by subclasses. */ - private final Composite fContentComposite; + private const Composite fContentComposite; /** Whether the information control is resizable. */ - private final bool fResizable; + private const bool fResizable; /** Composite containing the status line content or <code>null</code> if none. */ private Composite fStatusComposite; @@ -229,7 +229,7 @@ /** Label in the status line or <code>null</code> if none. */ private Label fStatusLabel; /** The toolbar manager used by the toolbar or <code>null</code> if none. */ - private final ToolBarManager fToolBarManager; + private const ToolBarManager fToolBarManager; /** Status line toolbar or <code>null</code> if none. */ private ToolBar fToolBar;
--- a/dwtx/jface/text/AbstractInformationControlManager.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/AbstractInformationControlManager.d Sun Aug 24 22:34:04 2008 +0200 @@ -292,7 +292,7 @@ * Constitutes entities to enumerate anchors for the layout of the information control. */ public static final class Anchor { - private final int fFlag; + private const int fFlag; private this(int flag) { fFlag= flag; } @@ -320,21 +320,21 @@ } /** Internal anchor list. */ - private final static Anchor[] ANCHORS= { new Anchor(DWT.TOP), new Anchor(DWT.BOTTOM), new Anchor(DWT.LEFT), new Anchor(DWT.RIGHT) }; + private const static Anchor[] ANCHORS= { new Anchor(DWT.TOP), new Anchor(DWT.BOTTOM), new Anchor(DWT.LEFT), new Anchor(DWT.RIGHT) }; /** Anchor representing the top of the information area */ - public final static Anchor ANCHOR_TOP= ANCHORS[0]; + public const static Anchor ANCHOR_TOP= ANCHORS[0]; /** Anchor representing the bottom of the information area */ - public final static Anchor ANCHOR_BOTTOM= ANCHORS[1]; + public const static Anchor ANCHOR_BOTTOM= ANCHORS[1]; /** Anchor representing the left side of the information area */ - public final static Anchor ANCHOR_LEFT= ANCHORS[2]; + public const static Anchor ANCHOR_LEFT= ANCHORS[2]; /** Anchor representing the right side of the information area */ - public final static Anchor ANCHOR_RIGHT= ANCHORS[3]; + public const static Anchor ANCHOR_RIGHT= ANCHORS[3]; /** * Anchor representing the middle of the subject control * @since 2.1 */ - public final static Anchor ANCHOR_GLOBAL= new Anchor(DWT.CENTER); + public const static Anchor ANCHOR_GLOBAL= new Anchor(DWT.CENTER); /** * Dialog store constant for the location's x-coordinate.
--- a/dwtx/jface/text/AbstractLineTracker.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/AbstractLineTracker.d Sun Aug 24 22:34:04 2008 +0200 @@ -202,9 +202,9 @@ * @since 3.1 */ protected static class Request { - public final int offset; - public final int length; - public final String text; + public const int offset; + public const int length; + public const String text; public this(int offset, int length, String text) { this.offset= offset;
--- a/dwtx/jface/text/CopyOnWriteTextStore.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/CopyOnWriteTextStore.d Sun Aug 24 22:34:04 2008 +0200 @@ -242,7 +242,7 @@ protected ITextStore fTextStore= new StringTextStore(); /** A modifiable <code>ITextStore</code> instance */ - private final ITextStore fModifiableTextStore; + private const ITextStore fModifiableTextStore; /** * Creates an empty text store. The given text store will be used upon first
--- a/dwtx/jface/text/CursorLinePainter.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/CursorLinePainter.d Sun Aug 24 22:34:04 2008 +0200 @@ -180,7 +180,7 @@ public class CursorLinePainter : IPainter, LineBackgroundListener { /** The viewer the painter works on */ - private final ITextViewer fViewer; + private const ITextViewer fViewer; /** The cursor line back ground color */ private Color fHighlightColor; /** The paint position manager for managing the line coordinates */
--- a/dwtx/jface/text/DefaultInformationControl.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/DefaultInformationControl.d Sun Aug 24 22:34:04 2008 +0200 @@ -256,15 +256,15 @@ /** The control's text widget */ private StyledText fText; /** The information presenter, or <code>null</code> if none. */ - private final IInformationPresenter fPresenter; + private const IInformationPresenter fPresenter; /** A cached text presentation */ - private final TextPresentation fPresentation= new TextPresentation(); + private const TextPresentation fPresentation= new TextPresentation(); /** * Additional styles to use for the text control. * @since 3.4, previously called <code>fTextStyle</code> */ - private final int fAdditionalTextStyles; + private const int fAdditionalTextStyles; /** * Creates a default information control with the given shell as parent. An information
--- a/dwtx/jface/text/DefaultLineTracker.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/DefaultLineTracker.d Sun Aug 24 22:34:04 2008 +0200 @@ -170,7 +170,7 @@ public class DefaultLineTracker : AbstractLineTracker { /** The predefined delimiters of this tracker */ - public final static String[] DELIMITERS= { "\r", "\n", "\r\n" }; //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-2$ + public const static String[] DELIMITERS= { "\r", "\n", "\r\n" }; //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-2$ /** A predefined delimiter information which is always reused as return value */ private DelimiterInfo fDelimiterInfo= new DelimiterInfo();
--- a/dwtx/jface/text/DocumentCommand.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/DocumentCommand.d Sun Aug 24 22:34:04 2008 +0200 @@ -186,13 +186,13 @@ */ private static class Command : Comparable { /** The offset of the range to be replaced */ - private final int fOffset; + private const int fOffset; /** The length of the range to be replaced. */ - private final int fLength; + private const int fLength; /** The replacement text */ - private final String fText; + private const String fText; /** The listener who owns this command */ - private final IDocumentListener fOwner; + private const IDocumentListener fOwner; /** * Creates a new command with the given specification. @@ -276,7 +276,7 @@ private static class ReverseListIterator : Iterator { /** The list iterator. */ - private final ListIterator fListIterator; + private const ListIterator fListIterator; /** * Creates a reverse list iterator. @@ -316,7 +316,7 @@ private static class CommandIterator : Iterator { /** The command iterator. */ - private final Iterator fIterator; + private const Iterator fIterator; /** The original command. */ private Command fCommand; @@ -409,7 +409,7 @@ * Additional document commands. * @since 2.1 */ - private final List fCommands= new ArrayList(); + private const List fCommands= new ArrayList(); /** * Indicates whether the caret should be shifted by this command. * @since 3.0
--- a/dwtx/jface/text/DocumentPartitioningChangedEvent.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/DocumentPartitioningChangedEvent.d Sun Aug 24 22:34:04 2008 +0200 @@ -171,9 +171,9 @@ public class DocumentPartitioningChangedEvent { /** The document whose partitionings changed */ - private final IDocument fDocument; + private const IDocument fDocument; /** The map of partitionings to changed regions. */ - private final Map fMap= new HashMap(); + private const Map fMap= new HashMap(); /**
--- a/dwtx/jface/text/DocumentRewriteSessionEvent.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/DocumentRewriteSessionEvent.d Sun Aug 24 22:34:04 2008 +0200 @@ -169,8 +169,8 @@ */ public class DocumentRewriteSessionEvent { - public final static Object SESSION_START= new Object(); - public final static Object SESSION_STOP= new Object(); + public const static Object SESSION_START= new Object(); + public const static Object SESSION_STOP= new Object(); /** The changed document */ public IDocument fDocument;
--- a/dwtx/jface/text/DocumentRewriteSessionType.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/DocumentRewriteSessionType.d Sun Aug 24 22:34:04 2008 +0200 @@ -181,24 +181,24 @@ * session type should only be used for <em>large</em> operations that touch more than about * fifty lines. Use {@link #UNRESTRICTED_SMALL} for small operations. */ - public final static DocumentRewriteSessionType UNRESTRICTED= new DocumentRewriteSessionType(); + public const static DocumentRewriteSessionType UNRESTRICTED= new DocumentRewriteSessionType(); /** * An small unrestricted rewrite session is a short sequence of unrestricted replace operations. * This should be used for changes that touch less than about fifty lines. * * @since 3.3 */ - public final static DocumentRewriteSessionType UNRESTRICTED_SMALL= new DocumentRewriteSessionType(); + public const static DocumentRewriteSessionType UNRESTRICTED_SMALL= new DocumentRewriteSessionType(); /** * A sequential rewrite session is a sequence of non-overlapping replace * operations starting at an arbitrary document offset. */ - public final static DocumentRewriteSessionType SEQUENTIAL= new DocumentRewriteSessionType(); + public const static DocumentRewriteSessionType SEQUENTIAL= new DocumentRewriteSessionType(); /** * A strictly sequential rewrite session is a sequence of non-overlapping * replace operations from the start of the document to its end. */ - public final static DocumentRewriteSessionType STRICTLY_SEQUENTIAL= new DocumentRewriteSessionType(); + public const static DocumentRewriteSessionType STRICTLY_SEQUENTIAL= new DocumentRewriteSessionType(); /**
--- a/dwtx/jface/text/FindReplaceDocumentAdapterContentProposalProvider.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/FindReplaceDocumentAdapterContentProposalProvider.d Sun Aug 24 22:34:04 2008 +0200 @@ -220,23 +220,23 @@ /** * The whole regular expression. */ - private final String fExpression; + private const String fExpression; /** * The document offset. */ - private final int fDocumentOffset; + private const int fDocumentOffset; /** * The high-priority proposals. */ - private final ArrayList fPriorityProposals; + private const ArrayList fPriorityProposals; /** * The low-priority proposals. */ - private final ArrayList fProposals; + private const ArrayList fProposals; /** * <code>true</code> iff <code>fExpression</code> ends with an open escape. */ - private final bool fIsEscape; + private const bool fIsEscape; /** * Creates a new Proposal Computer. @@ -499,7 +499,7 @@ * <code>true</code> iff the processor is for the find field. * <code>false</code> iff the processor is for the replace field. */ - private final bool fIsFind; + private const bool fIsFind; /**
--- a/dwtx/jface/text/GapTextStore.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/GapTextStore.d Sun Aug 24 22:34:04 2008 +0200 @@ -187,19 +187,19 @@ * The minimum gap size allocated when re-allocation occurs. * @since 3.3 */ - private final int fMinGapSize; + private const int fMinGapSize; /** * The maximum gap size allocated when re-allocation occurs. * @since 3.3 */ - private final int fMaxGapSize; + private const int fMaxGapSize; /** * The multiplier to compute the array size from the content length * (1 <= fSizeMultiplier <= 2). * * @since 3.3 */ - private final float fSizeMultiplier; + private const float fSizeMultiplier; /** The store's content */ private char[] fContent= new char[0];
--- a/dwtx/jface/text/Line.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/Line.d Sun Aug 24 22:34:04 2008 +0200 @@ -169,7 +169,7 @@ /** The length of the line */ public int length; /** The delimiter of this line */ - public final String delimiter; + public const String delimiter; /** * Creates a new Line.
--- a/dwtx/jface/text/ListLineTracker.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/ListLineTracker.d Sun Aug 24 22:34:04 2008 +0200 @@ -180,7 +180,7 @@ abstract class ListLineTracker : ILineTracker { /** The line information */ - private final List fLines= new ArrayList(); + private const List fLines= new ArrayList(); /** The length of the tracked text */ private int fTextLength;
--- a/dwtx/jface/text/MarkSelection.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/MarkSelection.d Sun Aug 24 22:34:04 2008 +0200 @@ -166,11 +166,11 @@ public class MarkSelection : IMarkSelection { /** The marked document. */ - private final IDocument fDocument; + private const IDocument fDocument; /** The offset of the mark selection. */ - private final int fOffset; + private const int fOffset; /** The length of the mark selection. */ - private final int fLength; + private const int fLength; /** * Creates a MarkSelection.
--- a/dwtx/jface/text/SequentialRewriteTextStore.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/SequentialRewriteTextStore.d Sun Aug 24 22:34:04 2008 +0200 @@ -177,9 +177,9 @@ */ private static class Replace { public int newOffset; - public final int offset; - public final int length; - public final String text; + public const int offset; + public const int length; + public const String text; public this(int offset, int newOffset, int length, String text) { this.newOffset= newOffset;
--- a/dwtx/jface/text/TextSelection.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/TextSelection.d Sun Aug 24 22:34:04 2008 +0200 @@ -167,7 +167,7 @@ public class TextSelection : ITextSelection { /** Internal empty text selection */ - private final static ITextSelection NULL= new TextSelection(); + private const static ITextSelection NULL= new TextSelection(); /** * Returns a shared instance of an empty text selection.
--- a/dwtx/jface/text/TextUtilities.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/TextUtilities.d Sun Aug 24 22:34:04 2008 +0200 @@ -180,14 +180,14 @@ /** * Default line delimiters used by the text functions of this class. */ - public final static String[] DELIMITERS= [ "\n", "\r", "\r\n" ]; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ + public const static String[] DELIMITERS= [ "\n", "\r", "\r\n" ]; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ /** * Default line delimiters used by these text functions. * * @deprecated use DELIMITERS instead */ - public final static String[] fgDelimiters= DELIMITERS; + public const static String[] fgDelimiters= DELIMITERS;
--- a/dwtx/jface/text/TextViewer.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/TextViewer.d Sun Aug 24 22:34:04 2008 +0200 @@ -751,7 +751,7 @@ class FindReplaceRange : LineBackgroundListener, ITextListener, IPositionUpdater { /** Internal name for the position category used to update the range. */ - private final static String RANGE_CATEGORY= "dwtx.jface.text.TextViewer.find.range"; //$NON-NLS-1$ + private const static String RANGE_CATEGORY= "dwtx.jface.text.TextViewer.find.range"; //$NON-NLS-1$ /** The highlight color of this range. */ private Color fHighlightColor; @@ -1650,12 +1650,12 @@ * The mark position category. * @since 2.0 */ - private final String MARK_POSITION_CATEGORY="__mark_category_" + hashCode(); //$NON-NLS-1$ + private const String MARK_POSITION_CATEGORY="__mark_category_" + hashCode(); //$NON-NLS-1$ /** * The mark position updater * @since 2.0 */ - private final IPositionUpdater fMarkPositionUpdater= new DefaultPositionUpdater(MARK_POSITION_CATEGORY); + private const IPositionUpdater fMarkPositionUpdater= new DefaultPositionUpdater(MARK_POSITION_CATEGORY); /** * The flag indicating the redraw behavior * @since 2.0 @@ -1685,7 +1685,7 @@ * Queued post selection changed events count. * @since 3.0 */ - private final int[] fNumberOfPostSelectionChangedEvents= new int[1]; + private const int[] fNumberOfPostSelectionChangedEvents= new int[1]; /** * Last selection range sent to post selection change listeners. * @since 3.0
--- a/dwtx/jface/text/TextViewerHoverManager.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/TextViewerHoverManager.d Sun Aug 24 22:34:04 2008 +0200 @@ -189,7 +189,7 @@ * Default value: <code>0</code>; * @since 3.0 */ - public final static int WIDGET_PRIORITY= 0; + public const static int WIDGET_PRIORITY= 0; /** The text viewer */
--- a/dwtx/jface/text/contentassist/AdditionalInfoController.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/contentassist/AdditionalInfoController.d Sun Aug 24 22:34:04 2008 +0200 @@ -247,7 +247,7 @@ }; /** The timer thread. */ - private final Thread fThread; + private const Thread fThread; /** The currently waiting / active task. */ private Task fTask; @@ -258,8 +258,8 @@ private Object fCurrentInfo= null; private bool fAllowShowing= false; - private final Display fDisplay; - private final int fDelay; + private const Display fDisplay; + private const int fDelay; /** * Creates a new timer. @@ -434,7 +434,7 @@ /** The table selection listener */ private SelectionListener fSelectionListener= new TableSelectionListener(); /** The delay after which additional information is displayed */ - private final int fDelay; + private const int fDelay; /** * The timer thread. * @since 3.2
--- a/dwtx/jface/text/contentassist/CompletionProposalPopup.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/contentassist/CompletionProposalPopup.d Sun Aug 24 22:34:04 2008 +0200 @@ -445,7 +445,7 @@ * * @since 3.2 */ - private final EmptyProposal fEmptyProposal= new EmptyProposal(); + private const EmptyProposal fEmptyProposal= new EmptyProposal(); /** * The text for the empty proposal, or <code>null</code> to use the default text. *
--- a/dwtx/jface/text/contentassist/ContentAssistEvent.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/contentassist/ContentAssistEvent.d Sun Aug 24 22:34:04 2008 +0200 @@ -87,11 +87,11 @@ /** * The content assistant computing proposals. */ - public final IContentAssistant assistant; + public const IContentAssistant assistant; /** * The processor for the current partition. */ - public final IContentAssistProcessor processor; + public const IContentAssistProcessor processor; /** * Tells, whether content assist was triggered by auto activation. * <p> @@ -100,5 +100,5 @@ * * @since 3.4 */ - public final bool isAutoActivated; + public const bool isAutoActivated; }
--- a/dwtx/jface/text/contentassist/ContentAssistant.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/contentassist/ContentAssistant.d Sun Aug 24 22:34:04 2008 +0200 @@ -285,8 +285,8 @@ private Object fMutex= new Object(); private int fShowStyle; - private final static int SHOW_PROPOSALS= 1; - private final static int SHOW_CONTEXT_INFO= 2; + private const static int SHOW_PROPOSALS= 1; + private const static int SHOW_CONTEXT_INFO= 2; protected this() { } @@ -428,11 +428,11 @@ // Presentation types. /** The presentation type for the proposal selection popup. */ - public final static int LAYOUT_PROPOSAL_SELECTOR= 0; + public const static int LAYOUT_PROPOSAL_SELECTOR= 0; /** The presentation type for the context selection popup. */ - public final static int LAYOUT_CONTEXT_SELECTOR= 1; + public const static int LAYOUT_CONTEXT_SELECTOR= 1; /** The presentation type for the context information hover . */ - public final static int LAYOUT_CONTEXT_INFO_POPUP= 2; + public const static int LAYOUT_CONTEXT_INFO_POPUP= 2; int fContextType= LAYOUT_CONTEXT_SELECTOR; Shell[] fShells= new Shell[3];
--- a/dwtx/jface/text/contentassist/ContextInformation.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/contentassist/ContextInformation.d Sun Aug 24 22:34:04 2008 +0200 @@ -60,11 +60,11 @@ public final class ContextInformation : IContextInformation { /** The name of the context. */ - private final String fContextDisplayString; + private const String fContextDisplayString; /** The information to be displayed. */ - private final String fInformationDisplayString; + private const String fInformationDisplayString; /** The image to be displayed. */ - private final Image fImage; + private const Image fImage; /** * Creates a new context information without an image.
--- a/dwtx/jface/text/contentassist/IContentAssistant.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/contentassist/IContentAssistant.d Sun Aug 24 22:34:04 2008 +0200 @@ -113,17 +113,17 @@ //------ proposal popup orientation styles ------------ /** The context info list will overlay the list of completion proposals. */ - public final static int PROPOSAL_OVERLAY= 10; + public const static int PROPOSAL_OVERLAY= 10; /** The completion proposal list will be removed before the context info list will be shown. */ - public final static int PROPOSAL_REMOVE= 11; + public const static int PROPOSAL_REMOVE= 11; /** The context info list will be presented without hiding or overlapping the completion proposal list. */ - public final static int PROPOSAL_STACKED= 12; + public const static int PROPOSAL_STACKED= 12; //------ context info box orientation styles ---------- /** Context info will be shown above the location it has been requested for without hiding the location. */ - public final static int CONTEXT_INFO_ABOVE= 20; + public const static int CONTEXT_INFO_ABOVE= 20; /** Context info will be shown below the location it has been requested for without hiding the location. */ - public final static int CONTEXT_INFO_BELOW= 21; + public const static int CONTEXT_INFO_BELOW= 21; /**
--- a/dwtx/jface/text/formatter/ContentFormatter.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/formatter/ContentFormatter.d Sun Aug 24 22:34:04 2008 +0200 @@ -270,7 +270,7 @@ /** Internal position category used for the formatter partitioning */ - private final static String PARTITIONING= "__formatter_partitioning"; //$NON-NLS-1$ + private const static String PARTITIONING= "__formatter_partitioning"; //$NON-NLS-1$ /** The map of <code>IFormattingStrategy</code> objects */ private Map fStrategies;
--- a/dwtx/jface/text/formatter/ContextBasedFormattingStrategy.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/formatter/ContextBasedFormattingStrategy.d Sun Aug 24 22:34:04 2008 +0200 @@ -43,7 +43,7 @@ private Map fCurrentPreferences= null; /** The list of preferences for initiated the formatting steps */ - private final LinkedList fPreferences= new LinkedList(); + private const LinkedList fPreferences= new LinkedList(); /* * @see dwtx.jface.text.formatter.IFormattingStrategyExtension#format()
--- a/dwtx/jface/text/formatter/FormattingContext.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/formatter/FormattingContext.d Sun Aug 24 22:34:04 2008 +0200 @@ -39,7 +39,7 @@ public class FormattingContext : IFormattingContext { /** Map to store the properties */ - private final Map fMap= new HashMap(); + private const Map fMap= new HashMap(); /* * @see dwtx.jface.text.formatter.IFormattingContext#dispose()
--- a/dwtx/jface/text/formatter/MultiPassContentFormatter.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/formatter/MultiPassContentFormatter.d Sun Aug 24 22:34:04 2008 +0200 @@ -116,11 +116,11 @@ /** The master formatting strategy */ private IFormattingStrategyExtension fMaster= null; /** The partitioning of this content formatter */ - private final String fPartitioning; + private const String fPartitioning; /** The slave formatting strategies */ - private final Map fSlaves= new HashMap(); + private const Map fSlaves= new HashMap(); /** The default content type */ - private final String fType; + private const String fType; /** * Creates a new content formatter.
--- a/dwtx/jface/text/hyperlink/DefaultHyperlinkPresenter.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/hyperlink/DefaultHyperlinkPresenter.d Sun Aug 24 22:34:04 2008 +0200 @@ -82,7 +82,7 @@ * @see dwtx.jface.resource.StringConverter * @see dwtx.jface.preference.PreferenceConverter */ - public final static String HYPERLINK_COLOR= "hyperlinkColor"; //$NON-NLS-1$ + public const static String HYPERLINK_COLOR= "hyperlinkColor"; //$NON-NLS-1$ /** The text viewer. */
--- a/dwtx/jface/text/hyperlink/HyperlinkManager.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/hyperlink/HyperlinkManager.d Sun Aug 24 22:34:04 2008 +0200 @@ -138,7 +138,7 @@ /** The hyperlink presenter. */ private IHyperlinkPresenter fHyperlinkPresenter; /** The detection strategy. */ - private final DETECTION_STRATEGY fDetectionStrategy; + private const DETECTION_STRATEGY fDetectionStrategy; /**
--- a/dwtx/jface/text/hyperlink/MultipleHyperlinkPresenter.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/hyperlink/MultipleHyperlinkPresenter.d Sun Aug 24 22:34:04 2008 +0200 @@ -124,7 +124,7 @@ } } - private final MultipleHyperlinkHoverManager fManager; + private const MultipleHyperlinkHoverManager fManager; private IHyperlink[] fInput; private Composite fParent; @@ -509,9 +509,9 @@ */ private static final int WIDGET_TOKEN_PRIORITY= 1; - private final MultipleHyperlinkHover fHover; - private final ITextViewer fTextViewer; - private final MultipleHyperlinkPresenter fHyperlinkPresenter; + private const MultipleHyperlinkHover fHover; + private const ITextViewer fTextViewer; + private const MultipleHyperlinkPresenter fHyperlinkPresenter; private Closer fCloser; private bool fIsControlVisible;
--- a/dwtx/jface/text/link/InclusivePositionUpdater.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/link/InclusivePositionUpdater.d Sun Aug 24 22:34:04 2008 +0200 @@ -46,7 +46,7 @@ public class InclusivePositionUpdater : IPositionUpdater { /** The position category. */ - private final String fCategory; + private const String fCategory; /** * Creates a new updater for the given <code>category</code>.
--- a/dwtx/jface/text/link/LinkedModeModel.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/link/LinkedModeModel.d Sun Aug 24 22:34:04 2008 +0200 @@ -262,13 +262,13 @@ } /** The set of linked position groups. */ - private final List fGroups= new ArrayList(); + private const List fGroups= new ArrayList(); /** The set of documents spanned by this group. */ - private final Set fDocuments= new HashSet(); + private const Set fDocuments= new HashSet(); /** The position updater for linked positions. */ - private final IPositionUpdater fUpdater= new InclusivePositionUpdater(getCategory()); + private const IPositionUpdater fUpdater= new InclusivePositionUpdater(getCategory()); /** The document listener on the documents affected by this model. */ - private final DocumentListener fDocumentListener= new DocumentListener(); + private const DocumentListener fDocumentListener= new DocumentListener(); /** The parent model for a hierarchical set up, or <code>null</code>. */ private LinkedModeModel fParentEnvironment; /** @@ -285,7 +285,7 @@ /** <code>true</code> when this model is changing documents. */ private bool fIsChanging= false; /** The linked listeners. */ - private final List fListeners= new ArrayList(); + private const List fListeners= new ArrayList(); /** Flag telling whether we have exited: */ private bool fIsActive= true; /**
--- a/dwtx/jface/text/link/LinkedModeUI.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/link/LinkedModeUI.d Sun Aug 24 22:34:04 2008 +0200 @@ -601,7 +601,7 @@ private IDocumentListener fDocumentListener= new DocumentListener(); /** The last caret position, used by fCaretListener. */ - private final Position fCaretPosition= new Position(0, 0); + private const Position fCaretPosition= new Position(0, 0); /** The exit policy to control custom exit behavior */ private IExitPolicy fExitPolicy= new NullExitPolicy(); /** The current frame position shown in the UI, or <code>null</code>. */
--- a/dwtx/jface/text/link/LinkedPositionAnnotations.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/link/LinkedPositionAnnotations.d Sun Aug 24 22:34:04 2008 +0200 @@ -60,8 +60,8 @@ private Annotation fFocusAnnotation= null; private Annotation fExitAnnotation= null; - private final Map fGroupAnnotations= new HashMap(); - private final Map fTargetAnnotations= new HashMap(); + private const Map fGroupAnnotations= new HashMap(); + private const Map fTargetAnnotations= new HashMap(); private Position[] fTargets= new Position[0]; private LinkedPosition fExitPosition= null;
--- a/dwtx/jface/text/link/LinkedPositionGroup.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/link/LinkedPositionGroup.d Sun Aug 24 22:34:04 2008 +0200 @@ -71,7 +71,7 @@ /* members */ /** The linked positions of this group. */ - private final List fPositions= new LinkedList(); + private const List fPositions= new LinkedList(); /** Whether we are sealed or not. */ private bool fIsSealed= false; /**
--- a/dwtx/jface/text/link/TabStopIterator.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/link/TabStopIterator.d Sun Aug 24 22:34:04 2008 +0200 @@ -73,7 +73,7 @@ private static final Comparator fComparator= new SequenceComparator(); /** The iteration sequence. */ - private final ArrayList fList; + private const ArrayList fList; /** The size of <code>fList</code>. */ private int fSize; /** Index of the current element, to the first one initially. */
--- a/dwtx/jface/text/projection/ProjectionDocument.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/projection/ProjectionDocument.d Sun Aug 24 22:34:04 2008 +0200 @@ -84,14 +84,14 @@ * document's fragments that correspond to the segments of the projection * document. */ - private final static String FRAGMENTS_CATEGORY_PREFIX= "__fragmentsCategory"; //$NON-NLS-1$ + private const static String FRAGMENTS_CATEGORY_PREFIX= "__fragmentsCategory"; //$NON-NLS-1$ /** * Name of the position category used to keep track of the project * document's segments that correspond to the fragments of the master * document. */ - private final static String SEGMENTS_CATEGORY= "__segmentsCategory"; //$NON-NLS-1$ + private const static String SEGMENTS_CATEGORY= "__segmentsCategory"; //$NON-NLS-1$ /** The master document */
--- a/dwtx/jface/text/projection/ProjectionDocumentEvent.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/projection/ProjectionDocumentEvent.d Sun Aug 24 22:34:04 2008 +0200 @@ -52,9 +52,9 @@ public class ProjectionDocumentEvent : SlaveDocumentEvent { /** The change type indicating a projection change */ - public final static Object PROJECTION_CHANGE= new Object(); + public const static Object PROJECTION_CHANGE= new Object(); /** The change type indicating a content change */ - public final static Object CONTENT_CHANGE= new Object(); + public const static Object CONTENT_CHANGE= new Object(); /** The change type */ private Object fChangeType;
--- a/dwtx/jface/text/revisions/IRevisionRulerColumnExtension.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/revisions/IRevisionRulerColumnExtension.d Sun Aug 24 22:34:04 2008 +0200 @@ -43,7 +43,7 @@ * Rendering mode type-safe enum. */ final class RenderingMode { - private final String fName; + private const String fName; private this(String name) { Assert.isLegal(name !is null); fName= name;
--- a/dwtx/jface/text/revisions/Revision.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/revisions/Revision.d Sun Aug 24 22:34:04 2008 +0200 @@ -44,7 +44,7 @@ */ public abstract class Revision { /** The original list of change regions, element type: {@link ChangeRegion}. */ - private final List fChangeRegions= new ArrayList(); + private const List fChangeRegions= new ArrayList(); /** * The cached list of adjusted ranges, element type: {@link RevisionRange}. <code>null</code> * if the list must be re-computed. Unmodifiable.
--- a/dwtx/jface/text/revisions/RevisionEvent.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/revisions/RevisionEvent.d Sun Aug 24 22:34:04 2008 +0200 @@ -36,7 +36,7 @@ */ public final class RevisionEvent { - private final RevisionInformation fInformation; + private const RevisionInformation fInformation; /** * Creates a new event.
--- a/dwtx/jface/text/revisions/RevisionInformation.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/revisions/RevisionInformation.d Sun Aug 24 22:34:04 2008 +0200 @@ -45,9 +45,9 @@ */ public final class RevisionInformation : ITextHoverExtension, IInformationProviderExtension2 { /** The revisions, element type: {@link Revision}. */ - private final List fRevisions= new ArrayList(); + private const List fRevisions= new ArrayList(); /** A unmodifiable view of <code>fRevisions</code>. */ - private final List fRORevisions= Collections.unmodifiableList(fRevisions); + private const List fRORevisions= Collections.unmodifiableList(fRevisions); /** * The flattened list of {@link RevisionRange}s, unmodifiable. <code>null</code> if the list * must be re-computed.
--- a/dwtx/jface/text/revisions/RevisionRange.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/revisions/RevisionRange.d Sun Aug 24 22:34:04 2008 +0200 @@ -34,9 +34,9 @@ * @noinstantiate This class is not intended to be instantiated by clients. */ public final class RevisionRange : ILineRange { - private final Revision fRevision; - private final int fStartLine; - private final int fNumberOfLines; + private const Revision fRevision; + private const int fStartLine; + private const int fNumberOfLines; this(Revision revision, ILineRange range) { Assert.isLegal(revision !is null);
--- a/dwtx/jface/text/rules/BufferedRuleBasedScanner.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/rules/BufferedRuleBasedScanner.d Sun Aug 24 22:34:04 2008 +0200 @@ -54,7 +54,7 @@ public class BufferedRuleBasedScanner : RuleBasedScanner { /** The default buffer size. Value = 500 */ - private final static int DEFAULT_BUFFER_SIZE= 500; + private const static int DEFAULT_BUFFER_SIZE= 500; /** The actual size of the buffer. Initially set to <code>DEFAULT_BUFFER_SIZE</code> */ private int fBufferSize= DEFAULT_BUFFER_SIZE; /** The buffer */
--- a/dwtx/jface/text/rules/DefaultPartitioner.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/rules/DefaultPartitioner.d Sun Aug 24 22:34:04 2008 +0200 @@ -83,7 +83,7 @@ * The position category this partitioner uses to store the document's partitioning information. * @deprecated As of 3.0, use <code>getManagingPositionCategories()</code> instead. */ - public final static String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$ + public const static String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$ /** The partitioner's scanner */
--- a/dwtx/jface/text/rules/FastPartitioner.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/rules/FastPartitioner.d Sun Aug 24 22:34:04 2008 +0200 @@ -109,7 +109,7 @@ /** * The position category this partitioner uses to store the document's partitioning information. */ - private final String fPositionCategory; + private const String fPositionCategory; /** * The active document rewrite session. */
--- a/dwtx/jface/text/rules/RuleBasedPartitioner.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/rules/RuleBasedPartitioner.d Sun Aug 24 22:34:04 2008 +0200 @@ -83,7 +83,7 @@ * The position category this partitioner uses to store the document's partitioning information * @deprecated As of 3.0, use <code>getManagingPositionCategories()</code>. */ - public final static String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$ + public const static String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$ /** The partitioner's scanner */
--- a/dwtx/jface/text/source/AbstractRulerColumn.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/AbstractRulerColumn.d Sun Aug 24 22:34:04 2008 +0200 @@ -209,9 +209,9 @@ /* Listeners */ /** The viewport listener. */ - private final InternalListener fInternalListener= new InternalListener(); + private const InternalListener fInternalListener= new InternalListener(); /** The mouse handler. */ - private final MouseHandler fMouseHandler= new MouseHandler(); + private const MouseHandler fMouseHandler= new MouseHandler(); /* * Implementation and context of this ruler - created and set in createControl(), disposed of in
--- a/dwtx/jface/text/source/Annotation.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/Annotation.d Sun Aug 24 22:34:04 2008 +0200 @@ -93,7 +93,7 @@ * Value: <code>"dwtx.text.annotation.unknown"</code> * @since 3.0 */ - public final static String TYPE_UNKNOWN= "dwtx.text.annotation.unknown"; //$NON-NLS-1$ + public const static String TYPE_UNKNOWN= "dwtx.text.annotation.unknown"; //$NON-NLS-1$ /**
--- a/dwtx/jface/text/source/AnnotationMap.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/AnnotationMap.d Sun Aug 24 22:34:04 2008 +0200 @@ -102,7 +102,7 @@ * The internal lock object used if <code>fLockObject</code> is <code>null</code>. * @since 3.2 */ - private final Object fInternalLockObject= new Object(); + private const Object fInternalLockObject= new Object(); /** The map holding the annotations */ private Map fInternalMap;
--- a/dwtx/jface/text/source/AnnotationModel.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/AnnotationModel.d Sun Aug 24 22:34:04 2008 +0200 @@ -115,10 +115,10 @@ */ private static final class RegionIterator : Iterator { - private final Iterator fParentIterator; - private final bool fCanEndAfter; - private final bool fCanStartBefore; - private final IAnnotationModel fModel; + private const Iterator fParentIterator; + private const bool fCanEndAfter; + private const bool fCanStartBefore; + private const IAnnotationModel fModel; private Object fNext; private Position fRegion; @@ -207,9 +207,9 @@ private static final class AnnotationsInterator : Iterator { private Object fNext; - private final Position[] fPositions; + private const Position[] fPositions; private int fIndex; - private final Map fMap; + private const Map fMap; /** * @param positions positions to iterate over
--- a/dwtx/jface/text/source/ChangeRulerColumn.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/ChangeRulerColumn.d Sun Aug 24 22:34:04 2008 +0200 @@ -186,22 +186,22 @@ /** * The view(port) listener. */ - private final InternalListener fInternalListener= new InternalListener(); + private const InternalListener fInternalListener= new InternalListener(); /** * The mouse handler. * @since 3.2 */ - private final MouseHandler fMouseHandler= new MouseHandler(); + private const MouseHandler fMouseHandler= new MouseHandler(); /** * The revision painter. * @since 3.2 */ - private final RevisionPainter fRevisionPainter; + private const RevisionPainter fRevisionPainter; /** * The diff info painter. * @since 3.2 */ - private final DiffPainter fDiffPainter; + private const DiffPainter fDiffPainter; /** This column's parent ruler */ private CompositeRuler fParentRuler; @@ -216,7 +216,7 @@ /** The ruler's annotation model. */ private IAnnotationModel fAnnotationModel; /** The width of the change ruler column. */ - private final int fWidth= 5; + private const int fWidth= 5; /** Cache for the actual scroll position in pixels */ private int fScrollPos;
--- a/dwtx/jface/text/source/DefaultCharacterPairMatcher.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/DefaultCharacterPairMatcher.d Sun Aug 24 22:34:04 2008 +0200 @@ -98,8 +98,8 @@ public class DefaultCharacterPairMatcher : ICharacterPairMatcher { private int fAnchor= -1; - private final CharPairs fPairs; - private final String fPartitioning; + private const CharPairs fPairs; + private const String fPartitioning; /** * Creates a new character pair matcher that matches the specified @@ -221,8 +221,8 @@ */ private static class DocumentPartitionAccessor { - private final IDocument fDocument; - private final String fPartitioning, fPartition; + private const IDocument fDocument; + private const String fPartitioning, fPartition; private ITypedRegion fCachedPartition; /** @@ -338,7 +338,7 @@ */ private static class CharPairs { - private final char[] fPairs; + private const char[] fPairs; public this(char[] pairs) { fPairs= pairs;
--- a/dwtx/jface/text/source/LineNumberChangeRulerColumn.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/LineNumberChangeRulerColumn.d Sun Aug 24 22:34:04 2008 +0200 @@ -110,13 +110,13 @@ * * @since 3.2 */ - private final RevisionPainter fRevisionPainter; + private const RevisionPainter fRevisionPainter; /** * The diff information painter strategy. * * @since 3.2 */ - private final DiffPainter fDiffPainter; + private const DiffPainter fDiffPainter; /** * Whether to show number or to behave like a change ruler column. * @since 3.3
--- a/dwtx/jface/text/source/projection/ProjectionSupport.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/projection/ProjectionSupport.d Sun Aug 24 22:34:04 2008 +0200 @@ -61,7 +61,7 @@ * Key of the projection annotation model inside the visual annotation * model. Also internally used as key for the projection drawing strategy. */ - public final static Object PROJECTION= new Object(); + public const static Object PROJECTION= new Object(); private static class ProjectionAnnotationsPainter : AnnotationPainter {
--- a/dwtx/jface/text/source/projection/SourceViewerInformationControl.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/source/projection/SourceViewerInformationControl.d Sun Aug 24 22:34:04 2008 +0200 @@ -73,7 +73,7 @@ /** The control's text widget */ private StyledText fText; /** The symbolic font name of the text font */ - private final String fSymbolicFontName; + private const String fSymbolicFontName; /** The text font (do not dispose!) */ private Font fTextFont; /** The control's source viewer */
--- a/dwtx/jface/text/templates/ContextTypeRegistry.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/ContextTypeRegistry.d Sun Aug 24 22:34:04 2008 +0200 @@ -51,7 +51,7 @@ public class ContextTypeRegistry { /** all known context types */ - private final Map fContextTypes= new LinkedHashMap(); + private const Map fContextTypes= new LinkedHashMap(); /** * Adds a context type to the registry. If there already is a context type
--- a/dwtx/jface/text/templates/DocumentTemplateContext.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/DocumentTemplateContext.d Sun Aug 24 22:34:04 2008 +0200 @@ -54,13 +54,13 @@ public class DocumentTemplateContext : TemplateContext { /** The text of the document. */ - private final IDocument fDocument; + private const IDocument fDocument; /** * The region of the document described by this context. We store a * position since clients may specify the document region as (updateable) * Positions. */ - private final Position fPosition; + private const Position fPosition; /** * The original offset of this context. Will only be updated by the setter * method.
--- a/dwtx/jface/text/templates/InclusivePositionUpdater.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/InclusivePositionUpdater.d Sun Aug 24 22:34:04 2008 +0200 @@ -48,7 +48,7 @@ class InclusivePositionUpdater : IPositionUpdater { /** The position category. */ - private final String fCategory; + private const String fCategory; /** * Creates a new updater for the given <code>category</code>.
--- a/dwtx/jface/text/templates/Template.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/Template.d Sun Aug 24 22:34:04 2008 +0200 @@ -59,7 +59,7 @@ * The auto insertable property. * @since 3.1 */ - private final bool fIsAutoInsertable; + private const bool fIsAutoInsertable; /** * Creates an empty template.
--- a/dwtx/jface/text/templates/TemplateContext.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/TemplateContext.d Sun Aug 24 22:34:04 2008 +0200 @@ -51,9 +51,9 @@ public abstract class TemplateContext { /** The context type of this context */ - private final TemplateContextType fContextType; + private const TemplateContextType fContextType; /** Additional variables. */ - private final Map fVariables= new HashMap(); + private const Map fVariables= new HashMap(); /** A flag to indicate that the context should not be modified. */ private bool fReadOnly;
--- a/dwtx/jface/text/templates/TemplateContextType.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/TemplateContextType.d Sun Aug 24 22:34:04 2008 +0200 @@ -70,7 +70,7 @@ private /* final */ String fId= null; /** Variable resolvers used by this content type. */ - private final Map fResolvers= new HashMap(); + private const Map fResolvers= new HashMap(); /** The name of the context type. */ private String fName= null;
--- a/dwtx/jface/text/templates/TemplateProposal.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/TemplateProposal.d Sun Aug 24 22:34:04 2008 +0200 @@ -71,10 +71,10 @@ */ public class TemplateProposal : ICompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3 { - private final Template fTemplate; - private final TemplateContext fContext; - private final Image fImage; - private final IRegion fRegion; + private const Template fTemplate; + private const TemplateContext fContext; + private const Image fImage; + private const IRegion fRegion; private int fRelevance; private IRegion fSelectedRegion; // initialized by apply()
--- a/dwtx/jface/text/templates/TemplateVariable.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/TemplateVariable.d Sun Aug 24 22:34:04 2008 +0200 @@ -57,11 +57,11 @@ public class TemplateVariable { /** The type name of the variable */ - private final TemplateVariableType fType; + private const TemplateVariableType fType; /** The name of the variable. */ - private final String fName; + private const String fName; /** The initial length in the template pattern. */ - private final int fInitialLength; + private const int fInitialLength; /** The offsets of the variable. */ private int[] fOffsets; /** Flag indicating if the variable has been resolved unambiguously. */
--- a/dwtx/jface/text/templates/TemplateVariableType.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/TemplateVariableType.d Sun Aug 24 22:34:04 2008 +0200 @@ -52,9 +52,9 @@ public final class TemplateVariableType { /** The name of the type. */ - private final String fName; + private const String fName; /** The parameter list. */ - private final List fParams; + private const List fParams; this(String name) { this(name, new String[0]);
--- a/dwtx/jface/text/templates/persistence/TemplatePersistenceData.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/persistence/TemplatePersistenceData.d Sun Aug 24 22:34:04 2008 +0200 @@ -38,9 +38,9 @@ * @noextend This class is not intended to be subclassed by clients. */ public class TemplatePersistenceData { - private final Template fOriginalTemplate; - private final String fId; - private final bool fOriginalIsEnabled; + private const Template fOriginalTemplate; + private const String fId; + private const bool fOriginalIsEnabled; private Template fCustomTemplate= null; private bool fIsDeleted= false;
--- a/dwtx/jface/text/templates/persistence/TemplateStore.d Sun Aug 24 22:31:00 2008 +0200 +++ b/dwtx/jface/text/templates/persistence/TemplateStore.d Sun Aug 24 22:34:04 2008 +0200 @@ -45,7 +45,7 @@ */ public class TemplateStore { /** The stored templates. */ - private final List fTemplates= new ArrayList(); + private const List fTemplates= new ArrayList(); /** The preference store. */ private IPreferenceStore fPreferenceStore; /**