better management of wrappeditems....
diff --git a/modeling/plugins/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF b/modeling/plugins/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF
index a32ee2a..e02a98d 100644
--- a/modeling/plugins/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF
+++ b/modeling/plugins/org.eclipse.pde.ds.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@
  org.eclipse.wst.sse.ui;bundle-version="1.1.100";resolution:=optional,
  org.eclipse.wst.xml.core;bundle-version="1.1.400";resolution:=optional,
  org.eclipse.wst.xml.ui;bundle-version="1.1.0";resolution:=optional,
- org.eclipse.jface.text;bundle-version="3.5.0"
+ org.eclipse.jface.text;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
diff --git a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/PropertiesPage.java b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/PropertiesPage.java
index 4164eb3..03b21d6 100644
--- a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/PropertiesPage.java
+++ b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/PropertiesPage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Anyware Technologies - initial API and implementation
  *
- * $Id: PropertiesPage.java,v 1.4 2009/06/02 09:08:26 bcabe Exp $
+ * $Id: PropertiesPage.java,v 1.5 2009/06/02 10:48:04 bcabe Exp $
  */
 package org.eclipse.pde.ds.ui.internal.editor;
 
@@ -18,8 +18,8 @@
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
 import org.eclipse.emf.ecore.util.FeatureMap.Entry;
 import org.eclipse.emf.edit.command.*;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.WrapperItemProvider;
 import org.eclipse.jface.viewers.*;
 import org.eclipse.pde.ds.scr.*;
 import org.eclipse.pde.ds.ui.internal.editor.action.newPropertiesAction;
@@ -52,10 +52,8 @@
 				Object sel = ((IStructuredSelection) _propertiesMasterDetail.getViewer().getSelection()).getFirstElement();
 				int idx = CommandParameter.NO_INDEX;
 				if (sel != null) {
-					if (sel instanceof WrapperItemProvider) {
-						WrapperItemProvider wip = (WrapperItemProvider) sel;
-						idx = ((Component) getObservedValue().getValue()).getAllProperties().indexOf(wip.getValue());
-					}
+					Object unwrappedElement = AdapterFactoryEditingDomain.unwrap(sel);
+					idx = ((Component) getObservedValue().getValue()).getAllProperties().indexOf(unwrappedElement);
 				}
 
 				Property p = ScrFactory.eINSTANCE.createProperty();
diff --git a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/detailpart/PropertiesDetailsPart.java b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/detailpart/PropertiesDetailsPart.java
index c963f88..db896f0 100644
--- a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/detailpart/PropertiesDetailsPart.java
+++ b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/detailpart/PropertiesDetailsPart.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Anyware Technologies - initial API and implementation
  *
- * $Id: PropertiesDetailsPart.java,v 1.4 2009/05/29 23:52:32 bcabe Exp $
+ * $Id: PropertiesDetailsPart.java,v 1.5 2009/06/02 10:48:03 bcabe Exp $
  */
 package org.eclipse.pde.ds.ui.internal.editor.detailpart;
 
@@ -16,8 +16,8 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.WrapperItemProvider;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
@@ -109,11 +109,8 @@
 
 	public void selectionChanged(IFormPart part, ISelection selection) {
 		IStructuredSelection sel = (IStructuredSelection) selection;
-		if (sel.getFirstElement() instanceof WrapperItemProvider) {
-			WrapperItemProvider wip = (WrapperItemProvider) sel.getFirstElement();
-			Object o = wip.getEditableValue(sel.getFirstElement());
-			currentProperties.setValue(o);
-		}
+		Object unwrappedElement = AdapterFactoryEditingDomain.unwrap(sel.getFirstElement());
+		currentProperties.setValue(unwrappedElement);
 	}
 
 }
diff --git a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/detailpart/PropertyDetailsPart.java b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/detailpart/PropertyDetailsPart.java
index 0a59920..a1d77a5 100644
--- a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/detailpart/PropertyDetailsPart.java
+++ b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/detailpart/PropertyDetailsPart.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Anyware Technologies - initial API and implementation
  *
- * $Id: PropertyDetailsPart.java,v 1.5 2009/06/02 10:48:02 bcabe Exp $
+ * $Id: PropertyDetailsPart.java,v 1.6 2009/06/26 10:49:34 bcabe Exp $
  */
 package org.eclipse.pde.ds.ui.internal.editor.detailpart;
 
@@ -16,8 +16,8 @@
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.WrapperItemProvider;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewersObservables;
 import org.eclipse.jface.layout.GridDataFactory;
@@ -119,11 +119,8 @@
 
 	public void selectionChanged(IFormPart part, ISelection selection) {
 		IStructuredSelection sel = (IStructuredSelection) selection;
-		if (sel.getFirstElement() instanceof WrapperItemProvider) {
-			WrapperItemProvider wip = (WrapperItemProvider) sel.getFirstElement();
-			Object o = wip.getEditableValue(sel.getFirstElement());
-			currentProperty.setValue(o);
-		}
+		Object unwrappedElement = AdapterFactoryEditingDomain.unwrap(sel.getFirstElement());
+		currentProperty.setValue(unwrappedElement);
 	}
 
 }