refs bug 285397 - modified to make Draw2d/GEF work out of the box with new compatibility bundle org.eclipse.draw2d.rapv20110914_R141v20110606_14-RC4v20110601_R14-RC3v20110523_R14-RC2v20110516_R14RC1v20110504_R14M7_av20110503_R14-M7Root_v14_Maintenance

43 files changed, 77 insertions, 43 deletions

diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/MouseWheelHandler.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/MouseWheelHandler.java
index fb32d54..b17a1ec 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/MouseWheelHandler.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/MouseWheelHandler.java
@@ -10,9 +10,10 @@
  *******************************************************************************/
 package org.eclipse.gef;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Event;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 /**
  * MouseWheelHandlers can be
  * {@link org.eclipse.gef.EditPartViewer#setProperty(String, Object) registered}
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/SelectionManager.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/SelectionManager.java
index 12f4770..3734452 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/SelectionManager.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/SelectionManager.java
@@ -18,10 +18,12 @@ import java.util.List;
 
 import org.eclipse.swt.widgets.Control;
 
+
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 
+
 /**
  * Manages a viewer's selection model. Selection management includes
  * representing a form of selection which is available to clients of a viewer as
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/editparts/ViewportMouseWheelHelper.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/editparts/ViewportMouseWheelHelper.java
index e38e16c..f5b1b66 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/editparts/ViewportMouseWheelHelper.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/editparts/ViewportMouseWheelHelper.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.gef.editparts;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Event;
 
 import org.eclipse.draw2d.RangeModel;
 import org.eclipse.draw2d.Viewport;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.MouseWheelHelper;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/PaletteSelectionTool.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/PaletteSelectionTool.java
index 8ab9d94..17bb540 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/PaletteSelectionTool.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/PaletteSelectionTool.java
@@ -10,9 +10,10 @@
  *******************************************************************************/
 package org.eclipse.gef.internal.ui.palette;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.tools.SelectionTool;
 import org.eclipse.gef.ui.palette.PaletteViewer;
 
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/ToolbarDropdownContributionItem.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/ToolbarDropdownContributionItem.java
index 307a34d..5975998 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/ToolbarDropdownContributionItem.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/ToolbarDropdownContributionItem.java
@@ -14,7 +14,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
@@ -39,6 +38,8 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 /**
  * A contribution item which delegates to an action.
  * <p>
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java
index 40ff6c2..f308cbd 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java
@@ -15,7 +15,6 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.Image;
@@ -31,6 +30,7 @@ import org.eclipse.draw2d.ImageFigure;
 import org.eclipse.draw2d.ImageUtilities;
 import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.rap.swt.SWT;
 import org.eclipse.draw2d.text.FlowPage;
 import org.eclipse.draw2d.text.ParagraphTextLayout;
 import org.eclipse.draw2d.text.TextFlow;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java
index 69bef29..abd815f 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.internal.ui.palette.editparts;
 
-import org.eclipse.swt.custom.ViewForm;
 import org.eclipse.swt.graphics.Color;
 
 import org.eclipse.draw2d.AbstractBorder;
@@ -21,6 +20,7 @@ import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.custom.ViewForm;
 
 class DropShadowButtonBorder extends AbstractBorder {
 
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/EditPartTipHelper.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/EditPartTipHelper.java
index f8f2a9c..e9d3e5d 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/EditPartTipHelper.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/EditPartTipHelper.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.internal.ui.palette.editparts;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.events.ShellAdapter;
@@ -23,6 +22,7 @@ import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 class EditPartTipHelper extends org.eclipse.draw2d.PopUpHelper {
 
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java
index 53741b4..596e05a 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.internal.ui.palette.editparts;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.PaletteData;
@@ -31,6 +30,7 @@ import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.PointList;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.internal.ui.palette.PaletteColorUtil;
 
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java
index f19bd54..a40f92f 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.internal.ui.palette.editparts;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.ACC;
 import org.eclipse.swt.accessibility.AccessibleControlEvent;
 import org.eclipse.swt.accessibility.AccessibleEvent;
@@ -33,6 +32,7 @@ import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.Toggle;
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.AccessibleEditPart;
 import org.eclipse.gef.DragTracker;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerFigure.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerFigure.java
index 181fd8f..e703ac5 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerFigure.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerFigure.java
@@ -96,11 +96,15 @@ public class RulerFigure extends Figure {
 	public Dimension getPreferredSize(int wHint, int hHint) {
 		Dimension prefSize = new Dimension();
 		if (isHorizontal()) {
+			// UNSUPPORTED - getAscent() not implemented in RAP
 			prefSize.height = (textMargin * 2) + BORDER_WIDTH
-					+ FigureUtilities.getFontMetrics(getFont()).getAscent();
+			// + FigureUtilities.getFontMetrics(getFont()).getAscent();
+					+ FigureUtilities.getFontMetrics(getFont()).getHeight();
 		} else {
+			// UNSUPPORTED - getLeading() not implemented in RAP
 			prefSize.width = (textMargin * 2) + BORDER_WIDTH
-					+ FigureUtilities.getFontMetrics(getFont()).getAscent();
+			// + FigureUtilities.getFontMetrics(getFont()).getAscent();
+					+ FigureUtilities.getFontMetrics(getFont()).getHeight();
 		}
 		return prefSize;
 	}
@@ -293,7 +297,9 @@ public class RulerFigure extends Figure {
 		// mark) that is
 		// beyond the end of the clip region
 		int endMark = (int) (((clippedBounds.y + clippedBounds.height) / dotsPerDivision)) + 1;
-		int leading = FigureUtilities.getFontMetrics(getFont()).getLeading();
+		// UNSUPPORTED - getLeading() not implemented in RAP
+		// int leading = FigureUtilities.getFontMetrics(getFont()).getLeading();
+		int leading = 0;
 		Rectangle forbiddenZone = new Rectangle();
 		for (int div = startMark; div <= endMark; div++) {
 			// y is the vertical position of the mark
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/AbstractTool.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/AbstractTool.java
index 290c614..3e8be00 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/AbstractTool.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/AbstractTool.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.KeyEvent;
@@ -40,6 +39,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.DragTracker;
 import org.eclipse.gef.EditDomain;
@@ -1442,7 +1442,7 @@ public abstract class AbstractTool extends org.eclipse.gef.util.FlagSupport
 	}
 
 	void setMouseCapture(boolean value) {
-	  // UNSUPPORTED - capture api not implemented in RAP
+		// UNSUPPORTED - capture api not implemented in RAP
 		// if (getCurrentViewer() != null
 		// && getCurrentViewer().getControl() != null
 		// && !getCurrentViewer().getControl().isDisposed())
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java
index ed543e4..565a5ff 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java
@@ -12,12 +12,12 @@ package org.eclipse.gef.tools;
 
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.widgets.Event;
 
 import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.AccessibleAnchorProvider;
 import org.eclipse.gef.EditPart;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java
index 13669b3..6ea1e36 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java
@@ -14,13 +14,13 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.graphics.Cursor;
 
 import org.eclipse.draw2d.Connection;
 import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.AccessibleAnchorProvider;
 import org.eclipse.gef.ConnectionEditPart;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DelayedDirectEditHelper.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DelayedDirectEditHelper.java
index b600d8c..19d98f4 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DelayedDirectEditHelper.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DelayedDirectEditHelper.java
@@ -21,6 +21,7 @@ import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
+
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.Request;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java
index 63066d9..60684a4 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java
@@ -15,7 +15,6 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.graphics.Cursor;
 
@@ -27,6 +26,7 @@ import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.AutoexposeHelper;
 import org.eclipse.gef.EditPart;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/MarqueeSelectionTool.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/MarqueeSelectionTool.java
index b3738b5..8720421 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/MarqueeSelectionTool.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/MarqueeSelectionTool.java
@@ -17,7 +17,6 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.widgets.Display;
 
@@ -31,6 +30,7 @@ import org.eclipse.draw2d.FigureUtilities;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.ConnectionEditPart;
 import org.eclipse.gef.EditPart;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/PanningSelectionTool.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/PanningSelectionTool.java
index 4c4d39b..22e16df 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/PanningSelectionTool.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/PanningSelectionTool.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.gef.tools;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.graphics.Cursor;
 
 import org.eclipse.draw2d.FigureCanvas;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.SharedCursors;
 
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java
index b500f2c..083622e 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java
@@ -12,7 +12,6 @@ package org.eclipse.gef.tools;
 
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Cursor;
 
 import org.eclipse.draw2d.IFigure;
@@ -22,6 +21,7 @@ import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.PrecisionDimension;
 import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.GraphicalEditPart;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectEditPartTracker.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectEditPartTracker.java
index ef2b6ba..1fc6fb9 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectEditPartTracker.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectEditPartTracker.java
@@ -12,9 +12,10 @@ package org.eclipse.gef.tools;
 
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Cursor;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.DragTracker;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartViewer;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java
index 9d4e3d0..95ab644 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java
@@ -13,7 +13,6 @@ package org.eclipse.gef.tools;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.MouseEvent;
@@ -21,6 +20,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.AccessibleHandleProvider;
 import org.eclipse.gef.DragTracker;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SimpleDragTracker.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SimpleDragTracker.java
index 78dc61f..6c18763 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SimpleDragTracker.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SimpleDragTracker.java
@@ -12,10 +12,11 @@ package org.eclipse.gef.tools;
 
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.graphics.Cursor;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.DragTracker;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.Request;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java
index 1f74321..b50f14d 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.ui.actions;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.printing.PrintDialog;
 import org.eclipse.swt.printing.Printer;
 import org.eclipse.swt.printing.PrinterData;
@@ -18,6 +17,8 @@ import org.eclipse.swt.printing.PrinterData;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.actions.ActionFactory;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.GraphicalViewer;
 import org.eclipse.gef.internal.GEFMessages;
 import org.eclipse.gef.print.PrintGraphicalViewerOperation;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java
index 074cd02..eec3912 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.ui.actions;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
@@ -29,6 +28,8 @@ import org.eclipse.ui.IPartListener;
 import org.eclipse.ui.IPartService;
 import org.eclipse.ui.IWorkbenchPart;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.editparts.ZoomListener;
 import org.eclipse.gef.editparts.ZoomManager;
 
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/console/DebugGEF.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/console/DebugGEF.java
index 372f0cf..773df51 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/console/DebugGEF.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/console/DebugGEF.java
@@ -13,7 +13,6 @@ package org.eclipse.gef.ui.console;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
@@ -22,6 +21,8 @@ import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.part.ViewPart;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.GEF;
 
 /**
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java
index 13f8819..d674e45 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.ACC;
 import org.eclipse.swt.accessibility.AccessibleAdapter;
 import org.eclipse.swt.accessibility.AccessibleControlAdapter;
@@ -40,6 +39,7 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ControlPaintHandler;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
@@ -87,6 +87,7 @@ import org.eclipse.draw2d.MarginBorder;
 import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.Triangle;
 import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.GraphicalViewer;
 import org.eclipse.gef.SharedCursors;
@@ -736,9 +737,11 @@ public class FlyoutPaletteComposite extends Composite {
 
 	private class Sash extends Composite {
 		private Control button;
+		private ControlPaintHandler helper;
 
 		public Sash(Composite parent, int style) {
 			super(parent, style);
+			helper = new ControlPaintHandler(this);
 			button = createFlyoutControlButton(this);
 			new SashDragManager();
 			// UNSUPPORTED - api not implemented in RAP
@@ -751,7 +754,7 @@ public class FlyoutPaletteComposite extends Composite {
 			// }
 			// });
 
-			addPaintListener(new PaintListener() {
+			helper.addPaintListener(new PaintListener() {
 				public void paintControl(org.eclipse.swt.events.PaintEvent event) {
 					paintSash(event.gc);
 				};
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/LayoutAction.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/LayoutAction.java
index 50e5634..56f03a1 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/LayoutAction.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/LayoutAction.java
@@ -23,6 +23,7 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuCreator;
 import org.eclipse.jface.resource.ImageDescriptor;
 
+
 import org.eclipse.gef.internal.Internal;
 
 /**
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java
index 1616b12..8ef9e50 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.ui.palette.customize;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -24,6 +23,7 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
 import org.eclipse.draw2d.FigureUtilities;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.palette.PaletteEntry;
 import org.eclipse.gef.palette.PaletteSeparator;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java
index a162308..43ed8d9 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.ui.palette.customize;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -18,6 +17,8 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.palette.PaletteDrawer;
 import org.eclipse.gef.palette.PaletteEntry;
 import org.eclipse.gef.ui.palette.PaletteMessages;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/EntryPage.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/EntryPage.java
index aa3da98..5b9e2be 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/EntryPage.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/EntryPage.java
@@ -13,6 +13,7 @@ package org.eclipse.gef.ui.palette.customize;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
+
 import org.eclipse.gef.palette.PaletteEntry;
 
 /**
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java
index 5656233..e202dbc 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java
@@ -17,7 +17,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.DisposeEvent;
@@ -37,6 +36,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ControlPaintHandler;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
@@ -74,6 +74,7 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.PageBook;
 
 import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.rap.swt.SWT;
 import org.eclipse.draw2d.widgets.MultiLineLabel;
 
 import org.eclipse.gef.internal.Internal;
@@ -528,7 +529,8 @@ public class PaletteCustomizerDialog extends Dialog implements
 		composite.setLayout(new FillLayout());
 
 		// A paint listener that draws an etched border around the toolbar
-		composite.addPaintListener(new PaintListener() {
+		ControlPaintHandler helper = new ControlPaintHandler(composite);
+		helper.addPaintListener(new PaintListener() {
 			public void paintControl(PaintEvent e) {
 				Rectangle area = composite.getBounds();
 				GC gc = e.gc;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java
index d03b3de..04bcb0e 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java
@@ -12,7 +12,6 @@ package org.eclipse.gef.ui.palette.customize;
 
 import java.util.HashMap;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -38,6 +37,8 @@ import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.ui.part.PageBook;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.ui.palette.PaletteMessages;
 import org.eclipse.gef.ui.palette.PaletteViewerPreferences;
 
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/ContentOutlinePage.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/ContentOutlinePage.java
index 301ee45..69f36bd 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/ContentOutlinePage.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/ContentOutlinePage.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 
+
 import org.eclipse.gef.EditPartViewer;
 
 /**
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java
index e45f7d6..23b6920 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java
@@ -10,10 +10,11 @@
  *******************************************************************************/
 package org.eclipse.gef.ui.parts;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.DefaultEditDomain;
 import org.eclipse.gef.internal.InternalGEFPlugin;
 import org.eclipse.gef.palette.PaletteRoot;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithPalette.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithPalette.java
