eclipse-capella#2893 Add model validation rules from Thales-LAS-Franc…

…e_AMS, all Tests
E2TP-MBSE-Paul · Sep 12, 2024 · 36a7b62 · 36a7b62
1 parent 4a3cc09
commit 36a7b62
Show file tree

Hide file tree

Showing 127 changed files with 11,190 additions and 21 deletions.
diff --git a/...on/src/org/polarsys/capella/core/data/cs/validation/interface_/CE_EIsSameAsItsFEsEIs.java b/...on/src/org/polarsys/capella/core/data/cs/validation/interface_/CE_EIsSameAsItsFEsEIs.java
@@ -28,7 +28,7 @@
 import org.polarsys.capella.core.validation.rule.AbstractValidationRuleOnSystemAnalysis;
 
 /**
- * ATM_CMATS_SA_R39 : The CE EI shall be the union of the EI of the FE allocated to the CE
+ * The CE EI shall be the union of the EI of the FE allocated to the CE
  */
 public class CE_EIsSameAsItsFEsEIs extends AbstractValidationRuleOnSystemAnalysis {
 

diff --git a/.../org/polarsys/capella/core/data/cs/validation/interface_/InterfaceEIsSameAsItsCEsEIs.java b/.../org/polarsys/capella/core/data/cs/validation/interface_/InterfaceEIsSameAsItsCEsEIs.java
@@ -28,7 +28,7 @@
 import org.polarsys.capella.core.validation.rule.AbstractValidationRuleOnSystemAnalysis;
 
 /**
- * ATM_CMATS_SA_R39 : The interface EI shall be identical at SA to the CE EI allocated.
+ * The interface EI shall be identical at SA to the CE EI allocated.
  */
 public class InterfaceEIsSameAsItsCEsEIs extends AbstractValidationRuleOnSystemAnalysis {
 

diff --git a/.../src/org/polarsys/capella/core/data/ctx/validation/systemFunction/DSC_SystemFunction.java b/.../src/org/polarsys/capella/core/data/ctx/validation/systemFunction/DSC_SystemFunction.java
@@ -13,18 +13,11 @@
  *******************************************************************************/
 package org.polarsys.capella.core.data.ctx.validation.systemFunction;
 
-import org.eclipse.emf.ecore.EObject;
 import org.polarsys.capella.core.validation.rule.AbstractDescriptionCheckingRule;
-import org.polarsys.capella.core.validation.rule.AbstractValidationRuleOnSystemAnalysis;
 
 /**
  * Functions should have a description
  */
 public class DSC_SystemFunction extends AbstractDescriptionCheckingRule {
-
-  @Override
-  protected boolean isApplicable(final EObject eObj) {
-    return AbstractValidationRuleOnSystemAnalysis.belongsToSA(eObj);
-  }
-
+  // Empty class, needed for reference in the plugin definition.
 }
diff --git a/...src/org/polarsys/capella/core/data/ctx/validation/systemFunction/FunctionNameUnicity.java b/...src/org/polarsys/capella/core/data/ctx/validation/systemFunction/FunctionNameUnicity.java
@@ -18,7 +18,7 @@
 import org.polarsys.capella.core.validation.rule.AbstractNameUnicity;
 
 /**
- * Functional Chains shall start from an End User and finish with an End User
+ * Function name shall be unique
  */
 public class FunctionNameUnicity extends AbstractNameUnicity {
 

diff --git a/core/plugins/org.polarsys.capella.core.data.fa.validation/plugin.xml b/core/plugins/org.polarsys.capella.core.data.fa.validation/plugin.xml
@@ -1205,7 +1205,7 @@ ComponentExchangeFunctionalExchangeAllocation ComponentExchange and FunctionalEx
             <constraint
                   class="org.polarsys.capella.core.data.fa.validation.functionalChain.FunctionalChainInvolvesLeafFunctions"
                   id="FCH_1"
-                  isEnabledByDefault="true"
+                  isEnabledByDefault="false"
                   lang="Java"
                   mode="Batch"
                   name="FCH_1 - FunctionalChain involves leaf functions"

diff --git a/...validation/src/org/polarsys/capella/core/data/fa/validation/ce/CE_EIsSameAsItsFEsEIs.java b/...validation/src/org/polarsys/capella/core/data/fa/validation/ce/CE_EIsSameAsItsFEsEIs.java
@@ -28,7 +28,7 @@
 import org.polarsys.capella.core.validation.rule.AbstractValidationRuleOnSystemAnalysis;
 
 /**
- * ATM_CMATS_SA_R39 : The CE EI shall be the union of the EI of the FE allocated to the CE
+ * The CE EI shall be the union of the EI of the FE allocated to the CE
  */
 public class CE_EIsSameAsItsFEsEIs extends AbstractValidationRuleOnSystemAnalysis {
 

diff --git a/core/plugins/org.polarsys.capella.core.data.information.validation/plugin.xml b/core/plugins/org.polarsys.capella.core.data.information.validation/plugin.xml
@@ -604,7 +604,7 @@ If an Association is on SystemArchitecture layer. It should not associate with a
                </target>
             </constraint>
             <constraint
-                  class="org.polarsys.capella.core.data.information.validation.exchangeitem.CNC_ExchangeItem_Interface"
+                  class="org.polarsys.capella.core.data.information.validation.exchangeItemAllocation.CNC_ExchangeItem_Interface"
                   id="NC_1-2"
                   isEnabledByDefault="false"
                   lang="Java"

diff --git a/...tion/src/org/polarsys/capella/core/data/information/validation/dataType/SUM_DataType.java b/...tion/src/org/polarsys/capella/core/data/information/validation/dataType/SUM_DataType.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2024 THALES GLOBAL SERVICES.
+ * Copyright (c) 2013, 2024 Thales LAS France SA.
+ * Copyright (c) 2024, 2024 THALES GLOBAL SERVICES.
  * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

diff --git a/...hangeitem/CNC_ExchangeItem_Interface.java → ...llocation/CNC_ExchangeItem_Interface.java b/...hangeitem/CNC_ExchangeItem_Interface.java → ...llocation/CNC_ExchangeItem_Interface.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2024 THALES GLOBAL SERVICES.
+ * Copyright (c) 2013, 2024 Thales LAS France SA.
+ * Copyright (c) 2024, 2024 THALES GLOBAL SERVICES.
  * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -10,7 +11,7 @@
  * Contributors:
  *    Thales - initial API and implementation
  *******************************************************************************/
-package org.polarsys.capella.core.data.information.validation.exchangeitem;
+package org.polarsys.capella.core.data.information.validation.exchangeItemAllocation;
 
 import org.eclipse.emf.ecore.EObject;
 

diff --git a/.../org/polarsys/capella/core/data/information/validation/exchangeitem/DSC_ExchangeItem.java b/.../org/polarsys/capella/core/data/information/validation/exchangeitem/DSC_ExchangeItem.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2024 THALES GLOBAL SERVICES.
+ * Copyright (c) 2013, 2024 Thales LAS France SA.
+ * Copyright (c) 2024, 2024 THALES GLOBAL SERVICES.
  * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

diff --git a/.../org/polarsys/capella/core/data/information/validation/exchangeitem/SUM_ExchangeItem.java b/.../org/polarsys/capella/core/data/information/validation/exchangeitem/SUM_ExchangeItem.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2024 THALES GLOBAL SERVICES.
+ * Copyright (c) 2013, 2024 Thales LAS France SA.
+ * Copyright (c) 2024, 2024 THALES GLOBAL SERVICES.
  * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

diff --git a/...g/polarsys/capella/core/data/information/validation/property/CNC_Property_TargetType.java b/...g/polarsys/capella/core/data/information/validation/property/CNC_Property_TargetType.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2024 THALES GLOBAL SERVICES.
+ * Copyright (c) 2013, 2024 Thales LAS France SA.
+ * Copyright (c) 2024, 2024 THALES GLOBAL SERVICES.
  * 
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

diff --git a/tests/plugins/org.polarsys.capella.test.validation.rules.ju/model/FC_1/.project b/tests/plugins/org.polarsys.capella.test.validation.rules.ju/model/FC_1/.project
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>FC_1</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.polarsys.capella.project.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/...ys.capella.test.validation.rules.ju/model/FC_1/.settings/org.eclipse.core.resources.prefs b/...ys.capella.test.validation.rules.ju/model/FC_1/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/plugins/org.polarsys.capella.test.validation.rules.ju/model/FC_1/FC_1.afm b/tests/plugins/org.polarsys.capella.test.validation.rules.ju/model/FC_1/FC_1.afm
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_oWdjMHAbEe-RlJsp6BGYuQ">
+  <viewpointReferences id="_oXpO8HAbEe-RlJsp6BGYuQ" vpId="org.polarsys.capella.core.viewpoint" version="7.0.0"/>
+</metadata:Metadata>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8