--- a/dwtx/jface/viewers/ColumnViewerEditor.d	Thu May 22 04:03:58 2008 +0200
+++ b/dwtx/jface/viewers/ColumnViewerEditor.d	Thu May 22 17:56:17 2008 +0200
@@ -183,9 +183,9 @@
                 && part.getEditingSupport().canEdit_package(element)) {
             cellEditor = part.getEditingSupport().getCellEditor_package(element);
             if (cellEditor !is null) {
-                int timeout = cellEditor.getDoubleClickTimeout();
+                int timeout = cellEditor.getDoubleClickTimeout_package();
 
-                final int activationTime;
+                int activationTime;
 
                 if (timeout !is 0) {
                     activationTime = activationEvent.time + timeout;
@@ -227,7 +227,7 @@
                 setEditor(control, cast(Item) cell.getItem(), cell.getColumnIndex());
                 cellEditor.setFocus();
 
-                if (cellEditor.dependsOnExternalFocusListener()) {
+                if (cellEditor.dependsOnExternalFocusListener_package()) {
                     if (focusListener is null) {
                         focusListener = new class FocusAdapter {
                             public void focusLost(FocusEvent e) {
@@ -238,17 +238,19 @@
                     control.addFocusListener(focusListener);
                 }
 
-                mouseListener = new class(control, activationEvent) MouseAdapter {
+                mouseListener = new class(control, activationEvent, activationTime) MouseAdapter {
                     Control control_;
                     ColumnViewerEditorActivationEvent activationEvent_;
-                    this(Control a, ColumnViewerEditorActivationEvent b){
+                    int activationTime_;
+                    this(Control a, ColumnViewerEditorActivationEvent b, int c){
                         control_=a;
                         activationEvent_=b;
+                        activationTime_=c;
                     }
                     public void mouseDown(MouseEvent e) {
                         // time wrap?
                         // check for expiration of doubleClickTime
-                        if (shouldFireDoubleClick(activationTime, e.time, activationEvent_) && e.button is 1) {
+                        if (shouldFireDoubleClick(activationTime_, e.time, activationEvent_) && e.button is 1) {
                             control_.removeMouseListener(mouseListener);
                             cancelEditing();
                             handleDoubleClickEvent();
@@ -355,7 +357,7 @@
                             control.removeTraverseListener(tabeditingListener);
                         }
                     }
-                    c.deactivate(tmp);
+                    c.deactivate_package(tmp);
 
                     if (editorActivationListener !is null
                             && !editorActivationListener.isEmpty()) {
@@ -424,7 +426,7 @@
                     }
 
                     CellEditor oldEditor = cellEditor;
-                    oldEditor.deactivate(tmp);
+                    oldEditor.deactivate_package(tmp);
 
                     if (editorActivationListener !is null
                             && !editorActivationListener.isEmpty()) {
@@ -616,7 +618,7 @@
     private bool isCellEditable(ColumnViewer viewer, ViewerCell cell) {
         ViewerColumn column = viewer.getViewerColumn(cell.getColumnIndex());
         return column !is null && column.getEditingSupport() !is null
-                && column.getEditingSupport().canEdit(cell.getElement());
+                && column.getEditingSupport().canEdit_package(cell.getElement());
     }
 
     private ViewerCell searchPreviousCell(ViewerRow row,
@@ -628,7 +630,7 @@
             previousCell = currentCell.getNeighbor(ViewerCell.LEFT, true);
         } else {
             if (row.getColumnCount() !is 0) {
-                previousCell = row.getCell(row.getCreationIndex(row
+                previousCell = row.getCell(row.getCreationIndex_package(row
                         .getColumnCount() - 1));
             } else {
                 previousCell = row.getCell(0);
@@ -637,7 +639,7 @@
         }
 
         // No endless loop
-        if (originalCell.equals(previousCell)) {
+        if (originalCell.opEquals(previousCell)) {
             return null;
         }
 
@@ -671,11 +673,11 @@
         if (currentCell !is null) {
             nextCell = currentCell.getNeighbor(ViewerCell.RIGHT, true);
         } else {
-            nextCell = row.getCell(row.getCreationIndex(0));
+            nextCell = row.getCell(row.getCreationIndex_package(0));
         }
 
         // No endless loop
-        if (originalCell.equals(nextCell)) {
+        if (originalCell.opEquals(nextCell)) {
             return null;
         }