Skip to content

Commit 2c7a2a9

Browse files
seidewitzseidewitz
committed
ST6RI-912 Removed isNonunique from Feature
- Removed Feature_isNonunique_SettingDelegate. - Updated CustomUML2EcoreImporter to not add isNonunique.
1 parent d493365 commit 2c7a2a9

10 files changed

Lines changed: 86 additions & 1021 deletions

File tree

‎org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/FeatureItemProvider.java‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,16 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
4646
if (itemPropertyDescriptors == null) {
4747
super.getPropertyDescriptors(object);
4848

49+
addOwningFeatureMembershipPropertyDescriptor(object);
4950
addOwningTypePropertyDescriptor(object);
51+
addEndOwningTypePropertyDescriptor(object);
5052
addIsUniquePropertyDescriptor(object);
5153
addIsOrderedPropertyDescriptor(object);
5254
addTypePropertyDescriptor(object);
5355
addOwnedRedefinitionPropertyDescriptor(object);
5456
addOwnedSubsettingPropertyDescriptor(object);
5557
addIsCompositePropertyDescriptor(object);
5658
addIsEndPropertyDescriptor(object);
57-
addEndOwningTypePropertyDescriptor(object);
5859
addOwnedTypingPropertyDescriptor(object);
5960
addFeaturingTypePropertyDescriptor(object);
6061
addOwnedTypeFeaturingPropertyDescriptor(object);
@@ -70,8 +71,6 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
7071
addCrossFeaturePropertyDescriptor(object);
7172
addDirectionPropertyDescriptor(object);
7273
addOwnedCrossSubsettingPropertyDescriptor(object);
73-
addOwningFeatureMembershipPropertyDescriptor(object);
74-
addIsNonuniquePropertyDescriptor(object);
7574
}
7675
return itemPropertyDescriptors;
7776
}
@@ -626,28 +625,6 @@ protected void addFeatureTargetPropertyDescriptor(Object object) {
626625
null));
627626
}
628627

