fixed create sibling filters
diff --git a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/masterdetail/PropertiesMasterDetail.java b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/masterdetail/PropertiesMasterDetail.java
index c7c8e1f..b9052b2 100644
--- a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/masterdetail/PropertiesMasterDetail.java
+++ b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/masterdetail/PropertiesMasterDetail.java
@@ -8,11 +8,10 @@
* Contributors:
* Anyware Technologies - initial API and implementation
*
- * $Id: PropertiesMasterDetail.java,v 1.15 2009/08/21 17:40:59 bcabe Exp $
+ * $Id: PropertiesMasterDetail.java,v 1.16 2009/09/11 22:08:47 bcabe Exp $
*/
package org.eclipse.pde.ds.ui.internal.editor.masterdetail;
-import org.eclipse.emf.ecore.util.FeatureMap;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.jface.viewers.*;
import org.eclipse.pde.ds.scr.Properties;
@@ -75,14 +74,9 @@
@Override
protected IFilter getCreateSiblingContextMenuFilter() {
return new IFilter() {
-
public boolean select(Object toTest) {
- if (toTest instanceof FeatureMap.Entry) {
- Object val = ((FeatureMap.Entry) toTest).getValue();
- return (val instanceof Property || val instanceof Properties);
- }
- return true;
-
+ Object unwrappedElement = AdapterFactoryEditingDomain.unwrap(toTest);
+ return (unwrappedElement instanceof Property || unwrappedElement instanceof Properties);
}
};
}
diff --git a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/masterdetail/ServicesMasterDetail.java b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/masterdetail/ServicesMasterDetail.java
index 38bc1b6..fc1095a 100644
--- a/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/masterdetail/ServicesMasterDetail.java
+++ b/modeling/plugins/org.eclipse.pde.ds.ui/src/org/eclipse/pde/ds/ui/internal/editor/masterdetail/ServicesMasterDetail.java
@@ -8,7 +8,7 @@
* Contributors:
* Anyware Technologies - initial API and implementation
*
- * $Id: ServicesMasterDetail.java,v 1.10 2009/08/21 17:40:59 bcabe Exp $
+ * $Id: ServicesMasterDetail.java,v 1.11 2009/09/11 22:08:47 bcabe Exp $
*/
package org.eclipse.pde.ds.ui.internal.editor.masterdetail;
@@ -16,8 +16,7 @@
import java.util.List;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jface.viewers.*;
import org.eclipse.pde.ds.scr.*;
import org.eclipse.pde.ds.ui.internal.editor.detailpart.services.ProvideDetailsPart;
import org.eclipse.pde.ds.ui.internal.editor.detailpart.services.ReferenceDetailsPart;
@@ -96,4 +95,14 @@
}
};
}
+
+ @Override
+ protected IFilter getCreateSiblingContextMenuFilter() {
+ return new IFilter() {
+ public boolean select(Object toTest) {
+ Object unwrappedElement = AdapterFactoryEditingDomain.unwrap(toTest);
+ return (unwrappedElement instanceof Provide || unwrappedElement instanceof Reference);
+ }
+ };
+ }
}
