366523: [Refactoring] oep.infra.core.adaptor.gmf should be refactored

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

14 files changed, 14 insertions, 14 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd
index f6263ab3e65..09cded0bf3e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/schema/papyrusDiagram.exsd
@@ -312,7 +312,7 @@ As Requirement diagram belongs to SysML category it will be created with a SysML
 <p>The value of the <code>creationCommandClass</code> attribute of <code>creationCommand</code>

  must represent a class that implements the <code>org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand</code> interface.

 <ul>

-<li><code>org.eclipse.papyrus.infra.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler</code> - an abstract implementation of a basic <code>ICreationCommand</code> for GMF diagrams. All CreationCommands for Papyrus diagrams extend this class.</li>

+<li><code>org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler</code> - an abstract implementation of a basic <code>ICreationCommand</code> for GMF diagrams. All CreationCommands for Papyrus diagrams extend this class.</li>

 </ul>

 </p>

       </documentation>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
index 40edabb8edf..0b821dc8a8b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.infra.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler;
+import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 
 public class BlockDefinitionDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java
index 586ae544a00..1a34bb44639 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramEditorFactory.java
@@ -13,7 +13,7 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.blockdefinition;
 
-import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfEditorFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 
 public class BlockDefinitionDiagramEditorFactory extends GmfEditorFactory {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
index 19b083d2313..fe0b8d6bd9e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentPro
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
 import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
index 75fcc93b0fb..35a6590f5c2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler;
+import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java
index 58ed2e625d4..9e7be491718 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramEditorFactory.java
@@ -13,7 +13,7 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.internalblock;
 
-import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfEditorFactory;
+import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
 
 public class InternalBlockDiagramEditorFactory extends GmfEditorFactory {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
index 2467d45785f..14ea4555850 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
@@ -41,7 +41,7 @@ import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.papyrus.gmf.diagram.common.compatibility.DiagramVersioningUtils;
 import org.eclipse.papyrus.gmf.diagram.common.compatibility.IDiagramVersionUpdater;
-import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
 import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/custom-src/org/eclipse/papyrus/sysml/diagram/parametric/CreateParametricDiagramCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/custom-src/org/eclipse/papyrus/sysml/diagram/parametric/CreateParametricDiagramCommand.java
index 584980eb3ce..fa809dc37e6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/custom-src/org/eclipse/papyrus/sysml/diagram/parametric/CreateParametricDiagramCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/custom-src/org/eclipse/papyrus/sysml/diagram/parametric/CreateParametricDiagramCommand.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler;

+import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;

 import org.eclipse.papyrus.infra.core.utils.EditorUtils;

 import org.eclipse.papyrus.sysml.diagram.parametric.edit.parts.ParametricEditPart;

 import org.eclipse.papyrus.sysml.diagram.parametric.part.SysmlDiagramEditorPlugin;

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/custom-src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/custom-src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramEditorFactory.java
index 7fd9e5ab155..9f55e97aad4 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/custom-src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramEditorFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/custom-src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramEditorFactory.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.sysml.diagram.parametric;

 

-import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfEditorFactory;

+import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;

 import org.eclipse.papyrus.sysml.diagram.parametric.edit.parts.ParametricEditPart;

 

 public class ParametricDiagramEditorFactory extends GmfEditorFactory {

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/part/SysmlDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/part/SysmlDiagramEditor.java
index dad401a6535..55d95caf27b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/part/SysmlDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/part/SysmlDiagramEditor.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.util.LocalSelectionTransfer;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;

+import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;

 import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

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

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

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
index 5148479aa9c..f409e106881 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
@@ -11,7 +11,7 @@ package org.eclipse.papyrus.sysml.diagram.requirement;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.papyrus.infra.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler;

+import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;

 import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.RequirementDiagramEditPart;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java
index b3a9c1ddf6d..35873ca46d6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramEditorFactory.java
@@ -9,7 +9,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.sysml.diagram.requirement;

 

-import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfEditorFactory;

+import org.eclipse.papyrus.infra.gmfdiag.common.GmfEditorFactory;

 import org.eclipse.papyrus.sysml.diagram.requirement.edit.part.RequirementDiagramEditPart;

 

 /**

diff --git a/plugins/views/documentation/org.eclipse.papyrus.views.documentation.view.papyrus/META-INF/MANIFEST.MF b/plugins/views/documentation/org.eclipse.papyrus.views.documentation.view.papyrus/META-INF/MANIFEST.MF
index 5ef73f72989..a5aca3308ae 100644
--- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation.view.papyrus/META-INF/MANIFEST.MF
+++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation.view.papyrus/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.papyrus.views.documentation.view;bundle-version="0.9.0",

  org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",

- org.eclipse.papyrus.infra.core.adaptor.gmf;bundle-version="0.9.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.9.0",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0"

 Bundle-Vendor: %providerName

diff --git a/plugins/views/documentation/org.eclipse.papyrus.views.documentation.view.papyrus/src/org/eclipse/papyrus/views/documentation/view/papyrus/PapyrusDocumentationPartHandler.java b/plugins/views/documentation/org.eclipse.papyrus.views.documentation.view.papyrus/src/org/eclipse/papyrus/views/documentation/view/papyrus/PapyrusDocumentationPartHandler.java
index 743a2f74485..8ef377f4a6f 100644
--- a/plugins/views/documentation/org.eclipse.papyrus.views.documentation.view.papyrus/src/org/eclipse/papyrus/views/documentation/view/papyrus/PapyrusDocumentationPartHandler.java
+++ b/plugins/views/documentation/org.eclipse.papyrus.views.documentation.view.papyrus/src/org/eclipse/papyrus/views/documentation/view/papyrus/PapyrusDocumentationPartHandler.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;

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

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.core.adaptor.gmf.DiagramsUtil;

+import org.eclipse.papyrus.infra.gmfdiag.common.DiagramsUtil;

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

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

 import org.eclipse.papyrus.views.documentation.DocumentationManager;