#162 Update TP to match Capella 6.0.0

- Update TP - Sirius API change adaptation - EMF Diff/Merge API change on IDifferenceCategory (eclipse/org.eclipse.emf.diffmerge.core@0821624#diff-fd27c9cc48996da6837f938e06501ab410bfe57ba2a689b8ab5c16ed841ab663) Change-Id: I0000000000000000000000000000000000000000 Signed-off-by: Arnaud Dieumegard <arnaud.dieumegard@obeo.fr>
eclipse-capella · Jul 21, 2022 · 0bb877b · 0bb877b
1 parent e50d108
commit 0bb877b
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 9 deletions.
diff --git a/...g/polarsys/capella/vp/requirements/design/service/CapellaRequirementsOpenJavaService.java b/...g/polarsys/capella/vp/requirements/design/service/CapellaRequirementsOpenJavaService.java
@@ -30,9 +30,9 @@
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
 import org.eclipse.sirius.diagram.EdgeTarget;
-import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContentLayerHelper;
+import org.eclipse.sirius.diagram.model.business.internal.helper.ContentLayerHelper;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
-import org.eclipse.sirius.diagram.description.Layer;
+import org.eclipse.sirius.diagram.description.Layer; 
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.polarsys.capella.common.mdsofa.common.constant.ICommonConstants;

diff --git a/...olarsys/capella/vp/requirements/importer/transposer/bridge/categories/EClassCategory.java b/...olarsys/capella/vp/requirements/importer/transposer/bridge/categories/EClassCategory.java
@@ -20,6 +20,7 @@
 import org.eclipse.emf.diffmerge.generic.api.Role;
 import org.eclipse.emf.diffmerge.generic.api.diff.IDifference;
 import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
+import org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory;
 import org.eclipse.emf.diffmerge.ui.viewers.categories.AbstractDifferenceCategory;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -120,4 +121,14 @@ public void run() {
     return image[0];
   }
 
+  /**
+   * @see org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory#copy()
+   */
+  @Override
+  public IDifferenceCategory copy() {
+      EClassCategory copied = new EClassCategory(this.iconClazz, this.name, this.clazzes);
+      copied.copyState(this);
+      return copied;
+  }
+
 }
diff --git a/...lla/vp/requirements/importer/transposer/bridge/categories/RelationIdentifierCategory.java b/...lla/vp/requirements/importer/transposer/bridge/categories/RelationIdentifierCategory.java
@@ -16,6 +16,7 @@
 import org.eclipse.emf.diffmerge.diffdata.EMatch;
 import org.eclipse.emf.diffmerge.generic.api.diff.IDifference;
 import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
+import org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory;
 import org.eclipse.emf.diffmerge.ui.viewers.categories.AbstractDifferenceCategory;
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.swt.graphics.Image;
@@ -88,4 +89,14 @@ public String getText(EMFDiffNode node_p) {
     return Messages.Categories_Relation_Identifier;
   }
 
+  /**
+   * @see org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory#copy()
+   */
+  @Override
+  public IDifferenceCategory copy() {
+      RelationIdentifierCategory copied = new RelationIdentifierCategory();
+      copied.copyState(this);
+      return copied;
+  }
+
 }
diff --git a/...rsys/capella/vp/requirements/importer/transposer/bridge/categories/ReqIFTextCategory.java b/...rsys/capella/vp/requirements/importer/transposer/bridge/categories/ReqIFTextCategory.java
@@ -16,6 +16,7 @@
 import org.eclipse.emf.diffmerge.diffdata.EMatch;
 import org.eclipse.emf.diffmerge.generic.api.diff.IDifference;
 import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
+import org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory;
 import org.eclipse.emf.diffmerge.ui.viewers.categories.AbstractDifferenceCategory;
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.swt.graphics.Image;
@@ -88,4 +89,14 @@ public String getText(EMFDiffNode node_p) {
     return Messages.Categories_ReqIFText_Identifier;
   }
 
+  /**
+   * @see org.eclipse.emf.diffmerge.ui.viewers.IDifferenceCategory#copy()
+   */
+  @Override
+  public IDifferenceCategory copy() {
+      ReqIFTextCategory copied = new ReqIFTextCategory();
+      copied.copyState(this);
+      return copied;
+  }
+
 }
diff --git a/...g/org.polarsys.capella.vp.requirements.target/tp/capella.target-definition.targetplatform b/...g/org.polarsys.capella.vp.requirements.target/tp/capella.target-definition.targetplatform
@@ -10,20 +10,20 @@
  *******************************************************************************/
 target "CapellaRequirementsVP"
 
-include "https://download.eclipse.org/capella/core/updates/nightly/5.x/targets/capella.target-definition.targetplatform"
+include "https://download.eclipse.org/capella/core/updates/stable/6.0.0-S20220531-095601/targets/capella.target-definition.targetplatform"
 
 with source, requirements
 
-location "https://download.eclipse.org/capella/core/updates/releases/5.2.0-R20211130-125709/org.polarsys.capella.rcp.site" {
+location "https://download.eclipse.org/capella/core/updates/stable/6.0.0-S20220531-095601/org.polarsys.capella.rcp.site" {
 	org.polarsys.capella.rcp.feature.group
 	org.polarsys.capella.cdo.mock.feature.feature.group
 }
 
-location "https://download.eclipse.org/capella/core/updates/releases/5.2.0-R20211130-125709/org.polarsys.capella.test.site" {
+location "https://download.eclipse.org/capella/core/updates/stable/6.0.0-S20220531-095601/org.polarsys.capella.test.site" {
 	org.polarsys.capella.test.feature.feature.group
 }
 
-location "https://download.eclipse.org/diffmerge/releases/0.13.1/edm-coevolution-site" {
+location "https://download.eclipse.org/diffmerge/stable/0.14.0-S20220629/edm-coevolution-site" {
 	org.eclipse.emf.diffmerge.coevolution.sdk.feature.feature.group
 }
 
@@ -35,14 +35,14 @@ location "https://download.eclipse.org/sphinx/releases/0.8.x" {
 	org.eclipse.sphinx.emf.serialization.feature.group
 }
 
-location "https://download.eclipse.org/modeling/emf/cdo/drops/R20180613-0111/" {
+location "https://download.eclipse.org/modeling/emf/cdo/drops/R20210608-2339/" {
     org.eclipse.emf.cdo.sdk.feature.group
 }
 
-location kitalpha-runtime-core-master "https://download.eclipse.org/kitalpha/updates/release/runtime/5.2.0/" {
+location kitalpha-runtime-core-master "https://download.eclipse.org/kitalpha/updates/stable/runtime/6.0.0.S202205250955/" {
     org.polarsys.kitalpha.doc.gen.business.core.feature.feature.group
 }
 
-location xhtml "https://download.eclipse.org/capella/addons/xhtmldocgen/updates/stable/5.1.0-S202106151504/" {
+location xhtml "https://download.eclipse.org/capella/addons/xhtmldocgen/updates/nightly/master/" {
     org.polarsys.capella.docgen.feature.feature.group
 }