# HG changeset patch # User Frank Benoit # Date 1237803949 -3600 # Node ID c4b36186a9bc0445358913e0d56fa203f98a8ba5 # Parent 5d87d4191adf72a423f74b7caa81f953158b65b9 Renamings diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet001TableViewer.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet001TableViewer.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet001TableViewer.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,21 +11,21 @@ * wbaxter at gmail dot com *******************************************************************************/ -module snippets.viewers.Snippet001TableViewer; +module org.eclipse.jface.snippets.viewers.Snippet001TableViewer; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.viewers.Viewer; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; -import dwt.DWT; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.SWT; -import dwt.dwthelper.utils; +import java.lang.all; +import java.util.ArrayList; import tango.util.Convert; -import dwtx.dwtxhelper.Collection; /** * A simple TableViewer to demonstrate usage diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet002TreeViewer.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet002TreeViewer.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet002TreeViewer.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,18 +11,18 @@ * wbaxter at gmail dot com *******************************************************************************/ -module snippets.viewers.Snippet002TreeViewer; +module org.eclipse.jface.snippets.viewers.Snippet002TreeViewer; -import dwt.DWT; -import dwtx.jface.viewers.ITreeContentProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TreeViewer; -import dwtx.jface.viewers.Viewer; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; +import org.eclipse.swt.SWT; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; -import dwt.dwthelper.utils; +import java.lang.all; import tango.util.Convert; diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet004HideSelection.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet004HideSelection.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet004HideSelection.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,23 +11,23 @@ * wbaxter at gmail dot com *******************************************************************************/ -module snippets.viewers.Snippet004HideSelection; +module org.eclipse.jface.snippets.viewers.Snippet004HideSelection; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.StructuredSelection; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.viewers.Viewer; -import dwt.DWT; -import dwt.events.MouseAdapter; -import dwt.events.MouseEvent; -import dwt.graphics.Point; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.MouseAdapter; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; -import dwt.dwthelper.utils; -import dwtx.dwtxhelper.Collection; +import java.lang.all; +import java.util.ArrayList; import tango.util.Convert; @@ -75,7 +75,7 @@ } public this(Shell shell) { - final TableViewer v = new TableViewer(shell,DWT.BORDER|DWT.FULL_SELECTION); + final TableViewer v = new TableViewer(shell,SWT.BORDER|SWT.FULL_SELECTION); v.setLabelProvider(new LabelProvider()); v.setContentProvider(new MyContentProvider()); ArrayList model = createModel(); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet005TreeCustomMenu.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet005TreeCustomMenu.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet005TreeCustomMenu.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,23 +11,23 @@ * wbaxter at gmail dot com *******************************************************************************/ -module snippets.viewers.Snippet005TreeCustomMenu; +module org.eclipse.jface.snippets.viewers.Snippet005TreeCustomMenu; -import dwtx.jface.action.Action; -import dwtx.jface.action.IMenuListener; -import dwtx.jface.action.IMenuManager; -import dwtx.jface.action.MenuManager; -import dwtx.jface.viewers.IStructuredSelection; -import dwtx.jface.viewers.ITreeContentProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TreeViewer; -import dwtx.jface.viewers.Viewer; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; -import dwt.DWT; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IMenuListener; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.SWT; -import dwt.dwthelper.utils; +import java.lang.all; import tango.util.Convert; import tango.io.Stdout; diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet006TableMultiLineCells.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet006TableMultiLineCells.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet006TableMultiLineCells.d Mon Mar 23 11:25:49 2009 +0100 @@ -10,31 +10,31 @@ * Port to the D programming language: * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet006TableMultiLineCells; +module org.eclipse.jface.snippets.viewers.Snippet006TableMultiLineCells; // http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jface.snippets/Eclipse%20JFace%20Snippets/org/eclipse/jface/snippets/viewers/Snippet006TableMultiLineCells.java?view=markup -import dwtx.jface.resource.JFaceResources; -import dwtx.jface.viewers.ColumnPixelData; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.OwnerDrawLabelProvider; -import dwtx.jface.viewers.StructuredSelection; -import dwtx.jface.viewers.TableLayout; -import dwtx.jface.viewers.Viewer; -import dwtx.jface.viewers.TableViewer; -import dwt.DWT; -import dwt.graphics.Font; -import dwt.graphics.Point; -import dwt.layout.GridData; -import dwt.layout.GridLayout; -import dwt.widgets.Composite; -import dwt.widgets.Display; -import dwt.widgets.Event; -import dwt.widgets.Shell; -import dwt.widgets.TableColumn; +import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.jface.viewers.ColumnPixelData; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.OwnerDrawLabelProvider; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TableLayout; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableColumn; -import dwt.dwthelper.utils; +import java.lang.all; version(JIVE){ import jive.stacktrace; } @@ -48,7 +48,7 @@ public static void main(String[] args) { Display display = new Display(); - Shell shell = new Shell(display, DWT.CLOSE|DWT.RESIZE); + Shell shell = new Shell(display, SWT.CLOSE|SWT.RESIZE); shell.setSize(400, 400); shell.setLayout(new GridLayout()); @@ -165,16 +165,16 @@ /* * (non-Javadoc) * - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(dwt.widgets.Composite) + * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ public void createPartControl(Composite parent) { - viewer = new TableViewer(parent, DWT.FULL_SELECTION); + viewer = new TableViewer(parent, SWT.FULL_SELECTION); viewer.setContentProvider(new class() IStructuredContentProvider { /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#dispose() + * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { } @@ -182,7 +182,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ public Object[] getElements(Object inputElement) { return entries; @@ -191,17 +191,17 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#inputChanged(dwtx.jface.viewers.Viewer, + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ - public void inputChanged(dwtx.jface.viewers.Viewer.Viewer viewer, Object oldInput, Object newInput) { + public void inputChanged(org.eclipse.jface.viewers.Viewer.Viewer viewer, Object oldInput, Object newInput) { } }); createColumns(); viewer.setLabelProvider(new class OwnerDrawLabelProvider { /* (non-Javadoc) - * @see dwtx.jface.viewers.OwnerDrawLabelProvider#measure(dwt.widgets.Event, java.lang.Object) + * @see org.eclipse.jface.viewers.OwnerDrawLabelProvider#measure(org.eclipse.swt.widgets.Event, java.lang.Object) */ protected void measure(Event event, Object element) { LineEntry line = cast(LineEntry) element; @@ -214,7 +214,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.OwnerDrawLabelProvider#paint(dwt.widgets.Event, + * @see org.eclipse.jface.viewers.OwnerDrawLabelProvider#paint(org.eclipse.swt.widgets.Event, * java.lang.Object) */ protected void paint(Event event, Object element) { @@ -243,7 +243,7 @@ viewer.getTable().setHeaderVisible(true); viewer.getTable().setLinesVisible(true); - TableColumn tc = new TableColumn(viewer.getTable(), DWT.NONE, 0); + TableColumn tc = new TableColumn(viewer.getTable(), SWT.NONE, 0); layout.addColumnData(new ColumnPixelData(350)); tc.setText("Lines"); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet007FullSelection.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet007FullSelection.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet007FullSelection.d Mon Mar 23 11:25:49 2009 +0100 @@ -9,32 +9,32 @@ * Tom Schindl - initial API and implementation *******************************************************************************/ -module snippets.viewers.Snippet007FullSelection; +module org.eclipse.jface.snippets.viewers.Snippet007FullSelection; -import dwtx.jface.viewers.CellEditor; -import dwtx.jface.viewers.ICellModifier; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.viewers.TextCellEditor; -import dwtx.jface.viewers.Viewer; -import dwt.DWT; -import dwt.graphics.Color; -import dwt.graphics.GC; -import dwt.graphics.Point; -import dwt.graphics.Rectangle; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Event; -import dwt.widgets.Listener; -import dwt.widgets.Shell; -import dwt.widgets.TableColumn; -import dwt.widgets.TableItem; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ICellModifier; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.TableItem; -import dwt.dwthelper.utils; +import java.lang.all; +import java.util.ArrayList; import tango.util.Convert; -import dwtx.dwtxhelper.Collection; /** * TableViewer: Hide full selection @@ -82,7 +82,7 @@ } public this(Shell shell) { - final TableViewer v = new TableViewer(shell,DWT.BORDER|DWT.FULL_SELECTION); + final TableViewer v = new TableViewer(shell,SWT.BORDER|SWT.FULL_SELECTION); v.setLabelProvider(new LabelProvider()); v.setContentProvider(new MyContentProvider()); v.setCellModifier(new class(v) ICellModifier { @@ -108,11 +108,11 @@ v.setColumnProperties(["column1", "column2" ]); v.setCellEditors([ new TextCellEditor(v.getTable()),new TextCellEditor(v.getTable()) ]); - TableColumn column = new TableColumn(v.getTable(),DWT.NONE); + TableColumn column = new TableColumn(v.getTable(),SWT.NONE); column.setWidth(100); column.setText("Column 1"); - column = new TableColumn(v.getTable(),DWT.NONE); + column = new TableColumn(v.getTable(),SWT.NONE); column.setWidth(100); column.setText("Column 2"); @@ -121,13 +121,13 @@ v.getTable().setLinesVisible(true); v.getTable().setHeaderVisible(true); - v.getTable().addListener(DWT.EraseItem, new class Listener { + v.getTable().addListener(SWT.EraseItem, new class Listener { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ public void handleEvent(Event event) { - event.detail &= ~DWT.SELECTED; + event.detail &= ~SWT.SELECTED; } }); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet010OwnerDraw.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet010OwnerDraw.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet010OwnerDraw.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,29 +11,29 @@ * Port to the D programming language: * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet010OwnerDraw.d; +module org.eclipse.jface.snippets.viewers.Snippet010OwnerDraw.d; -import dwtx.jface.resource.JFaceResources; -import dwtx.jface.viewers.Viewer; -import dwtx.jface.viewers.ColumnPixelData; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.OwnerDrawLabelProvider; -import dwtx.jface.viewers.StructuredSelection; -import dwtx.jface.viewers.TableLayout; -import dwtx.jface.viewers.TableViewer; -import dwt.DWT; -import dwt.graphics.Rectangle; -import dwt.graphics.TextLayout; -import dwt.graphics.TextStyle; -import dwt.layout.GridData; -import dwt.layout.GridLayout; -import dwt.widgets.Composite; -import dwt.widgets.Display; -import dwt.widgets.Event; -import dwt.widgets.Shell; -import dwt.widgets.TableColumn; +import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ColumnPixelData; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.OwnerDrawLabelProvider; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TableLayout; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.graphics.TextLayout; +import org.eclipse.swt.graphics.TextStyle; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableColumn; -import dwt.dwthelper.utils; +import java.lang.all; void main(String[] args) { Snippet010OwnerDraw.main(args); @@ -44,7 +44,7 @@ public static void main(String[] args) { Display display = new Display(); - Shell shell = new Shell(display, DWT.CLOSE); + Shell shell = new Shell(display, SWT.CLOSE); shell.setSize(400, 400); shell.setLayout(new GridLayout()); @@ -126,7 +126,7 @@ */ protected void drawFlag(Event event) { event.gc.setBackground(viewer.getControl().getDisplay() - .getSystemColor(DWT.COLOR_BLUE)); + .getSystemColor(SWT.COLOR_BLUE)); Rectangle bounds = event.getBounds(); bounds.width += 100; @@ -158,13 +158,13 @@ TextStyle plain = new TextStyle(JFaceResources .getFont(JFaceResources.DEFAULT_FONT), display - .getSystemColor(DWT.COLOR_LIST_FOREGROUND), display - .getSystemColor(DWT.COLOR_LIST_BACKGROUND)); + .getSystemColor(SWT.COLOR_LIST_FOREGROUND), display + .getSystemColor(SWT.COLOR_LIST_BACKGROUND)); TextStyle italic = new TextStyle(JFaceResources.getFontRegistry() .getItalic(JFaceResources.DEFAULT_FONT), display - .getSystemColor(DWT.COLOR_BLUE), display - .getSystemColor(DWT.COLOR_LIST_BACKGROUND)); + .getSystemColor(SWT.COLOR_BLUE), display + .getSystemColor(SWT.COLOR_LIST_BACKGROUND)); layout.setStyle(plain, 0, name.length - 1); layout.setStyle(italic, name.length, buffer.length - 1); @@ -217,7 +217,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.tests.viewers.OwnerDrawExample.CountryEntry#drawFlag(dwt.widgets.Event) + * @see org.eclipse.jface.tests.viewers.OwnerDrawExample.CountryEntry#drawFlag(org.eclipse.swt.widgets.Event) */ protected void drawFlag(Event event) { @@ -228,19 +228,19 @@ stripeHeight); event.gc.setBackground(viewer.getControl().getDisplay() - .getSystemColor(DWT.COLOR_BLACK)); + .getSystemColor(SWT.COLOR_BLACK)); event.gc.fillRectangle(stripe); stripe.y += stripeHeight; event.gc.setBackground(viewer.getControl().getDisplay() - .getSystemColor(DWT.COLOR_RED)); + .getSystemColor(SWT.COLOR_RED)); event.gc.fillRectangle(stripe); stripe.y += stripeHeight; event.gc.setBackground(viewer.getControl().getDisplay() - .getSystemColor(DWT.COLOR_YELLOW)); + .getSystemColor(SWT.COLOR_YELLOW)); event.gc.fillRectangle(stripe); } @@ -256,7 +256,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.tests.viewers.OwnerDrawExample.CountryEntry#drawFlag(dwt.widgets.Event) + * @see org.eclipse.jface.tests.viewers.OwnerDrawExample.CountryEntry#drawFlag(org.eclipse.swt.widgets.Event) */ protected void drawFlag(Event event) { @@ -267,19 +267,19 @@ stripeHeight); event.gc.setBackground(viewer.getControl().getDisplay() - .getSystemColor(DWT.COLOR_RED)); + .getSystemColor(SWT.COLOR_RED)); event.gc.fillRectangle(stripe); stripe.y += stripeHeight; event.gc.setBackground(viewer.getControl().getDisplay() - .getSystemColor(DWT.COLOR_WHITE)); + .getSystemColor(SWT.COLOR_WHITE)); event.gc.fillRectangle(stripe); stripe.y += stripeHeight; event.gc.setBackground(viewer.getControl().getDisplay() - .getSystemColor(DWT.COLOR_RED)); + .getSystemColor(SWT.COLOR_RED)); event.gc.fillRectangle(stripe); } @@ -293,7 +293,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.tests.viewers.OwnerDrawExample.CountryEntry#drawFlag(dwt.widgets.Event) + * @see org.eclipse.jface.tests.viewers.OwnerDrawExample.CountryEntry#drawFlag(org.eclipse.swt.widgets.Event) */ protected void drawFlag(Event event) { @@ -301,7 +301,7 @@ bounds.width += 100; event.gc.setBackground(viewer.getControl().getDisplay() - .getSystemColor(DWT.COLOR_RED)); + .getSystemColor(SWT.COLOR_RED)); event.gc.fillRectangle(new Rectangle(bounds.width / 2 + bounds.x - 5, bounds.y, 10, bounds.height)); event.gc.fillRectangle(new Rectangle(bounds.x, bounds.height / 2 @@ -324,16 +324,16 @@ /* * (non-Javadoc) * - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(dwt.widgets.Composite) + * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) */ public void createPartControl(Composite parent) { - viewer = new TableViewer(parent, DWT.FULL_SELECTION); + viewer = new TableViewer(parent, SWT.FULL_SELECTION); viewer.setContentProvider(new class() IStructuredContentProvider { /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#dispose() + * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { }; @@ -341,7 +341,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ public Object[] getElements(Object inputElement) { return (cast(Snippet010OwnerDraw) inputElement).entries; @@ -350,7 +350,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#inputChanged(dwtx.jface.viewers.Viewer, + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ public void inputChanged(Viewer viewer, @@ -374,7 +374,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.OwnerDrawLabelProvider#paint(dwt.widgets.Event, + * @see org.eclipse.jface.viewers.OwnerDrawLabelProvider#paint(org.eclipse.swt.widgets.Event, * java.lang.Object) */ protected void paint(Event event, Object element) { @@ -404,7 +404,7 @@ viewer.getTable().setLinesVisible(true); for (int i = 0; i < COLUMN_COUNT; i++) { - TableColumn tc = new TableColumn(viewer.getTable(), DWT.NONE, i); + TableColumn tc = new TableColumn(viewer.getTable(), SWT.NONE, i); layout.addColumnData(new ColumnPixelData(100)); tc.setText(getTitleFor(i)); } diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet011CustomTooltips.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet011CustomTooltips.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet011CustomTooltips.d Mon Mar 23 11:25:49 2009 +0100 @@ -12,21 +12,21 @@ module org.eclipse.jface.snippets.viewers.Snippet011CustomTooltips; -import dwt.dwthelper.utils; +import java.lang.all; -import dwtx.jface.viewers.CellLabelProvider; -import dwtx.jface.viewers.ColumnViewerToolTipSupport; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.viewers.TableViewerColumn; -import dwtx.jface.viewers.Viewer; -import dwtx.jface.viewers.ViewerCell; -import dwtx.jface.window.ToolTip; -import dwt.DWT; -import dwt.graphics.Point; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; +import org.eclipse.jface.viewers.CellLabelProvider; +import org.eclipse.jface.viewers.ColumnViewerToolTipSupport; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TableViewerColumn; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerCell; +import org.eclipse.jface.window.ToolTip; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; /** * Explore New API: JFace custom tooltips drawing. @@ -60,7 +60,7 @@ Shell shell = new Shell(display); shell.setLayout(new FillLayout()); - TableViewer v = new TableViewer(shell, DWT.FULL_SELECTION); + TableViewer v = new TableViewer(shell, SWT.FULL_SELECTION); v.getTable().setLinesVisible(true); v.getTable().setHeaderVisible(true); v.setContentProvider(new MyContentProvider()); @@ -90,7 +90,7 @@ } }; - TableViewerColumn column = new TableViewerColumn(v, DWT.NONE); + TableViewerColumn column = new TableViewerColumn(v, SWT.NONE); column.setLabelProvider(labelProvider); column.getColumn().setText("Column 1"); column.getColumn().setWidth(100); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet014TreeViewerNoMandatoryLabelProvider.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet014TreeViewerNoMandatoryLabelProvider.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet014TreeViewerNoMandatoryLabelProvider.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,27 +11,27 @@ * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet014TreeViewerNoMandatoryLabelProvider; +module org.eclipse.jface.snippets.viewers.Snippet014TreeViewerNoMandatoryLabelProvider; -import dwtx.jface.resource.FontRegistry; -import dwtx.jface.viewers.ITableColorProvider; -import dwtx.jface.viewers.ITableFontProvider; -import dwtx.jface.viewers.ITableLabelProvider; -import dwtx.jface.viewers.ITreeContentProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TreeViewer; -import dwtx.jface.viewers.Viewer; -import dwt.DWT; -import dwt.graphics.Color; -import dwt.graphics.Font; -import dwt.graphics.Image; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; -import dwt.widgets.TreeColumn; +import org.eclipse.jface.resource.FontRegistry; +import org.eclipse.jface.viewers.ITableColorProvider; +import org.eclipse.jface.viewers.ITableFontProvider; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TreeColumn; -import dwt.dwthelper.utils; +import java.lang.all; import tango.util.Convert; import tango.util.container.LinkedList; @@ -68,7 +68,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ public Object[] getElements(Object inputElement) { return (cast(MyModel) inputElement).child.toArray(); @@ -77,7 +77,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#dispose() + * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { @@ -86,7 +86,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#inputChanged(dwtx.jface.viewers.Viewer, + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -96,7 +96,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ public Object[] getChildren(Object parentElement) { return getElements(parentElement); @@ -105,7 +105,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ public Object getParent(Object element) { if (element is null) { @@ -118,7 +118,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ public bool hasChildren(Object element) { return (cast(MyModel) element).child.size() > 0; @@ -177,14 +177,14 @@ public Color getBackground(Object element, int columnIndex) { if ((cast(MyModel) element).counter % 2 == 0) { - return Display.getCurrent().getSystemColor(DWT.COLOR_RED); + return Display.getCurrent().getSystemColor(SWT.COLOR_RED); } return null; } public Color getForeground(Object element, int columnIndex) { if ((cast(MyModel) element).counter % 2 == 1) { - return Display.getCurrent().getSystemColor(DWT.COLOR_RED); + return Display.getCurrent().getSystemColor(SWT.COLOR_RED); } return null; } @@ -194,11 +194,11 @@ public this(Shell shell) { final TreeViewer v = new TreeViewer(shell); - TreeColumn column = new TreeColumn(v.getTree(),DWT.NONE); + TreeColumn column = new TreeColumn(v.getTree(),SWT.NONE); column.setWidth(200); column.setText("Column 1"); - column = new TreeColumn(v.getTree(),DWT.NONE); + column = new TreeColumn(v.getTree(),SWT.NONE); column.setWidth(200); column.setText("Column 2"); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet016TableLayout.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet016TableLayout.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet016TableLayout.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,26 +11,26 @@ * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet016TableLayout; +module org.eclipse.jface.snippets.viewers.Snippet016TableLayout; -import dwtx.jface.layout.TableColumnLayout; -import dwtx.jface.viewers.ColumnWeightData; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.ITableLabelProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.viewers.Viewer; -import dwt.DWT; -import dwt.graphics.Image; -import dwt.layout.FillLayout; -import dwt.widgets.Composite; -import dwt.widgets.Display; -import dwt.widgets.Shell; -import dwt.widgets.Table; -import dwt.widgets.TableColumn; +import org.eclipse.jface.layout.TableColumnLayout; +import org.eclipse.jface.viewers.ColumnWeightData; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; -import dwt.dwthelper.utils; +import java.lang.all; import tango.util.Convert; /** @@ -66,7 +66,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ public Object[] getElements(Object inputElement) { return (cast(ArrayWrapperObject) inputElement).array; @@ -75,7 +75,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#dispose() + * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { @@ -84,7 +84,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#inputChanged(dwtx.jface.viewers.Viewer, + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -118,7 +118,7 @@ } public this(Composite comp) { - final TableViewer v = new TableViewer(new Table(comp, DWT.BORDER)); + final TableViewer v = new TableViewer(new Table(comp, SWT.BORDER)); v.setLabelProvider(new MyLabelProvider()); v.setContentProvider(new MyContentProvider()); v.getTable().setHeaderVisible(true); @@ -126,12 +126,12 @@ TableColumnLayout ad = new TableColumnLayout(); comp.setLayout(ad); - TableColumn column = new TableColumn(v.getTable(), DWT.NONE); + TableColumn column = new TableColumn(v.getTable(), SWT.NONE); column.setText("Column 1"); column.setMoveable(true); ad.setColumnData(column, new ColumnWeightData(90, 290)); - column = new TableColumn(v.getTable(), DWT.NONE); + column = new TableColumn(v.getTable(), SWT.NONE); column.setText("Column 2"); column.setMoveable(true); ad.setColumnData(column, new ColumnWeightData(10, 200)); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet019TableViewerAddRemoveColumnsWithEditingNewAPI.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet019TableViewerAddRemoveColumnsWithEditingNewAPI.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet019TableViewerAddRemoveColumnsWithEditingNewAPI.d Mon Mar 23 11:25:49 2009 +0100 @@ -9,31 +9,31 @@ * Tom Schindl - initial API and implementation *******************************************************************************/ -module snippets.viewers.Snippet019TableViewerAddRemoveColumnsWithEditingNewAPI; +module org.eclipse.jface.snippets.viewers.Snippet019TableViewerAddRemoveColumnsWithEditingNewAPI; -import dwtx.jface.action.Action; -import dwtx.jface.action.IMenuListener; -import dwtx.jface.action.IMenuManager; -import dwtx.jface.action.MenuManager; -import dwtx.jface.internal.ConfigureColumnsDialog; -import dwtx.jface.viewers.CellEditor; -import dwtx.jface.viewers.ColumnLabelProvider; -import dwtx.jface.viewers.EditingSupport; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.viewers.TableViewerColumn; -import dwtx.jface.viewers.TextCellEditor; -import dwtx.jface.viewers.Viewer; -import dwtx.jface.window.SameShellProvider; -import dwt.DWT; -import dwt.events.MouseAdapter; -import dwt.events.MouseEvent; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; -import dwt.dwthelper.utils; -import dwtx.jface.window.IShellProvider; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IMenuListener; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.internal.ConfigureColumnsDialog; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ColumnLabelProvider; +import org.eclipse.jface.viewers.EditingSupport; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TableViewerColumn; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.window.SameShellProvider; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.MouseAdapter; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import java.lang.all; +import org.eclipse.jface.window.IShellProvider; /** * Explore the new API added in 3.3 and see how easily you can create reusable @@ -176,10 +176,10 @@ private TableViewerColumn column; TableViewer v; public this(Shell shell) { - v = new TableViewer(shell, DWT.BORDER - | DWT.FULL_SELECTION); + v = new TableViewer(shell, SWT.BORDER + | SWT.FULL_SELECTION); - TableViewerColumn column = new TableViewerColumn(v,DWT.NONE); + TableViewerColumn column = new TableViewerColumn(v,SWT.NONE); column.setLabelProvider(new GivenNameLabelProvider()); column.setEditingSupport(new GivenNameEditing(v)); @@ -187,7 +187,7 @@ column.getColumn().setText("Givenname"); column.getColumn().setMoveable(true); - column = new TableViewerColumn(v,DWT.NONE); + column = new TableViewerColumn(v,SWT.NONE); column.setLabelProvider(new SurNameLabelProvider()); column.setEditingSupport(new SurNameEditing(v)); column.getColumn().setWidth(200); @@ -228,7 +228,7 @@ } private void addEmailColumn(int columnIndex) { - column = new TableViewerColumn(v, DWT.NONE, columnIndex); + column = new TableViewerColumn(v, SWT.NONE, columnIndex); column.setLabelProvider(new EmailLabelProvider()); column.setEditingSupport(new EmailEditing(v)); column.getColumn().setText("E-Mail"); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet026TreeViewerTabEditing.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet026TreeViewerTabEditing.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet026TreeViewerTabEditing.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,35 +11,35 @@ * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet026TreeViewerTabEditing; +module org.eclipse.jface.snippets.viewers.Snippet026TreeViewerTabEditing; -import dwtx.jface.viewers.CellEditor; -import dwtx.jface.viewers.ColumnLabelProvider; -import dwtx.jface.viewers.ColumnViewerEditor; -import dwtx.jface.viewers.ColumnViewer; -import dwtx.jface.viewers.ColumnViewerEditorActivationStrategy; -import dwtx.jface.viewers.EditingSupport; -import dwtx.jface.viewers.ColumnViewerEditorActivationEvent; -import dwtx.jface.viewers.FocusCellOwnerDrawHighlighter; -import dwtx.jface.viewers.ITreeContentProvider; -import dwtx.jface.viewers.TextCellEditor; -import dwtx.jface.viewers.TreePath; -import dwtx.jface.viewers.TreeViewerFocusCellManager; -import dwtx.jface.viewers.TreeViewerEditor; -import dwtx.jface.viewers.TreeViewer; -import dwtx.jface.viewers.TreeViewerColumn; -import dwtx.jface.viewers.Viewer; -import dwt.DWT; -import dwt.events.SelectionEvent; -import dwt.events.SelectionListener; -import dwt.layout.FillLayout; -import dwt.widgets.Button; -import dwt.widgets.Display; -import dwt.widgets.Shell; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ColumnLabelProvider; +import org.eclipse.jface.viewers.ColumnViewerEditor; +import org.eclipse.jface.viewers.ColumnViewer; +import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy; +import org.eclipse.jface.viewers.EditingSupport; +import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent; +import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.jface.viewers.TreePath; +import org.eclipse.jface.viewers.TreeViewerFocusCellManager; +import org.eclipse.jface.viewers.TreeViewerEditor; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.TreeViewerColumn; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; -import dwt.dwthelper.utils; -import dwtx.dwtxhelper.Collection; +import java.lang.all; +import java.util.ArrayList; import tango.util.Convert; @@ -69,10 +69,10 @@ */ public class Snippet026TreeViewerTabEditing { public this(Shell shell) { - Button b = new Button(shell,DWT.PUSH); + Button b = new Button(shell,SWT.PUSH); b.setText("Remove column"); - final TreeViewer v = new TreeViewer(shell, DWT.BORDER - | DWT.FULL_SELECTION); + final TreeViewer v = new TreeViewer(shell, SWT.BORDER + | SWT.FULL_SELECTION); v.getTree().setLinesVisible(true); v.getTree().setHeaderVisible(true); b.addSelectionListener(new class(v) SelectionListener { @@ -101,7 +101,7 @@ ColumnViewerEditorActivationEvent event) { return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION - || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == DWT.CR) + || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR) || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC; } }; @@ -112,7 +112,7 @@ final TextCellEditor textCellEditor = new TextCellEditor(v.getTree()); - TreeViewerColumn column = new TreeViewerColumn(v, DWT.NONE); + TreeViewerColumn column = new TreeViewerColumn(v, SWT.NONE); column.getColumn().setWidth(200); column.getColumn().setMoveable(true); column.getColumn().setText("Column 1"); @@ -146,7 +146,7 @@ } }); - column = new TreeViewerColumn(v, DWT.NONE); + column = new TreeViewerColumn(v, SWT.NONE); column.getColumn().setWidth(200); column.getColumn().setMoveable(true); column.getColumn().setText("Column 2"); @@ -180,7 +180,7 @@ } }); - column = new TreeViewerColumn(v, DWT.NONE); + column = new TreeViewerColumn(v, SWT.NONE); column.getColumn().setWidth(200); column.getColumn().setMoveable(true); column.getColumn().setText("Column 3"); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet031TableViewerCustomTooltipsMultiSelection.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet031TableViewerCustomTooltipsMultiSelection.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet031TableViewerCustomTooltipsMultiSelection.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,32 +11,31 @@ * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet031TableViewerCustomTooltipsMultiSelection; +module org.eclipse.jface.snippets.viewers.Snippet031TableViewerCustomTooltipsMultiSelection; // http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jface.snippets/Eclipse%20JFace%20Snippets/org/eclipse/jface/snippets/viewers/Snippet031TableViewerCustomTooltipsMultiSelection.java?view=markup -import dwtx.dwtxhelper.Collection; import tango.util.Convert; +import java.util.ArrayList; -import dwtx.jface.viewers.ArrayContentProvider; -import dwtx.jface.viewers.ILabelProviderListener; -import dwtx.jface.viewers.ITableLabelProvider; -import dwtx.jface.viewers.TableViewer; -import dwt.DWT; -import dwt.graphics.Image; -import dwt.graphics.Point; -import dwt.graphics.Rectangle; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Event; -import dwt.widgets.Label; -import dwt.widgets.Listener; -import dwt.widgets.Shell; -import dwt.widgets.Table; -import dwt.widgets.TableColumn; -import dwt.widgets.TableItem; -import dwt.dwthelper.System; -import dwt.widgets.Listener; +import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Listener; alias char[] String; void main(String[] args) @@ -95,13 +94,13 @@ public this(Shell shell) { - final Table table = new Table(shell, DWT.H_SCROLL | DWT.V_SCROLL | DWT.MULTI | DWT.FULL_SELECTION); + final Table table = new Table(shell, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION); table.setHeaderVisible(true); table.setLinesVisible(true); final TableViewer v = new TableViewer(table); - TableColumn tableColumn1 = new TableColumn(table, DWT.NONE); - TableColumn tableColumn2 = new TableColumn(table, DWT.NONE); + TableColumn tableColumn1 = new TableColumn(table, SWT.NONE); + TableColumn tableColumn2 = new TableColumn(table, SWT.NONE); String column1 = "Column 1", column2 = "Column 2"; /* Setup the table columns */ @@ -120,18 +119,18 @@ /** * The listener that gets added to the table. This listener is responsible for creating the tooltips * when hovering over a cell item. This listener will listen for the following events: - *
  • DWT.KeyDown - to remove the tooltip
    • - *
  • DWT.Dispose - to remove the tooltip
    • - *
  • DWT.MouseMove - to remove the tooltip
    • - *
  • DWT.MouseHover - to set the tooltip
    • + *
  • SWT.KeyDown - to remove the tooltip
    • + *
  • SWT.Dispose - to remove the tooltip
    • + *
  • SWT.MouseMove - to remove the tooltip
    • + *
  • SWT.MouseHover - to set the tooltip
    • */ Listener tableListener = dgListener(&handleTableListener, table); - table.addListener (DWT.Dispose, tableListener); - table.addListener (DWT.KeyDown, tableListener); - table.addListener (DWT.MouseMove, tableListener); - table.addListener (DWT.MouseHover, tableListener); + table.addListener (SWT.Dispose, tableListener); + table.addListener (SWT.KeyDown, tableListener); + table.addListener (SWT.MouseMove, tableListener); + table.addListener (SWT.MouseHover, tableListener); } void handleTableListener(Event event, Table table) @@ -141,19 +140,19 @@ /* * (non-Javadoc) - * @see dwt.widgets.Listener#handleEvent(dwt.widgets.Event) + * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ switch (event.type) { - case DWT.KeyDown: - case DWT.Dispose: - case DWT.MouseMove: { + case SWT.KeyDown: + case SWT.Dispose: + case SWT.MouseMove: { if (tooltip is null) break; tooltip.dispose (); tooltip = null; label = null; break; } - case DWT.MouseHover: { + case SWT.MouseHover: { Point coords = new Point(event.x, event.y); TableItem item = table.getItem(coords); if (item !is null) { @@ -164,14 +163,14 @@ if (tooltip !is null && !tooltip.isDisposed ()) tooltip.dispose (); /* Create a new Tooltip */ - tooltip = new Shell (table.getShell(), DWT.ON_TOP | DWT.NO_FOCUS | DWT.TOOL); - tooltip.setBackground (table.getDisplay().getSystemColor (DWT.COLOR_INFO_BACKGROUND)); + tooltip = new Shell (table.getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); + tooltip.setBackground (table.getDisplay().getSystemColor (SWT.COLOR_INFO_BACKGROUND)); FillLayout layout = new FillLayout (); layout.marginWidth = 2; tooltip.setLayout (layout); - label = new Label (tooltip, DWT.NONE); - label.setForeground (table.getDisplay().getSystemColor (DWT.COLOR_INFO_FOREGROUND)); - label.setBackground (table.getDisplay().getSystemColor (DWT.COLOR_INFO_BACKGROUND)); + label = new Label (tooltip, SWT.NONE); + label.setForeground (table.getDisplay().getSystemColor (SWT.COLOR_INFO_FOREGROUND)); + label.setBackground (table.getDisplay().getSystemColor (SWT.COLOR_INFO_BACKGROUND)); /* Store the TableItem with the label so we can pass the mouse event later */ label.setData ("_TableItem_", item); @@ -180,11 +179,11 @@ label.setText("Tooltip: " ~ to!(char[])(item.getData()) ~ " : " ~ to!(char[])(columnIndex)); /* Setup Listeners to remove the tooltip and transfer the received mouse events */ - label.addListener (DWT.MouseExit, tooltipLabelListener); - label.addListener (DWT.MouseDown, tooltipLabelListener); + label.addListener (SWT.MouseExit, tooltipLabelListener); + label.addListener (SWT.MouseDown, tooltipLabelListener); /* Set the size and position of the tooltip */ - Point size = tooltip.computeSize (DWT.DEFAULT, DWT.DEFAULT); + Point size = tooltip.computeSize (SWT.DEFAULT, SWT.DEFAULT); Rectangle rect = item.getBounds (columnIndex); Point pt = table.toDisplay (rect.x, rect.y); tooltip.setBounds (pt.x, pt.y, size.x, size.y); @@ -206,17 +205,17 @@ final TooltipLabelListener tooltipLabelListener; final class TooltipLabelListener : Listener { private bool isCTRLDown(Event e) { - return (e.stateMask & DWT.CTRL) != 0; + return (e.stateMask & SWT.CTRL) != 0; } /* * (non-Javadoc) - * @see dwt.widgets.Listener#handleEvent(dwt.widgets.Event) + * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) */ public void handleEvent (Event event) { Label label = cast(Label)event.widget; Shell shell = label.getShell (); switch (event.type) { - case DWT.MouseDown: /* Handle a user Click */ + case SWT.MouseDown: /* Handle a user Click */ /* Extract our Data */ Event e = new Event (); e.item = cast(TableItem) label.getData ("_TableItem_"); @@ -257,13 +256,13 @@ } /* Set the new selection of the table and notify the listeners */ table.setSelection (newSelection); - table.notifyListeners (DWT.Selection, e); + table.notifyListeners (SWT.Selection, e); /* Remove the Tooltip */ shell.dispose (); table.setFocus(); break; - case DWT.MouseExit: + case SWT.MouseExit: shell.dispose (); break; } diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet040TableViewerSorting.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet040TableViewerSorting.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet040TableViewerSorting.d Mon Mar 23 11:25:49 2009 +0100 @@ -10,27 +10,27 @@ * Port to the D programming language: * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet040TableViewerSorting; +module org.eclipse.jface.snippets.viewers.Snippet040TableViewerSorting; // http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jface.snippets/Eclipse%20JFace%20Snippets/org/eclipse/jface/snippets/viewers/Snippet040TableViewerSorting.java?view=markup -import dwtx.jface.viewers.CellEditor; -import dwtx.jface.viewers.ColumnLabelProvider; -import dwtx.jface.viewers.ColumnViewer; -import dwtx.jface.viewers.EditingSupport; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.viewers.TableViewerColumn; -import dwtx.jface.viewers.TextCellEditor; -import dwtx.jface.viewers.Viewer; -import dwtx.jface.viewers.ViewerComparator; -import dwt.DWT; -import dwt.events.SelectionAdapter; -import dwt.events.SelectionEvent; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; -import dwt.dwthelper.utils; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ColumnLabelProvider; +import org.eclipse.jface.viewers.ColumnViewer; +import org.eclipse.jface.viewers.EditingSupport; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.TableViewerColumn; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.ViewerComparator; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import java.lang.all; version(JIVE) import jive.stacktrace; @@ -139,16 +139,16 @@ public void setSorter(ColumnViewerSorter sorter, int direction) { if( direction is NONE ) { column.getColumn().getParent().setSortColumn(null); - column.getColumn().getParent().setSortDirection(DWT.NONE); + column.getColumn().getParent().setSortDirection(SWT.NONE); viewer.setComparator(null); } else { column.getColumn().getParent().setSortColumn(column.getColumn()); sorter.direction = direction; if( direction is ASC ) { - column.getColumn().getParent().setSortDirection(DWT.DOWN); + column.getColumn().getParent().setSortDirection(SWT.DOWN); } else { - column.getColumn().getParent().setSortDirection(DWT.UP); + column.getColumn().getParent().setSortDirection(SWT.UP); } if( viewer.getComparator() is sorter ) { @@ -171,10 +171,10 @@ public this(Shell shell) { - TableViewer v = new TableViewer(shell, DWT.BORDER | DWT.FULL_SELECTION); + TableViewer v = new TableViewer(shell, SWT.BORDER | SWT.FULL_SELECTION); v.setContentProvider(new MyContentProvider()); - TableViewerColumn column = new TableViewerColumn(v, DWT.NONE); + TableViewerColumn column = new TableViewerColumn(v, SWT.NONE); column.getColumn().setWidth(200); column.getColumn().setText("Givenname"); column.getColumn().setMoveable(true); @@ -207,7 +207,7 @@ } }; - column = new TableViewerColumn(v, DWT.NONE); + column = new TableViewerColumn(v, SWT.NONE); column.getColumn().setWidth(200); column.getColumn().setText("Surname"); column.getColumn().setMoveable(true); @@ -240,7 +240,7 @@ } }; - column = new TableViewerColumn(v, DWT.NONE); + column = new TableViewerColumn(v, SWT.NONE); column.getColumn().setWidth(200); column.getColumn().setText("E-Mail"); column.getColumn().setMoveable(true); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet043NoColumnTreeViewerKeyboardEditing.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet043NoColumnTreeViewerKeyboardEditing.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet043NoColumnTreeViewerKeyboardEditing.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,32 +11,32 @@ * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet043NoColumnTreeViewerKeyboardEditing; +module org.eclipse.jface.snippets.viewers.Snippet043NoColumnTreeViewerKeyboardEditing; -import dwtx.jface.viewers.CellEditor; -import dwtx.jface.viewers.ColumnViewerEditor; -import dwtx.jface.viewers.ColumnViewer; -import dwtx.jface.viewers.ColumnViewerEditorActivationStrategy; -import dwtx.jface.viewers.ColumnViewerEditorActivationEvent; -import dwtx.jface.viewers.FocusCellOwnerDrawHighlighter; -import dwtx.jface.viewers.ICellModifier; -import dwtx.jface.viewers.ITreeContentProvider; -import dwtx.jface.viewers.TextCellEditor; -import dwtx.jface.viewers.TreePath; -import dwtx.jface.viewers.TreeViewerFocusCellManager; -import dwtx.jface.viewers.TreeViewerEditor; -import dwtx.jface.viewers.TreeViewer; -import dwtx.jface.viewers.Viewer; -import dwt.DWT; -import dwt.events.SelectionEvent; -import dwt.events.SelectionListener; -import dwt.layout.FillLayout; -import dwt.widgets.Button; -import dwt.widgets.Display; -import dwt.widgets.Item; -import dwt.widgets.Shell; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.ColumnViewerEditor; +import org.eclipse.jface.viewers.ColumnViewer; +import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy; +import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent; +import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter; +import org.eclipse.jface.viewers.ICellModifier; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.jface.viewers.TreePath; +import org.eclipse.jface.viewers.TreeViewerFocusCellManager; +import org.eclipse.jface.viewers.TreeViewerEditor; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Item; +import org.eclipse.swt.widgets.Shell; -import dwt.dwthelper.utils; +import java.lang.all; import tango.util.Convert; import tango.util.container.LinkedList; @@ -68,10 +68,10 @@ public class Snippet043NoColumnTreeViewerKeyboardEditing { alias LinkedList!(MyModel) ArrayList; public this(Shell shell) { - Button b = new Button(shell, DWT.PUSH); + Button b = new Button(shell, SWT.PUSH); b.setText("BBB"); - final TreeViewer v = new TreeViewer(shell, DWT.BORDER - | DWT.FULL_SELECTION); + final TreeViewer v = new TreeViewer(shell, SWT.BORDER + | SWT.FULL_SELECTION); b.addSelectionListener(new class(v) SelectionListener { TreeViewer v; this(TreeViewer v_) @@ -127,7 +127,7 @@ ColumnViewerEditorActivationEvent event) { return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION - || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == DWT.CR) + || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR) || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC; } }; diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet047VirtualLazyTreeViewer.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet047VirtualLazyTreeViewer.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/viewers/Snippet047VirtualLazyTreeViewer.d Mon Mar 23 11:25:49 2009 +0100 @@ -11,18 +11,18 @@ * yidabu at gmail dot com ( D China http://www.d-programming-language-china.org/ ) *******************************************************************************/ -module snippets.viewers.Snippet047VirtualLazyTreeViewer; +module org.eclipse.jface.snippets.viewers.Snippet047VirtualLazyTreeViewer; -import dwtx.jface.viewers.ILazyTreeContentProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TreeViewer; -import dwtx.jface.viewers.Viewer; -import dwt.DWT; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; +import org.eclipse.jface.viewers.ILazyTreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; -import dwt.dwthelper.utils; +import java.lang.all; import tango.util.Convert; import tango.util.container.LinkedList; @@ -77,7 +77,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ILazyTreeContentProvider#getParent(java.lang.Object) + * @see org.eclipse.jface.viewers.ILazyTreeContentProvider#getParent(java.lang.Object) */ public Object getParent(Object element) { if (cast(LeafNode)element) @@ -88,7 +88,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ILazyTreeContentProvider#updateChildCount(java.lang.Object, + * @see org.eclipse.jface.viewers.ILazyTreeContentProvider#updateChildCount(java.lang.Object, * int) */ public void updateChildCount(Object element, int currentChildCount) { @@ -107,7 +107,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ILazyTreeContentProvider#updateElement(java.lang.Object, + * @see org.eclipse.jface.viewers.ILazyTreeContentProvider#updateElement(java.lang.Object, * int) */ public void updateElement(Object parent, int index) { @@ -162,7 +162,7 @@ } public this(Shell shell) { - final TreeViewer v = new TreeViewer(shell, DWT.VIRTUAL | DWT.BORDER); + final TreeViewer v = new TreeViewer(shell, SWT.VIRTUAL | SWT.BORDER); v.setLabelProvider(new LabelProvider()); v.setContentProvider(new MyContentProvider(v)); v.setUseHashlookup(true); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet020CustomizedControlTooltips.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet020CustomizedControlTooltips.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet020CustomizedControlTooltips.d Mon Mar 23 11:25:49 2009 +0100 @@ -9,38 +9,38 @@ * Tom Schindl - initial API and implementation *******************************************************************************/ -module dwtx.jface.snippets.window.Snippet020CustomizedControlTooltips; +module org.eclipse.jface.snippets.window.Snippet020CustomizedControlTooltips; -import dwtx.jface.resource.ImageDescriptor; -import dwtx.jface.resource.JFaceResources; -import dwtx.jface.util.Policy; -import dwtx.jface.window.DefaultToolTip; -import dwtx.jface.window.ToolTip; -import dwt.DWT; -import dwt.events.MouseAdapter; -import dwt.events.MouseEvent; -import dwt.events.SelectionAdapter; -import dwt.events.SelectionEvent; -import dwt.events.SelectionListener; -import dwt.graphics.Point; -import dwt.graphics.RGB; -import dwt.layout.FillLayout; -import dwt.layout.GridData; -import dwt.layout.GridLayout; -import dwt.layout.RowLayout; -import dwt.widgets.Button; -import dwt.widgets.Composite; -import dwt.widgets.Control; -import dwt.widgets.Display; -import dwt.widgets.Event; -import dwt.widgets.Label; -import dwt.widgets.Link; -import dwt.widgets.MessageBox; -import dwt.widgets.Shell; -import dwt.widgets.Text; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.jface.util.Policy; +import org.eclipse.jface.window.DefaultToolTip; +import org.eclipse.jface.window.ToolTip; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.MouseAdapter; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.RGB; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.layout.RowLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Link; +import org.eclipse.swt.widgets.MessageBox; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; -import dwt.dwthelper.utils; +import java.lang.all; version(JIVE) import jive.stacktrace; /** @@ -72,7 +72,7 @@ protected Composite createToolTipContentArea(Event event, Composite parent) { - Composite comp = new Composite(parent,DWT.NONE); + Composite comp = new Composite(parent,SWT.NONE); GridLayout gl = new GridLayout(1,false); gl.marginBottom=0; @@ -84,8 +84,8 @@ gl.verticalSpacing=1; comp.setLayout(gl); - Composite topArea = new Composite(comp,DWT.NONE); - GridData data = new GridData(DWT.FILL,DWT.FILL,true,false); + Composite topArea = new Composite(comp,SWT.NONE); + GridData data = new GridData(SWT.FILL,SWT.FILL,true,false); data.widthHint=200; topArea.setLayoutData(data); topArea.setBackground(JFaceResources.getColorRegistry().get(HEADER_BG_COLOR)); @@ -100,14 +100,14 @@ topArea.setLayout(gl); - Label l = new Label(topArea,DWT.NONE); + Label l = new Label(topArea,SWT.NONE); l.setText(headerText); l.setBackground(JFaceResources.getColorRegistry().get(HEADER_BG_COLOR)); l.setFont(JFaceResources.getFontRegistry().get(HEADER_FONT)); l.setForeground(JFaceResources.getColorRegistry().get(HEADER_FG_COLOR)); l.setLayoutData(new GridData(GridData.FILL_BOTH)); - Composite iconComp = new Composite(topArea,DWT.NONE); + Composite iconComp = new Composite(topArea,SWT.NONE); iconComp.setLayoutData(new GridData()); iconComp.setLayout(new GridLayout(2,false)); iconComp.setBackground(JFaceResources.getColorRegistry().get(HEADER_BG_COLOR)); @@ -121,7 +121,7 @@ gl.marginRight=0; iconComp.setLayout(gl); - Label helpIcon = new Label(iconComp,DWT.NONE); + Label helpIcon = new Label(iconComp,SWT.NONE); helpIcon.setBackground(JFaceResources.getColorRegistry().get(HEADER_BG_COLOR)); helpIcon.setImage(JFaceResources.getImage(HEADER_HELP_ICON)); helpIcon.addMouseListener(new class MouseAdapter { @@ -133,7 +133,7 @@ }); - Label closeIcon = new Label(iconComp,DWT.NONE); + Label closeIcon = new Label(iconComp,SWT.NONE); closeIcon.setBackground(JFaceResources.getColorRegistry().get(HEADER_BG_COLOR)); closeIcon.setImage(JFaceResources.getImage(HEADER_CLOSE_ICON)); closeIcon.addMouseListener(new class MouseAdapter { @@ -150,7 +150,7 @@ } protected Composite createContentArea(Composite parent) { - return new Composite(parent,DWT.NONE); + return new Composite(parent,SWT.NONE); } protected void openHelp() { @@ -164,13 +164,13 @@ } protected Composite createContentArea(Composite parent) { Composite comp = super.createContentArea(parent); - comp.setBackground(parent.getDisplay().getSystemColor(DWT.COLOR_INFO_BACKGROUND)); + comp.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); FillLayout layout = new FillLayout(); layout.marginWidth=5; comp.setLayout(layout); - Link l = new Link(comp,DWT.NONE); + Link l = new Link(comp,SWT.NONE); l.setText("This a custom tooltip you can: \n- pop up any control you want\n- define delays\n - ... \nGo and get Eclipse M4 from http://www.eclipse.org"); - l.setBackground(parent.getDisplay().getSystemColor(DWT.COLOR_INFO_BACKGROUND)); + l.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); l.addSelectionListener(new class SelectionAdapter { public void widgetSelected(SelectionEvent e) { openURL(); @@ -180,14 +180,14 @@ } protected void openURL() { - MessageBox box = new MessageBox(parent,DWT.ICON_INFORMATION); + MessageBox box = new MessageBox(parent,SWT.ICON_INFORMATION); box.setText("Eclipse.org"); box.setMessage("Here is where we'd open the URL."); box.open(); } protected void openHelp() { - MessageBox box = new MessageBox(parent,DWT.ICON_INFORMATION); + MessageBox box = new MessageBox(parent,SWT.ICON_INFORMATION); box.setText("Info"); box.setMessage("Here is where we'd show some information."); box.open(); @@ -206,7 +206,7 @@ JFaceResources.getImageRegistry().put(MyToolTip.HEADER_CLOSE_ICON,ImageDescriptor.createFromFile(getImportData!("jface.snippets.showerr_tsk.gif"))); JFaceResources.getImageRegistry().put(MyToolTip.HEADER_HELP_ICON,ImageDescriptor.createFromFile(getImportData!("jface.snippets.linkto_help.gif"))); - Text text = new Text(parent,DWT.BORDER); + Text text = new Text(parent,SWT.BORDER); text.setText("Hello World"); MyToolTip myTooltipLabel = new MyToolTip2(text); @@ -214,18 +214,18 @@ myTooltipLabel.setHideOnMouseDown(false); myTooltipLabel.activate(); - text = new Text(parent,DWT.BORDER); + text = new Text(parent,SWT.BORDER); text.setText("Hello World"); DefaultToolTip toolTip = new DefaultToolTip(text); toolTip.setText("Hello World\nHello World"); - toolTip.setBackgroundColor(parent.getDisplay().getSystemColor(DWT.COLOR_RED)); + toolTip.setBackgroundColor(parent.getDisplay().getSystemColor(SWT.COLOR_RED)); - Button b = new Button(parent,DWT.PUSH); + Button b = new Button(parent,SWT.PUSH); b.setText("Popup on press"); toolTipDelayed = new DefaultToolTip(b,ToolTip.RECREATE,true); toolTipDelayed.setText("Hello World\nHello World"); - toolTipDelayed.setBackgroundColor(parent.getDisplay().getSystemColor(DWT.COLOR_RED)); + toolTipDelayed.setBackgroundColor(parent.getDisplay().getSystemColor(SWT.COLOR_RED)); toolTipDelayed.setHideDelay(2000); b.addSelectionListener(new class SelectionAdapter { diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet023TreeViewerCustomTooltips.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet023TreeViewerCustomTooltips.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet023TreeViewerCustomTooltips.d Mon Mar 23 11:25:49 2009 +0100 @@ -9,33 +9,34 @@ * Tom Schindl - initial API and implementation *******************************************************************************/ -module dwtx.jface.snippets.window.Snippet023TreeViewerCustomTooltips; +module org.eclipse.jface.snippets.window.Snippet023TreeViewerCustomTooltips; -import dwtx.jface.viewers.CellLabelProvider; -import dwtx.jface.viewers.ITreeContentProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TreeViewer; -import dwtx.jface.viewers.Viewer; -import dwt.DWT; -import dwt.graphics.Point; -import dwt.graphics.Rectangle; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Event; -import dwt.widgets.Label; -import dwt.widgets.Listener; -import dwt.widgets.Shell; -import dwt.widgets.TreeItem; +import org.eclipse.jface.viewers.CellLabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TreeItem; -import dwtx.dwtxhelper.Collection; -import dwt.dwthelper.utils; +import java.lang.all; +import java.util.ArrayList; + import tango.text.convert.Format; import tango.util.log.Trace; /** * A simple TreeViewer to demonstrate how custom tooltips could be created * easily. This is an extended version from - * http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/dwt.snippets/src/org/eclipse/swt/snippets/Snippet125.java + * http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet125.java * * This code is for users pre 3.3 others could use newly added tooltip support in * {@link CellLabelProvider} @@ -49,7 +50,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ public Object[] getElements(Object inputElement) { return (cast(MyModel) inputElement).child.toArray(); @@ -58,7 +59,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#dispose() + * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { @@ -67,7 +68,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#inputChanged(dwtx.jface.viewers.Viewer, + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -77,7 +78,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ public Object[] getChildren(Object parentElement) { return getElements(parentElement); @@ -86,7 +87,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) */ public Object getParent(Object element) { if (element is null) { @@ -99,7 +100,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ public bool hasChildren(Object element) { return (cast(MyModel) element).child.size() > 0; @@ -139,17 +140,17 @@ Label label = cast(Label)event.widget; Shell shell_ = label.getShell (); switch (event.type) { - case DWT.MouseDown: + case SWT.MouseDown: Event e = new Event (); e.item = cast(TreeItem) label.getData ("_TABLEITEM"); // Assuming table is single select, set the selection as if // the mouse down event went through to the table v.getTree().setSelection ([cast(TreeItem) e.item]); - v.getTree().notifyListeners (DWT.Selection, e); + v.getTree().notifyListeners (SWT.Selection, e); shell_.dispose (); v.getTree().setFocus(); break; - case DWT.MouseExit: + case SWT.MouseExit: shell_.dispose (); break; default: @@ -157,10 +158,10 @@ }); Listener treeListener = new MyTreeListener(); - v.getTree().addListener (DWT.Dispose, treeListener); - v.getTree().addListener (DWT.KeyDown, treeListener); - v.getTree().addListener (DWT.MouseMove, treeListener); - v.getTree().addListener (DWT.MouseHover, treeListener); + v.getTree().addListener (SWT.Dispose, treeListener); + v.getTree().addListener (SWT.KeyDown, treeListener); + v.getTree().addListener (SWT.MouseMove, treeListener); + v.getTree().addListener (SWT.MouseHover, treeListener); } class MyTreeListener : Listener { @@ -168,16 +169,16 @@ Label label = null; public void handleEvent (Event event) { switch (event.type) { - case DWT.Dispose: - case DWT.KeyDown: - case DWT.MouseMove: { + case SWT.Dispose: + case SWT.KeyDown: + case SWT.MouseMove: { if (tip is null) break; tip.dispose (); tip = null; label = null; break; } - case DWT.MouseHover: { + case SWT.MouseHover: { Point coords = new Point(event.x, event.y); TreeItem item = v.getTree().getItem(coords); if (item !is null) { @@ -186,19 +187,19 @@ for (int i = 0; i < columns || i is 0; i++) { if (item.getBounds(i).contains(coords)) { if (tip !is null && !tip.isDisposed ()) tip.dispose (); - tip = new Shell (v.getTree().getShell(), DWT.ON_TOP | DWT.NO_FOCUS | DWT.TOOL); - tip.setBackground (v.getTree().getDisplay().getSystemColor (DWT.COLOR_INFO_BACKGROUND)); + tip = new Shell (v.getTree().getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); + tip.setBackground (v.getTree().getDisplay().getSystemColor (SWT.COLOR_INFO_BACKGROUND)); FillLayout layout = new FillLayout (); layout.marginWidth = 2; tip.setLayout (layout); - label = new Label (tip, DWT.NONE); - label.setForeground (v.getTree().getDisplay().getSystemColor (DWT.COLOR_INFO_FOREGROUND)); - label.setBackground (v.getTree().getDisplay().getSystemColor (DWT.COLOR_INFO_BACKGROUND)); + label = new Label (tip, SWT.NONE); + label.setForeground (v.getTree().getDisplay().getSystemColor (SWT.COLOR_INFO_FOREGROUND)); + label.setBackground (v.getTree().getDisplay().getSystemColor (SWT.COLOR_INFO_BACKGROUND)); label.setData ("_TABLEITEM", item); label.setText (Format("Tooltip: {} => {}", item.getData(), i)); - label.addListener (DWT.MouseExit, labelListener); - label.addListener (DWT.MouseDown, labelListener); - Point size = tip.computeSize (DWT.DEFAULT, DWT.DEFAULT); + label.addListener (SWT.MouseExit, labelListener); + label.addListener (SWT.MouseDown, labelListener); + Point size = tip.computeSize (SWT.DEFAULT, SWT.DEFAULT); Rectangle rect = item.getBounds (i); Point pt = v.getTree().toDisplay (rect.x, rect.y); tip.setBounds (pt.x, pt.y, size.x, size.y); diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet031TableStaticTooltip.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet031TableStaticTooltip.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/window/Snippet031TableStaticTooltip.d Mon Mar 23 11:25:49 2009 +0100 @@ -9,26 +9,26 @@ * Tom Schindl - initial API and implementation *******************************************************************************/ -module dwtx.jface.snippets.window.Snippet031TableStaticTooltip; +module org.eclipse.jface.snippets.window.Snippet031TableStaticTooltip; -import dwtx.jface.viewers.IStructuredContentProvider; -import dwtx.jface.viewers.ITableLabelProvider; -import dwtx.jface.viewers.LabelProvider; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.viewers.Viewer; -import dwtx.jface.window.DefaultToolTip; -import dwtx.jface.window.ToolTip; -import dwt.DWT; -import dwt.graphics.Color; -import dwt.graphics.GC; -import dwt.graphics.Image; -import dwt.graphics.Point; -import dwt.layout.FillLayout; -import dwt.widgets.Display; -import dwt.widgets.Shell; -import dwt.widgets.TableColumn; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.window.DefaultToolTip; +import org.eclipse.jface.window.ToolTip; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TableColumn; -import dwt.dwthelper.utils; +import java.lang.all; import tango.text.convert.Format; @@ -47,7 +47,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ public Object[] getElements(Object inputElement) { return arrayFromObject!(MyModel)( inputElement ); @@ -56,7 +56,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#dispose() + * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { @@ -65,7 +65,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.viewers.IContentProvider#inputChanged(dwtx.jface.viewers.Viewer, + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, * java.lang.Object, java.lang.Object) */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -117,16 +117,16 @@ TableViewer v; public this(Shell shell) { - v = new TableViewer(shell, DWT.BORDER - | DWT.FULL_SELECTION); + v = new TableViewer(shell, SWT.BORDER + | SWT.FULL_SELECTION); v.setLabelProvider(new MyLabelProvider()); v.setContentProvider(new MyContentProvider()); - TableColumn column = new TableColumn(v.getTable(), DWT.NONE); + TableColumn column = new TableColumn(v.getTable(), SWT.NONE); column.setWidth(200); column.setText("Column 1"); - column = new TableColumn(v.getTable(), DWT.NONE); + column = new TableColumn(v.getTable(), SWT.NONE); column.setWidth(200); column.setText("Column 2"); @@ -139,7 +139,7 @@ ToolTip.NO_RECREATE, false); toolTip.setText("Hello World\nHello World"); toolTip.setBackgroundColor(v.getTable().getDisplay().getSystemColor( - DWT.COLOR_RED)); + SWT.COLOR_RED)); toolTip.setShift(new Point(10, 5)); } @@ -187,4 +187,4 @@ void main(){ Snippet031TableStaticTooltip.main(null); -} \ No newline at end of file +} diff -r 5d87d4191adf -r c4b36186a9bc org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/wizard/Snippet047WizardWithLongRunningOperation.d --- a/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/wizard/Snippet047WizardWithLongRunningOperation.d Mon Mar 23 11:16:06 2009 +0100 +++ b/org.eclipse.jface.snippets/EclipseJfaceSnippets/org/eclipse/jface/snippets/wizard/Snippet047WizardWithLongRunningOperation.d Mon Mar 23 11:25:49 2009 +0100 @@ -12,35 +12,34 @@ *******************************************************************************/ module jface.snippets.wizard.Snippet047WizardWithLongRunningOperation; -import dwtx.jface.viewers.ArrayContentProvider; -import dwtx.jface.viewers.ISelectionChangedListener; -import dwtx.jface.viewers.SelectionChangedEvent; -import dwtx.jface.viewers.TableViewer; -import dwtx.jface.wizard.IWizardPage; -import dwtx.jface.wizard.Wizard; -import dwtx.jface.wizard.WizardDialog; -import dwtx.jface.wizard.WizardPage; -import dwt.DWT; -import dwt.events.SelectionAdapter; -import dwt.events.SelectionEvent; -import dwt.layout.FillLayout; -import dwt.layout.GridData; -import dwt.layout.GridLayout; -import dwt.widgets.Button; -import dwt.widgets.Composite; -import dwt.widgets.Display; -import dwt.widgets.Label; -import dwt.widgets.ProgressBar; -import dwt.widgets.Shell; +import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.ProgressBar; +import org.eclipse.swt.widgets.Shell; -import dwt.dwthelper.utils; -import dwt.dwthelper.Runnable; -import dwtx.dwtxhelper.Collection; -import tango.core.Thread; +import java.lang.all; +import java.utils.ArrayList; + +import java.lang.Thread; import tango.text.convert.Format; -import tango.util.log.Trace; -import dwtx.jface.operation.ModalContext; +import org.eclipse.jface.operation.ModalContext; /** * Example how to load data from a background thread into a TableViewer @@ -61,7 +60,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.wizard.Wizard#addPages() + * @see org.eclipse.jface.wizard.Wizard#addPages() */ public void addPages() { addPage(new MyWizardPageThread("Thread Page", loadingType)); @@ -75,7 +74,7 @@ /* * (non-Javadoc) * - * @see dwtx.jface.wizard.Wizard#canFinish() + * @see org.eclipse.jface.wizard.Wizard#canFinish() */ public bool canFinish() { IWizardPage[] pages = getPages(); @@ -98,7 +97,7 @@ } public /+override+/ void createControl(Composite parent) { - Composite comp = new Composite(parent, DWT.NONE); + Composite comp = new Composite(parent, SWT.NONE); setControl(comp); } } @@ -118,10 +117,10 @@ auto mt = new MyThread(); mt.parent = parent; - mt.comp = new Composite(parent, DWT.NONE); + mt.comp = new Composite(parent, SWT.NONE); mt.comp.setLayout(new GridLayout(1, false)); - v = new TableViewer(mt.comp, DWT.FULL_SELECTION); + v = new TableViewer(mt.comp, SWT.FULL_SELECTION); v.setContentProvider(new ArrayContentProvider!(Object)()); v.getTable().setLayoutData(new GridData(GridData.FILL_BOTH)); v.addSelectionChangedListener(new class ISelectionChangedListener { @@ -132,15 +131,15 @@ }); - mt.barContainer = new Composite(mt.comp, DWT.NONE); + mt.barContainer = new Composite(mt.comp, SWT.NONE); mt.barContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); mt.barContainer.setLayout(new GridLayout(2, false)); - Label l = new Label(mt.barContainer, DWT.NONE); + Label l = new Label(mt.barContainer, SWT.NONE); l.setText("Loading Data"); mt.bar = new ProgressBar(mt.barContainer, - (loadingType == 1) ? DWT.INDETERMINATE : DWT.NONE); + (loadingType == 1) ? SWT.INDETERMINATE : SWT.NONE); mt.bar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); if (loadingType == 2) { @@ -164,7 +163,7 @@ private void threadWork(){ if (loadingType == 1) { try { - Thread.sleep(10.000); + Thread.sleep(10_000); ArrayList ms = new ArrayList(); for (int i = 0; i < 10; i++) { ms.add(new MyModel(i)); @@ -202,7 +201,7 @@ }, j )); try { - Thread.sleep(1.000); + Thread.sleep(1_000); } catch (InterruptedException e) { // TODO Auto-generated catch block ExceptionPrintStackTrace(e); @@ -247,7 +246,7 @@ shell = new Shell(display); shell.setLayout(new FillLayout()); - Button b = new Button(shell, DWT.PUSH); + Button b = new Button(shell, SWT.PUSH); b.setText("Load in one Chunk"); b.addSelectionListener(new class SelectionAdapter { @@ -258,7 +257,7 @@ }); - b = new Button(shell, DWT.PUSH); + b = new Button(shell, SWT.PUSH); b.setText("Load Item by Item"); b.addSelectionListener(new class SelectionAdapter {