| commit | 27965f912c2334f3a2d375d311d93a44e85f5360 | [log] [tgz] |
|---|---|---|
| author | Joseph Carrol <jdsalingerjr@gmail.com> | Sat Nov 16 23:48:30 2013 +0100 |
| committer | sopotc <sopotc@HOME-DH> | Sat Nov 16 23:49:49 2013 +0100 |
| tree | 62a8d9ef662e1e3014a61a4474accbcbc4822062 | |
| parent | 28484c8ca9ccf41a9dbbb883d8e6814aafd381fc [diff] |
Bug 384514 - [Model Editor] Cannot add view placeholders in fragments Signed-off-by: Joseph Carrol <jdsalingerjr@gmail.com>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java index 1eb5fb6..16d6414 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java
@@ -11,6 +11,7 @@ package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.e4.tools.emf.ui.common.IModelResource; import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor; @@ -120,6 +121,12 @@ } } } + + // NEW IMPLEMENTATION: + for (MApplicationElement f : ((MModelFragments) resource.getRoot().get(0)).getImports()) { + // let filter() do its job + list.addAll(filter(Collections.singletonList(f))); + } viewer.setInput(list); }