Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-11-10 09:07:19 +0000
committercletavernie2011-11-10 09:07:19 +0000
commit08286c3b027f1c51a788c44021142b3a04e7404e (patch)
treeefd4a8a209f7df351a19165c4d66a4932a95a7cb /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication
parent1630defc9a2d2534c791ffe1b5e22009d925b810 (diff)
downloadorg.eclipse.papyrus-08286c3b027f1c51a788c44021142b3a04e7404e.tar.gz
org.eclipse.papyrus-08286c3b027f1c51a788c44021142b3a04e7404e.tar.xz
org.eclipse.papyrus-08286c3b027f1c51a788c44021142b3a04e7404e.zip
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramCreationCondition.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramEditorFactory.java3
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CreateCommunicationDiagramWithNavigationHandler.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/UmlCommunicationDiagramForMultiEditor.java10
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/MessageLabelInverseOrientation.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/ObservationLayoutEditPolicy.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/DurationObservationNodeFigure.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/MessageFigure.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/TimeObservationNodeFigure.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationCommandHelper.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationUtil.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/DurationObservationHelper.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/InconsistentMessageViewsHelper.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/TimeObservationHelper.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parser/LifelineCustomParsers.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageItemSemanticEditPolicy.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageNameItemSemanticEditPolicy.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml196
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java1
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java6
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/expressions/UMLOCLFactory.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java35
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditorPlugin.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DiagramGeneralPreferencePage.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/MessagePreferencePage.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java14
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java4
48 files changed, 217 insertions, 214 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
index 4b23ab2b889..6106f05c717 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -67,7 +67,7 @@ Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication;singleton:=true
-Import-Package: org.eclipse.papyrus.service.edit.service,
- org.eclipse.papyrus.uml.diagram.communication.custom.edit.policies,
- org.eclipse.papyrus.uml.diagram.communication.custom.helper
+Import-Package: org.eclipse.papyrus.uml.diagram.communication.custom.edit.policies,
+ org.eclipse.papyrus.uml.diagram.communication.custom.helper,
+ org.eclipse.papyrus.infra.services.edit.service
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramCreationCondition.java
index fb0547ed6f4..57605a7ad56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramCreationCondition.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramCreationCondition.java
@@ -15,7 +15,7 @@
package org.eclipse.papyrus.uml.diagram.communication;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;
+import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;
import org.eclipse.uml2.uml.Interaction;
// TODO: Auto-generated Javadoc
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramEditorFactory.java
index e13206f7a59..fe61591597b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CommunicationDiagramEditorFactory.java
@@ -15,8 +15,7 @@
package org.eclipse.papyrus.uml.diagram.communication;
-import org.eclipse.papyrus.core.adaptor.gmf.GmfEditorFactory;
-import org.eclipse.papyrus.uml.diagram.communication.UmlCommunicationDiagramForMultiEditor;
+import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfEditorFactory;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CreateCommunicationDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CreateCommunicationDiagramWithNavigationHandler.java
index 9e8042bc359..2077dec0826 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CreateCommunicationDiagramWithNavigationHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/CreateCommunicationDiagramWithNavigationHandler.java
@@ -13,9 +13,7 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.communication;
-import org.eclipse.papyrus.navigation.CreateDiagramWithNavigationHandler;
-import org.eclipse.papyrus.uml.diagram.communication.CommunicationDiagramCreationCondition;
-import org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;
public class CreateCommunicationDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/UmlCommunicationDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/UmlCommunicationDiagramForMultiEditor.java
index a19d75f6dc4..7845cd81682 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/UmlCommunicationDiagramForMultiEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/UmlCommunicationDiagramForMultiEditor.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.core.editor.BackboneException;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditor;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
import org.eclipse.swt.widgets.Composite;
@@ -33,7 +33,7 @@ import org.eclipse.ui.PartInitException;
/**
* <pre>
- * An editor to be used in multitabs editor.
+ * An editor to be used in multitabs editor.
* This editor extends the original UMLDiagramEditor generated by GMF.
* </pre>
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/MessageLabelInverseOrientation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/MessageLabelInverseOrientation.java
index 9aaad3e3bdb..0e537e2c332 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/MessageLabelInverseOrientation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/commands/MessageLabelInverseOrientation.java
@@ -24,7 +24,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessageReorientCommand;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.LifelineEditPartCN;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.MessageNameEditPart;
import org.eclipse.ui.IObjectActionDelegate;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/ObservationLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/ObservationLayoutEditPolicy.java
index 79355c1318d..4e528f8d368 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/ObservationLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/edit/policies/ObservationLayoutEditPolicy.java
@@ -21,7 +21,6 @@ import org.eclipse.gef.editpolicies.LayoutEditPolicy;
import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.communication.custom.edit.policies.ExternalLabelPrimaryDragRoleEditPolicy;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.DurationObservationLabelEditPartCN;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.DurationObservationStereotypeLabelEditPartCN;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.TimeObservationNameEditPartCN;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/DurationObservationNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/DurationObservationNodeFigure.java
index 083930c8c72..2c5735c641e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/DurationObservationNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/DurationObservationNodeFigure.java
@@ -15,7 +15,6 @@
package org.eclipse.papyrus.uml.diagram.communication.custom.figures;
import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.communication.custom.figures.AbstractObservationNodeFigure;
import org.eclipse.swt.graphics.Image;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/MessageFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/MessageFigure.java
index 42f6f09b7f5..6255ec9ed3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/MessageFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/MessageFigure.java
@@ -18,7 +18,6 @@ import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
-import org.eclipse.papyrus.uml.diagram.communication.custom.figures.CustomWrappingLabel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/TimeObservationNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/TimeObservationNodeFigure.java
index 9cdbdcf1877..84a844707de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/TimeObservationNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/figures/TimeObservationNodeFigure.java
@@ -15,7 +15,6 @@
package org.eclipse.papyrus.uml.diagram.communication.custom.figures;
import org.eclipse.papyrus.uml.diagram.common.Activator;
-import org.eclipse.papyrus.uml.diagram.communication.custom.figures.AbstractObservationNodeFigure;
import org.eclipse.swt.graphics.Image;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationCommandHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationCommandHelper.java
index f7ed2a8becb..3dc65df739b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationCommandHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationCommandHelper.java
@@ -21,7 +21,6 @@ import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Event;
import org.eclipse.uml2.uml.Interaction;
import org.eclipse.uml2.uml.InteractionFragment;
-import org.eclipse.uml2.uml.InteractionOperand;
import org.eclipse.uml2.uml.Lifeline;
import org.eclipse.uml2.uml.Message;
import org.eclipse.uml2.uml.MessageEnd;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationUtil.java
index d9ece312f26..51beded861d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/CommunicationUtil.java
@@ -39,7 +39,6 @@ import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.communication.custom.helper.CommunicationUtil;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.LifelineEditPartCN;
import org.eclipse.uml2.common.util.CacheAdapter;
import org.eclipse.uml2.uml.DestructionEvent;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/DurationObservationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/DurationObservationHelper.java
index 6b267635dca..60fb8aae929 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/DurationObservationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/DurationObservationHelper.java
@@ -41,7 +41,6 @@ import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.common.helper.AssociationHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;
import org.eclipse.uml2.uml.DurationObservation;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/InconsistentMessageViewsHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/InconsistentMessageViewsHelper.java
index ea6f9a53c93..292961d22e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/InconsistentMessageViewsHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/InconsistentMessageViewsHelper.java
@@ -30,7 +30,6 @@ import org.eclipse.gmf.runtime.notation.Connector;
import org.eclipse.gmf.runtime.notation.DecorationNode;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.communication.custom.helper.InconsistentMessageViewsHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.uml2.uml.Message;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/TimeObservationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/TimeObservationHelper.java
index ceede1d6e38..777de81b223 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/TimeObservationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/helper/TimeObservationHelper.java
@@ -40,7 +40,6 @@ import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;
import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
-import org.eclipse.papyrus.uml.diagram.common.helper.AssociationHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;
import org.eclipse.uml2.uml.NamedElement;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java
index a7bded5ad9b..0906c70fabe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/messages/Messages.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.uml.diagram.communication.custom.messages;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.uml.diagram.communication.custom.messages.Messages;
// TODO: Auto-generated Javadoc
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parser/LifelineCustomParsers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parser/LifelineCustomParsers.java
index 2cc520401c7..75222dd65b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parser/LifelineCustomParsers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/parser/LifelineCustomParsers.java
@@ -92,7 +92,7 @@ public class LifelineCustomParsers extends org.eclipse.papyrus.uml.diagram.commu
/**
* Information identifying the lifeline displayed inside the rectangle
*
- * @see org.eclipse.papyrus.diagram.sequence.parsers.MessageFormatParser#getPrintString(org.eclipse.core.runtime.IAdaptable, int)
+ * @see org.eclipse.papyrus.uml.diagram.sequence.parsers.MessageFormatParser#getPrintString(org.eclipse.core.runtime.IAdaptable, int)
*/
@Override
public String getPrintString(IAdaptable element, int flags) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java
index 07f6b3a365f..7630392bc4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomLifelineItemSemanticEditPolicyCN.java
@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessageCreateCommand;
import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessagesReorientCommand;
import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageItemSemanticEditPolicy.java
index 697ab7c52ef..2b086cc3eee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageItemSemanticEditPolicy.java
@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
import org.eclipse.gmf.runtime.notation.DecorationNode;
-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.uml.diagram.communication.custom.commands.CustomMessageCreateCommand;
import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;
import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageNameItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageNameItemSemanticEditPolicy.java
index ffbad46243d..3be61a991b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageNameItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/custom-src/org/eclipse/papyrus/uml/diagram/communication/custom/policies/itemsemantic/CustomMessageNameItemSemanticEditPolicy.java
@@ -21,8 +21,8 @@ import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.uml.diagram.communication.edit.policies.UMLBaseItemSemanticEditPolicy;
import org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes;
import org.eclipse.uml2.uml.Message;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
index 25e467da79b..330606393ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
@@ -8,7 +8,7 @@
<command
categoryId="org.eclipse.papyrus.editor.category"
description="Create a new Communication Diagram "
- id="org.eclipse.papyrus.diagram.communication.CreateCommunicationDiagramCommand"
+ id="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand"
name="Create a new Communication Diagram">
</command>
</extension>
@@ -17,13 +17,13 @@
point="org.eclipse.ui.handlers">
<handler
class="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramWithNavigationHandler"
- commandId="org.eclipse.papyrus.diagram.communication.CreateCommunicationDiagramCommand">
+ commandId="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand">
<activeWhen>
<or>
<with
variable="activeEditorId">
<equals
- value="org.eclipse.papyrus.core.papyrusEditor">
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
</equals>
</with>
</or>
@@ -35,8 +35,8 @@
point="org.eclipse.ui.menus">
<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
- <toolbar id="org.eclipse.papyrus.diagram.ui.toolbar">
- <command commandId="org.eclipse.papyrus.diagram.communication.CreateCommunicationDiagramCommand"
+ <toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar">
+ <command commandId="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand"
icon="icons/obj16/Diagram_Communication.gif"
label="Create a new Communication Diagram"
style="push"
@@ -49,9 +49,9 @@
</menuContribution>
<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
- <menu id="org.eclipse.papyrus.diagram.ui.menu.diagrams"
+ <menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams"
label="Diagrams">
- <command commandId="org.eclipse.papyrus.diagram.communication.CreateCommunicationDiagramCommand"
+ <command commandId="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand"
icon="icons/obj16/Diagram_Communication.gif"
label="Create a new Communication Diagram"
style="push"
@@ -64,7 +64,7 @@
</menuContribution>
<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
- <command commandId="org.eclipse.papyrus.diagram.communication.CreateCommunicationDiagramCommand"
+ <command commandId="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand"
icon="icons/obj16/Diagram_Communication.gif"
label="Create a new Communication Diagram"
style="push"
@@ -78,7 +78,7 @@
</extension>
<extension
- point="org.eclipse.papyrus.core.papyrusDiagram">
+ point="org.eclipse.papyrus.infra.core.papyrusDiagram">
<editorDiagram
factoryClass="org.eclipse.papyrus.uml.diagram.communication.CommunicationDiagramEditorFactory"
icon="icons/obj16/Diagram_Communication.gif">
@@ -87,7 +87,7 @@
creationCommandClass="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand"
creationCondition="org.eclipse.papyrus.uml.diagram.communication.CommunicationDiagramCreationCondition"
icon="icons/obj16/Diagram_Communication.gif"
- id="org.eclipse.papyrus.diagram.communication.CreateCommunicationDiagramCommand"
+ id="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand"
label="UML Communication Diagram"
language="uml">
</creationCommand>
@@ -97,19 +97,19 @@
<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
<?gmfgen generated="true"?>
<MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLMarkerNavigationProvider">
- <MarkerType name="org.eclipse.papyrus.diagram.communication.diagnostic"/>
+ <MarkerType name="org.eclipse.papyrus.uml.diagram.communication.diagnostic"/>
<Priority name="Lowest"/>
</MarkerNavigationProvider>
</extension>
-<extension id="diagnostic" name="org.eclipse.papyrus.diagram.communication problems" point="org.eclipse.core.resources.markers">
+<extension id="diagnostic" name="org.eclipse.papyrus.uml.diagram.communication problems" point="org.eclipse.core.resources.markers">
<?gmfgen generated="true"?>
<super type="org.eclipse.core.resources.problemmarker"/>
<super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
<persistent value="true"/>
</extension> <extension
- id="org.eclipse.papyrus.diagram.communication.palettedefinition"
- name="org.eclipse.papyrus.diagram.communication Predefined Entries"
+ id="org.eclipse.papyrus.uml.diagram.communication.palettedefinition"
+ name="org.eclipse.papyrus.uml.diagram.communication Predefined Entries"
point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
<?gmfgen generated="true"?>
@@ -197,8 +197,8 @@
</extension>
<extension
- id="org.eclipse.papyrus.diagram.communication.standard"
- name="org.eclipse.papyrus.diagram.communication Standard Palette"
+ id="org.eclipse.papyrus.uml.diagram.communication.standard"
+ name="org.eclipse.papyrus.uml.diagram.communication Standard Palette"
point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
<?gmfgen generated="true"?>
@@ -267,7 +267,7 @@
</contribution>
- <editor id="org.eclipse.papyrus.diagram.communication"/>
+ <editor id="org.eclipse.papyrus.uml.diagram.communication"/>
</paletteProvider>
</extension>
@@ -277,51 +277,51 @@
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.InteractionPreferencePage"
- id="org.eclipse.papyrus.diagram.communication.preferences.InteractionPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.InteractionPreferencePage"
name="Interaction Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.TimeObservationPreferencePage"
- id="org.eclipse.papyrus.diagram.communication.preferences.TimeObservationPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.TimeObservationPreferencePage"
name="TimeObservation Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.ShortCutDiagramPreferencePage"
- id="org.eclipse.papyrus.diagram.communication.preferences.ShortCutDiagramPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.ShortCutDiagramPreferencePage"
name="ShortCutDiagram Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.CommentPreferencePage"
- id="org.eclipse.papyrus.diagram.communication.preferences.CommentPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.CommentPreferencePage"
name="Comment Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.ConstraintPreferencePage"
- id="org.eclipse.papyrus.diagram.communication.preferences.ConstraintPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.ConstraintPreferencePage"
name="Constraint Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.LifelinePreferencePage"
- id="org.eclipse.papyrus.diagram.communication.preferences.LifelinePreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.LifelinePreferencePage"
name="Lifeline Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.DurationObservationPreferencePage"
- id="org.eclipse.papyrus.diagram.communication.preferences.DurationObservationPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.DurationObservationPreferencePage"
name="DurationObservation Node" />
@@ -329,9 +329,9 @@
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.MessagePreferencePage"
- id="org.eclipse.papyrus.diagram.communication.preferences.MessagePreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.MessagePreferencePage"
name="Message Link" />
@@ -346,7 +346,7 @@
<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
<?gmfgen generated="true"?>
- <viewProvider class="org.eclipse.papyrus.diagram.communication.providers.UMLViewProvider">
+ <viewProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLViewProvider">
<Priority name="Lowest"/>
<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLCommunicationDiagram"/>
<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="8002,8016,8001,8004,8005,8006,8007"/>
@@ -356,7 +356,7 @@
<extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
<?gmfgen generated="true"?>
- <editpartProvider class="org.eclipse.papyrus.diagram.communication.providers.UMLEditPartProvider">
+ <editpartProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLEditPartProvider">
<Priority name="Lowest"/>
<object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
<method name="getType()" value="PapyrusUMLCommunicationDiagram"/>
@@ -381,9 +381,9 @@
<?gmfgen generated="true"?>
<modelingAssistantProvider class="org.eclipse.papyrus.uml.diagram.communication.providers.UMLModelingAssistantProvider">
<Priority name="Lowest"/>
- <object class="org.eclipse.papyrus.diagram.communication.edit.parts.ModelEditPart" id="Package_1000"/>
- <object class="org.eclipse.papyrus.diagram.communication.edit.parts.InteractionEditPart" id="Interaction_8002"/>
- <object class="org.eclipse.papyrus.diagram.communication.edit.parts.ShortCutDiagramEditPart" id="Diagram_8016"/>
+ <object class="org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart" id="Package_1000"/>
+ <object class="org.eclipse.papyrus.uml.diagram.communication.edit.parts.InteractionEditPart" id="Interaction_8002"/>
+ <object class="org.eclipse.papyrus.uml.diagram.communication.edit.parts.ShortCutDiagramEditPart" id="Diagram_8016"/>
<context elements="Package_1000,Interaction_8002,Diagram_8016"/>
</modelingAssistantProvider>
</extension>
@@ -406,7 +406,7 @@
<?gmfgen generated="true"?>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.Package_1000"
+ id="org.eclipse.papyrus.uml.diagram.communication.Package_1000"
name="%metatype.name.Package_1000"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Package"
@@ -416,7 +416,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.Interaction_8002"
+ id="org.eclipse.papyrus.uml.diagram.communication.Interaction_8002"
name="%metatype.name.Interaction_8002"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Interaction"
@@ -426,7 +426,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.Diagram_8016"
+ id="org.eclipse.papyrus.uml.diagram.communication.Diagram_8016"
name="%metatype.name.Diagram_8016"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Diagram"
@@ -436,7 +436,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.Lifeline_8001"
+ id="org.eclipse.papyrus.uml.diagram.communication.Lifeline_8001"
name="%metatype.name.Lifeline_8001"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Lifeline"
@@ -446,7 +446,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.Constraint_8004"
+ id="org.eclipse.papyrus.uml.diagram.communication.Constraint_8004"
name="%metatype.name.Constraint_8004"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Constraint"
@@ -456,7 +456,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.Comment_8005"
+ id="org.eclipse.papyrus.uml.diagram.communication.Comment_8005"
name="%metatype.name.Comment_8005"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Comment"
@@ -466,7 +466,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.TimeObservation_8006"
+ id="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_8006"
name="%metatype.name.TimeObservation_8006"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="TimeObservation"
@@ -476,7 +476,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.DurationObservation_8007"
+ id="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_8007"
name="%metatype.name.DurationObservation_8007"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="DurationObservation"
@@ -486,7 +486,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.communication.Message_8009"
+ id="org.eclipse.papyrus.uml.diagram.communication.Message_8009"
name="%metatype.name.Message_8009"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Message"
@@ -496,7 +496,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.communication.CommentAnnotatedElement_8010"
+ id="org.eclipse.papyrus.uml.diagram.communication.CommentAnnotatedElement_8010"
name="%metatype.name.CommentAnnotatedElement_8010"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
@@ -505,7 +505,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.communication.ConstraintConstrainedElement_8011"
+ id="org.eclipse.papyrus.uml.diagram.communication.ConstraintConstrainedElement_8011"
name="%metatype.name.ConstraintConstrainedElement_8011"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
@@ -514,7 +514,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.communication.DurationObservationEvent_8012"
+ id="org.eclipse.papyrus.uml.diagram.communication.DurationObservationEvent_8012"
name="%metatype.name.DurationObservationEvent_8012"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
@@ -523,7 +523,7 @@
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.communication.TimeObservationEvent_8013"
+ id="org.eclipse.papyrus.uml.diagram.communication.TimeObservationEvent_8013"
name="%metatype.name.TimeObservationEvent_8013"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
@@ -534,27 +534,27 @@
<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
<?gmfgen generated="true"?>
- <clientContext id="org.eclipse.papyrus.diagram.communication.TypeContext">
+ <clientContext id="org.eclipse.papyrus.uml.diagram.communication.TypeContext">
<enablement>
<test
property="org.eclipse.gmf.runtime.emf.core.editingDomain"
- value="org.eclipse.papyrus.diagram.communication.EditingDomain"/>
+ value="org.eclipse.papyrus.uml.diagram.communication.EditingDomain"/>
</enablement>
</clientContext>
- <binding context="org.eclipse.papyrus.diagram.communication.TypeContext">
- <elementType ref="org.eclipse.papyrus.diagram.communication.Package_1000"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.Interaction_8002"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.Diagram_8016"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.Lifeline_8001"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.Constraint_8004"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.Comment_8005"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.TimeObservation_8006"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.DurationObservation_8007"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.Message_8009"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.CommentAnnotatedElement_8010"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.ConstraintConstrainedElement_8011"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.DurationObservationEvent_8012"/>
- <elementType ref="org.eclipse.papyrus.diagram.communication.TimeObservationEvent_8013"/>
+ <binding context="org.eclipse.papyrus.uml.diagram.communication.TypeContext">
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Package_1000"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Interaction_8002"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Diagram_8016"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Lifeline_8001"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Constraint_8004"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Comment_8005"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_8006"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_8007"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.Message_8009"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.CommentAnnotatedElement_8010"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.ConstraintConstrainedElement_8011"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.DurationObservationEvent_8012"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.communication.TimeObservationEvent_8013"/>
<advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
</binding>
</extension>
@@ -562,9 +562,9 @@
<extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
<?gmfgen generated="true"?>
<propertyTester
- id="org.eclipse.papyrus.diagram.communication.URIEditorInputPropertyTester"
+ id="org.eclipse.papyrus.uml.diagram.communication.URIEditorInputPropertyTester"
type="org.eclipse.emf.common.ui.URIEditorInput"
- namespace="org.eclipse.papyrus.diagram.communication"
+ namespace="org.eclipse.papyrus.uml.diagram.communication"
properties="isURIEditorInput"
class="org.eclipse.papyrus.uml.diagram.communication.part.UMLUriEditorInputTester">
</propertyTester>
@@ -574,14 +574,14 @@
<?gmfgen generated="true"?>
<viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
<includes>
- <contentExtension pattern="org.eclipse.papyrus.diagram.communication.resourceContent"/>
- <contentExtension pattern="org.eclipse.papyrus.diagram.communication.domainResourceContent"/>
- <contentExtension pattern="org.eclipse.papyrus.diagram.communication.navigatorLinkHelper"/>
+ <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.resourceContent"/>
+ <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.domainResourceContent"/>
+ <contentExtension pattern="org.eclipse.papyrus.uml.diagram.communication.navigatorLinkHelper"/>
</includes>
</viewerContentBinding>
<viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
<includes>
- <actionExtension pattern="org.eclipse.papyrus.diagram.communication.navigatorActionProvider"/>
+ <actionExtension pattern="org.eclipse.papyrus.uml.diagram.communication.navigatorActionProvider"/>
</includes>
</viewerActionBinding>
</extension>
@@ -589,7 +589,7 @@
<extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
<?gmfgen generated="true"?>
<navigatorContent
- id="org.eclipse.papyrus.diagram.communication.resourceContent"
+ id="org.eclipse.papyrus.uml.diagram.communication.resourceContent"
name="%navigatorContentName"
priority="normal"
contentProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorContentProvider"
@@ -611,7 +611,7 @@
</or>
</possibleChildren>
<commonSorter
- id="org.eclipse.papyrus.diagram.communication.navigatorSorter"
+ id="org.eclipse.papyrus.uml.diagram.communication.navigatorSorter"
class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorSorter">
<parentExpression>
<or>
@@ -625,7 +625,7 @@
</commonSorter>
</navigatorContent>
<navigatorContent
- id="org.eclipse.papyrus.diagram.communication.domainResourceContent"
+ id="org.eclipse.papyrus.uml.diagram.communication.domainResourceContent"
name="%domainNavigatorContentName"
priority="normal"
contentProvider="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLDomainNavigatorContentProvider"
@@ -646,7 +646,7 @@
</possibleChildren>
</navigatorContent>
<actionProvider
- id="org.eclipse.papyrus.diagram.communication.navigatorActionProvider"
+ id="org.eclipse.papyrus.uml.diagram.communication.navigatorActionProvider"
class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorActionProvider">
<enablement>
<or>
@@ -659,12 +659,12 @@
<extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
<?gmfgen generated="true"?>
<linkHelper
- id="org.eclipse.papyrus.diagram.communication.navigatorLinkHelper"
+ id="org.eclipse.papyrus.uml.diagram.communication.navigatorLinkHelper"
class="org.eclipse.papyrus.uml.diagram.communication.navigator.UMLNavigatorLinkHelper">
<editorInputEnablement>
<and>
<instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
- <test property="org.eclipse.papyrus.diagram.communication.isURIEditorInput"/>
+ <test property="org.eclipse.papyrus.uml.diagram.communication.isURIEditorInput"/>
</and>
</editorInputEnablement>
<selectionEnablement>
@@ -679,15 +679,15 @@
categoryId="org.eclipse.ui.category.edit"
defaultHandler="org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramUpdateCommand"
description="%update.diagram.description"
- id="org.eclipse.papyrus.diagram.communication.updateDiagram"
+ id="org.eclipse.papyrus.uml.diagram.communication.updateDiagram"
name="%update.diagram.name"/>
</extension>
<extension point="org.eclipse.ui.bindings" id="update-cmd-binding">
<?gmfgen generated="true"?>
<key
- commandId="org.eclipse.papyrus.diagram.communication.updateDiagram"
- contextId="org.eclipse.papyrus.diagram.communication.ui.diagramContext"
+ commandId="org.eclipse.papyrus.uml.diagram.communication.updateDiagram"
+ contextId="org.eclipse.papyrus.uml.diagram.communication.ui.diagramContext"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="F5"/>
</extension>
@@ -695,25 +695,25 @@
<extension point="org.eclipse.ui.preferencePages" id="prefpages">
<?gmfgen generated="true"?>
<page
- id="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
name="PapyrusUMLCommunicationDiagram Diagram"
- category="org.eclipse.papyrus.preferences.diagrams"
+ category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramGeneralPreferencePage">
</page>
<page
- id="org.eclipse.papyrus.diagram.communication.preferences.DiagramPrintingPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPrintingPreferencePage"
name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
- category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPrintingPreferencePage">
</page>
<page
- id="org.eclipse.papyrus.diagram.communication.preferences.DiagramRulersAndGridPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramRulersAndGridPreferencePage"
name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
- category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLCommunicationDiagram"
+ category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLCommunicationDiagram"
class="org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramRulersAndGridPreferencePage">
</page>
@@ -722,12 +722,12 @@
id="ep-provider"
point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
<editpartProvider
- class="org.eclipse.papyrus.diagram.communication.custom.providers.CustomUMLEditPartProvider">
+ class="org.eclipse.papyrus.uml.diagram.communication.custom.providers.CustomUMLEditPartProvider">
<Priority
name="Highest">
</Priority>
<object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
- <method name="getType()" value="org.eclipse.papyrus.diagram.communication"/>
+ <method name="getType()" value="org.eclipse.papyrus.uml.diagram.communication"/>
</object>
<object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
<method name="getType()" value="2001,3001"/>
@@ -749,7 +749,7 @@
<?gmfgen generated="true"?>
<context
description="%context.description"
- id="org.eclipse.papyrus.diagram.communication.ui.diagramContext"
+ id="org.eclipse.papyrus.uml.diagram.communication.ui.diagramContext"
name="%context.name"
parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
</context>
@@ -758,14 +758,14 @@
point="org.eclipse.ui.popupMenus">
<objectContribution
adaptable="false"
- id="org.eclipse.papyrus.diagram.communication.objectContribution.messageLabelReorient"
+ id="org.eclipse.papyrus.uml.diagram.communication.objectContribution.messageLabelReorient"
objectClass="org.eclipse.papyrus.uml.diagram.communication.edit.parts.MessageNameEditPart">
<action
class="org.eclipse.papyrus.uml.diagram.communication.custom.commands.MessageLabelInverseOrientation"
- definitionId="org.eclipse.papyrus.diagram.communication.messagelabelreorientID"
+ definitionId="org.eclipse.papyrus.uml.diagram.communication.messagelabelreorientID"
enablesFor="1"
icon="icons/arrow-rotate.gif"
- id="org.eclipse.papyrus.diagram.communication.MessagelabelreorientID"
+ id="org.eclipse.papyrus.uml.diagram.communication.MessagelabelreorientID"
label="Reverse message orientation"
menubarPath="editGroup">
</action>
@@ -782,7 +782,7 @@
<extension
point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
<viewProvider
- class="org.eclipse.papyrus.diagram.communication.custom.providers.CustomUMLViewProvider">
+ class="org.eclipse.papyrus.uml.diagram.communication.custom.providers.CustomUMLViewProvider">
<Priority
name="High">
</Priority>
@@ -803,13 +803,13 @@
<extension
point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
<binding
- context="org.eclipse.papyrus.service.edit.TypeContext">
+ context="org.eclipse.papyrus.infra.services.edit.TypeContext">
<elementType
ref="org.eclipse.papyrus.uml.diagram.communication.MessageHelperAdvice">
</elementType>
</binding>
<binding
- context="org.eclipse.papyrus.service.edit.TypeContext">
+ context="org.eclipse.papyrus.infra.services.edit.TypeContext">
<elementType
ref="org.eclipse.papyrus.uml.diagram.communication.DestroyMessageAdvice">
</elementType>
@@ -845,7 +845,7 @@
<extension
point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
<editpolicyProvider
- class="org.eclipse.papyrus.diagram.communication.custom.providers.CustomEditPolicyProvider">
+ class="org.eclipse.papyrus.uml.diagram.communication.custom.providers.CustomEditPolicyProvider">
<Priority
name="Lowest">
</Priority>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java
index 54c6ee46098..562ec2706fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java
@@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java
index 64d91796716..4ee399c5261 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java
@@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
index 06625e1ab04..710b8d89f4e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
@@ -48,8 +48,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
index acf1888f080..9f3bcb0da7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
@@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
index 721ff74d4ce..b9c690451aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
@@ -41,8 +41,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
index 0fa30ab5cb4..9e568b1b5c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
@@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
index f567822ae86..96e1758feb4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
@@ -48,8 +48,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
index 531bf934e15..645cedceb6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.uml.diagram.communication.edit.policies;
import java.util.ArrayList;
import java.util.List;
-import java.util.List;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.DeleteCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
index 83a293cbdf8..f2fe83fb03e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.uml.diagram.communication.edit.policies;
import java.util.ArrayList;
import java.util.List;
-import java.util.List;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.DeleteCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
index 2c5f18ce394..a165d5d8303 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.uml.diagram.communication.edit.policies;
import java.util.ArrayList;
import java.util.List;
-import java.util.List;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.DeleteCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
index 0239bac1133..be1b25e1591 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.List;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.DeleteCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
index 5b44cf865f6..d2b332c956d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.uml.diagram.communication.edit.policies;
import java.util.ArrayList;
import java.util.List;
-import java.util.List;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.DeleteCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
index ce79c261f9f..44d0c90abaf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.uml.diagram.communication.edit.policies;
import java.util.ArrayList;
import java.util.List;
-import java.util.List;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.DeleteCommand;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 7d8c0c89f7f..ee63b7dacfe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -47,9 +47,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.uml.diagram.communication.edit.helpers.UMLBaseEditHelper;
import org.eclipse.papyrus.uml.diagram.communication.expressions.UMLOCLFactory;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/expressions/UMLOCLFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/expressions/UMLOCLFactory.java
index ee65669b27f..ebdd6483819 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/expressions/UMLOCLFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/expressions/UMLOCLFactory.java
@@ -24,9 +24,9 @@ import org.eclipse.ocl.Environment;
import org.eclipse.ocl.EvaluationEnvironment;
import org.eclipse.ocl.ParserException;
import org.eclipse.ocl.ecore.EcoreFactory;
+import org.eclipse.ocl.ecore.OCL.Helper;
import org.eclipse.ocl.ecore.OCLExpression;
import org.eclipse.ocl.ecore.Variable;
-import org.eclipse.ocl.ecore.OCL.Helper;
import org.eclipse.ocl.options.ParsingOptions;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java
index 8bf32c310df..15b85d63265 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java
@@ -1,14 +1,14 @@
/*****************************************************************************
* Copyright (c) 2010 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Saadia Dhouib saadia.dhouib@cea.fr
+ * Saadia Dhouib saadia.dhouib@cea.fr
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.communication.part;
@@ -39,10 +39,10 @@ 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.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.adaptor.gmf.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;
import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
@@ -133,6 +133,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected String getContextID() {
return CONTEXT_ID;
}
@@ -140,6 +141,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
PaletteRoot paletteRoot;
if(existingPaletteRoot == null) {
@@ -155,6 +157,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected PreferencesHint getPreferencesHint() {
return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
}
@@ -162,6 +165,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public String getContributorId() {
return UMLDiagramEditorPlugin.ID;
}
@@ -169,6 +173,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public Object getAdapter(Class type) {
if(type == IPropertySheetPage.class) {
return null;
@@ -187,6 +192,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
return documentProvider;
}
@@ -194,6 +200,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public TransactionalEditingDomain getEditingDomain() {
return editingDomain;
}
@@ -201,6 +208,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected final void setDocumentProvider(IEditorInput input) {
// Already set in the constructor
}
@@ -215,6 +223,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public boolean isSaveAsAllowed() {
return true;
}
@@ -222,6 +231,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public void doSaveAs() {
performSaveAs(new NullProgressMonitor());
}
@@ -229,6 +239,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected void performSaveAs(IProgressMonitor progressMonitor) {
// Nothing
}
@@ -236,6 +247,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public ShowInContext getShowInContext() {
return new ShowInContext(getEditorInput(), getNavigatorSelection());
}
@@ -251,6 +263,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected void configureGraphicalViewer() {
super.configureGraphicalViewer();
DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());
@@ -263,6 +276,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected TransactionalEditingDomain createEditingDomain() {
// Already configured
return editingDomain;
@@ -271,6 +285,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected void configureDiagramEditDomain() {
super.configureDiagramEditDomain();
getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
@@ -284,6 +299,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public void doSave(IProgressMonitor progressMonitor) {
// The saving of the resource is done by the CoreMultiDiagramEditor
savedOperation = getOperationHistory().getUndoOperation(getUndoContext());
@@ -292,6 +308,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public boolean isDirty() {
IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());
return savedOperation != op;
@@ -311,6 +328,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
public void dispose() {
// remove palette service listener
// remove preference listener
@@ -331,6 +349,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected PaletteViewer constructPaletteViewer() {
return new PapyrusPaletteViewer();
}
@@ -338,6 +357,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
/**
* @generated
*/
+ @Override
protected PaletteViewerProvider createPaletteViewerProvider() {
getEditDomain().setPaletteRoot(createPaletteRoot(null));
return new PaletteViewerProvider(getEditDomain()) {
@@ -349,6 +369,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
* with a defaultTool that is the SelectToolEx that undestands how to handle the enter
* key which will result in the creation of the shape also.
*/
+ @Override
protected void configurePaletteViewer(PaletteViewer viewer) {
super.configurePaletteViewer(viewer);
@@ -366,6 +387,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
viewer.setCustomizer(createPaletteCustomizer());
}
+ @Override
public PaletteViewer createPaletteViewer(Composite parent) {
PaletteViewer pViewer = constructPaletteViewer();
pViewer.createControl(parent);
@@ -393,6 +415,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
* the KeyEvent
* @return <code>true</code> if KeyEvent was handled in some way
*/
+ @Override
public boolean keyReleased(KeyEvent event) {
if(event.keyCode == SWT.Selection) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditorPlugin.java
index 2e107444d8a..344b330ee62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditorPlugin.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.preferences.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
import org.eclipse.papyrus.uml.diagram.communication.edit.policies.UMLBaseItemSemanticEditPolicy;
import org.eclipse.papyrus.uml.diagram.communication.expressions.UMLOCLFactory;
import org.eclipse.papyrus.uml.diagram.communication.preferences.DiagramPreferenceInitializer;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java
index 117e5fabefc..75aca503610 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.uml.diagram.communication.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
@@ -52,15 +52,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java
index 1076d812a23..95cb6cff4fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.uml.diagram.communication.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
@@ -52,15 +52,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DiagramGeneralPreferencePage.java
index 86f61eb8ff5..6a5578208a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DiagramGeneralPreferencePage.java
@@ -13,7 +13,7 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.communication.preferences;
-import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java
index bec5e623133..b71f3581ed5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.uml.diagram.communication.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
@@ -52,15 +52,15 @@ public class DurationObservationPreferencePage extends AbstractPapyrusNodePrefer
store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java
index 3e3576eceb7..2eb7a77cba4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.uml.diagram.communication.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
@@ -60,15 +60,15 @@ public class InteractionPreferencePage extends AbstractPapyrusNodePreferencePage
store.setDefault(preferenceName, true);
}
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java
index e2e47bd703c..44b5b74aa68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.uml.diagram.communication.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
@@ -52,15 +52,15 @@ public class LifelinePreferencePage extends AbstractPapyrusNodePreferencePage {
store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 25);
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/MessagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/MessagePreferencePage.java
index 84caad467e6..074c76d152c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/MessagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/MessagePreferencePage.java
@@ -14,7 +14,7 @@
package org.eclipse.papyrus.uml.diagram.communication.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java
index bd362fb414e..3de756dcae7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.uml.diagram.communication.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
@@ -52,15 +52,15 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference
store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java
index adcea1ccdc8..2f17a6c665f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java
@@ -14,8 +14,8 @@
package org.eclipse.papyrus.uml.diagram.communication.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;
import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;
@@ -52,15 +52,15 @@ public class TimeObservationPreferencePage extends AbstractPapyrusNodePreference
store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
index 9446f6ad376..c3388c2ee07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
@@ -52,8 +52,8 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.AppliedStereotypeMessageEditPart;
import org.eclipse.papyrus.uml.diagram.communication.edit.parts.CommentAnnotatedElementEditPart;

Back to the top