diff options
| author | Camille Letavernier | 2013-07-25 15:00:25 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2013-07-25 15:02:17 +0000 |
| commit | 0cf8e396f1c70664a78562f7a07bffd7479bacd0 (patch) | |
| tree | 8ed823e019bfd7903a56fea678ca7902c5153bed /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation | |
| parent | 518675d728515bea834659b1cdd7ffaa6311ca5b (diff) | |
| download | org.eclipse.papyrus-0cf8e396f1c70664a78562f7a07bffd7479bacd0.tar.gz org.eclipse.papyrus-0cf8e396f1c70664a78562f7a07bffd7479bacd0.tar.xz org.eclipse.papyrus-0cf8e396f1c70664a78562f7a07bffd7479bacd0.zip | |
413745: [All Diagrams] NPE in NavigationEditPolicy
https://bugs.eclipse.org/bugs/show_bug.cgi?id=413745
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation')
| -rw-r--r-- | plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/editpolicy/NavigationEditPolicy.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/editpolicy/NavigationEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/editpolicy/NavigationEditPolicy.java index 9c6f1bf6f24..e70b2d52237 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/editpolicy/NavigationEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/infra/gmfdiag/navigation/editpolicy/NavigationEditPolicy.java @@ -75,6 +75,10 @@ public class NavigationEditPolicy extends GraphicalEditPolicy { public void showTargetFeedback(Request request) {
super.showTargetFeedback(request);
+ if(viewerContext == null) {
+ return;
+ }
+
//Do not install navigation on the root
if(getRoot() == getHost()) {
return;
@@ -88,7 +92,7 @@ public class NavigationEditPolicy extends GraphicalEditPolicy { @Override
public Command getCommand(Request request) {
- if(request instanceof SelectionRequest) {
+ if(request instanceof SelectionRequest && viewerContext != null) {
return viewerContext.navigate((SelectionRequest)request);
}
return super.getCommand(request);
|