398712: [Core] Multiple issues with the PageManager

https://bugs.eclipse.org/bugs/show_bug.cgi?id=398712

360243: [ModelExplorer] Undo/Redo on delete for Diagrams and Tables
https://bugs.eclipse.org/bugs/show_bug.cgi?id=360243

8 files changed, 144 insertions, 72 deletions

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/AbstractHyperLinkHelper.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/AbstractHyperLinkHelper.java
index cd2ea3bb151..5c97ad09217 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/AbstractHyperLinkHelper.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/AbstractHyperLinkHelper.java
@@ -89,17 +89,6 @@ public abstract class AbstractHyperLinkHelper {
 	}

 

 	/**

-	 * this method is called when the element is selected an clicked in order to

-	 * open a diagram in the case of hyperlink diagram

-	 * 

-	 * @param HyperLinkObject

-	 *        the hyperlink object that is selected

-	 */

-	public void executeSelectPressed(HyperLinkObject HyperLinkObject) {

-		HyperLinkObject.executeSelectPressed();

-	}

-

-	/**

 	 * from a list of hyperlinks, it return a list of hyperlink with the same

 	 * kind. for example return a list of diagramhyperlink

 	 * 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/EditorHyperLinkHelper.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/EditorHyperLinkHelper.java
index 6c3ca283831..9e61d74e98a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/EditorHyperLinkHelper.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/helper/EditorHyperLinkHelper.java
@@ -144,11 +144,13 @@ public class EditorHyperLinkHelper extends AbstractHyperLinkHelper {
 	public HyperLinkEditor getHyperLinkObjectFor(final EAnnotation eAnnotation) {

 		for(String source : HyperLinkConstants.validHyperLinkPageSources) {

 			if(source.equals(eAnnotation.getSource())) {

-				HyperLinkEditor editor = new HyperLinkEditor();

-				editor.setObject(eAnnotation.getReferences().get(0));

-				editor.setIsDefault(Boolean.parseBoolean(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION)));

-				editor.setTooltipText(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT));

-				return editor;

+				if(!eAnnotation.getReferences().isEmpty()) {

+					HyperLinkEditor editor = new HyperLinkEditor();

+					editor.setObject(eAnnotation.getReferences().get(0));

+					editor.setIsDefault(Boolean.parseBoolean(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_IS_DEFAULT_NAVIGATION)));

+					editor.setTooltipText(eAnnotation.getDetails().get(HyperLinkConstants.HYPERLINK_TOOLTYPE_TEXT));

+					return editor;

+				}

 			}

 		}

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java
index e7a833f56d3..ba1bfcd570b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkDocument.java
@@ -52,7 +52,7 @@ public class HyperLinkDocument extends HyperLinkObject {
 	}

 

 	@Override

-	public void executeSelectPressed() {

+	public void openLink() {

 		try {

 			// this is a file try to open it

 			String fileName = getHyperlinkDocument();

@@ -80,4 +80,9 @@ public class HyperLinkDocument extends HyperLinkObject {
 		list.add(index, editor.getHyperlinkDocument());

 

 	}

+

+	@Override

+	public boolean needsOpenCommand() {

+		return false;

+	}

 }

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkEditor.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkEditor.java
index c6e306f06ca..cb88606aa09 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkEditor.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkEditor.java
@@ -17,8 +17,9 @@ import java.util.List;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistry;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

 import org.eclipse.papyrus.infra.hyperlink.Activator;

@@ -33,12 +34,18 @@ public class HyperLinkEditor extends HyperLinkObject {
 	 * 

 	 */

 	@Override

