[475826] Fix NPE at Eclipse shutdown

Remove useless UIJob in DiagramUIPlugin$Implementation.start() to avoid
NPE at Eclipse shutdown with Modeling Perspective.

Don't access SessionManagerListener contributed by extension point on
SessionManager.removeSessionListener() call as this method is only
needed for SessionManagerListener registered programmatically.

Bug: 475826
Change-Id: I354abfda00108cc816ab93ad30a02de6f7c656fb
Cherry-picked-from: 468042
Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

2 files changed, 0 insertions, 20 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/ui/provider/DiagramUIPlugin.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/ui/provider/DiagramUIPlugin.java
index 6ca4139a40..6b08d8b745 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/ui/provider/DiagramUIPlugin.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/ui/provider/DiagramUIPlugin.java
@@ -18,12 +18,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.core.commands.Command;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -58,10 +54,7 @@ import org.eclipse.sirius.viewpoint.description.validation.provider.ValidationIt
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 import org.eclipse.sirius.viewpoint.provider.ViewpointItemProviderAdapterFactory;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.progress.UIJob;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -183,18 +176,6 @@ public final class DiagramUIPlugin extends EMFPlugin {
 
             layoutDataManagerRegistryListener = new LayoutDataManagerRegistryListener();
             layoutDataManagerRegistryListener.init();
-
-            UIJob job = new UIJob("InitSynchronizedCommand") {
-                @Override
-                public IStatus runInUIThread(IProgressMonitor monitor) {
-                    ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);
-                    Command command = commandService.getCommand("org.eclipse.sirius.diagram.ui.command.synchronizedDiagram");
-                    command.isEnabled();
-                    return new Status(IStatus.OK, DiagramUIPlugin.ID, "Init synchronized command performed succesfully");
-                }
-
-            };
-            job.schedule();
         }
 
         /**
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/SessionManagerImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/SessionManagerImpl.java
index d8a4905fdf..edbbea5712 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/SessionManagerImpl.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/SessionManagerImpl.java
@@ -99,7 +99,6 @@ public class SessionManagerImpl extends SessionManagerEObjectImpl implements Ses
     @Override
     public void removeSessionsListener(final SessionManagerListener listener) {
         programmaticListeners.remove(listener);
-        getExtensionPointListeners().remove(listener);
     }
 
     @Override