index f8ba62d..75c5b8a 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithPalette.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithPalette.java
@@ -13,9 +13,10 @@ package org.eclipse.gef.ui.parts;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 import org.eclipse.gef.DefaultEditDomain;
 import org.eclipse.gef.palette.PaletteRoot;
 import org.eclipse.gef.ui.palette.PaletteViewer;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java
index 5b68c27..017cba8 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DragSource;
 import org.eclipse.swt.dnd.DragSourceAdapter;
 import org.eclipse.swt.dnd.DragSourceEvent;
@@ -38,6 +37,7 @@ import org.eclipse.draw2d.ExclusionSearch;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.LightweightSystem;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.AccessibleEditPart;
 import org.eclipse.gef.EditDomain;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerKeyHandler.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerKeyHandler.java
index f6f0159..1ae25d8 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerKeyHandler.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerKeyHandler.java
@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 
 import org.eclipse.draw2d.FigureCanvas;
@@ -23,6 +22,7 @@ import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.ConnectionEditPart;
 import org.eclipse.gef.EditPart;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/PaletteViewerKeyHandler.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/PaletteViewerKeyHandler.java
index 7ecb952..b02df01 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/PaletteViewerKeyHandler.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/PaletteViewerKeyHandler.java
@@ -13,11 +13,11 @@ package org.eclipse.gef.ui.parts;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyEvent;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.internal.ui.palette.editparts.DrawerEditPart;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/Splitter.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/Splitter.java
index 3c7c982..670ca33 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/Splitter.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/Splitter.java
@@ -13,7 +13,6 @@ package org.eclipse.gef.ui.parts;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.GC;
@@ -21,12 +20,14 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ControlPaintHandler;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Layout;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Sash;
 
 import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 class Splitter extends Composite {
 
@@ -203,7 +204,9 @@ class Splitter extends Composite {
 			for (int i = sashes.length; i < newSashes.length; i++) {
 				newSashes[i] = new Sash(this, sashOrientation);
 				newSashes[i].setBackground(ColorConstants.button);
-				newSashes[i].addPaintListener(new PaintListener() {
+				ControlPaintHandler helper = new ControlPaintHandler(
+						newSashes[i]);
+				helper.addPaintListener(new PaintListener() {
 					public void paintControl(PaintEvent e) {
 						paint((Sash) e.widget, e.gc);
 					}
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/TreeViewer.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/TreeViewer.java
index f2220e3..fe3b2f8 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/TreeViewer.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/TreeViewer.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.events.KeyEvent;
@@ -35,6 +34,7 @@ import org.eclipse.swt.widgets.Widget;
 import org.eclipse.jface.viewers.StructuredSelection;
 
 import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartViewer;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/rulers/RulerComposite.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/rulers/RulerComposite.java
index ba1f2ca..03a668f 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/rulers/RulerComposite.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/rulers/RulerComposite.java
@@ -14,7 +14,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.KeyEvent;
@@ -40,6 +39,7 @@ import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.RangeModel;
 import org.eclipse.draw2d.Viewport;
 import org.eclipse.draw2d.geometry.Insets;
+import org.eclipse.draw2d.rap.swt.SWT;
 
 import org.eclipse.gef.DragTracker;
 import org.eclipse.gef.EditDomain;
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspector.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspector.java
index 09a633e..1caaedc 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspector.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspector.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.gef.ui.stackview;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -23,6 +22,8 @@ import org.eclipse.ui.part.Page;
 import org.eclipse.ui.part.PageBook;
 import org.eclipse.ui.part.PageBookView;
 
+import org.eclipse.draw2d.rap.swt.SWT;
+
 /**
  * Internal class used for a debug view.
  * 
diff --git a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspectorPage.java b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspectorPage.java
index d6e0fe6..3129db7 100644
--- a/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspectorPage.java
+++ b/bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspectorPage.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.TreeViewer;
 
+
 import org.eclipse.gef.commands.CommandStack;
 
 /**