diff options
| author | Asma Smaoui | 2017-04-14 14:12:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2017-04-24 14:15:44 +0000 |
| commit | 3a7f1d7e23febb8043083a9b59bad3765dd2e1f8 (patch) | |
| tree | 12d10e993be70aef9edcc540dd76e665a0ecb6a9 | |
| parent | 12d7c9b619576e77c4505910c425dc576bfbb74e (diff) | |
| download | org.eclipse.papyrus-3a7f1d7e23febb8043083a9b59bad3765dd2e1f8.tar.gz org.eclipse.papyrus-3a7f1d7e23febb8043083a9b59bad3765dd2e1f8.tar.xz org.eclipse.papyrus-3a7f1d7e23febb8043083a9b59bad3765dd2e1f8.zip | |
Bug 513583 - [Embedded Editor] Can not set a new Papyrus embedded editor
for Port as the default editor
* correct typo in plugin.xml for the xtext Transition configuration
* force Papyrus to consider the direct editor with highest priority
Change-Id: I25886fbc626d29ce85339b3ea84ba5f0851f2b0e
Signed-off-by: Asma Smaoui <asma.smaoui@cea.fr>
2 files changed, 9 insertions, 4 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorRegistry.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorRegistry.java index 49905504a42..f1d4c8ce225 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorRegistry.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/definition/DirectEditorRegistry.java @@ -118,17 +118,22 @@ public class DirectEditorRegistry { */ public IDirectEditorExtensionPoint getDefaultDirectEditor(String ObjectToEdit) { Iterator<Integer> keyIterator = editorMap.keySet().iterator(); - + TreeMap<Integer, IDirectEditorExtensionPoint> directEditorExtensionPoints = new TreeMap<Integer, IDirectEditorExtensionPoint>(); while (keyIterator.hasNext()) { Integer index = keyIterator.next(); Iterator<IDirectEditorExtensionPoint> iter = editorMap.get(index).iterator(); while (iter.hasNext()) { IDirectEditorExtensionPoint directEditorExtensionPoint = iter.next(); if (directEditorExtensionPoint.getObjectToEdit().equals(ObjectToEdit)) { - return directEditorExtensionPoint; + directEditorExtensionPoints.put(directEditorExtensionPoint.getPriority(), directEditorExtensionPoint); } } + // if the user add a direct editor with highest priority, do not return the default direct editor but the direct editor with highest priority + // this will set the highest priority direct editor to the default one + if (!directEditorExtensionPoints.isEmpty()) { + return directEditorExtensionPoints.firstEntry().getValue(); + } } return null; } diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml index 45ffb695542..f38fe6d6d84 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.transition.xtext.ui/plugin.xml @@ -203,10 +203,10 @@ <popupeditor editorConfiguration="org.eclipse.papyrus.uml.textedit.transition.xtext.ui.contributions.TransitionEditorConfigurationContribution"> </popupeditor> - </DirectEditor> <Priority name="Medium"> - </Priority> + </Priority> + </DirectEditor> </extension> </plugin> |