-	public void executeSelectPressed() {

+	public void openLink() {

 		EObject context = EMFHelper.getEObject(getObject());

 		if(context != null) {

 			try {

-				IPageMngr pageMngr = ServiceUtilsForEObject.getInstance().getIPageMngr(context);

-				pageMngr.openPage(getObject());

+				final IPageManager pageManager = ServiceUtilsForEObject.getInstance().getIPageManager(context);

+				Object objectToOpen = getObject();

+				if(pageManager.isOpen(objectToOpen)) {

+					pageManager.selectPage(objectToOpen);

+				} else {

+					pageManager.openPage(objectToOpen);

+				}

+

 			} catch (Exception ex) {

 				Activator.log.error(ex);

 			}

@@ -71,4 +78,22 @@ public class HyperLinkEditor extends HyperLinkObject {
 			list.add(index, editor.getHyperLinkEditor());

 		}

 	}

+

+	/**

+	 * {@inheritDoc}

+	 * 

+	 * This HyperLink needs an executable EMF command when the page is not yet opened

+	 * Otherwise, openLink() can be called directly

+	 */

+	@Override

+	public boolean needsOpenCommand() {

+		EObject context = EMFHelper.getEObject(getObject());

+		try {

+			ServicesRegistry registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(context);

+			final IPageManager pageManager = registry.getService(IPageManager.class);

+			return !pageManager.isOpen(context);

+		} catch (ServiceException ex) {

+			return false;

+		}

+	}

 }

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkObject.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkObject.java
index 0daad237ce2..49bf2681ff2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkObject.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkObject.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
 

 /**

  * This is the Object use to manipulate into hyperlinks

- *

+ * 

  */

 public abstract class HyperLinkObject {

 

@@ -29,13 +29,13 @@ public abstract class HyperLinkObject {
 	 */

 	protected String tooltipText;

 

-	/** the object that is the target of the hyperlink**/

+	/** the object that is the target of the hyperlink **/

 	protected Object object;

 

 	/**

 	 * boolean to known if this hyperlink is a default hyperlink

 	 */

-	protected boolean isDefault=false;

+	protected boolean isDefault = false;

 

 	/**

 	 * @return the associated tooltip

@@ -46,13 +46,14 @@ public abstract class HyperLinkObject {
 

 	/**

 	 * set a string that is the associated tool tup

+	 * 

 	 * @param tooltipText

 	 */

 	public void setTooltipText(String tooltipText) {

 		this.tooltipText = tooltipText;

 	}

 

-	/** 

+	/**

 	 * 

 	 * @return the object that is the target of the hyperlink

 	 */

@@ -62,7 +63,9 @@ public abstract class HyperLinkObject {
 

 	/**

 	 * set the object that will be the target of the hyperlink

-	 * @param object the targeted object

+	 * 

+	 * @param object

+	 *        the targeted object

 	 */

 	public void setObject(Object object) {

 		this.object = object;

@@ -70,30 +73,42 @@ public abstract class HyperLinkObject {
 

 	/**

 	 * set a boolean in order to make this hyperlink as default

-	 * @param isDefault true or false

+	 * 

+	 * @param isDefault

+	 *        true or false

 	 */

-	public void setIsDefault(boolean isDefault){

-		this.isDefault= isDefault;

+	public void setIsDefault(boolean isDefault) {

+		this.isDefault = isDefault;

 	}

+

 	/**

 	 * 

 	 * @return true is the hyperlink is default

 	 */

-	public boolean getIsDefault(){

+	public boolean getIsDefault() {

 		return this.isDefault;

 	}

-	

-	/**

-	 * Used to execute an action when the hyperlink object is selected and clicked 

-	 * for example can open a new editor or a diagram...

-	 */

-	public abstract void executeSelectPressed();

-	

+

 	/**

 	 * Used to execute an action when the hyperlink object is selected and clicked to be edited

- 

-	 * @param list of hyperlink that are containted by a graphical element

-	 * @param amodel the top package root element

+	 * 

+	 * @param list

+	 *        of hyperlink that are containted by a graphical element

+	 * @param amodel

+	 *        the top package root element

 	 */

 	public abstract void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel);

+

+	/**

+	 * Tells whether openLink() should be called within an EMF command

+	 * 

+	 * @return

+	 */

+	public abstract boolean needsOpenCommand();

+

+	/**

+	 * Opens the current hyperlink.

+	 */

+	public abstract void openLink();

+

 }

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkWeb.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkWeb.java
index 206a2f8188f..8da7c3cf3e8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkWeb.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/object/HyperLinkWeb.java
@@ -23,8 +23,8 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.browser.IWorkbenchBrowserSupport;

 

 /**

- * this is an hyperlink to manage web link (it open a web browser when it is selected) 

- *

+ * this is an hyperlink to manage web link (it open a web browser when it is selected)

+ * 

  */

 public class HyperLinkWeb extends HyperLinkObject {

 

@@ -41,31 +41,37 @@ public class HyperLinkWeb extends HyperLinkObject {
 	/**

 	 * 

 	 * @see org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject#executeSelectPressed()

-	 *

+	 * 

 	 */

 	@Override

-	public void executeSelectPressed() {

+	public void openLink() {

 		try {

 			// this is an url

 			PlatformUI.getWorkbench().getBrowserSupport().createBrowser(IWorkbenchBrowserSupport.AS_EXTERNAL, "aCustomId", "url", "url").openURL(new URL(this.getHyperLinkWeb())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

 		} catch (Exception e) {

 			Activator.log.error(e);

 		}

-		

+

 	}

-/**

- * 

- * @see org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject#executeEditMousePressed(java.util.List, org.eclipse.uml2.uml.Package)

- *

- */

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.hyperlink.object.HyperLinkObject#executeEditMousePressed(java.util.List, org.eclipse.uml2.uml.Package)

+	 * 

+	 */

 	@Override

-	public void executeEditMousePressed(List<HyperLinkObject> list,EObject amodel) {

+	public void executeEditMousePressed(List<HyperLinkObject> list, EObject amodel) {

 		EditorHyperLinkWebShell editor = new EditorHyperLinkWebShell();

 		editor.setHyperLinkWeb(this);

 		editor.open();

 		int index = list.indexOf(this);

 		list.remove(this);

 		list.add(index, editor.getHyperLinkWeb());

-		

+

+	}

+

+	@Override

+	public boolean needsOpenCommand() {

+		return false;

 	}

 }

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java
index bcb37b62929..c1c9834ff8c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/ui/EditorLookForEditorShell.java
@@ -14,10 +14,14 @@
 package org.eclipse.papyrus.infra.hyperlink.ui;

 

 import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.IStructuredSelection;

@@ -31,10 +35,10 @@ import org.eclipse.papyrus.commands.ICreationCommandRegistry;
 import org.eclipse.papyrus.infra.core.editorsfactory.IPageIconsRegistry;

 import org.eclipse.papyrus.infra.core.extension.NotFoundException;

 import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.providers.strategy.SemanticEMFContentProvider;

+import org.eclipse.papyrus.infra.emf.providers.MoDiscoContentProvider;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

 import org.eclipse.papyrus.infra.hyperlink.Activator;

@@ -123,7 +127,16 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell {
 		@Override

 		public void widgetSelected(SelectionEvent e) {

 			try {

-				EObject elt = (EObject)((IStructuredSelection)treeViewer.getSelection()).getFirstElement();

+				if(treeViewer.getSelection().isEmpty()) {

+					return;

+				}

+

+				IStructuredSelection selection = (IStructuredSelection)treeViewer.getSelection();

+

+				EObject elt = EMFHelper.getEObject(selection.getFirstElement());

+				if(elt == null) {

+					return;

+				}

 

 				setContainer(elt);

 				ModelSet modelSet = ServiceUtilsForEObject.getInstance().getModelSet(elt);

@@ -132,10 +145,8 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell {
 				creationCommand.createDiagram(modelSet, container, null);

 

 				// refresh several filtered tree

-				getDiagramfilteredTree().getViewer().setInput(null);

-				getDiagramfilteredTree().getViewer().setInput(""); //$NON-NLS-1$

-				getModeFilteredTree().getViewer().setInput(null);

-				getModeFilteredTree().getViewer().setInput(model.eResource());

+				getDiagramfilteredTree().getViewer().refresh();

+				getModeFilteredTree().getViewer().refresh();

 			} catch (NotFoundException ex) {

 				Activator.log.error(ex);

 			} catch (ServiceException ex) {

@@ -221,9 +232,9 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell {
 		}

 

 		treeViewer.setLabelProvider(labelProvider);

-		//treeViewer.setContentProvider(new CustomAdapterFactoryContentProvider(adapterFactory));

-		treeViewer.setContentProvider(new SemanticEMFContentProvider(new EObject[]{ amodel }));

-		//		treeViewer.setContentProvider(new CustomizableModelContentProvider());

+		//		treeViewer.setContentProvider(new CustomAdapterFactoryContentProvider(adapterFactory));

+		//		treeViewer.setContentProvider(new SemanticEMFContentProvider(amodel)); //This content provider will only display the selected element, instead of the root element

+		treeViewer.setContentProvider(new MoDiscoContentProvider()); //FIXME: Use a standard, non-deprecated content provider.

 		//treeViewer.setInput(model.eResource());

 		treeViewer.setInput(registry);

 

@@ -240,7 +251,7 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell {
 

 

 		diagramListTreeViewer.setContentProvider(new EditorListContentProvider(model));

-		diagramListTreeViewer.setInput(" "); //$NON-NLS-1$

+		diagramListTreeViewer.setInput(""); //$NON-NLS-1$

 

 		// add listner on the new button to display menu for each diagram

 		diagramMenuButton = new Menu(getNewDiagrambutton());

@@ -267,21 +278,40 @@ public class EditorLookForEditorShell extends AbstractLookForEditorShell {
 				IStructuredSelection iSelection = (IStructuredSelection)getModeFilteredTree().getViewer().getSelection();

 				Iterator<?> iterator = iSelection.iterator();

 

-				IPageMngr pageManager;

+				final IPageManager pageManager;

+				TransactionalEditingDomain editingDomain;

 				try {

-					pageManager = ServiceUtilsForEObject.getInstance().getIPageMngr(model);

+					pageManager = ServiceUtilsForEObject.getInstance().getIPageManager(model);

+					editingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(model);

 				} catch (ServiceException ex) {

 					Activator.log.error(ex);

 					return;

 				}

 

+				final List<Object> pagesToDelete = new LinkedList<Object>();

 				while(iterator.hasNext()) {

-					pageManager.removePage(iterator.next());

+					EObject selectedElement = EMFHelper.getEObject(iterator.next());

+					if(pageManager.allPages().contains(selectedElement)) {

+						pagesToDelete.add(selectedElement);

+					}

 				}

-				getDiagramfilteredTree().getViewer().setInput(null);

-				getDiagramfilteredTree().getViewer().setInput(""); //$NON-NLS-1$

-				getModeFilteredTree().getViewer().setInput(null);

-				getModeFilteredTree().getViewer().setInput(model.eResource());

+

+				if(pagesToDelete.isEmpty()) {

+					return;

+				}

+

+				editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain, "Delete diagrams") {

+

+					@Override

+					protected void doExecute() {

+						for(Object page : pagesToDelete) {

+							pageManager.removePage(page);

+						}

+					}

+				});

+

+				//getDiagramfilteredTree().getViewer().setInput(""); //$NON-NLS-1$

+				getModeFilteredTree().getViewer().refresh();

 			}

 		});

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java
index ce121ef5984..b7603596d8f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/src/org/eclipse/papyrus/infra/hyperlink/util/EditorListContentProvider.java
@@ -19,7 +19,7 @@ import java.util.List;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageMngr;

+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;

 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

 import org.eclipse.papyrus.infra.hyperlink.Activator;

 

@@ -63,7 +63,7 @@ public class EditorListContentProvider implements ITreeContentProvider {
 	 */

 	public Object[] getElements(Object inputElement) {

 		try {

-			IPageMngr iPageMngr = ServiceUtilsForEObject.getInstance().getIPageMngr(model);

+			IPageManager iPageMngr = ServiceUtilsForEObject.getInstance().getIPageManager(model);

 			Object[] result = iPageMngr.allPages().toArray();

 

 			List<Object> res = new ArrayList<Object>();