Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Carrol2013-11-16 22:48:30 +0000
committersopotc2013-11-16 22:49:49 +0000
commit27965f912c2334f3a2d375d311d93a44e85f5360 (patch)
tree62a8d9ef662e1e3014a61a4474accbcbc4822062
parent28484c8ca9ccf41a9dbbb883d8e6814aafd381fc (diff)
downloadorg.eclipse.e4.tools-27965f912c2334f3a2d375d311d93a44e85f5360.tar.gz
org.eclipse.e4.tools-27965f912c2334f3a2d375d311d93a44e85f5360.tar.xz
org.eclipse.e4.tools-27965f912c2334f3a2d375d311d93a44e85f5360.zip
Bug 384514 - [Model Editor] Cannot add view placeholders in fragments I20131120-2200I20131119-2200I20131118-2200I20131117-2200I20131116-2200
Signed-off-by: Joseph Carrol <jdsalingerjr@gmail.com>
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java7
1 files changed, 7 insertions, 0 deletions
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 1eb5fb66..16d64147 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 @@ public class SharedElementsDialog extends TitleAreaDialog {
}
}
}
+
+ // 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);
}

Back to the top