Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Bégaudeau2016-03-29 05:16:00 -0400
committerStéphane Bégaudeau2016-03-29 10:57:06 -0400
commitebf6266c353bf4d43a0942932be0d07063350711 (patch)
treedff2ac6dd9fa2fe672030da0a60166cbf6b21887 /samples
parent9058ad456bcae2f6a7271336a7cec96a6aaa0c23 (diff)
downloadorg.eclipse.eef-ebf6266c353bf4d43a0942932be0d07063350711.tar.gz
org.eclipse.eef-ebf6266c353bf4d43a0942932be0d07063350711.tar.xz
org.eclipse.eef-ebf6266c353bf4d43a0942932be0d07063350711.zip
Remove the dependency to o.e.eef.properties.ui from IDE UI
Change-Id: I6c93f060b7e36e1e18159669acd78e5070df37e1 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/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java14
2 files changed, 5 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 9d484e878..15c4c1814 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
@@ -25,6 +25,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.common.ui;bundle-version="[2.7.0,3.0.0)",
org.eclipse.eef.core;bundle-version="[1.6.0,2.0.0)",
org.eclipse.eef.common;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.eef.common.ui;bundle-version="[1.6.0,2.0.0)",
org.eclipse.eef.ide.ui,
com.google.guava
Bundle-Localization: plugin
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 67530ec28..e4d217b94 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
@@ -12,11 +12,11 @@ package org.eclipse.eef.sample.custom.widget.colorpicker;
import org.eclipse.eef.EEFCustomWidgetDescription;
import org.eclipse.eef.EEFWidgetDescription;
+import org.eclipse.eef.common.ui.api.EEFWidgetFactory;
+import org.eclipse.eef.common.ui.api.IEEFFormContainer;
import org.eclipse.eef.core.api.controllers.IConsumer;
import org.eclipse.eef.core.api.controllers.IEEFWidgetController;
import org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager;
-import org.eclipse.eef.properties.ui.api.EEFTabbedPropertySheetPage;
-import org.eclipse.eef.properties.ui.api.EEFTabbedPropertySheetWidgetFactory;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.sirius.common.interpreter.api.IInterpreter;
import org.eclipse.sirius.common.interpreter.api.IVariableManager;
@@ -77,15 +77,9 @@ public class ColorPickerLifecycleManager extends AbstractEEFWidgetLifecycleManag
this.description = description;
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.eef.ide.ui.api.AbstractEEFCustomWidgetLifecycleManager#createControl(org.eclipse.swt.widgets.Composite,
- * org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
- */
@Override
- protected void createMainControl(Composite parent, EEFTabbedPropertySheetPage tabbedPropertySheetPage) {
- EEFTabbedPropertySheetWidgetFactory widgetFactory = tabbedPropertySheetPage.getWidgetFactory();
+ protected void createMainControl(Composite parent, IEEFFormContainer formContainer) {
+ EEFWidgetFactory widgetFactory = formContainer.getWidgetFactory();
FormData formData = new FormData();
formData.left = new FormAttachment(0, LABEL_WIDTH);

Back to the top