--- a/dwtx/jface/viewers/TreeViewer.d	Thu Apr 10 19:10:12 2008 +0200
+++ b/dwtx/jface/viewers/TreeViewer.d	Fri Apr 11 01:24:25 2008 +0200
@@ -76,10 +76,12 @@
  * </p>
  */
 public class TreeViewer : AbstractTreeViewer {
-
-    public alias AbstractTreeViewer.preservingSelection preservingSelection;
-    public alias AbstractTreeViewer.getSelection getSelection;
-    public alias AbstractTreeViewer.setSelection setSelection;
+    alias AbstractTreeViewer.addTreeListener addTreeListener;
+    alias AbstractTreeViewer.getLabelProvider getLabelProvider;
+    alias AbstractTreeViewer.getSelection getSelection;
+    alias AbstractTreeViewer.preservingSelection preservingSelection;
+    alias AbstractTreeViewer.remove remove;
+    alias AbstractTreeViewer.setSelection setSelection;
 
     private static final String VIRTUAL_DISPOSE_KEY = Policy.JFACE
             ~ ".DISPOSE_LISTENER"; //$NON-NLS-1$
@@ -153,7 +155,7 @@
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected void addTreeListener(Control c, TreeListener listener) {
+    protected override void addTreeListener(Control c, TreeListener listener) {
         (cast(Tree) c).addTreeListener(listener);
     }
 
@@ -162,7 +164,7 @@
      *
      * @see dwtx.jface.viewers.ColumnViewer#getColumnViewerOwner(int)
      */
-    protected Widget getColumnViewerOwner(int columnIndex) {
+    protected override Widget getColumnViewerOwner(int columnIndex) {
         if (columnIndex < 0 || ( columnIndex > 0 && columnIndex >= getTree().getColumnCount() ) ) {
             return null;
         }
@@ -176,7 +178,7 @@
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected Item[] getChildren(Widget o) {
+    protected override Item[] getChildren(Widget o) {
         if (auto ti = cast(TreeItem)o ) {
             return ti.getItems();
         }
@@ -189,14 +191,14 @@
     /*
      * (non-Javadoc) Method declared in Viewer.
      */
-    public Control getControl() {
+    public override Control getControl() {
         return tree;
     }
 
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected bool getExpanded(Item item) {
+    protected override bool getExpanded(Item item) {
         return (cast(TreeItem) item).getExpanded();
     }
 
@@ -205,7 +207,7 @@
      *
      * @see dwtx.jface.viewers.ColumnViewer#getItemAt(dwt.graphics.Point)
      */
-    protected Item getItemAt(Point p) {
+    protected override Item getItemAt(Point p) {
         TreeItem[] selection = tree.getSelection();
 
         if( selection.length is 1 ) {
@@ -224,21 +226,21 @@
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected int getItemCount(Control widget) {
+    protected override int getItemCount(Control widget) {
         return (cast(Tree) widget).getItemCount();
     }
 
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected int getItemCount(Item item) {
+    protected override int getItemCount(Item item) {
         return (cast(TreeItem) item).getItemCount();
     }
 
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected Item[] getItems(Item item) {
+    protected override Item[] getItems(Item item) {
         return (cast(TreeItem) item).getItems();
     }
 
@@ -251,21 +253,21 @@
      * <code>ILabelProvider</code>, then it provides only the label text and
      * image for the first column, and any remaining columns are blank.
      */
-    public IBaseLabelProvider getLabelProvider() {
+    public override IBaseLabelProvider getLabelProvider() {
         return super.getLabelProvider();
     }
 
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected Item getParentItem(Item item) {
+    protected override Item getParentItem(Item item) {
         return (cast(TreeItem) item).getParentItem();
     }
 
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected Item[] getSelection(Control widget) {
+    protected override Item[] getSelection(Control widget) {
         return (cast(Tree) widget).getSelection();
     }
 
@@ -283,7 +285,7 @@
      *
      * @see dwtx.jface.viewers.AbstractTreeViewer#hookControl(dwt.widgets.Control)
      */
-    protected void hookControl(Control control) {
+    protected override void hookControl(Control control) {
         super.hookControl(control);
         Tree treeControl = cast(Tree) control;
 
@@ -311,14 +313,14 @@
         }
     }
 
-    protected ColumnViewerEditor createViewerEditor() {
+    protected override ColumnViewerEditor createViewerEditor() {
         return new TreeViewerEditor(this,null,new ColumnViewerEditorActivationStrategy(this),ColumnViewerEditor.DEFAULT);
     }
 
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected Item newItem(Widget parent, int flags, int ix) {
+    protected override Item newItem(Widget parent, int flags, int ix) {
         TreeItem item;
 
         if ( cast(TreeItem)parent ) {
@@ -334,14 +336,14 @@
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected void removeAll(Control widget) {
+    protected override void removeAll(Control widget) {
         (cast(Tree) widget).removeAll();
     }
 
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected void setExpanded(Item node, bool expand) {
+    protected override void setExpanded(Item node, bool expand) {
         (cast(TreeItem) node).setExpanded(expand);
         if (contentProviderIsLazy) {
             // force repaints to happen
@@ -352,7 +354,7 @@
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected void setSelection(SeqView!(Item) items) {
+    protected override void setSelection(SeqView!(Item) items) {
 
         Item[] current = getSelection(getTree());
 
@@ -367,7 +369,7 @@
     /*
      * (non-Javadoc) Method declared in AbstractTreeViewer.
      */
-    protected void showItem(Item item) {
+    protected override void showItem(Item item) {
         getTree().showItem(cast(TreeItem) item);
     }
 
@@ -377,7 +379,7 @@
      * @see dwtx.jface.viewers.AbstractTreeViewer#getChild(dwt.widgets.Widget,
      *      int)
      */
-    protected Item getChild(Widget widget, int index) {
+    protected override Item getChild(Widget widget, int index) {
         if (auto ti = cast(TreeItem)widget ) {
             return ti.getItem(index);
         }
@@ -387,7 +389,7 @@
         return null;
     }
 
-    protected void assertContentProviderType(IContentProvider provider) {
+    protected override void assertContentProviderType(IContentProvider provider) {
         if ( null !is cast(ILazyTreeContentProvider)provider
                 || null !is cast(ILazyTreePathContentProvider)provider ) {
             return;
@@ -395,14 +397,14 @@
         super.assertContentProviderType(provider);
     }
 
-    protected Object[] getRawChildren(Object parent) {
+    protected override Object[] getRawChildren(Object parent) {
         if (contentProviderIsLazy) {
             return new Object[0];
         }
         return super.getRawChildren(parent);
     }
 
-    void preservingSelection(Runnable updateCode, bool reveal) {
+    override void preservingSelection(Runnable updateCode, bool reveal) {
         if (preservingSelection_){
             // avoid preserving the selection if called reentrantly,
             // see bug 172640
@@ -591,7 +593,7 @@
         return selection;
     }
 
-    public bool isExpandable(Object element) {
+    public override bool isExpandable(Object element) {
         if (contentProviderIsLazy) {
             TreeItem treeItem = cast(TreeItem) internalExpand(element, false);
             if (treeItem is null) {
@@ -603,7 +605,7 @@
         return super.isExpandable(element);
     }
 
-    protected Object getParentElement(Object element) {
+    protected override Object getParentElement(Object element) {
         bool oldBusy = busy;
         busy = true;
         try {
@@ -625,7 +627,7 @@
         }
     }
 
-    protected void createChildren(Widget widget) {
+    protected override void createChildren(Widget widget) {
         if (contentProviderIsLazy) {
             Object element = widget.getData();
             if (element is null && cast(TreeItem)widget ) {
@@ -655,7 +657,7 @@
         super.createChildren(widget);
     }
 
-    protected void internalAdd(Widget widget, Object parentElement,
+    protected override void internalAdd(Widget widget, Object parentElement,
             Object[] childElements) {
         if (contentProviderIsLazy) {
             if (auto ti = cast(TreeItem)widget ) {
@@ -702,7 +704,7 @@
      * @see dwtx.jface.viewers.AbstractTreeViewer#internalRefreshStruct(dwt.widgets.Widget,
      *      java.lang.Object, bool)
      */
-    protected void internalRefreshStruct(Widget widget, Object element,
+    protected override void internalRefreshStruct(Widget widget, Object element,
             bool updateLabels) {
         if (contentProviderIsLazy) {
             // clear all starting with the given widget
@@ -765,7 +767,7 @@
      * To unmap elements correctly, we need to register a dispose listener with
      * the item if the tree is virtual.
      */
-    protected void mapElement(Object element, Widget item) {
+    protected override void mapElement(Object element, Widget item) {
         super.mapElement(element, item);
         // make sure to unmap elements if the tree is virtual
         if ((getTree().getStyle() & DWT.VIRTUAL) !is 0) {
@@ -796,7 +798,7 @@
      *
      * @see dwtx.jface.viewers.ColumnViewer#getRowPartFromItem(dwt.widgets.Widget)
      */
-    protected ViewerRow getViewerRowFromItem(Widget item) {
+    protected override ViewerRow getViewerRowFromItem(Widget item) {
         if( cachedRow is null ) {
             cachedRow = new TreeViewerRow(cast(TreeItem) item);
         } else {
@@ -836,7 +838,7 @@
      *
      * @see dwtx.jface.viewers.AbstractTreeViewer#internalInitializeTree(dwt.widgets.Control)
      */
-    protected void internalInitializeTree(Control widget) {
+    protected override void internalInitializeTree(Control widget) {
         if (contentProviderIsLazy) {
             if (cast(Tree)widget && widget.getData() !is null) {
                 virtualLazyUpdateChildCount(widget, 0);
@@ -852,7 +854,7 @@
      * @see dwtx.jface.viewers.AbstractTreeViewer#updatePlus(dwt.widgets.Item,
      *      java.lang.Object)
      */
-    protected void updatePlus(Item item, Object element) {
+    protected override void updatePlus(Item item, Object element) {
         if (contentProviderIsLazy) {
             Object data = item.getData();
             int itemCount = 0;
@@ -938,7 +940,7 @@
     /* (non-Javadoc)
      * @see dwtx.jface.viewers.AbstractTreeViewer#handleTreeExpand(dwt.events.TreeEvent)
      */
-    protected void handleTreeExpand(TreeEvent event) {
+    protected override void handleTreeExpand(TreeEvent event) {
         if (contentProviderIsLazy) {
             if (event.item.getData() !is null) {
                 Item[] children = getChildren(event.item);
@@ -958,7 +960,7 @@
     /* (non-Javadoc)
      * @see dwtx.jface.viewers.AbstractTreeViewer#setContentProvider(dwtx.jface.viewers.IContentProvider)
      */
-    public void setContentProvider(IContentProvider provider) {
+    public override void setContentProvider(IContentProvider provider) {
         contentProviderIsLazy = (cast(ILazyTreeContentProvider)provider )
                 || (cast(ILazyTreePathContentProvider)provider );
         contentProviderIsTreeBased = null !is cast(ILazyTreePathContentProvider)provider ;
@@ -1108,7 +1110,7 @@
         }
     }
 
-    protected void disassociate(Item item) {
+    protected override void disassociate(Item item) {
         if (contentProviderIsLazy) {
             // avoid causing a callback:
             item.setText(" "); //$NON-NLS-1$
@@ -1116,7 +1118,7 @@
         super.disassociate(item);
     }
 
-    protected int doGetColumnCount() {
+    protected override int doGetColumnCount() {
         return tree.getColumnCount();
     }
 
@@ -1134,11 +1136,11 @@
      *            <code>true</code> if the selection is to be made visible,
      *            and <code>false</code> otherwise
      */
-    public void setSelection(ISelection selection, bool reveal) {
+    public override void setSelection(ISelection selection, bool reveal) {
         super.setSelection(selection, reveal);
     }
 
-    public void editElement(Object element, int column) {
+    public override void editElement(Object element, int column) {
         if( cast(TreePath)element ) {
             setSelection(new TreeSelection(cast(TreePath) element));
             TreeItem[] items = tree.getSelection();