629-
/**
630-
* This adds a property descriptor for the Is Nonunique feature.
631-
* <!-- begin-user-doc -->
632-
* <!-- end-user-doc -->
633-
* @generated
634-
*/
635-
protected void addIsNonuniquePropertyDescriptor(Object object) {
636-
itemPropertyDescriptors.add
637-
(createItemPropertyDescriptor
638-
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
639-
getResourceLocator(),
640-
getString("_UI_Feature_isNonunique_feature"),
641-
getString("_UI_PropertyDescriptor_description", "_UI_Feature_isNonunique_feature", "_UI_Feature_type"),
642-
SysMLPackage.Literals.FEATURE__IS_NONUNIQUE,
643-
true,
644-
false,
645-
false,
646-
ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
647-
null,
648-
null));
649-
}
650-
651628
/**
652629
* This returns Feature.gif.
653630
* <!-- begin-user-doc -->
@@ -698,7 +675,6 @@ public void notifyChanged(Notification notification) {
698675
case SysMLPackage.FEATURE__IS_VARIABLE:
699676
case SysMLPackage.FEATURE__IS_CONSTANT:
700677
case SysMLPackage.FEATURE__DIRECTION:
701-
case SysMLPackage.FEATURE__IS_NONUNIQUE:
702678
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
703679
return;
704680
}
@@ -748,14 +724,14 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col
748724
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
749725
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
750726
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
751-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
752-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
753-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
754727
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||
755728
childFeature == SysMLPackage.Literals.TYPE__OWNED_INTERSECTING ||
756729
childFeature == SysMLPackage.Literals.TYPE__OWNED_UNIONING ||
757730
childFeature == SysMLPackage.Literals.TYPE__OWNED_DISJOINING ||
758731
childFeature == SysMLPackage.Literals.TYPE__OWNED_DIFFERENCING ||
732+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
733+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
734+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
759735
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_IMPORT;
760736

761737
if (qualify) {

‎org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/SysMLItemProviderAdapterFactory.java‎

Lines changed: 79 additions & 79 deletions
Large diffs are not rendered by default.

‎org.omg.sysml.uml.ecore.importer/src/org/omg/sysml/uml/ecore/importer/CustomUML2EcoreConverter.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,7 @@ private void customConvert(DiagnosticChain diagnostics) {
5858
} else if (element instanceof org.eclipse.uml2.uml.Class && modelElement instanceof EClass) {
5959
String name = ((org.eclipse.uml2.uml.Class)element).getName();
6060
EClass eClass = (EClass)modelElement;
61-
if ("Feature".equals(name)) {
62-
// Add the "isNonunique" attribute as the effective logical inverse of "isUnique".
63-
EClassifier booleanType = eClass.getEStructuralFeature("isUnique").getEType();
64-
EAttribute isNonUniqueAttribute = EcoreFactory.eINSTANCE.createEAttribute();
65-
addStructuralFeature(eClass, isNonUniqueAttribute, "isNonunique", booleanType, 1, 1, "false", false);
66-
addSysMLAnnotation("Feature::isNonUnique", isNonUniqueAttribute);
67-
} else if ("InvocationExpression".equals(name)) {
61+
if ("InvocationExpression".equals(name)) {
6862
// Add the "operand" reference as a workaround for parsing operator expression arguments.
6963
EClassifier expressionClass = eClass.getEStructuralFeature("argument").getEType();
7064
EReference operandReference = EcoreFactory.eINSTANCE.createEReference();

‎org.omg.sysml/model/SysML.ecore‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -443,11 +443,6 @@
443443
<eAnnotations source="subsets" references="#//Feature/ownedSubsetting"/>
444444
<eAnnotations source="http://www.omg.org/spec/SysML"/>
445445
</eStructuralFeatures>
446-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isNonunique" ordered="false"
447-
lowerBound="1" eType="ecore:EDataType types.ecore#//Boolean" volatile="true"
448-
transient="true" defaultValueLiteral="false" derived="true">
449-
<eAnnotations source="http://www.omg.org/spec/SysML"/>
450-
</eStructuralFeatures>
451446
</eClassifiers>
452447
<eClassifiers xsi:type="ecore:EClass" name="Type" eSuperTypes="#//Namespace">
453448
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

‎org.omg.sysml/model/SysML.genmodel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@
144144
<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute SysML.ecore#//Feature/direction"/>
145145
<genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
146146
propertySortChoices="true" ecoreFeature="ecore:EReference SysML.ecore#//Feature/ownedCrossSubsetting"/>
147-
<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute SysML.ecore#//Feature/isNonunique"/>
148147
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="SysML.ecore#//Feature/directionFor">
149148
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="SysML.ecore#//Feature/directionFor/type"/>
150149
</genOperations>

‎org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_isNonunique_SettingDelegate.java‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/Feature.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@
250250
* <li>{@link org.omg.sysml.lang.sysml.Feature#getCrossFeature <em>Cross Feature</em>}</li>
251251
* <li>{@link org.omg.sysml.lang.sysml.Feature#getDirection <em>Direction</em>}</li>
252252
* <li>{@link org.omg.sysml.lang.sysml.Feature#getOwnedCrossSubsetting <em>Owned Cross Subsetting</em>}</li>
253-
* <li>{@link org.omg.sysml.lang.sysml.Feature#isNonunique <em>Is Nonunique</em>}</li>
254253
* </ul>
255254
*
256255
* @see org.omg.sysml.lang.sysml.SysMLPackage#getFeature()
@@ -936,34 +935,6 @@ public interface Feature extends Type {
936935
*/
937936
void setOwnedCrossSubsetting(CrossSubsetting value);
938937

939-
/**
940-
* Returns the value of the '<em><b>Is Nonunique</b></em>' attribute.
941-
* The default value is <code>"false"</code>.
942-
* <!-- begin-user-doc -->
943-
* <p>
944-
* If the meaning of the '<em>Is Nonunique</em>' attribute isn't clear,
945-
* there really should be more of a description here...
946-
* </p>
947-
* <!-- end-user-doc -->
948-
* @return the value of the '<em>Is Nonunique</em>' attribute.
949-
* @see #setIsNonunique(boolean)
950-
* @see org.omg.sysml.lang.sysml.SysMLPackage#getFeature_IsNonunique()
951-
* @model default="false" dataType="org.omg.sysml.lang.types.Boolean" required="true" transient="true" volatile="true" derived="true" ordered="false"
952-
* annotation="http://www.omg.org/spec/SysML"
953-
* @generated
954-
*/
955-
boolean isNonunique();
956-
957-
/**
958-
* Sets the value of the '{@link org.omg.sysml.lang.sysml.Feature#isNonunique <em>Is Nonunique</em>}' attribute.
959-
* <!-- begin-user-doc -->
960-
* <!-- end-user-doc -->
961-
* @param value the new value of the '<em>Is Nonunique</em>' attribute.
962-
* @see #isNonunique()
963-
* @generated
964-
*/
965-
void setIsNonunique(boolean value);
966-
967938
/**
968939
* <!-- begin-user-doc -->
969940
* <!-- end-user-doc -->

0 commit comments

Comments
 (0)