commit 8b320fa47e13631e9d07bdd394d551377d647ad7
author Ansgar Radermacher <ansgar.radermacher@cea.fr> Tue Jul 05 19:20:29 2022 +0200
committer Ansgar Radermacher <ansgar.radermacher@cea.fr> Wed Jul 06 10:43:53 2022 +0200
tree 87702d11feff7c4b63637d26d9648f0648e92cab
parent a12481804559817f113bcf41b77a23672488e970

Bug 580187 - [Designer, releng] Create a minimal feature/RCP for code generation

- Adapt to restructuring in SW designer, e.g.
  - new dependencies to designer.uml.tools.utils
  - location of CommandSupport class

Change-Id: I0960e39a7b5ff968296c2617e0359479f1738784
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>

plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/META-INF/MANIFEST.MF

diff --git a/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/META-INF/MANIFEST.MF b/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/META-INF/MANIFEST.MF
index 4114ed7..87156b2 100644
--- a/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/META-INF/MANIFEST.MF
+++ b/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@
  org.eclipse.papyrus.robotics.assertions.ui,
  org.eclipse.papyrus.robotics.assertions.profile,
  org.eclipse.papyrus.infra.properties.ui,
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0"
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.papyrus.robotics.assertions.languages.othello
 Bundle-ActivationPolicy: lazy

plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java

diff --git a/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java b/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java
index 00f2d61..0dec1a4 100644
--- a/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java
+++ b/plugins/assertions/languages/org.eclipse.papyrus.robotics.assertions.languages.othello/src/org/eclipse/papyrus/robotics/assertions/languages/othello/OthelloLanguage.java
@@ -21,7 +21,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants;
+import org.eclipse.papyrus.designer.infra.base.StringConstants;
 import org.eclipse.papyrus.robotics.assertions.languages.AssertionsHelper;
 import org.eclipse.papyrus.robotics.assertions.languages.IExpressionLanguage;
 import org.eclipse.papyrus.robotics.assertions.languages.othello.activator.Activator;

plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF

diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF
index 2fa49e9..e9279c8 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@
  org.eclipse.papyrus.robotics.properties;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.2.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.2.0",
  org.eclipse.papyrus.robotics.parameters;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.assertions.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,5.0.0)",
@@ -39,7 +39,8 @@
  org.eclipse.papyrus.uml.tools;bundle-version="[4.3.0,6.0.0)",
  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.2.0,4.0.0)",
  org.eclipse.emf.databinding;bundle-version="1.5.0",
- org.eclipse.papyrus.robotics.assertions.ui;bundle-version="0.8.0"
+ org.eclipse.papyrus.robotics.assertions.ui;bundle-version="0.8.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.papyrus.robotics.nfps

plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/assertions/AssertionTableCellManager.java

diff --git a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/assertions/AssertionTableCellManager.java b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/assertions/AssertionTableCellManager.java
index dad9484..0a2acf4 100644
--- a/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/assertions/AssertionTableCellManager.java
+++ b/plugins/assertions/org.eclipse.papyrus.robotics.assertions.tables/src/org/eclipse/papyrus/robotics/assertions/tables/assertions/AssertionTableCellManager.java
@@ -25,7 +25,7 @@
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils;
+import org.eclipse.papyrus.designer.infra.base.StringUtils;
 import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

plugins/bt/org.eclipse.papyrus.robotics.bt.architecture/.project

diff --git a/plugins/bt/org.eclipse.papyrus.robotics.bt.architecture/.project b/plugins/bt/org.eclipse.papyrus.robotics.bt.architecture/.project
index 63998f8..2e3db4e 100644
--- a/plugins/bt/org.eclipse.papyrus.robotics.bt.architecture/.project
+++ b/plugins/bt/org.eclipse.papyrus.robotics.bt.architecture/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.papyrus.plugin.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.papyrus.plugin.nature</nature>
 	</natures>
 </projectDescription>

plugins/bt/org.eclipse.papyrus.robotics.bt.types/META-INF/MANIFEST.MF

diff --git a/plugins/bt/org.eclipse.papyrus.robotics.bt.types/META-INF/MANIFEST.MF b/plugins/bt/org.eclipse.papyrus.robotics.bt.types/META-INF/MANIFEST.MF
index 05dded3..4926bf8 100644
--- a/plugins/bt/org.eclipse.papyrus.robotics.bt.types/META-INF/MANIFEST.MF
+++ b/plugins/bt/org.eclipse.papyrus.robotics.bt.types/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@
  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.4.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.2.0,6.0.0)",
  org.eclipse.papyrus.uml.tools;bundle-version="[4.3.0,6.0.0)",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.bt.architecture,
  org.eclipse.papyrus.robotics.bt.profile;bundle-version="0.7.0",
@@ -23,7 +23,9 @@
  org.eclipse.swt;bundle-version="3.0.0",
  org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,6.0.0)"
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,6.0.0)",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.papyrus.robotics.bt.types
 Bundle-ActivationPolicy: lazy

plugins/bt/org.eclipse.papyrus.robotics.bt.types/src/org/eclipse/papyrus/robotics/bt/types/advices/AbstractControlNodeEditHelperAdvice.java

diff --git a/plugins/bt/org.eclipse.papyrus.robotics.bt.types/src/org/eclipse/papyrus/robotics/bt/types/advices/AbstractControlNodeEditHelperAdvice.java b/plugins/bt/org.eclipse.papyrus.robotics.bt.types/src/org/eclipse/papyrus/robotics/bt/types/advices/AbstractControlNodeEditHelperAdvice.java
index 86cb7b5..fd79e77 100644
--- a/plugins/bt/org.eclipse.papyrus.robotics.bt.types/src/org/eclipse/papyrus/robotics/bt/types/advices/AbstractControlNodeEditHelperAdvice.java
+++ b/plugins/bt/org.eclipse.papyrus.robotics.bt.types/src/org/eclipse/papyrus/robotics/bt/types/advices/AbstractControlNodeEditHelperAdvice.java
@@ -20,7 +20,7 @@
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.robotics.bt.standardlibrary.utils.StandardBTSemanticsUtils;
 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

plugins/bt/org.eclipse.papyrus.robotics.bt.xsdgw.uml2xml/META-INF/MANIFEST.MF

diff --git a/plugins/bt/org.eclipse.papyrus.robotics.bt.xsdgw.uml2xml/META-INF/MANIFEST.MF b/plugins/bt/org.eclipse.papyrus.robotics.bt.xsdgw.uml2xml/META-INF/MANIFEST.MF
index 87fc237..5936635 100644
--- a/plugins/bt/org.eclipse.papyrus.robotics.bt.xsdgw.uml2xml/META-INF/MANIFEST.MF
+++ b/plugins/bt/org.eclipse.papyrus.robotics.bt.xsdgw.uml2xml/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@
  org.eclipse.papyrus.robotics.bt.xsdgw.ecore;bundle-version="0.7.0",
  org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.1.0,5.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.1.0,5.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.1.0,5.0.0)",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin

plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/META-INF/MANIFEST.MF

diff --git a/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/META-INF/MANIFEST.MF b/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/META-INF/MANIFEST.MF
index ae1f062..59e0046 100644
--- a/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/META-INF/MANIFEST.MF
+++ b/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/META-INF/MANIFEST.MF
@@ -22,9 +22,9 @@
  org.eclipse.papyrus.designer.transformation.extensions;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.deployment.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.languages.common.extensionpoints;bundle-version="1.1.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.designer.languages.common.profile,
