Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Bégaudeau2016-04-05 04:03:20 -0400
committerStéphane Bégaudeau2016-04-20 04:07:45 -0400
commita78bb60de900f8100e0dcc7eee002af20608c8d4 (patch)
tree0feb97d29c8d1e7bde11dee702c891424a175b81 /samples
parentc67128ae4e8a3055ed3da96044a82aa44a7fdc56 (diff)
downloadorg.eclipse.eef-a78bb60de900f8100e0dcc7eee002af20608c8d4.tar.gz
org.eclipse.eef-a78bb60de900f8100e0dcc7eee002af20608c8d4.tar.xz
org.eclipse.eef-a78bb60de900f8100e0dcc7eee002af20608c8d4.zip
Add support for layout
Change-Id: I7a65de5a7e23d61347d64db0e1dc59cbb6ac5b94 Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
Diffstat (limited to 'samples')
-rw-r--r--samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF1
-rw-r--r--samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties1
-rw-r--r--samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java8
3 files changed, 0 insertions, 10 deletions
diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF
index 15c4c1814..93feae582 100644
--- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF
+++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Import-Package: org.eclipse.eef;version="[1.6.0,2.0.0)",
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)",
org.eclipse.eef.properties.ui;bundle-version="[1.6.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ui.forms;bundle-version="[3.5.200,4.0.0)",
diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties
index bb85c49f5..3d0697db5 100644
--- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties
+++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/build.properties
@@ -14,4 +14,3 @@ bin.includes = META-INF/,\
plugin.xml,\
icons/
javacProjectSettings = true
-additional.bundles = org.eclipse.emf.transaction
diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java
index 87a8e114c..90651fd6c 100644
--- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java
+++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java
@@ -31,8 +31,6 @@ import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.ColorDialog;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -87,16 +85,10 @@ public class ColorPickerLifecycleManager extends AbstractEEFWidgetLifecycleManag
protected void createMainControl(Composite parent, IEEFFormContainer formContainer) {
EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory();
- FormData formData = new FormData();
- formData.left = new FormAttachment(0, LABEL_WIDTH);
- formData.right = new FormAttachment(100, 0);
-
// Create the color picker
this.colorPicker = new ColorPicker(parent);
widgetFactory.paintBordersFor(parent);
- this.colorPicker.setLayoutData(formData);
-
this.controller = new ColorPickerController(this.description, this.variableManager, this.interpreter, this.contextAdapter);
}

Back to the top