Rename editor classes for consistency.

6 files changed, 12 insertions, 11 deletions

diff --git a/org.eclipse.papyrus.core/src/org/eclipse/papyrus/core/editor/SashMultiDiagramEditor.java b/org.eclipse.papyrus.core/src/org/eclipse/papyrus/core/editor/CoreMultiDiagramEditor.java
index 3d7e16d2570..abd2efc2e4d 100644
--- a/org.eclipse.papyrus.core/src/org/eclipse/papyrus/core/editor/SashMultiDiagramEditor.java
+++ b/org.eclipse.papyrus.core/src/org/eclipse/papyrus/core/editor/CoreMultiDiagramEditor.java
@@ -84,7 +84,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
  * 

  *         TODO : remove GMF dependency !

  */

-public class SashMultiDiagramEditor extends SashMultiPageEditorPart<Diagram> implements IMultiDiagramEditor, ITabbedPropertySheetPageContributor, IDiagramWorkbenchPart {

+public class CoreMultiDiagramEditor extends SashMultiPageEditorPart<Diagram> implements IMultiDiagramEditor, ITabbedPropertySheetPageContributor, IDiagramWorkbenchPart {

 

 	/** Log object */

 	Logger log = Logger.getLogger(getClass().getName());

@@ -154,7 +154,7 @@ public class SashMultiDiagramEditor extends SashMultiPageEditorPart<Diagram> imp
 	/**

 	 * Constructor.

 	 */

-	public SashMultiDiagramEditor() {

+	public CoreMultiDiagramEditor() {

 		super();

 		setDiagramEditDomain(new DiagramEditDomain(this));

 	}

diff --git a/org.eclipse.papyrus.editor/plugin.xml b/org.eclipse.papyrus.editor/plugin.xml
index d39deda14da..840894badf0 100644
--- a/org.eclipse.papyrus.editor/plugin.xml
+++ b/org.eclipse.papyrus.editor/plugin.xml
@@ -4,7 +4,7 @@
    <extension point="org.eclipse.ui.editors">

       <editor

             class="org.eclipse.papyrus.core.editor.SashMultiDiagramEditor"

-            contributorClass="org.eclipse.papyrus.editor.PapyrusActionBarContributor"

+            contributorClass="org.eclipse.uml2.diagram.clazz.part.UMLDiagramActionBarContributor"

             default="true"

             extensions="di2"

             icon="icons/papyrus/Papyrus.gif"

diff --git a/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiEditor.java b/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java
index 4fd9ee9f17b..c31a167931f 100644
--- a/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiEditor.java
+++ b/org.eclipse.papyrus.editor/src/org/eclipse/papyrus/editor/PapyrusMultiDiagramEditor.java
@@ -14,15 +14,16 @@
 

 package org.eclipse.papyrus.editor;

 

-import org.eclipse.papyrus.core.editor.SashMultiDiagramEditor;

+import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;

 

 

 /**

  * Papyrus main MultiEditor.

  * This class add GMF adaptation dedicated to Papyrus. 

+ * TODO : move GMF dependencies into this plugin.

  * @author dumoulin

  *

  */

-public class PapyrusMultiEditor extends SashMultiDiagramEditor {

+public class PapyrusMultiDiagramEditor extends CoreMultiDiagramEditor {

 

 }

diff --git a/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditorsContributionItem.java b/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditorsContributionItem.java
index f7504c07a5e..074e91ce811 100644
--- a/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditorsContributionItem.java
+++ b/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/DirectEditorsContributionItem.java
@@ -9,7 +9,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.action.ContributionItem;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.core.editor.SashMultiDiagramEditor;

+import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;

 import org.eclipse.papyrus.core.utils.BusinessModelResolver;

 import org.eclipse.papyrus.extensionpoints.editors.definition.DirectEditorExtensionPoint;

 import org.eclipse.swt.SWT;

@@ -146,7 +146,7 @@ public class DirectEditorsContributionItem extends ContributionItem implements I
 				public void widgetSelected(SelectionEvent e) {

 					// launch editor 

 					GMFEmbeddedEditorActionDelegate actionDelegate = new GMFEmbeddedEditorActionDelegate();

-					actionDelegate.setActivePart(null, ((SashMultiDiagramEditor)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getActiveEditor());

+					actionDelegate.setActivePart(null, ((CoreMultiDiagramEditor)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getActiveEditor());

 					actionDelegate.selectionChanged(null, getSelection());

 					actionDelegate.setExtensionPointConfiguration(configuration);

 					actionDelegate.run(null);

diff --git a/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/GMFEmbeddedEditorActionDelegate.java b/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/GMFEmbeddedEditorActionDelegate.java
index b25aa424042..8da8151fa13 100644
--- a/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/GMFEmbeddedEditorActionDelegate.java
+++ b/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/GMFEmbeddedEditorActionDelegate.java
@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.core.editor.SashMultiDiagramEditor;

+import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.widgets.Composite;

@@ -40,7 +40,7 @@ public class GMFEmbeddedEditorActionDelegate extends OpenEmbeddedTextEditorObjec
 	 */

 	@Override

 	protected Control getControl() {

-		return ((SashMultiDiagramEditor)part).getDiagramGraphicalViewer().getControl();

+		return ((CoreMultiDiagramEditor)part).getDiagramGraphicalViewer().getControl();

 	}

 	

 	/**

diff --git a/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/OpenEmbeddedTextEditorObjectActionDelegate.java b/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/OpenEmbeddedTextEditorObjectActionDelegate.java
index 6b81ef266e8..cd06e405697 100644
--- a/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/OpenEmbeddedTextEditorObjectActionDelegate.java
+++ b/org.eclipse.papyrus.extensionpoints.editors/src/org/eclipse/papyrus/extensionpoints/editors/ui/OpenEmbeddedTextEditorObjectActionDelegate.java
@@ -17,7 +17,7 @@ import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;

 import org.eclipse.jface.action.IAction;

-import org.eclipse.papyrus.core.editor.SashMultiDiagramEditor;

+import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.definition.DirectEditorExtensionPoint;

@@ -152,7 +152,7 @@ public abstract class OpenEmbeddedTextEditorObjectActionDelegate implements IObj
 	 */

 	protected EmbeddedTextEditor createEditor(Composite composite) {

 		// retrieves the source viewer configuration

-		final SashMultiDiagramEditor multiDiagramEditor = (SashMultiDiagramEditor)part.getSite().getPage().getActiveEditor();

+		final CoreMultiDiagramEditor multiDiagramEditor = (CoreMultiDiagramEditor)part.getSite().getPage().getActiveEditor();

 		TransactionalEditingDomain domain = multiDiagramEditor.getDefaultContext().getTransactionalEditingDomain();

 		DiagramCommandStack diagramCommandStack = multiDiagramEditor.getDiagramEditDomain().getDiagramCommandStack();

 		return new EmbeddedTextEditor(directEditorExtensionPoint.getDirectEditorConfiguration(), diagramCommandStack, domain );