Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Noyrit2016-08-09 10:25:50 +0000
committerGerrit Code Review @ Eclipse.org2016-08-28 15:46:41 +0000
commit7310db0b3b2e8ee805fedf4bfd16baf438c89332 (patch)
tree3dadff6a067e8d8bcbf837d8277dfac7749aef27 /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation
parent7851474fe5f33de156c797942945a3e9c97cb0a8 (diff)
downloadorg.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.tar.gz
org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.tar.xz
org.eclipse.papyrus-7310db0b3b2e8ee805fedf4bfd16baf438c89332.zip
Bug 443799 - Fix potential bugs identified by FindBugs in oep.infra.*
Bug 499554 - Oxygen release version number moved to 3.0.0. Change-Id: I8e112db7175a5b89eb9b37973639627a6c29e007
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF10
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml22
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/DefaultNavigationMenu.java46
3 files changed, 38 insertions, 40 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
index dcf26dc0f4a..38d7348e08b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.services.navigation;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.services.openelement;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.openelement;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.services.viewersearch;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.papyrus.infra.gmfdiag.navigation,
org.eclipse.papyrus.infra.gmfdiag.navigation.decorator,
@@ -16,7 +16,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.navigation,
org.eclipse.papyrus.infra.gmfdiag.navigation.menu.button
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
index 5e5c8ce62f2..434b09bfb27 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/pom.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>org.eclipse.papyrus.infra.gmfdiag.navigation</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.infra-gmfdiag</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.infra.gmfdiag.navigation</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/DefaultNavigationMenu.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/DefaultNavigationMenu.java
index 5686a217f81..26f840a10e3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/DefaultNavigationMenu.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/menu/DefaultNavigationMenu.java
@@ -30,9 +30,7 @@ import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.gmfdiag.navigation.Activator;
-import org.eclipse.papyrus.infra.gmfdiag.navigation.menu.button.MoreButton;
import org.eclipse.papyrus.infra.gmfdiag.navigation.menu.listener.NavigationMenuKeyListener;
-import org.eclipse.papyrus.infra.gmfdiag.navigation.menu.listener.SelectionMenuMouseTrackListener;
import org.eclipse.papyrus.infra.gmfdiag.navigation.menu.listener.SelectionMenuSelectionChangedListener;
import org.eclipse.papyrus.infra.gmfdiag.navigation.menu.provider.SelectionMenuLabelProvider;
import org.eclipse.papyrus.infra.services.navigation.service.ExtendedNavigableElement;
@@ -56,7 +54,7 @@ public class DefaultNavigationMenu implements NavigationMenu {
private Shell parentShell;
private NavigationService navigationService;
-
+
private ViewerSearchService viewerSearchService;
private EObject currentModel;
@@ -72,9 +70,9 @@ public class DefaultNavigationMenu implements NavigationMenu {
private boolean wasUnderlined;
private WrappingLabel lastWrappingLabel;
-
- private static boolean altReleasedPostNavigation = true;
-
+
+ private boolean altReleasedPostNavigation = true;
+
private View selectedView;
public class NavigationMenuInitializationException extends Exception {
@@ -280,13 +278,13 @@ public class DefaultNavigationMenu implements NavigationMenu {
if (navigationMenuElements.isEmpty()) {
return;
}
-
+
// Add "More..." button
- //navigationMenuElements.add(new MoreButton());
-
+ // navigationMenuElements.add(new MoreButton());
+
// The semantic element
EObject umlElement = EMFHelper.getEObject(source);
-
+
// Create the selection menu and subMenus list
selectionMenu = new SelectionMenu(shell);
subMenus = new LinkedList<SelectionMenu>();
@@ -313,7 +311,7 @@ public class DefaultNavigationMenu implements NavigationMenu {
selectionMenu.addSelectionChangedListener(new SelectionMenuSelectionChangedListener(DefaultNavigationMenu.this, selectionMenu, navigationMenuElements, umlElement, subMenus));
selectionMenu.addKeyListener(new NavigationMenuKeyListener(this));
- //selectionMenu.addMouseTrackListener(new SelectionMenuMouseTrackListener(DefaultNavigationMenu.this, selectionMenu, subMenus, umlElement));
+ // selectionMenu.addMouseTrackListener(new SelectionMenuMouseTrackListener(DefaultNavigationMenu.this, selectionMenu, subMenus, umlElement));
}
public void addContextualMenus(List<Object> navigationMenuElements, Object umlElement) {
@@ -330,22 +328,22 @@ public class DefaultNavigationMenu implements NavigationMenu {
if (navElement == null) {
return null;
}
-
+
EObject element = null;
if (navElement instanceof ExtendedNavigableElement
&& ((ExtendedNavigableElement) navElement).getSemanticElement() instanceof EObject) {
element = (EObject) ((ExtendedNavigableElement) navElement).getSemanticElement();
}
-
+
if (element != null) {
ViewerSearchService viewerSearchService = null;
-
+
try {
viewerSearchService = getViewerSearchService();
} catch (NavigationMenuInitializationException e) {
Activator.log.error(e);
}
-
+
if (viewerSearchService != null) {
return viewerSearchService.getViewersInCurrentModel(element, null, false, onlyOpened);
}
@@ -353,13 +351,13 @@ public class DefaultNavigationMenu implements NavigationMenu {
return new LinkedList<Object>();
}
-
+
public void showInModelExplorer(NavigableElement navigableElement) {
Object semanticElement = null;
if (navigableElement instanceof ExtendedNavigableElement) {
semanticElement = ((ExtendedNavigableElement) navigableElement).getSemanticElement();
}
-
+
if (semanticElement != null) {
try {
getNavigationService().navigate(semanticElement, "org.eclipse.papyrus.views.modelexplorer.navigation.target");
@@ -402,21 +400,21 @@ public class DefaultNavigationMenu implements NavigationMenu {
return servicesRegistry;
}
- private NavigationService getNavigationService() throws NavigationMenuInitializationException {
+ private NavigationService getNavigationService() throws NavigationMenuInitializationException {
if (navigationService == null) {
throw new NavigationMenuInitializationException(navigationService);
}
return navigationService;
}
-
- public ViewerSearchService getViewerSearchService() throws NavigationMenuInitializationException {
+
+ public ViewerSearchService getViewerSearchService() throws NavigationMenuInitializationException {
if (viewerSearchService == null) {
throw new NavigationMenuInitializationException(viewerSearchService);
}
return viewerSearchService;
}
- private Shell getParentShell() throws NavigationMenuInitializationException {
+ private Shell getParentShell() throws NavigationMenuInitializationException {
if (parentShell == null) {
throw new NavigationMenuInitializationException(parentShell);
}
@@ -566,7 +564,7 @@ public class DefaultNavigationMenu implements NavigationMenu {
Activator.log.error(e);
}
}
-
+
public View getSelectedView() {
return selectedView;
}
@@ -579,8 +577,8 @@ public class DefaultNavigationMenu implements NavigationMenu {
public void setParentShell(Shell parentShell) {
this.parentShell = parentShell;
}
-
+
public void altReleased() {
- this.altReleasedPostNavigation = true;
+ altReleasedPostNavigation = true;
}
} \ No newline at end of file

Back to the top