Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShuai Li2016-04-15 14:51:05 +0000
committerShuai Li2016-04-15 17:38:23 +0000
commitfa7712970f5bfa6a03c4e0854ab88b8de721d0ef (patch)
tree09d6c89e27e4635a4930b9a25d7cf90a836037c9 /plugins/views
parent8825c18b6e8926b45269c40d9af43c3c064b0048 (diff)
downloadorg.eclipse.papyrus-fa7712970f5bfa6a03c4e0854ab88b8de721d0ef.tar.gz
org.eclipse.papyrus-fa7712970f5bfa6a03c4e0854ab88b8de721d0ef.tar.xz
org.eclipse.papyrus-fa7712970f5bfa6a03c4e0854ab88b8de721d0ef.zip
Bug 463687 - Not possible to see and click-to-navigate to opposite
elements across links in Model Explorer - Add navigation contributor for relationships: * Type of association member ends * Types of directed relationship targets and sources - Add navigation contributor for activity edge: * Target * Source - Add navigation contributor for connector end: * Role * Part with port * Defining end - UI improvements and fixes * Do not show navigation menu after a navigation if Alt hasn't been released once at least * Fix a bug where in the model explorer, we navigate to the selected element, but then we might navigate right away to another hovered over element in some cases - Refactoring * Add generic navigable element from which every navigable element should inherit * Fix some navigable element labels * Remove menu button contributors for source and targets ends under More... Change-Id: Idfcd2d460d44d5f14dfa9ff12c7cf7dd6dde4a71 Signed-off-by: Shuai Li <shuai.li@cea.fr>
Diffstat (limited to 'plugins/views')
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java29
1 files changed, 1 insertions, 28 deletions
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
index fe72adfb35c..92720e236dc 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
@@ -479,6 +479,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
public void keyReleased(KeyEvent e) {
if (navigationMenu != null) {
if (e.keyCode == SWT.ALT) {
+ navigationMenu.altReleased();
navigationMenu.exitItem();
}
}
@@ -509,34 +510,6 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
}
});
- tree.addMouseListener(new MouseAdapter() {
-
- @Override
- public void mouseUp(MouseEvent e) {
- if ((e.stateMask & SWT.ALT) == 0) {
- return;
- }
-
- TreeItem currentItem = getTreeItem(e);
- if (currentItem != null) {
- Object data = currentItem.getData();
- try {
- NavigationService service = serviceRegistry.getService(NavigationService.class);
- List<NavigableElement> navigableElements = service.getNavigableElements(data);
-
- // TODO: Implement a priority on NavigableElements and navigate the element with the highest priority
- for (NavigableElement navigableElement : navigableElements) {
- if (navigableElement.isEnabled()) {
- service.navigate(navigableElement);
- }
- }
- } catch (ServiceException ex) {
- Activator.log.error(ex);
- }
- }
- }
- });
-
tree.addMouseMoveListener(new MouseMoveListener() {
@Override

Back to the top