Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml')
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml b/plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml
index 9d6f055af1..235099bed7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.osee</groupId>
<artifactId>org.eclipse.osee.client.parent</artifactId>
- <version>0.17.0-SNAPSHOT</version>
+ <version>0.17.1-SNAPSHOT</version>
<relativePath>../../plugins/org.eclipse.osee.client.parent</relativePath>
</parent>

Back to the top

ass='none' style='width: 90.9%;'/> -rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/NativeGraphicsSource.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintFigureOperation.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintOperation.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrinterGraphics.java4
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTEventDispatcher.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTGraphics.java12
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScalableLayeredPane.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScaledGraphics.java11
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Shape.java3
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/TextUtilities.java8
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ToolTipHelper.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/parts/ScrollableThumbnail.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/parts/Thumbnail.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/text/BidiProcessor.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/text/BlockFlow.java3
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/text/BlockFlowLayout.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/text/FlowBorder.java6
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/text/FlowUtilities.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/text/InlineFlow.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/text/TextFlow.java2
-rw-r--r--bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/widgets/MultiLineLabel.java2
-rw-r--r--bundles/org.eclipse.gef/META-INF/MANIFEST.MF1
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/MouseWheelHandler.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/SelectionManager.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/editparts/ViewportMouseWheelHelper.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/PaletteSelectionTool.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/ToolbarDropdownContributionItem.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DetailedLabelFigure.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/EditPartTipHelper.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerFigure.java12
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/AbstractTool.java4
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DelayedDirectEditHelper.java1
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/MarqueeSelectionTool.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/PanningSelectionTool.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectEditPartTracker.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/tools/SimpleDragTracker.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/console/DebugGEF.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java7
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/LayoutAction.java1
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DefaultEntryPage.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/DrawerEntryPage.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/EntryPage.java1
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteCustomizerDialog.java6
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/palette/customize/PaletteSettingsDialog.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/ContentOutlinePage.java1
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithPalette.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerKeyHandler.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/PaletteViewerKeyHandler.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/Splitter.java7
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/parts/TreeViewer.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/rulers/RulerComposite.java2
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspector.java3
-rw-r--r--bundles/org.eclipse.gef/src/org/eclipse/gef/ui/stackview/CommandStackInspectorPage.java1
-rw-r--r--bundles/org.eclipse.rap.gef.demo/META-INF/MANIFEST.MF1
-rw-r--r--bundles/org.eclipse.rap.gef.demo/RAP GEF Demo.launch5
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/AbstractExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/ExampleUtil.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/graph/AbstractGraphDemo.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/layouts/FlowLayoutExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/layouts/GridLayoutExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/layouts/ToolbarLayoutExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/path/PathExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/path/PathFigure.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/swt/ShapeStylesExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/text/BidiBlockExample.java11
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/text/MultiLineLabelExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/text/TestBorder.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/text/TextFlowFactory.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/text/TextFlowLargeExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/text/TextSurroundingFigureExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/thumbnail/ThumbnailExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/tree/TreeExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/uml/UMLClassFigure.java4
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/draw2d/examples/zoom/ZoomExample.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/flow/parts/ActivityDirectEditManager.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/flow/ui/FlowEditor.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/flow/ui/FlowEditorView.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/logicdesigner/LogicEditor.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/logicdesigner/LogicEditorView.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/logicdesigner/actions/PrintModeDialog.java11
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/logicdesigner/edit/LogicDiagramEditPart.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/gef/examples/logicdesigner/edit/LogicLabelEditManager.java2
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/rap/gef/demo/Application.java8
-rw-r--r--bundles/org.eclipse.rap.gef.demo/src/org/eclipse/rap/gef/demo/EditorView.java3
-rw-r--r--bundles/org.eclipse.zest.core/META-INF/MANIFEST.MF3
-rw-r--r--bundles/org.eclipse.zest.core/src/org/eclipse/zest/core/viewers/internal/GraphItemStyler.java2
-rw-r--r--bundles/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/Graph.java4
-rw-r--r--bundles/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/internal/XYScaledGraphics.java22
115 files changed, 214 insertions, 159 deletions
diff --git a/bundles/org.eclipse.draw2d/META-INF/MANIFEST.MF b/bundles/org.eclipse.draw2d/META-INF/MANIFEST.MF
index 4e4dc45..55c4e33 100644
--- a/bundles/org.eclipse.draw2d/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.draw2d/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Export-Package: org.eclipse.draw2d,
Require-Bundle: org.eclipse.core.jobs;bundle-version="3.5.100",
org.eclipse.core.runtime;bundle-version="3.6.100",
org.eclipse.rap.rwt;bundle-version="1.4.0",
- org.eclipse.rap.ui;bundle-version="1.4.0"
+ org.eclipse.rap.ui;bundle-version="1.4.0",
+ org.eclipse.draw2d.rap;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/BufferedGraphicsSource.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/BufferedGraphicsSource.java
index ecc7408..ec3d098 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/BufferedGraphicsSource.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/BufferedGraphicsSource.java
@@ -10,12 +10,12 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Control;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
class BufferedGraphicsSource implements GraphicsSource {
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ColorConstants.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ColorConstants.java
index b064763..5ddb002 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ColorConstants.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ColorConstants.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
+import org.eclipse.draw2d.rap.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ConnectionLayer.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ConnectionLayer.java
index dc153b1..9894f68 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ConnectionLayer.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ConnectionLayer.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* Layer designed specifically to handle the presence of connections. This is
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Cursors.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Cursors.java
index 56f9d38..a7dd2a5 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Cursors.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Cursors.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
+import org.eclipse.draw2d.rap.swt.SWT;
import org.eclipse.swt.graphics.Cursor;
/**
@@ -192,8 +192,11 @@ public class Cursors {
IBEAM = new Cursor(null, SWT.CURSOR_IBEAM);
NO = new Cursor(null, SWT.CURSOR_NO);
SIZEALL = new Cursor(null, SWT.CURSOR_SIZEALL);
- SIZENESW = new Cursor(null, SWT.CURSOR_SIZENESW);
- SIZENWSE = new Cursor(null, SWT.CURSOR_SIZENWSE);
+ //UNSUPPORTED - these constants are not implemented yet in RAP
+// SIZENESW = new Cursor(null, SWT.CURSOR_SIZENESW);
+// SIZENWSE = new Cursor(null, SWT.CURSOR_SIZENWSE);
+ SIZENESW = new Cursor(null, SWT.CURSOR_SIZEALL);
+ SIZENWSE = new Cursor(null, SWT.CURSOR_SIZEALL);
UPARROW = new Cursor(null, SWT.CURSOR_UPARROW);
WAIT = new Cursor(null, SWT.CURSOR_WAIT);
}
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/DeferredUpdateManager.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/DeferredUpdateManager.java
index 2d495ea..f2dd442 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/DeferredUpdateManager.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/DeferredUpdateManager.java
@@ -16,12 +16,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.widgets.Display;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* An UpdateManager that asynchronously updates the affected figures.
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Figure.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Figure.java
index 71dc88e..589dc9b 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Figure.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Figure.java
@@ -18,7 +18,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Cursor;
@@ -30,6 +29,7 @@ import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2d.geometry.Translatable;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* The base implementation for graphical figures.
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/FigureCanvas.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/FigureCanvas.java
index 995938f..837023c 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/FigureCanvas.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/FigureCanvas.java
@@ -14,7 +14,6 @@ package org.eclipse.draw2d;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Font;
@@ -27,6 +26,7 @@ import org.eclipse.swt.widgets.Slider;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* A scrolling Canvas that contains {@link Figure Figures} viewed through a
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Graphics.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Graphics.java
index 41cce77..2f38b8e 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Graphics.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Graphics.java
@@ -10,21 +10,20 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
+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.draw2d.rap.swt.graphics.LineAttributes;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontMetrics;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.LineAttributes;
import org.eclipse.swt.graphics.Path;
import org.eclipse.swt.graphics.Pattern;
import org.eclipse.swt.graphics.TextLayout;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
/**
* The Graphics class allows you to draw to a surface. The drawXxx() methods
* that pertain to shapes draw an outline of the shape, whereas the fillXxx()
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/GridData.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/GridData.java
index acdf061..f2666f4 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/GridData.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/GridData.java
@@ -11,9 +11,9 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* <code>GridData</code> is the layout data object associated with
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/GridLayout.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/GridLayout.java
index 22dac61..e7d0b41 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/GridLayout.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/GridLayout.java
@@ -15,10 +15,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.swt.SWT;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* Lays out children into a Grid arrangement in which overall aligment and
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ImageUtilities.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ImageUtilities.java
index 990fd6e..979e2f3 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ImageUtilities.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ImageUtilities.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontMetrics;
@@ -22,6 +21,7 @@ import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;
import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* @author Pratik Shah
@@ -54,7 +54,9 @@ public class ImageUtilities {
FontMetrics metrics = FigureUtilities.getFontMetrics(font);
Dimension strSize = FigureUtilities.getStringExtents(string, font);
- Image srcImage = new Image(display, strSize.width, metrics.getAscent());
+ // UNSUPPORTED - getAscent() not implemented in RAP
+// Image srcImage = new Image(display, strSize.width, metrics.getAscent());
+ Image srcImage = new Image(display, strSize.width, metrics.getHeight());
// UNSUPPORTED - image constructor not implemented in RAP
// GC gc = new GC(srcImage);
GC gc = new GC(srcImage.getDevice());
@@ -62,7 +64,9 @@ public class ImageUtilities {
gc.setForeground(foreground);
gc.setBackground(background);
gc.fillRectangle(srcImage.getBounds());
- gc.drawString(string, 0, 0 - metrics.getLeading());
+ // UNSUPPORTED - getLeading() not implemented in RAP
+// gc.drawString(string, 0, 0 - metrics.getLeading());
+ gc.drawString(string, 0, 0);
Image result = createRotatedImage(srcImage);
gc.dispose();
srcImage.dispose();
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/InputEvent.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/InputEvent.java
index b0f3eac..51ada7d 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/InputEvent.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/InputEvent.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* The base class for Draw2d events.
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/LightweightSystem.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/LightweightSystem.java
index 1137763..c51d513 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/LightweightSystem.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/LightweightSystem.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.AccessibleControlEvent;
import org.eclipse.swt.accessibility.AccessibleControlListener;
import org.eclipse.swt.accessibility.AccessibleEvent;
@@ -52,6 +51,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ui.presentations.PresentationUtil;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* The LightweightSystem is the link between SWT and Draw2d. It is the component
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/NativeGraphicsSource.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/NativeGraphicsSource.java
index c71b5e4..28450f2 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/NativeGraphicsSource.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/NativeGraphicsSource.java
@@ -11,9 +11,9 @@
package org.eclipse.draw2d;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.swt.widgets.Control;
/**
* A graphics source that posts a paint request to the control rather than
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java
index acb2bfa..52a1b21 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PopUpHelper.java
@@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* Provides abstract support for classes that manage popups. Popups in Draw2d
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintFigureOperation.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintFigureOperation.java
index eddeb7c..f959758 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintFigureOperation.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintFigureOperation.java
@@ -11,12 +11,12 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.printing.Printer;
import org.eclipse.swt.widgets.Display;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* Class responsible for printing Figures.
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintOperation.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintOperation.java
index 6b27580..a7032b6 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintOperation.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrintOperation.java
@@ -10,12 +10,12 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.printing.Printer;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* Implementation of draw2d's printing capabilities.
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrinterGraphics.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrinterGraphics.java
index 028139d..e952067 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrinterGraphics.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/PrinterGraphics.java
@@ -14,11 +14,11 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.eclipse.swt.SWT;
+import org.eclipse.draw2d.rap.swt.SWT;
+import org.eclipse.draw2d.rap.swt.graphics.LineAttributes;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.LineAttributes;
import org.eclipse.swt.printing.Printer;
import org.eclipse.swt.widgets.Display;
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTEventDispatcher.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTEventDispatcher.java
index d3e9c9e..2bc3f49 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTEventDispatcher.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTEventDispatcher.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
+import org.eclipse.draw2d.rap.swt.SWT;
import org.eclipse.swt.accessibility.AccessibleControlEvent;
import org.eclipse.swt.accessibility.AccessibleControlListener;
import org.eclipse.swt.accessibility.AccessibleEvent;
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTGraphics.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTGraphics.java
index b518e4c..f5809dc 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTGraphics.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTGraphics.java
@@ -13,13 +13,15 @@ package org.eclipse.draw2d;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.swt.SWT;
+import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2d.rap.swt.SWT;
+import org.eclipse.draw2d.rap.swt.graphics.LineAttributes;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontMetrics;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.LineAttributes;
import org.eclipse.swt.graphics.Path;
import org.eclipse.swt.graphics.Pattern;
import org.eclipse.swt.graphics.Region;
@@ -27,9 +29,6 @@ import org.eclipse.swt.graphics.TextLayout;
import org.eclipse.swt.graphics.Transform;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
/**
* A concrete implementation of <code>Graphics</code> using an SWT
* <code>GC</code>. There are 2 states contained in this graphics class -- the
@@ -794,7 +793,8 @@ public class SWTGraphics extends Graphics {
currentState.bgColor = appliedState.bgColor = gc.getBackground();
currentState.fgColor = appliedState.fgColor = gc.getForeground();
currentState.font = appliedState.font = gc.getFont();
- currentState.lineAttributes = gc.getLineAttributes();
+ org.eclipse.swt.graphics.LineAttributes lineAttributes = gc.getLineAttributes();
+ currentState.lineAttributes = new LineAttributes(lineAttributes.width,lineAttributes.cap,lineAttributes.join);
appliedState.lineAttributes = clone(currentState.lineAttributes);
// UNSUPPORTED - api is not implemented in RAP
// currentState.graphicHints |= gc.getLineStyle();
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScalableLayeredPane.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScalableLayeredPane.java
index 595f418..7648659 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScalableLayeredPane.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScalableLayeredPane.java
@@ -10,11 +10,11 @@
*******************************************************************************/
package org.eclipse.draw2d;
-import org.eclipse.swt.SWT;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2d.geometry.Translatable;
+import org.eclipse.draw2d.rap.swt.SWT;
/**
* A non-freeform, scalable layered pane.
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScaledGraphics.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScaledGraphics.java
index 8769513..3b6b432 100644
--- a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScaledGraphics.java
+++ b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/ScaledGraphics.java
@@ -15,13 +15,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.swt.SWT;
+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.draw2d.rap.swt.graphics.LineAttributes;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.FontMetrics;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.LineAttributes;
import org.eclipse.swt.graphics.Path;
import org.eclipse.swt.graphics.PathData;
import org.eclipse.swt.graphics.Pattern;
@@ -29,10 +32,6 @@ import org.eclipse.swt.graphics.TextLayout;
import org.eclipse.swt.graphics.TextStyle;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
/**
* A Graphics object able to scale all operations based on the current scale
* factor.
diff --git a/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Shape.java b/bundles/org.eclipse.draw2d/src/org/eclipse/draw2d/Shape.java