avoid duplicated name error on Xsmp Documents

ThalesGroup · Apr 15, 2024 · 3f0aab5 · 3f0aab5
1 parent 7110dc2
commit 3f0aab5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/org.eclipse.xsmp/src/org/eclipse/xsmp/validation/SmpNamesAreUniqueValidationHelper.java b/org.eclipse.xsmp/src/org/eclipse/xsmp/validation/SmpNamesAreUniqueValidationHelper.java
@@ -12,7 +12,7 @@
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.xsmp.model.xsmp.Catalogue;
+import org.eclipse.xsmp.model.xsmp.Document;
 import org.eclipse.xsmp.model.xsmp.Namespace;
 import org.eclipse.xsmp.model.xsmp.Operation;
 import org.eclipse.xsmp.model.xsmp.Parameter;
@@ -45,9 +45,9 @@ protected boolean isDuplicate(IEObjectDescription description, IEObjectDescripti
     final var first = description.getEObjectOrProxy();
     final var second = candidate.getEObjectOrProxy();
 
-    if (first instanceof Catalogue || second instanceof Catalogue)
+    if (first instanceof Document || second instanceof Document)
     {
-      result = first instanceof Catalogue && second instanceof Catalogue;
+      result = first.eClass().equals(second.eClass());
     }
     // 2 namespaces can have the same name except if they are in the same catalogue
     else if (first instanceof Namespace && second instanceof Namespace)

diff --git a/vscode-extension/src/wizard.ts b/vscode-extension/src/wizard.ts
@@ -55,7 +55,6 @@ export async function createProjectWizard() {
     const profiles = [
         { id: xsmpSdkProfileId, label: "XSMP-SDK Profile" },
         { id: esaCdkProfileId, label: "ESA-CDK Profile" },
-        { id: esaCdkLegacyProfileId, label: "ESA-CDK Legacy Profile (Preview)" }
     ];
 
     const profile = await vscode.window.showQuickPick(profiles, {