ST6RI-897 Moved redefinition of other defaults to constructors.

seidewitz · seidewitz · commit fdebe52ade84 · 2026-02-03T12:01:25.000-08:00
In subclasses of:
- ExportImpl (isImportAll)
- OperatorImpl (operator)
- RequirementConstraintMembership (kind)
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/CollectExpressionImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/CollectExpressionImpl.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022 Model Driven Solutions, Inc.
+ * Copyright (c) 2022, 2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,8 +17,7 @@
  *  
  * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
  *******************************************************************************/
-/**
- */
+
 package org.omg.sysml.lang.sysml.impl;
 
 import org.eclipse.emf.ecore.EClass;
@@ -35,15 +34,16 @@
  */
 public class CollectExpressionImpl extends OperatorExpressionImpl implements CollectExpression {
 
-	private static final String COLLECT_FUNCTION = "collect";
+	private static final String COLLECT_OPERATOR = "collect";
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	protected CollectExpressionImpl() {
 		super();
+		operator = OPERATOR_EDEFAULT = COLLECT_OPERATOR;
 	}
 
 	/**
@@ -56,9 +56,4 @@ protected EClass eStaticClass() {
 		return SysMLPackage.Literals.COLLECT_EXPRESSION;
 	}
 
-	@Override
-	public String getOperator() {
-		return COLLECT_FUNCTION;
-	}
-
 } //CollectExpressionImpl
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/ExposeImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/ExposeImpl.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2020-2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2020-2021, 2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -53,14 +53,4 @@ protected EClass eStaticClass() {
 		return SysMLPackage.Literals.EXPOSE;
 	}
 	
-	// Additional overrides
-	
-	/**
-	 * @generated NOT
-	 */
-	@Override
-	public boolean isImportAll() {
-		return true;
-	}
-
 } //ExposeImpl
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FeatureChainExpressionImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FeatureChainExpressionImpl.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022-2023 Model Driven Solutions, Inc.
+ * Copyright (c) 2022-2023, 2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -47,7 +47,7 @@
  */
 public class FeatureChainExpressionImpl extends OperatorExpressionImpl implements FeatureChainExpression {
 
-	private static final String FEATURE_CHAIN_FUNCTION = ".";
+	private static final String FEATURE_CHAIN_OPERATOR = ".";
 
 	/**
 	 * The cached setting delegate for the '{@link #getTargetFeature() <em>Target Feature</em>}' reference.
@@ -62,10 +62,11 @@ public class FeatureChainExpressionImpl extends OperatorExpressionImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	protected FeatureChainExpressionImpl() {
 		super();
+		operator = OPERATOR_EDEFAULT = FEATURE_CHAIN_OPERATOR;
 	}
 
 	/**
@@ -78,14 +79,6 @@ protected EClass eStaticClass() {
 		return SysMLPackage.Literals.FEATURE_CHAIN_EXPRESSION;
 	}
 
-	/**
-	 * @generated NOT
-	 */
-	@Override
-	public String getOperator() {
-		return FEATURE_CHAIN_FUNCTION;
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FramedConcernMembershipImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FramedConcernMembershipImpl.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022 Model Driven Solutions, Inc.
+ * Copyright (c) 2022, 2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,8 +17,7 @@
  *  
  * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
  *******************************************************************************/
-/**
- */
+
 package org.omg.sysml.lang.sysml.impl;
 
 import org.eclipse.emf.ecore.EClass;
@@ -66,10 +65,11 @@ public class FramedConcernMembershipImpl extends RequirementConstraintMembership
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	protected FramedConcernMembershipImpl() {
 		super();
+		kind = KIND_EDEFAULT = RequirementConstraintKind.REQUIREMENT;
 	}
 
 	/**
@@ -158,29 +158,6 @@ public boolean isSetReferencedConcern() {
 		return basicGetReferencedConcern() != null;
 	}
 
-	// Additional Overrides
-	
-	/**
-	 * @generated NOT
-	 */
-	@Override
-	public RequirementConstraintKind getKind() {
-		return RequirementConstraintKind.REQUIREMENT;
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * Consider the "kind" property to never be explicitly "set". 
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		return featureID != SysMLPackage.REQUIREMENT_CONSTRAINT_MEMBERSHIP__KIND && eIsSetGen(featureID);
-	}
-	
-	//
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -240,7 +217,7 @@ public void eUnset(int featureID) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean eIsSetGen(int featureID) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 			case SysMLPackage.FRAMED_CONCERN_MEMBERSHIP__OWNED_CONSTRAINT:
 				return isSetOwnedConstraint();
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/ImportImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/ImportImpl.java
@@ -18,8 +18,7 @@
  * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
  *  
  *******************************************************************************/
-/**
- */
+
 package org.omg.sysml.lang.sysml.impl;
 
 import java.lang.reflect.InvocationTargetException;
@@ -105,10 +104,10 @@ public abstract class ImportImpl extends RelationshipImpl implements Import {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #isImportAll()
-	 * @generated
+	 * @generated NOT
 	 * @ordered
 	 */
-	protected static final boolean IS_IMPORT_ALL_EDEFAULT = false;
+	protected boolean IS_IMPORT_ALL_EDEFAULT = false;
 
 	/**
 	 * The cached value of the '{@link #isImportAll() <em>Is Import All</em>}' attribute.
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/IndexExpressionImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/IndexExpressionImpl.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2025 Model Driven Solutions, Inc.
+ * Copyright (c) 2025, 2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,6 +17,7 @@
  *  
  * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
  *******************************************************************************/
+
 package org.omg.sysml.lang.sysml.impl;
 
 import org.eclipse.emf.ecore.EClass;
@@ -33,15 +34,16 @@
  */
 public class IndexExpressionImpl extends OperatorExpressionImpl implements IndexExpression {
 
-	private static final String INDEX_FUNCTION = "#";
+	private static final String INDEX_OPERATOR= "#";
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	protected IndexExpressionImpl() {
 		super();
+		operator = OPERATOR_EDEFAULT = INDEX_OPERATOR;
 	}
 
 	/**
@@ -54,12 +56,4 @@ protected EClass eStaticClass() {
 		return SysMLPackage.Literals.INDEX_EXPRESSION;
 	}
 
-	/**
-	 * @generated NOT
-	 */
-	@Override
-	public String getOperator() {
-		return INDEX_FUNCTION;
-	}
-
 } //IndexExpressionImpl
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/MembershipExposeImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/MembershipExposeImpl.java
@@ -1,5 +1,24 @@
-/**
- */
+/*******************************************************************************
+ * SysML 2 Pilot Implementation
+ * Copyright (c) 2020-2024 Model Driven Solutions, Inc.
+ *    
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *  
+ * You should have received a copy of theGNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *  
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ *  
+ *******************************************************************************/
+
 package org.omg.sysml.lang.sysml.impl;
 
 import org.eclipse.emf.ecore.EClass;
@@ -22,6 +41,7 @@ public class MembershipExposeImpl extends MembershipImportImpl implements Member
 	 */
 	protected MembershipExposeImpl() {
 		super();
+		isImportAll = IS_IMPORT_ALL_EDEFAULT = true;
 	}
 
 	/**
@@ -34,14 +54,4 @@ protected EClass eStaticClass() {
 		return SysMLPackage.Literals.MEMBERSHIP_EXPOSE;
 	}
 
-	// Additional overrides
-	
-	/**
-	 * @generated NOT
-	 */
-	@Override
-	public boolean isImportAll() {
-		return true;
-	}
-
 } //MembershipExposeImpl
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/NamespaceExposeImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/NamespaceExposeImpl.java
@@ -1,5 +1,24 @@
-/**
- */
+/*******************************************************************************
+ * SysML 2 Pilot Implementation
+ * Copyright (c) 2020-2024 Model Driven Solutions, Inc.
+ *    
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *  
+ * You should have received a copy of theGNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *  
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ *  
+ *******************************************************************************/
+
 package org.omg.sysml.lang.sysml.impl;
 
 import org.eclipse.emf.ecore.EClass;
@@ -22,6 +41,7 @@ public class NamespaceExposeImpl extends NamespaceImportImpl implements Namespac
 	 */
 	protected NamespaceExposeImpl() {
 		super();
+		isImportAll = IS_IMPORT_ALL_EDEFAULT = true;
 	}
 
 	/**
@@ -34,14 +54,4 @@ protected EClass eStaticClass() {
 		return SysMLPackage.Literals.NAMESPACE_EXPOSE;
 	}
 
-	// Additional overrides
-	
-	/**
-	 * @generated NOT
-	 */
-	@Override
-	public boolean isImportAll() {
-		return true;
-	}
-
 } //NamespaceExposeImpl
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/OperatorExpressionImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/OperatorExpressionImpl.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2020-2023, 2025 Model Driven Solutions, Inc.
+ * Copyright (c) 2020-2023, 2025, 2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -47,10 +47,10 @@ public class OperatorExpressionImpl extends InvocationExpressionImpl implements
 	 * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getOperator()
-	 * @generated
+	 * @generated NOT
 	 * @ordered
 	 */
-	protected static final String OPERATOR_EDEFAULT = null;
+	protected String OPERATOR_EDEFAULT = null;
 
 	/**
 	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/RequirementConstraintMembershipImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/RequirementConstraintMembershipImpl.java
@@ -59,7 +59,7 @@ public class RequirementConstraintMembershipImpl extends FeatureMembershipImpl i
 	 * @generated NOT
 	 * @ordered
 	 */
-	protected static final RequirementConstraintKind KIND_EDEFAULT = null;
+	protected RequirementConstraintKind KIND_EDEFAULT = null;
 	
 	/**
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/RequirementVerificationMembershipImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/RequirementVerificationMembershipImpl.java
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/SelectExpressionImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/SelectExpressionImpl.java