- org.eclipse.papyrus.designer.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.ui;bundle-version="1.1.0",
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.transformation.library;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
@@ -33,7 +33,9 @@
  org.eclipse.cdt.core;bundle-version="5.4.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,6.0.0)",
  org.eclipse.papyrus.robotics.ros2.preferences;bundle-version="0.7.0",
- org.eclipse.core.runtime;bundle-version="3.0.0"
+ org.eclipse.core.runtime;bundle-version="3.0.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.8.0.qualifier

plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/Helpers.java

diff --git a/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/Helpers.java b/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/Helpers.java
index e2c1493..e34a561 100644
--- a/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/Helpers.java
+++ b/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/Helpers.java
@@ -15,11 +15,11 @@
 package org.eclipse.papyrus.robotics.codegen.common.utils;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
 import org.eclipse.papyrus.designer.languages.common.base.StdUriConstants;
 import org.eclipse.papyrus.designer.languages.cpp.profile.C_Cpp.External;
 import org.eclipse.papyrus.designer.languages.cpp.profile.C_Cpp.Ptr;
 import org.eclipse.papyrus.designer.transformation.core.transformations.TransformationContext;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.NamedElement;

plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/TopicUtils.xtend

diff --git a/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/TopicUtils.xtend b/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/TopicUtils.xtend
index b5b5e17..e57cf6b 100644
--- a/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/TopicUtils.xtend
+++ b/plugins/codegen/org.eclipse.papyrus.robotics.codegen.common/src/org/eclipse/papyrus/robotics/codegen/common/utils/TopicUtils.xtend
@@ -21,7 +21,7 @@
 import org.eclipse.uml2.uml.Property
 
 import static extension org.eclipse.papyrus.robotics.core.utils.InteractionUtils.getCommObject
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants
+import org.eclipse.papyrus.designer.infra.base.StringConstants
 
 /**
  * A set of utility functions around port and topic names

plugins/customization/org.eclipse.papyrus.robotics.core/META-INF/MANIFEST.MF

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.core/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.robotics.core/META-INF/MANIFEST.MF
index da1694c..1c9e46c 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.core/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.robotics.core/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,4.0.0)",
  org.eclipse.papyrus.designer.deployment.tools;bundle-version="0.7.7",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.2.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.2.0",
  org.eclipse.papyrus.marte.static.profile;bundle-version="1.2.0",
  org.eclipse.jface;bundle-version="[3.20.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
@@ -28,7 +28,9 @@
  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.2.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.3.0,3.0.0)",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.2.0,5.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="2.0.0"
+ org.eclipse.emf.edit.ui;bundle-version="2.0.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Export-Package: org.eclipse.papyrus.robotics.core,
  org.eclipse.papyrus.robotics.core.commands,
  org.eclipse.papyrus.robotics.core.menu,

plugins/customization/org.eclipse.papyrus.robotics.core/src/org/eclipse/papyrus/robotics/core/types/advice/AbstractApplyStereotypeEditHelperAdvice.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.core/src/org/eclipse/papyrus/robotics/core/types/advice/AbstractApplyStereotypeEditHelperAdvice.java b/plugins/customization/org.eclipse.papyrus.robotics.core/src/org/eclipse/papyrus/robotics/core/types/advice/AbstractApplyStereotypeEditHelperAdvice.java
index 21cf63b..aae9759 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.core/src/org/eclipse/papyrus/robotics/core/types/advice/AbstractApplyStereotypeEditHelperAdvice.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.core/src/org/eclipse/papyrus/robotics/core/types/advice/AbstractApplyStereotypeEditHelperAdvice.java
@@ -24,7 +24,7 @@
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.uml.tools.commands.ApplyProfileCommand;
 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

plugins/customization/org.eclipse.papyrus.robotics.library/META-INF/MANIFEST.MF

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.robotics.library/META-INF/MANIFEST.MF
index e815f75..3f04ffb 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/META-INF/MANIFEST.MF
@@ -11,11 +11,13 @@
  org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.4.0,5.0.0)",
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.2.0,5.0.0)",
  org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,6.0.0)",
  org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,5.0.0)",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.2.0,4.0.0)"
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.2.0,4.0.0)",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/AdviceUtil.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/AdviceUtil.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/AdviceUtil.java
index 8b36533..847956a 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/AdviceUtil.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/advice/AdviceUtil.java
@@ -17,7 +17,7 @@
 package org.eclipse.papyrus.robotics.library.advice;
 
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.library.util.RoboticsLibResource;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.uml2.uml.Classifier;

plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/ActionCommPatternMatcher.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/ActionCommPatternMatcher.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/ActionCommPatternMatcher.java
index bcabd8d..a8f61f7 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/ActionCommPatternMatcher.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/ActionCommPatternMatcher.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.library.advice.AbstractActionPatternAdvice;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.NamedElement;

plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/EventCommPatternMatcher.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/EventCommPatternMatcher.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/EventCommPatternMatcher.java
index 90a75de..63a1833 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/EventCommPatternMatcher.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/EventCommPatternMatcher.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.library.advice.EventCommPatternAdvice;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.NamedElement;

plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PubSubCommPatternMatcher.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PubSubCommPatternMatcher.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PubSubCommPatternMatcher.java
index 989e711..53c7901 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PubSubCommPatternMatcher.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PubSubCommPatternMatcher.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.library.advice.PubSubCommPatternAdvice;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.NamedElement;

plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PushCommPatternMatcher.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PushCommPatternMatcher.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PushCommPatternMatcher.java
index 9de8cdd..0fcebde 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PushCommPatternMatcher.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/PushCommPatternMatcher.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.library.advice.PushCommPatternAdvice;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.NamedElement;

plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/QueryCommPatternMatcher.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/QueryCommPatternMatcher.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/QueryCommPatternMatcher.java
index 4ce2743..6426a4c 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/QueryCommPatternMatcher.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/QueryCommPatternMatcher.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.library.advice.QueryCommPatternAdvice;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.NamedElement;

plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/SendCommPatternMatcher.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/SendCommPatternMatcher.java b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/SendCommPatternMatcher.java
index 6593c0d..86ece23 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/SendCommPatternMatcher.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.library/src/org/eclipse/papyrus/robotics/library/matcher/SendCommPatternMatcher.java
@@ -18,7 +18,7 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.library.advice.SendCommPatternAdvice;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.NamedElement;

plugins/customization/org.eclipse.papyrus.robotics.parameters/META-INF/MANIFEST.MF

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.parameters/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.robotics.parameters/META-INF/MANIFEST.MF
index 3c41d19..3d04f7f 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.parameters/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.robotics.parameters/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@
  org.eclipse.papyrus.robotics.properties;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.2.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.properties;bundle-version="[3.5.0,5.0.0)",
  org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,5.0.0)",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
@@ -33,7 +33,8 @@
  org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.2.0,6.0.0)",
  org.eclipse.ui;bundle-version="[3.100.0,4.0.0)",
  org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,5.0.0)",
- org.eclipse.emf.databinding;bundle-version="1.5.0"
+ org.eclipse.emf.databinding;bundle-version="1.5.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Export-Package: org.eclipse.papyrus.robotics.parameters.utils

plugins/customization/org.eclipse.papyrus.robotics.parameters/src/org/eclipse/papyrus/robotics/parameters/defaultvalue/DefaultValueTableCellManager.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.parameters/src/org/eclipse/papyrus/robotics/parameters/defaultvalue/DefaultValueTableCellManager.java b/plugins/customization/org.eclipse.papyrus.robotics.parameters/src/org/eclipse/papyrus/robotics/parameters/defaultvalue/DefaultValueTableCellManager.java
index c36e031..76227be 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.parameters/src/org/eclipse/papyrus/robotics/parameters/defaultvalue/DefaultValueTableCellManager.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.parameters/src/org/eclipse/papyrus/robotics/parameters/defaultvalue/DefaultValueTableCellManager.java
@@ -27,7 +27,7 @@
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils;
+import org.eclipse.papyrus.designer.infra.base.StringUtils;
 import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

plugins/customization/org.eclipse.papyrus.robotics.wizards/META-INF/MANIFEST.MF

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.wizards/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.robotics.wizards/META-INF/MANIFEST.MF
index 6c8f5e5..b3be773 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.wizards/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.robotics.wizards/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.1.0,5.0.0)",
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.1.0,4.0.0)",
  org.eclipse.papyrus.uml.tools;bundle-version="[4.3.0,6.0.0)",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.2.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="[3.6.0,5.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.commands,
  org.eclipse.core.databinding;bundle-version="[1.9.0,2.0.0)",

plugins/customization/org.eclipse.papyrus.robotics.wizards/src/org/eclipse/papyrus/robotics/wizards/wizards/NewRoboticsModelWizard.java

diff --git a/plugins/customization/org.eclipse.papyrus.robotics.wizards/src/org/eclipse/papyrus/robotics/wizards/wizards/NewRoboticsModelWizard.java b/plugins/customization/org.eclipse.papyrus.robotics.wizards/src/org/eclipse/papyrus/robotics/wizards/wizards/NewRoboticsModelWizard.java
index 97a8e0a..d5f097c 100644
--- a/plugins/customization/org.eclipse.papyrus.robotics.wizards/src/org/eclipse/papyrus/robotics/wizards/wizards/NewRoboticsModelWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.robotics.wizards/src/org/eclipse/papyrus/robotics/wizards/wizards/NewRoboticsModelWizard.java
@@ -22,7 +22,7 @@
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils;
+import org.eclipse.papyrus.designer.infra.base.StringUtils;
 import org.eclipse.papyrus.infra.core.resource.BadArgumentExcetion;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;

plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/META-INF/MANIFEST.MF

diff --git a/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/META-INF/MANIFEST.MF b/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/META-INF/MANIFEST.MF
index 0319049..94d1bf8 100644
--- a/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/META-INF/MANIFEST.MF
+++ b/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/META-INF/MANIFEST.MF
@@ -29,12 +29,13 @@
  org.eclipse.papyrus.uml.textedit.common.xtext;bundle-version="[2.1.0,4.0.0)",
  org.eclipse.papyrus.uml.textedit.common.xtext.ui;bundle-version="2.0.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.robotics.xtext.util;bundle-version="0.7.0",
  org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors;bundle-version="[1.0.0,3.0.0)",
  org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[2.1.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.9.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[2.0.0,4.0.0)"
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.papyrus.robotics.xtext.compdef.ui.contentassist,

plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/src/org/eclipse/papyrus/robotics/xtext/compdef/ui/contribution/CompDefEditorConfigurationContribution.java

diff --git a/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/src/org/eclipse/papyrus/robotics/xtext/compdef/ui/contribution/CompDefEditorConfigurationContribution.java b/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/src/org/eclipse/papyrus/robotics/xtext/compdef/ui/contribution/CompDefEditorConfigurationContribution.java
index 038a4a3..7a7f36e 100644
--- a/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/src/org/eclipse/papyrus/robotics/xtext/compdef/ui/contribution/CompDefEditorConfigurationContribution.java
+++ b/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.compdef.ui/src/org/eclipse/papyrus/robotics/xtext/compdef/ui/contribution/CompDefEditorConfigurationContribution.java
@@ -30,7 +30,7 @@
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
 import org.eclipse.papyrus.robotics.core.utils.ParameterUtils;
 import org.eclipse.papyrus.robotics.profile.robotics.components.Activity;

plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/META-INF/MANIFEST.MF

diff --git a/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/META-INF/MANIFEST.MF b/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/META-INF/MANIFEST.MF
index 805f63a..296a814 100644
--- a/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/META-INF/MANIFEST.MF
+++ b/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.robotics.xtext.util;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.2.0",
+Require-Bundle: org.eclipse.papyrus.designer.infra.base;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="5.5.0",
  org.eclipse.papyrus.uml.xtext.integration.core;bundle-version="[2.1.0,4.0.0)",
  org.eclipse.emf.transaction;bundle-version="1.7.0",
@@ -14,7 +14,8 @@
  org.eclipse.swt;bundle-version="3.0.0",
  org.eclipse.papyrus.uml.properties.xtext;bundle-version="1.3.0",
  org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,5.0.0)",
- org.eclipse.xtext;bundle-version="2.20.0"
+ org.eclipse.xtext;bundle-version="2.20.0",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.apache.log4j
 Export-Package: org.eclipse.papyrus.robotics.xtext.util

plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/src/org/eclipse/papyrus/robotics/xtext/util/TrackNames.java

diff --git a/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/src/org/eclipse/papyrus/robotics/xtext/util/TrackNames.java b/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/src/org/eclipse/papyrus/robotics/xtext/util/TrackNames.java
index ffed173..0f3310f 100644
--- a/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/src/org/eclipse/papyrus/robotics/xtext/util/TrackNames.java
+++ b/plugins/customization/textedit/org.eclipse.papyrus.robotics.xtext.util/src/org/eclipse/papyrus/robotics/xtext/util/TrackNames.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.uml2.uml.NamedElement;
 
 /**

plugins/examples/org.eclipse.papyrus.robotics.examples/plugin.xml

diff --git a/plugins/examples/org.eclipse.papyrus.robotics.examples/plugin.xml b/plugins/examples/org.eclipse.papyrus.robotics.examples/plugin.xml
index 0c08cea..db14e2f 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.examples/plugin.xml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.examples/plugin.xml
@@ -29,7 +29,7 @@
 	<extension point="org.eclipse.emf.common.ui.examples">
 		<example
 			id="org.eclipse.papyrus.robotics.examples.PRC2Example"
-			pageImage="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/PapyrusLogo_48x48.png"
+			pageImage="platform:/plugin/org.eclipse.papyrus.designer.infra.ui/icons/PapyrusLogo_48x48.png"
 			wizardID="org.eclipse.papyrus.robotics.examples.category.RobMoSysExamples.installer">
 			<projectDescriptor
 				contentURI="models/PRC2/"

plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/plugin.xml

diff --git a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/plugin.xml b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/plugin.xml
index 4f9dc81..1ea80b8 100644
--- a/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/plugin.xml
+++ b/plugins/examples/org.eclipse.papyrus.robotics.ros2.examples/plugin.xml
@@ -17,7 +17,7 @@
 	<extension point="org.eclipse.emf.common.ui.examples">
 		<example
 			id="org.eclipse.papyrus.robotics.ros2.examples.dummyrobot"
-			pageImage="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/PapyrusLogo_48x48.png"
+			pageImage="platform:/plugin/org.eclipse.papyrus.designer.infra.ui/icons/PapyrusLogo_48x48.png"
 			wizardID="org.eclipse.papyrus.robotics.examples.category.RobMoSysExamples.installer">
 			<projectDescriptor
 				contentURI="models/dummy_robot/"
@@ -32,7 +32,7 @@
 	<extension point="org.eclipse.emf.common.ui.examples">
 		<example
 			id="org.eclipse.papyrus.robotics.ros2.examples.mara"
-			pageImage="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/PapyrusLogo_48x48.png"
+			pageImage="platform:/plugin/org.eclipse.papyrus.designer.infra.ui/icons/PapyrusLogo_48x48.png"
 			wizardID="org.eclipse.papyrus.robotics.examples.category.RobMoSysExamples.installer">
 			<projectDescriptor
 				contentURI="models/mara/"
@@ -48,7 +48,7 @@
 	<extension point="org.eclipse.emf.common.ui.examples">
 		<example
 			id="org.eclipse.papyrus.robotics.ros2.examples.fromscratch_services"
-			pageImage="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/PapyrusLogo_48x48.png"
+			pageImage="platform:/plugin/org.eclipse.papyrus.designer.infra.ui/icons/PapyrusLogo_48x48.png"
 			wizardID="org.eclipse.papyrus.robotics.examples.category.RobMoSysExamples.installer">
 			<projectDescriptor
 				contentURI="models/fromscratch/"
@@ -64,7 +64,7 @@
 	<extension point="org.eclipse.emf.common.ui.examples">
 		<example
 			id="org.eclipse.papyrus.robotics.ros2.examples.tests.cs"
-			pageImage="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/PapyrusLogo_48x48.png"
+			pageImage="platform:/plugin/org.eclipse.papyrus.designer.infra.ui/icons/PapyrusLogo_48x48.png"
 			wizardID="org.eclipse.papyrus.robotics.examples.category.RobMoSysExamples.installer">
 			<projectDescriptor
 				contentURI="testmodels/clientServer/"
@@ -77,7 +77,7 @@
 		</example>
 		<example
 			id="org.eclipse.papyrus.robotics.ros2.examples.tests.ps"
-			pageImage="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/PapyrusLogo_48x48.png"
+			pageImage="platform:/plugin/org.eclipse.papyrus.designer.infra.ui/icons/PapyrusLogo_48x48.png"
 			wizardID="org.eclipse.papyrus.robotics.examples.category.RobMoSysExamples.installer">
 			<projectDescriptor
 				contentURI="testmodels/publishSubscribe/"
@@ -90,7 +90,7 @@
 		</example>
 		<example
 			id="org.eclipse.papyrus.robotics.ros2.examples.tests.send"
-			pageImage="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/PapyrusLogo_48x48.png"
+			pageImage="platform:/plugin/org.eclipse.papyrus.designer.infra.ui/icons/PapyrusLogo_48x48.png"
 			wizardID="org.eclipse.papyrus.robotics.examples.category.RobMoSysExamples.installer">
 			<projectDescriptor
 				contentURI="testmodels/sendReceive/"
@@ -103,7 +103,7 @@
 		</example>
 		<example
 			id="org.eclipse.papyrus.robotics.ros2.examples.tests.ps"
-			pageImage="platform:/plugin/org.eclipse.papyrus.designer.ui/icons/PapyrusLogo_48x48.png"
+			pageImage="platform:/plugin/org.eclipse.papyrus.designer.infra.ui/icons/PapyrusLogo_48x48.png"
 			wizardID="org.eclipse.papyrus.robotics.examples.category.RobMoSysExamples.installer">
 			<projectDescriptor
 				contentURI="testmodels/publishSubscribe_extcode/"

plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/META-INF/MANIFEST.MF

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/META-INF/MANIFEST.MF b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/META-INF/MANIFEST.MF
index a65e5c8..fcc8ed7 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/META-INF/MANIFEST.MF
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/META-INF/MANIFEST.MF
@@ -16,13 +16,13 @@
  org.eclipse.papyrus.designer.deployment.tools;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.transformation.vsl;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.deployment.profile;bundle-version="0.7.0",
- org.eclipse.papyrus.designer.ui;bundle-version="1.0.4",
+ org.eclipse.papyrus.designer.infra.ui;bundle-version="1.0.4",
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.transformation.library;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,6.0.0)",
  org.eclipse.papyrus.robotics.library;bundle-version="0.7.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.uml.tools;bundle-version="[4.3.0,6.0.0)",
  org.eclipse.cdt;bundle-version="9.0.0",
  org.eclipse.cdt.ui;bundle-version="6.0.0",

plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/src/org/eclipse/papyrus/robotics/ros2/base/EnvironmentUtils.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/src/org/eclipse/papyrus/robotics/ros2/base/EnvironmentUtils.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/src/org/eclipse/papyrus/robotics/ros2/base/EnvironmentUtils.java
index 6dc859a..2da064d 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/src/org/eclipse/papyrus/robotics/ros2/base/EnvironmentUtils.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.base/src/org/eclipse/papyrus/robotics/ros2/base/EnvironmentUtils.java
@@ -26,7 +26,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils;
+import org.eclipse.papyrus.designer.infra.base.StringUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/META-INF/MANIFEST.MF

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/META-INF/MANIFEST.MF b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/META-INF/MANIFEST.MF
index da10a69..9778c3c 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/META-INF/MANIFEST.MF
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
  org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.4.0,3.0.0)",
  org.eclipse.papyrus.designer.transformation.base;bundle-version="0.8.0",
  org.eclipse.papyrus.designer.languages.cpp.library;bundle-version="1.1.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.designer.languages.common.codegen.ui;bundle-version="1.1.0",
  org.eclipse.papyrus.designer.languages.cpp.cdt.texteditor;bundle-version="1.1.0",
  org.eclipse.papyrus.robotics.ros2.codegen.cpp;bundle-version="0.7.0",
@@ -32,7 +32,9 @@
  org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.3.0,3.0.0)",
  org.eclipse.gmf.runtime.common.core;bundle-version="1.6.0",
  org.eclipse.papyrus.infra.ui;bundle-version="[2.1.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)"
+ org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="3.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.8.0.qualifier

plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncRoboticsCDTtoModel.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncRoboticsCDTtoModel.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncRoboticsCDTtoModel.java
index 4765754..ef11b91 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncRoboticsCDTtoModel.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.cdteditor/src/org/eclipse/papyrus/robotics/ros2/cdteditor/sync/SyncRoboticsCDTtoModel.java
@@ -41,10 +41,10 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.designer.languages.common.base.codesync.SyncStatus;
 import org.eclipse.papyrus.designer.languages.common.extensionpoints.ILangCodegen;
 import org.eclipse.papyrus.designer.languages.common.extensionpoints.SyncInformation;
 import org.eclipse.papyrus.designer.languages.cpp.cdt.texteditor.Utils;
-import org.eclipse.papyrus.designer.languages.cpp.cdt.texteditor.listener.ModelListener;
 import org.eclipse.papyrus.designer.languages.cpp.cdt.texteditor.sync.SyncCDTtoModel;
 import org.eclipse.papyrus.designer.languages.cpp.codegen.Constants;
 import org.eclipse.papyrus.designer.languages.cpp.profile.C_Cpp.Include;
@@ -71,11 +71,10 @@
 		super(input, classifier, projectName, generatorID);
 	}
 
-
 	@Override
 	public void run() {
 		ICElement ice = CDTUITools.getEditorInputCElement(m_input);
-		ModelListener.syncFromEditor = true;
+		SyncStatus.syncFromEditor = true;
 
 		if (ice instanceof ITranslationUnit) {
 			ICProject project = CoreModel.getDefault().getCModel().getCProject(m_projectName);
@@ -114,12 +113,12 @@
 				}
 			}
 		}
-		ModelListener.syncFromEditor = false;
+		SyncStatus.syncFromEditor = false;
 	}
 
 	/**
-	 * Examine the children of a translation unit in order to extract the
-	 * methods that are defined within hte unit
+	 * Examine the children of a translation unit in order to extract the methods
+	 * that are defined within hte unit
 	 *
 	 * @param itu
 	 * @param selector
@@ -167,8 +166,7 @@
 	/**
 	 * update the contents of the CppInclude directive
 	 *
-	 * @param itu
-	 *            the translation unit
+	 * @param itu the translation unit
 	 */
 	public void updateCppInclude(ITranslationUnit itu) {
 		String contents = new String(itu.getContents());
@@ -202,29 +200,26 @@
 	}
 
 	/**
-	 * Update a method in the model based on the qualified name.
-	 * Unlike the overridden method in designer, the code only updates the behavior, not an
-	 * operation. It also only updates the body, not the signature
-	 * as the latter is supposed to be added by the generator based on the function type
+	 * Update a method in the model based on the qualified name. Unlike the
+	 * overridden method in designer, the code only updates the behavior, not an
+	 * operation. It also only updates the body, not the signature as the latter is
+	 * supposed to be added by the generator based on the function type
 	 * 
-	 * @param position
-	 *            The position of the method within the file. Used to identify
-	 *            renaming operations
-	 * @param parent
-	 *            the CDT parent which is used to get a list of children
-	 * @param qualifiedName
-	 *            the qualified name of a method
-	 * @param body
-	 *            the method body
-	 * @param declarator
-	 *            the declarator for the method
-	 * @return the operation or the behavior within the model that got updated. The latter is returned in
-	 *         case of behaviors that do not have a specification (e.g. the effect of a transition).
+	 * @param position      The position of the method within the file. Used to
+	 *                      identify renaming operations
+	 * @param parent        the CDT parent which is used to get a list of children
+	 * @param qualifiedName the qualified name of a method
+	 * @param body          the method body
+	 * @param declarator    the declarator for the method
+	 * @return the operation or the behavior within the model that got updated. The
+	 *         latter is returned in case of behaviors that do not have a
+	 *         specification (e.g. the effect of a transition).
 	 */
 	public NamedElement updateMethod(int position, IParent parent, String qualifiedName, String body,
 			IASTFunctionDeclarator declarator, SyncInformation syncInfo) {
 
-		String names[] = qualifiedName.split(org.eclipse.papyrus.designer.languages.cpp.cdt.texteditor.TextEditorConstants.nsSep);
+		String names[] = qualifiedName
+				.split(org.eclipse.papyrus.designer.languages.cpp.cdt.texteditor.TextEditorConstants.nsSep);
 		String name = names[names.length - 1];
 
 		Behavior behavior = null;
@@ -254,7 +249,8 @@
 			}
 			for (int i = 0; i < ob.getLanguages().size(); i++) {
 				// update first body of one of the languages supported by CDT. This implies that
-				// it is actually not possible to have separate C and C++ bodes in the same opaque
+				// it is actually not possible to have separate C and C++ bodes in the same
+				// opaque
 				// behavior (which is rarely a good idea).
 				String language = ob.getLanguages().get(i);
 				if (TextEditorConstants.CPP.matcher(language).matches() || c_cpp_langID.equals(language)) {
@@ -270,21 +266,21 @@
 	}
 
 	/**
-	 * Obtain a behavior from the model. Similar to method getModelOperationFromName in
-	 * superclass, but Robotics functions are currently defined by opaque behaviors
+	 * Obtain a behavior from the model. Similar to method getModelOperationFromName
+	 * in superclass, but Robotics functions are currently defined by opaque
+	 * behaviors
 	 * 
-	 * @param name
-	 *            the operation name within CDT
-	 * @param parent
-	 *            the parent of the CDT method within CDT editor model
-	 * @param position
-	 *            the position within the other methods. This information is used to locate methods
-	 *            within the model that might have been renamed in the CDT editor.
+	 * @param name     the operation name within CDT
+	 * @param parent   the parent of the CDT method within CDT editor model
+	 * @param position the position within the other methods. This information is
+	 *                 used to locate methods within the model that might have been
+	 *                 renamed in the CDT editor.
 	 * @return a UML operation
 	 */
 	public Behavior getModelBehaviorFromName(String name, IParent parent, int position) {
 		// operation does not belong to component itself, but to one of the
-		// activities which in turn consist of functions. Currently, functions are defined
+		// activities which in turn consist of functions. Currently, functions are
+		// defined
 		// in the package containing the component
 		PackageableElement beh = m_classifier.getNearestPackage().getPackagedElement(name);
 		if (beh instanceof OpaqueBehavior) {
@@ -297,7 +293,8 @@
 				bl.add((Behavior) pe);
 			}
 		}
-		// operation is not found via name in the model. try to locate the operation in the model at the same
+		// operation is not found via name in the model. try to locate the operation in
+		// the model at the same
 		// "position" as the method in the file and
 		// verify that this method does not have the same name as any method
 		// in the CDT file.
@@ -324,14 +321,13 @@
 	}
 
 	/**
-	 * update a comment of a named element. Besides the comment of the element itself, comments on contained
-	 * parameters are handled.
+	 * update a comment of a named element. Besides the comment of the element
+	 * itself, comments on contained parameters are handled.
 	 * 
-	 * @param itu
-	 *            a translation unit
+	 * @param itu        a translation unit
 	 * @param definition
-	 * @param ne
-	 *            a named element that is either an operation or a behavior (in order to update parameters)
+	 * @param ne         a named element that is either an operation or a behavior
+	 *                   (in order to update parameters)
 	 */
 	public void updateComment(ITranslationUnit itu, IASTFunctionDefinition definition, NamedElement ne) {
 		IASTFileLocation bodyLoc = definition.getFileLocation();

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/META-INF/MANIFEST.MF

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/META-INF/MANIFEST.MF b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/META-INF/MANIFEST.MF
index a41c46d..ef545b6 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/META-INF/MANIFEST.MF
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/META-INF/MANIFEST.MF
@@ -24,9 +24,9 @@
  org.eclipse.papyrus.designer.transformation.extensions;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.deployment.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.languages.common.extensionpoints;bundle-version="1.1.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.designer.languages.common.profile,
- org.eclipse.papyrus.designer.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.ui;bundle-version="1.1.0",
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.transformation.library;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
@@ -39,7 +39,9 @@
  org.eclipse.core.runtime;bundle-version="3.0.0",
  org.eclipse.papyrus.infra.tools;bundle-version="[3.2.0,5.0.0)",
  org.eclipse.emf.transaction;bundle-version="1.9.0",
- org.eclipse.papyrus.robotics.library;bundle-version="0.8.0"
+ org.eclipse.papyrus.robotics.library;bundle-version="0.8.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.8.0.qualifier

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/LangSpecificTransformations.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/LangSpecificTransformations.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/LangSpecificTransformations.java
index 9a4ba68..f112617 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/LangSpecificTransformations.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/LangSpecificTransformations.java
@@ -17,7 +17,7 @@
 import java.util.List;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess;
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess;
 import org.eclipse.papyrus.robotics.ros2.codegen.common.component.AbstractCompTransformations;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Package;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/component/AbstractCompTransformations.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/component/AbstractCompTransformations.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/component/AbstractCompTransformations.java
index 2441ce0..0de6bbb 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/component/AbstractCompTransformations.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/component/AbstractCompTransformations.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.robotics.ros2.codegen.common.component;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess;
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess;
 import org.eclipse.papyrus.robotics.ros2.codegen.common.message.CreateMsgPackage;
 import org.eclipse.uml2.uml.Class;
 

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/launch/LaunchScript.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/launch/LaunchScript.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/launch/LaunchScript.xtend
index 9698b21..75c869a 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/launch/LaunchScript.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/launch/LaunchScript.xtend
@@ -19,7 +19,7 @@
 import java.util.Collections
 import java.util.List
 import org.eclipse.papyrus.designer.deployment.tools.DepUtils
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.papyrus.robotics.core.utils.PortUtils
 import org.eclipse.papyrus.robotics.ros2.preferences.Ros2Distributions
 import org.eclipse.papyrus.robotics.ros2.preferences.Ros2PreferenceUtils

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMessage.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMessage.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMessage.xtend
index c805afc..a5f6d98 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMessage.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMessage.xtend
@@ -15,7 +15,7 @@
 package org.eclipse.papyrus.robotics.ros2.codegen.common.message
 
 import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.ChoiceType
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil
 import org.eclipse.uml2.uml.DataType
 import org.eclipse.uml2.uml.Enumeration
@@ -30,7 +30,7 @@
 import org.eclipse.uml2.uml.util.UMLUtil
 import org.eclipse.papyrus.robotics.bpc.profile.bpc.Entity
 import org.eclipse.uml2.uml.Element
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants
+import org.eclipse.papyrus.designer.infra.base.StringConstants
 
 class CreateMessage {
 

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMsgPackage.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMsgPackage.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMsgPackage.xtend
index 9bf5be8..26df386 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMsgPackage.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/message/CreateMsgPackage.xtend
@@ -18,7 +18,7 @@
 import java.util.Map
 import org.eclipse.core.runtime.CoreException
 import org.eclipse.core.runtime.NullProgressMonitor
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils
 import org.eclipse.papyrus.designer.languages.common.base.file.ProjectBasedFileAccess
 import org.eclipse.papyrus.designer.transformation.base.utils.TransformationException
 import org.eclipse.papyrus.designer.transformation.core.transformations.ExecuteTransformationChain

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/utils/TransformationUtils.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/utils/TransformationUtils.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/utils/TransformationUtils.java
index 065d4ad..496cfec 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/utils/TransformationUtils.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.common/src/org/eclipse/papyrus/robotics/ros2/codegen/common/utils/TransformationUtils.java
@@ -16,9 +16,9 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
 import org.eclipse.papyrus.designer.transformation.core.transformations.ExecuteTransformationChain;
 import org.eclipse.papyrus.designer.transformation.profile.Transformation.M2MTrafoChain;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.ros2.codegen.common.RoboticsTContext;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.NamedElement;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/META-INF/MANIFEST.MF

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/META-INF/MANIFEST.MF b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/META-INF/MANIFEST.MF
index 3e0ee98..366c9c1 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/META-INF/MANIFEST.MF
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/META-INF/MANIFEST.MF
@@ -22,9 +22,9 @@
  org.eclipse.papyrus.designer.transformation.extensions;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.deployment.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.languages.common.extensionpoints;bundle-version="1.1.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.designer.languages.common.profile,
- org.eclipse.papyrus.designer.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.ui;bundle-version="1.1.0",
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.transformation.library;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
@@ -35,10 +35,11 @@
  org.eclipse.papyrus.robotics.ros2.preferences;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.codegen.common;bundle-version="0.8.0",
  org.eclipse.core.runtime;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.tools;bundle-version="[3.2.0,5.0.0)",
  org.eclipse.emf.transaction;bundle-version="1.9.0",
  org.eclipse.papyrus.robotics.library;bundle-version="0.8.0",
- org.eclipse.papyrus.robotics.ros2.codegen.common;bundle-version="0.8.0"
+ org.eclipse.papyrus.robotics.ros2.codegen.common;bundle-version="0.8.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.8.0.qualifier

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/CppSpecificTransformations.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/CppSpecificTransformations.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/CppSpecificTransformations.java
index 4217ce5..ef978e5 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/CppSpecificTransformations.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/CppSpecificTransformations.java
@@ -17,7 +17,7 @@
 import java.util.List;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess;
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess;
 import org.eclipse.papyrus.robotics.ros2.codegen.common.LangSpecificTransformations;
 import org.eclipse.papyrus.robotics.ros2.codegen.common.component.AbstractCompTransformations;
 import org.eclipse.papyrus.robotics.ros2.codegen.common.message.CreateMsgPackage;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompCMakeLists.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompCMakeLists.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompCMakeLists.xtend
index 425e047..31ad904 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompCMakeLists.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompCMakeLists.xtend
@@ -19,7 +19,7 @@
 import java.util.Collections
 import java.util.List
 import org.eclipse.papyrus.designer.languages.common.base.file.ProtSection
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.papyrus.robotics.codegen.common.component.CodeSkeleton
 import org.eclipse.uml2.uml.Class
 import org.eclipse.uml2.uml.NamedElement

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompPackageXML.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompPackageXML.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompPackageXML.xtend
index 1028ed6..86b84ed 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompPackageXML.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateCompPackageXML.xtend
@@ -17,7 +17,7 @@
 
 import java.util.ArrayList
 import java.util.List
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.papyrus.robotics.ros2.codegen.common.utils.MessageUtils
 import org.eclipse.papyrus.uml.tools.utils.PackageUtil
 import org.eclipse.uml2.uml.Class

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgCMakeLists.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgCMakeLists.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgCMakeLists.xtend
index 43d7c1b..2549c8d 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgCMakeLists.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgCMakeLists.xtend
@@ -14,7 +14,7 @@
  
 package org.eclipse.papyrus.robotics.ros2.codegen.cpp.build
 
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.uml2.uml.Package
 
 import static extension org.eclipse.papyrus.robotics.codegen.common.utils.PackageTools.pkgName

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgPackageXML.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgPackageXML.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgPackageXML.xtend
index e3e9c75..e84ea09 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgPackageXML.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateMsgPkgPackageXML.xtend
@@ -16,7 +16,7 @@
 
 import java.util.ArrayList
 import java.util.List
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.uml2.uml.Package
 
 import static extension org.eclipse.papyrus.robotics.codegen.common.utils.PackageTools.pkgName

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizCMakeLists.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizCMakeLists.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizCMakeLists.xtend
index 16c59c7..48782aa 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizCMakeLists.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizCMakeLists.xtend
@@ -17,7 +17,7 @@
 import java.util.List
 import java.util.Map
 import java.util.Set
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.papyrus.robotics.profile.robotics.skills.SkillDefinition
 import org.eclipse.papyrus.robotics.profile.robotics.skills.SkillSemantic
 import org.eclipse.papyrus.robotics.ros2.codegen.common.utils.SkillRealizBuildUtils

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizPackageXML.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizPackageXML.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizPackageXML.xtend
index 6aa47a7..47e0aa3 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizPackageXML.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/build/CreateSkillRealizPackageXML.xtend
@@ -17,7 +17,7 @@
 import java.util.List
 import java.util.Map
 import java.util.Set
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.papyrus.robotics.profile.robotics.skills.SkillDefinition
 import org.eclipse.papyrus.robotics.profile.robotics.skills.SkillSemantic
 import org.eclipse.papyrus.robotics.ros2.codegen.common.utils.SkillRealizBuildUtils

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ComponentTransformations.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ComponentTransformations.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ComponentTransformations.xtend
index 89e09d2..7c6a664 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ComponentTransformations.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ComponentTransformations.xtend
@@ -21,7 +21,7 @@
 import org.eclipse.papyrus.designer.transformation.base.utils.TransformationException
 import org.eclipse.papyrus.designer.transformation.core.transformations.ExecuteTransformationChain
 import org.eclipse.papyrus.designer.transformation.core.transformations.TransformationContext
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.papyrus.robotics.codegen.common.utils.ApplyProfiles
 import org.eclipse.papyrus.robotics.core.utils.PortUtils
 import org.eclipse.papyrus.robotics.profile.robotics.components.ComponentDefinition
@@ -37,7 +37,7 @@
 
 import static org.eclipse.papyrus.robotics.ros2.codegen.cpp.utils.RosCppTypes.*
 
-import static extension org.eclipse.papyrus.designer.languages.common.base.ElementUtils.varName
+import static extension org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils.varName
 import static extension org.eclipse.papyrus.robotics.codegen.common.utils.ActivityUtils.*
 import static extension org.eclipse.papyrus.robotics.codegen.common.utils.ComponentUtils.isRegistered
 import static extension org.eclipse.papyrus.robotics.core.utils.InteractionUtils.*

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/Constructor.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/Constructor.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/Constructor.xtend
index e2fb43a..ccd2cc9 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/Constructor.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/Constructor.xtend
@@ -34,7 +34,7 @@
 import static extension org.eclipse.papyrus.robotics.ros2.codegen.common.utils.RosHelpers.*
 import static extension org.eclipse.papyrus.robotics.ros2.codegen.common.utils.MessageUtils.*
 import static extension org.eclipse.papyrus.robotics.ros2.codegen.cpp.utils.RosCppTypes.*
-import static extension org.eclipse.papyrus.designer.languages.common.base.ElementUtils.varName
+import static extension org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils.varName
 
 /**
  * Manage constructor creation, including port

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/CreateMain.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/CreateMain.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/CreateMain.xtend
index 384ef3c..fd452bc 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/CreateMain.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/CreateMain.xtend
@@ -14,7 +14,7 @@
 
 package org.eclipse.papyrus.robotics.ros2.codegen.cpp.component
 
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils
 import org.eclipse.papyrus.designer.languages.cpp.profile.C_Cpp.Include
 import org.eclipse.papyrus.designer.languages.cpp.profile.C_Cpp.ManualGeneration
 import org.eclipse.papyrus.robotics.profile.robotics.functions.FunctionKind

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ParameterTransformations.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ParameterTransformations.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ParameterTransformations.xtend
index 203cc93..373dd52 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ParameterTransformations.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/ParameterTransformations.xtend
@@ -14,7 +14,7 @@
 
 package org.eclipse.papyrus.robotics.ros2.codegen.cpp.component
 
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils
+import org.eclipse.papyrus.designer.infra.base.StringUtils
 import org.eclipse.papyrus.robotics.profile.robotics.parameters.ParameterEntry
 import org.eclipse.uml2.uml.Class
 import org.eclipse.uml2.uml.OpaqueBehavior
@@ -22,7 +22,7 @@
 import org.eclipse.uml2.uml.UMLPackage
 import org.eclipse.uml2.uml.util.UMLUtil
 
-import static extension org.eclipse.papyrus.designer.languages.common.base.StringUtils.varName
+import static extension org.eclipse.papyrus.designer.infra.base.StringUtils.varName
 import static extension org.eclipse.papyrus.robotics.core.utils.ParameterUtils.getAllParameters
 import static extension org.eclipse.papyrus.robotics.core.utils.ParameterUtils.getParameterClass
 import static extension org.eclipse.papyrus.robotics.ros2.codegen.cpp.utils.RosCppTypes.*

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/RoboticsCppCreator.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/RoboticsCppCreator.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/RoboticsCppCreator.java
index 9567f1a..a458ffe 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/RoboticsCppCreator.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/component/RoboticsCppCreator.java
@@ -21,7 +21,7 @@
 import org.eclipse.papyrus.designer.transformation.base.utils.TransformationException;
 import org.eclipse.papyrus.designer.transformation.core.transformations.ExecuteTransformationChain;
 import org.eclipse.papyrus.designer.transformation.core.transformations.TransformationContext;
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess;
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess;
 import org.eclipse.papyrus.robotics.codegen.common.component.CodeSkeleton;
 import org.eclipse.papyrus.robotics.ros2.codegen.cpp.utils.ProjectTools;
 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/skillrealization/CreateSkillRealizationCppCode.xtend

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/skillrealization/CreateSkillRealizationCppCode.xtend b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/skillrealization/CreateSkillRealizationCppCode.xtend
index 720c10c..4bff073 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/skillrealization/CreateSkillRealizationCppCode.xtend
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.cpp/src/org/eclipse/papyrus/robotics/ros2/codegen/cpp/skillrealization/CreateSkillRealizationCppCode.xtend
@@ -16,7 +16,7 @@
 
 import java.util.Map
 import org.eclipse.papyrus.designer.transformation.base.utils.TransformationException
-import org.eclipse.papyrus.infra.tools.file.IPFileSystemAccess
+import org.eclipse.papyrus.designer.languages.common.base.file.IPFileSystemAccess
 import org.eclipse.papyrus.robotics.profile.robotics.skills.SkillDefinition
 import org.eclipse.papyrus.robotics.profile.robotics.skills.SkillOperationalState
 import org.eclipse.papyrus.robotics.profile.robotics.skills.SkillSemantic

plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF
index 8b22e5a..856e865 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.codegen.tests/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@
  org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.100",
  org.eclipse.papyrus.designer.languages.cpp.codegen;bundle-version="1.1.0",
  org.eclipse.papyrus.designer.languages.cpp.cdt.project;bundle-version="1.1.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.2.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.2.0",
  org.eclipse.uml2.uml.resources;bundle-version="5.2.0",
  org.eclipse.uml2.uml;bundle-version="5.5.0",
  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.4.0,4.0.0)",
@@ -32,7 +32,8 @@
  org.eclipse.ui;bundle-version="[3.100.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="3.0.0",
  org.eclipse.core.resources;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)"
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0"
 Export-Package: org.eclipse.papyrus.robotics.ros2.codegen.tests
 Bundle-Vendor: %providerName
 Bundle-Version: 0.8.0.qualifier

plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/META-INF/MANIFEST.MF

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/META-INF/MANIFEST.MF b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/META-INF/MANIFEST.MF
index e9e1e54..99891da 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/META-INF/MANIFEST.MF
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
  org.eclipse.uml2.uml;bundle-version="4.0.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.diagrams;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.ros2.base;bundle-version="0.7.0",

plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsLaunchDelegate.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsLaunchDelegate.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsLaunchDelegate.java
index 256f42c..36473df 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsLaunchDelegate.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsLaunchDelegate.java
@@ -30,7 +30,7 @@
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
 import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants;
+import org.eclipse.papyrus.designer.infra.base.StringConstants;
 import org.eclipse.papyrus.robotics.ros2.base.EnvironmentUtils;
 import org.eclipse.papyrus.robotics.ros2.base.Ros2Constants;
 

plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsRunConfigurationTab.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsRunConfigurationTab.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsRunConfigurationTab.java
index ffb2ff4..a949879 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsRunConfigurationTab.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/RoboticsRunConfigurationTab.java
@@ -20,7 +20,7 @@
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants;
+import org.eclipse.papyrus.designer.infra.base.StringConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/lifecycle/LifecycleState.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/lifecycle/LifecycleState.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/lifecycle/LifecycleState.java
index 1ff7395..4a705ca 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/lifecycle/LifecycleState.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/lifecycle/LifecycleState.java
@@ -7,7 +7,7 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants;
+import org.eclipse.papyrus.designer.infra.base.StringConstants;
 import org.eclipse.papyrus.robotics.ros2.base.ProcessUtils;
 import org.eclipse.papyrus.robotics.ros2.base.Ros2Constants;
 import org.eclipse.papyrus.robotics.ros2.base.Ros2ProcessBuilder;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/utils/LaunchUtils.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/utils/LaunchUtils.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/utils/LaunchUtils.java
index f59fe61..98b657e 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/utils/LaunchUtils.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.launch/src/org/eclipse/papyrus/robotics/ros2/launch/utils/LaunchUtils.java
@@ -20,7 +20,7 @@
 
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants;
+import org.eclipse.papyrus.designer.infra.base.StringConstants;
 import org.eclipse.papyrus.robotics.codegen.common.utils.ComponentUtils;
 import org.eclipse.papyrus.robotics.codegen.common.utils.PackageTools;
 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/META-INF/MANIFEST.MF

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/META-INF/MANIFEST.MF b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/META-INF/MANIFEST.MF
index a27046c..ea2d7ab 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/META-INF/MANIFEST.MF
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/META-INF/MANIFEST.MF
@@ -18,13 +18,13 @@
  org.eclipse.papyrus.designer.deployment.tools;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.transformation.vsl;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.deployment.profile;bundle-version="0.7.0",
- org.eclipse.papyrus.designer.ui;bundle-version="1.0.4",
+ org.eclipse.papyrus.designer.infra.ui;bundle-version="1.0.4",
  org.eclipse.papyrus.robotics.profile;bundle-version="0.7.0",
  org.eclipse.papyrus.designer.transformation.library;bundle-version="0.7.0",
  org.eclipse.papyrus.robotics.core;bundle-version="0.7.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.4.0,6.0.0)",
  org.eclipse.papyrus.robotics.library;bundle-version="0.7.0",
- org.eclipse.papyrus.designer.languages.common.base;bundle-version="1.1.0",
+ org.eclipse.papyrus.designer.infra.base;bundle-version="1.1.0",
  org.eclipse.papyrus.uml.tools;bundle-version="[4.3.0,6.0.0)",
  org.eclipse.cdt;bundle-version="9.0.0",
  org.eclipse.cdt.ui;bundle-version="6.0.0",
@@ -38,7 +38,9 @@
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.1.0,5.0.0)",
  org.eclipse.papyrus.infra.core;bundle-version="[3.1.0,5.0.0)",
  org.eclipse.gmf.runtime.notation;bundle-version="1.10.0",
- org.eclipse.papyrus.robotics.ros2.codegen.cpp;bundle-version="0.8.0"
+ org.eclipse.papyrus.robotics.ros2.codegen.cpp;bundle-version="0.8.0",
+ org.eclipse.papyrus.designer.languages.common.base;bundle-version="2.1.0",
+ org.eclipse.papyrus.designer.uml.tools.utils;bundle-version="3.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.8.0.qualifier

plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseNodeFromSource.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseNodeFromSource.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseNodeFromSource.java
index 366a751..fe4b7c4 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseNodeFromSource.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseNodeFromSource.java
@@ -36,7 +36,7 @@
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils;
+import org.eclipse.papyrus.designer.infra.base.StringUtils;
 import org.eclipse.papyrus.designer.languages.cpp.library.CppUriConstants;
 import org.eclipse.papyrus.infra.core.resource.BadArgumentExcetion;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseParametersFromSource.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseParametersFromSource.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseParametersFromSource.java
index 712e7a9..19f2ddd 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseParametersFromSource.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReverseParametersFromSource.java
@@ -39,9 +39,9 @@
 import org.eclipse.cdt.internal.core.model.ASTStringUtil;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
 import org.eclipse.papyrus.designer.languages.common.base.StdUriConstants;
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
+import org.eclipse.papyrus.designer.infra.base.StringUtils;
 import org.eclipse.papyrus.robotics.core.utils.ParameterUtils;
 import org.eclipse.papyrus.robotics.profile.robotics.parameters.ParameterEntry;
 import org.eclipse.papyrus.robotics.ros2.reverse.ParamInfo;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReversePortsFromSource.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReversePortsFromSource.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReversePortsFromSource.java
index 2564ecf..e1c7a17 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReversePortsFromSource.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromfile/ReversePortsFromSource.java
@@ -34,7 +34,7 @@
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateId;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils;
+import org.eclipse.papyrus.designer.infra.base.StringUtils;
 import org.eclipse.papyrus.robotics.ros2.reverse.Activator;
 import org.eclipse.papyrus.robotics.ros2.reverse.PortInfo;
 import org.eclipse.papyrus.robotics.ros2.reverse.PortInfo.PortKind;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseMessages.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseMessages.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseMessages.java
index 72b1b5f..ad2aad0 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseMessages.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseMessages.java
@@ -24,9 +24,9 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants;
+import org.eclipse.papyrus.designer.infra.base.StringConstants;
 import org.eclipse.papyrus.designer.transformation.base.utils.ModelManagement;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.core.utils.FileExtensions;
 import org.eclipse.papyrus.robotics.core.utils.ScanUtils;
 import org.eclipse.papyrus.robotics.library.advice.ActionCommPatternAdvice;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseNodes.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseNodes.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseNodes.java
index ce9cd12..0419e5c 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseNodes.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/fromsys/ReverseNodes.java
@@ -35,10 +35,10 @@
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
-import org.eclipse.papyrus.designer.languages.common.base.StringUtils;
+import org.eclipse.papyrus.designer.infra.base.StringUtils;
 import org.eclipse.papyrus.designer.languages.cpp.library.CppUriConstants;
 import org.eclipse.papyrus.designer.transformation.base.utils.ModelManagement;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.infra.core.resource.BadArgumentExcetion;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ReverseUtils.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ReverseUtils.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ReverseUtils.java
index adf0e96..dbfc19e 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ReverseUtils.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ReverseUtils.java
@@ -26,7 +26,7 @@
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.designer.languages.common.base.StringConstants;
+import org.eclipse.papyrus.designer.infra.base.StringConstants;
 import org.eclipse.papyrus.designer.transformation.base.utils.ModelManagement;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ServiceDefUtils.java

diff --git a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ServiceDefUtils.java b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ServiceDefUtils.java
index a5f8e24..8f0ec09 100644
--- a/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ServiceDefUtils.java
+++ b/plugins/ros2/org.eclipse.papyrus.robotics.ros2.reverse/src/org/eclipse/papyrus/robotics/ros2/reverse/utils/ServiceDefUtils.java
@@ -17,7 +17,7 @@
 import java.util.List;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.designer.languages.common.base.ElementUtils;
+import org.eclipse.papyrus.designer.uml.tools.utils.ElementUtils;
 import org.eclipse.papyrus.robotics.library.advice.ActionCommPatternAdvice;
 import org.eclipse.papyrus.robotics.library.advice.PubSubCommPatternAdvice;
 import org.eclipse.papyrus.robotics.library.advice.QueryCommPatternAdvice;