diff --git a/backend/application/pom.xml b/backend/application/pom.xml new file mode 100644 index 0000000..326296f --- /dev/null +++ b/backend/application/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + org.eclipse.syson + syson-application-parent + 2023.10.8 + + syson-application-parent + SysON Application Parent + pom + + + syson-application + syson-application-configuration + + diff --git a/backend/application/syson-application-configuration/.checkstyle b/backend/application/syson-application-configuration/.checkstyle index b2201ea..24e98b3 100644 --- a/backend/application/syson-application-configuration/.checkstyle +++ b/backend/application/syson-application-configuration/.checkstyle @@ -1,8 +1,16 @@ - - + + + + + + + + + + diff --git a/backend/application/syson-application-configuration/pom.xml b/backend/application/syson-application-configuration/pom.xml index f25f241..a4fb2db 100644 --- a/backend/application/syson-application-configuration/pom.xml +++ b/backend/application/syson-application-configuration/pom.xml @@ -74,6 +74,11 @@ sirius-components-widget-reference-view-edit ${sirius.web.version} + + org.eclipse.sirius + sirius-components-collaborative-widget-reference + ${sirius.web.version} + org.eclipse.sirius sirius-web-services diff --git a/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/configuration/SysMLv2PropertiesConfigurer.java b/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/configuration/SysMLv2PropertiesConfigurer.java index ca4fe17..001b28f 100644 --- a/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/configuration/SysMLv2PropertiesConfigurer.java +++ b/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/configuration/SysMLv2PropertiesConfigurer.java @@ -294,8 +294,12 @@ private WidgetDescription createReferenceWidget() { ReferenceWidgetDescription refWidget = ReferenceFactory.eINSTANCE.createReferenceWidgetDescription(); refWidget.setName("ReferenceWidget"); refWidget.setLabelExpression("aql:self.getDetailsViewLabel(eStructuralFeature)"); - refWidget.setReferenceNameExpression("aql:eStructuralFeature"); + refWidget.setReferenceNameExpression("aql:eStructuralFeature.name"); + refWidget.setReferenceOwnerExpression("aql:self"); refWidget.setIsEnabledExpression("aql:not(eStructuralFeature.isReadOnly())"); + ChangeContext setNewValueOperation = ViewFactory.eINSTANCE.createChangeContext(); + setNewValueOperation.setExpression("aql:self.setNewValue(eStructuralFeature, " + ViewFormDescriptionConverter.NEW_VALUE + ")"); + refWidget.getBody().add(setNewValueOperation); return refWidget; } } diff --git a/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/services/DetailsViewService.java b/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/services/DetailsViewService.java index 8e665d9..fae2fc4 100644 --- a/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/services/DetailsViewService.java +++ b/backend/application/syson-application-configuration/src/main/java/org/eclipse/syson/application/services/DetailsViewService.java @@ -146,6 +146,6 @@ public EEnumLiteral getEnumValue(Element element, EAttribute eAttribute) { } public boolean isReference(EStructuralFeature eStructuralFeature) { - return eStructuralFeature instanceof EReference eReference && !eReference.isContainment() && eReference.isChangeable(); + return eStructuralFeature instanceof EReference eReference && !eReference.isContainment() && !eReference.isContainer() && eReference.isChangeable(); } } diff --git a/backend/application/syson-application/.checkstyle b/backend/application/syson-application/.checkstyle index b2201ea..84ad855 100644 --- a/backend/application/syson-application/.checkstyle +++ b/backend/application/syson-application/.checkstyle @@ -1,8 +1,16 @@ - - + + + + + + + + + + diff --git a/backend/metamodel/pom.xml b/backend/metamodel/pom.xml new file mode 100644 index 0000000..48cfede --- /dev/null +++ b/backend/metamodel/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + org.eclipse.syson + syson-metamodel-parent + 2023.10.8 + + syson-metamodel-parent + SysON Metamodel Parent + pom + + + syson-sysml-metamodel + syson-sysml-metamodel-edit + + diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationDefinitionItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationDefinitionItemProvider.java index 86c3d54..3bfd17b 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationDefinitionItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationDefinitionItemProvider.java @@ -55,8 +55,8 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addExpressionPropertyDescriptor(object); addIsModelLevelEvaluablePropertyDescriptor(object); + addExpressionPropertyDescriptor(object); addResultPropertyDescriptor(object); addCalculationPropertyDescriptor(object); } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationUsageItemProvider.java index aca6580..8db9b58 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationUsageItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationUsageItemProvider.java @@ -55,8 +55,8 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addFunctionPropertyDescriptor(object); addIsModelLevelEvaluablePropertyDescriptor(object); + addFunctionPropertyDescriptor(object); addResultPropertyDescriptor(object); addCalculationDefinitionPropertyDescriptor(object); } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectionUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectionUsageItemProvider.java index 99f7800..0c3b92e 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectionUsageItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectionUsageItemProvider.java @@ -55,10 +55,10 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addIndividualDefinitionPropertyDescriptor(object); addIsIndividualPropertyDescriptor(object); - addOccurrenceDefinitionPropertyDescriptor(object); addPortionKindPropertyDescriptor(object); + addIndividualDefinitionPropertyDescriptor(object); + addOccurrenceDefinitionPropertyDescriptor(object); addItemDefinitionPropertyDescriptor(object); addPartDefinitionPropertyDescriptor(object); addConnectionDefinitionPropertyDescriptor(object); diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java index 1eb410e..dd2acac 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java @@ -62,9 +62,9 @@ public List getPropertyDescriptors(Object object) { addRelatedElementPropertyDescriptor(object); addSourcePropertyDescriptor(object); addTargetPropertyDescriptor(object); + addIsDirectedPropertyDescriptor(object); addAssociationPropertyDescriptor(object); addConnectorEndPropertyDescriptor(object); - addIsDirectedPropertyDescriptor(object); addRelatedFeaturePropertyDescriptor(object); addSourceFeaturePropertyDescriptor(object); addTargetFeaturePropertyDescriptor(object); diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java index 47ab89c..c77a47b 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java @@ -62,9 +62,9 @@ public List getPropertyDescriptors(Object object) { addRelatedElementPropertyDescriptor(object); addSourcePropertyDescriptor(object); addTargetPropertyDescriptor(object); + addIsDirectedPropertyDescriptor(object); addAssociationPropertyDescriptor(object); addConnectorEndPropertyDescriptor(object); - addIsDirectedPropertyDescriptor(object); addRelatedFeaturePropertyDescriptor(object); addSourceFeaturePropertyDescriptor(object); addTargetFeaturePropertyDescriptor(object); diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintDefinitionItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintDefinitionItemProvider.java index 453218a..12710df 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintDefinitionItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintDefinitionItemProvider.java @@ -57,8 +57,8 @@ public List getPropertyDescriptors(Object object) { addParameterPropertyDescriptor(object); addStepPropertyDescriptor(object); - addExpressionPropertyDescriptor(object); addIsModelLevelEvaluablePropertyDescriptor(object); + addExpressionPropertyDescriptor(object); addResultPropertyDescriptor(object); } return itemPropertyDescriptors; diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintUsageItemProvider.java index bbaa158..de27a38 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintUsageItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintUsageItemProvider.java @@ -57,8 +57,8 @@ public List getPropertyDescriptors(Object object) { addBehaviorPropertyDescriptor(object); addParameterPropertyDescriptor(object); - addFunctionPropertyDescriptor(object); addIsModelLevelEvaluablePropertyDescriptor(object); + addFunctionPropertyDescriptor(object); addResultPropertyDescriptor(object); addPredicatePropertyDescriptor(object); addConstraintDefinitionPropertyDescriptor(object); diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/DefinitionItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/DefinitionItemProvider.java index 9808f3a..6bfbbdf 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/DefinitionItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/DefinitionItemProvider.java @@ -55,8 +55,8 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addDirectedUsagePropertyDescriptor(object); addIsVariationPropertyDescriptor(object); + addDirectedUsagePropertyDescriptor(object); addOwnedActionPropertyDescriptor(object); addOwnedAllocationPropertyDescriptor(object); addOwnedAnalysisCasePropertyDescriptor(object); diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ElementItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ElementItemProvider.java index 2f66cf8..300bf9f 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ElementItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ElementItemProvider.java @@ -77,18 +77,18 @@ public List getPropertyDescriptors(Object object) { addAliasIdsPropertyDescriptor(object); addDeclaredNamePropertyDescriptor(object); addDeclaredShortNamePropertyDescriptor(object); - addDocumentationPropertyDescriptor(object); addElementIdPropertyDescriptor(object); addIsImpliedIncludedPropertyDescriptor(object); addIsLibraryElementPropertyDescriptor(object); addNamePropertyDescriptor(object); + addQualifiedNamePropertyDescriptor(object); + addShortNamePropertyDescriptor(object); + addDocumentationPropertyDescriptor(object); addOwnedAnnotationPropertyDescriptor(object); addOwnedElementPropertyDescriptor(object); addOwnerPropertyDescriptor(object); addOwningMembershipPropertyDescriptor(object); addOwningNamespacePropertyDescriptor(object); - addQualifiedNamePropertyDescriptor(object); - addShortNamePropertyDescriptor(object); addTextualRepresentationPropertyDescriptor(object); } return itemPropertyDescriptors; diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ExpressionItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ExpressionItemProvider.java index 58578cf..8f1631b 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ExpressionItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ExpressionItemProvider.java @@ -55,8 +55,8 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addFunctionPropertyDescriptor(object); addIsModelLevelEvaluablePropertyDescriptor(object); + addFunctionPropertyDescriptor(object); addResultPropertyDescriptor(object); } return itemPropertyDescriptors; diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureItemProvider.java index 916b5ea..8261f9f 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureItemProvider.java @@ -55,10 +55,7 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addChainingFeaturePropertyDescriptor(object); addDirectionPropertyDescriptor(object); - addEndOwningTypePropertyDescriptor(object); - addFeaturingTypePropertyDescriptor(object); addIsCompositePropertyDescriptor(object); addIsDerivedPropertyDescriptor(object); addIsEndPropertyDescriptor(object); @@ -67,6 +64,9 @@ public List getPropertyDescriptors(Object object) { addIsPortionPropertyDescriptor(object); addIsReadOnlyPropertyDescriptor(object); addIsUniquePropertyDescriptor(object); + addChainingFeaturePropertyDescriptor(object); + addEndOwningTypePropertyDescriptor(object); + addFeaturingTypePropertyDescriptor(object); addOwnedFeatureChainingPropertyDescriptor(object); addOwnedFeatureInvertingPropertyDescriptor(object); addOwnedRedefinitionPropertyDescriptor(object); diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureValueItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureValueItemProvider.java index 52c4945..21a1d99 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureValueItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureValueItemProvider.java @@ -55,9 +55,9 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addFeatureWithValuePropertyDescriptor(object); addIsDefaultPropertyDescriptor(object); addIsInitialPropertyDescriptor(object); + addFeatureWithValuePropertyDescriptor(object); addValuePropertyDescriptor(object); } return itemPropertyDescriptors; diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FunctionItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FunctionItemProvider.java index e00f6ae..bc08261 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FunctionItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FunctionItemProvider.java @@ -55,8 +55,8 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addExpressionPropertyDescriptor(object); addIsModelLevelEvaluablePropertyDescriptor(object); + addExpressionPropertyDescriptor(object); addResultPropertyDescriptor(object); } return itemPropertyDescriptors; diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ImportItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ImportItemProvider.java index 4301274..45b5813 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ImportItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ImportItemProvider.java @@ -55,11 +55,11 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addImportedElementPropertyDescriptor(object); - addImportOwningNamespacePropertyDescriptor(object); addIsImportAllPropertyDescriptor(object); addIsRecursivePropertyDescriptor(object); addVisibilityPropertyDescriptor(object); + addImportedElementPropertyDescriptor(object); + addImportOwningNamespacePropertyDescriptor(object); } return itemPropertyDescriptors; } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MembershipItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MembershipItemProvider.java index 4cd07bf..13439aa 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MembershipItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MembershipItemProvider.java @@ -55,12 +55,12 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addMemberElementPropertyDescriptor(object); addMemberElementIdPropertyDescriptor(object); addMemberNamePropertyDescriptor(object); - addMembershipOwningNamespacePropertyDescriptor(object); addMemberShortNamePropertyDescriptor(object); addVisibilityPropertyDescriptor(object); + addMemberElementPropertyDescriptor(object); + addMembershipOwningNamespacePropertyDescriptor(object); } return itemPropertyDescriptors; } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OccurrenceUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OccurrenceUsageItemProvider.java index fb5c2bd..76d5ba7 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OccurrenceUsageItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OccurrenceUsageItemProvider.java @@ -55,10 +55,10 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addIndividualDefinitionPropertyDescriptor(object); addIsIndividualPropertyDescriptor(object); - addOccurrenceDefinitionPropertyDescriptor(object); addPortionKindPropertyDescriptor(object); + addIndividualDefinitionPropertyDescriptor(object); + addOccurrenceDefinitionPropertyDescriptor(object); } return itemPropertyDescriptors; } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OwningMembershipItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OwningMembershipItemProvider.java index b7e3f03..2fa82fa 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OwningMembershipItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/OwningMembershipItemProvider.java @@ -55,10 +55,10 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addOwnedMemberElementPropertyDescriptor(object); addOwnedMemberElementIdPropertyDescriptor(object); addOwnedMemberNamePropertyDescriptor(object); addOwnedMemberShortNamePropertyDescriptor(object); + addOwnedMemberElementPropertyDescriptor(object); } return itemPropertyDescriptors; } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementDefinitionItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementDefinitionItemProvider.java index acc4215..a0ecb4c 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementDefinitionItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementDefinitionItemProvider.java @@ -55,14 +55,14 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); + addReqIdPropertyDescriptor(object); + addTextPropertyDescriptor(object); addActorParameterPropertyDescriptor(object); addAssumedConstraintPropertyDescriptor(object); addFramedConcernPropertyDescriptor(object); - addReqIdPropertyDescriptor(object); addRequiredConstraintPropertyDescriptor(object); addStakeholderParameterPropertyDescriptor(object); addSubjectParameterPropertyDescriptor(object); - addTextPropertyDescriptor(object); } return itemPropertyDescriptors; } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementUsageItemProvider.java index 2e9c311..b2fed93 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementUsageItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementUsageItemProvider.java @@ -55,15 +55,15 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); + addReqIdPropertyDescriptor(object); + addTextPropertyDescriptor(object); addActorParameterPropertyDescriptor(object); addAssumedConstraintPropertyDescriptor(object); addFramedConcernPropertyDescriptor(object); - addReqIdPropertyDescriptor(object); addRequiredConstraintPropertyDescriptor(object); addRequirementDefinitionPropertyDescriptor(object); addStakeholderParameterPropertyDescriptor(object); addSubjectParameterPropertyDescriptor(object); - addTextPropertyDescriptor(object); } return itemPropertyDescriptors; } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateDefinitionItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateDefinitionItemProvider.java index d69fb4d..560bd38 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateDefinitionItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateDefinitionItemProvider.java @@ -55,10 +55,10 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); + addIsParallelPropertyDescriptor(object); addDoActionPropertyDescriptor(object); addEntryActionPropertyDescriptor(object); addExitActionPropertyDescriptor(object); - addIsParallelPropertyDescriptor(object); addStatePropertyDescriptor(object); } return itemPropertyDescriptors; diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateSubactionMembershipItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateSubactionMembershipItemProvider.java index a1d4236..59a57c5 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateSubactionMembershipItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateSubactionMembershipItemProvider.java @@ -55,8 +55,8 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addActionPropertyDescriptor(object); addKindPropertyDescriptor(object); + addActionPropertyDescriptor(object); } return itemPropertyDescriptors; } diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateUsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateUsageItemProvider.java index 3857bd5..e49535c 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateUsageItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/StateUsageItemProvider.java @@ -55,10 +55,10 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); + addIsParallelPropertyDescriptor(object); addDoActionPropertyDescriptor(object); addEntryActionPropertyDescriptor(object); addExitActionPropertyDescriptor(object); - addIsParallelPropertyDescriptor(object); addStateDefinitionPropertyDescriptor(object); } return itemPropertyDescriptors; diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/TypeItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/TypeItemProvider.java index 27afa6c..0764705 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/TypeItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/TypeItemProvider.java @@ -55,6 +55,9 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); + addIsAbstractPropertyDescriptor(object); + addIsConjugatedPropertyDescriptor(object); + addIsSufficientPropertyDescriptor(object); addDifferencingTypePropertyDescriptor(object); addDirectedFeaturePropertyDescriptor(object); addEndFeaturePropertyDescriptor(object); @@ -64,9 +67,6 @@ public List getPropertyDescriptors(Object object) { addInheritedMembershipPropertyDescriptor(object); addInputPropertyDescriptor(object); addIntersectingTypePropertyDescriptor(object); - addIsAbstractPropertyDescriptor(object); - addIsConjugatedPropertyDescriptor(object); - addIsSufficientPropertyDescriptor(object); addMultiplicityPropertyDescriptor(object); addOutputPropertyDescriptor(object); addOwnedConjugatorPropertyDescriptor(object); diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/UsageItemProvider.java b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/UsageItemProvider.java index f1130bd..5eb07d5 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/UsageItemProvider.java +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/UsageItemProvider.java @@ -55,10 +55,10 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addDefinitionPropertyDescriptor(object); - addDirectedUsagePropertyDescriptor(object); addIsReferencePropertyDescriptor(object); addIsVariationPropertyDescriptor(object); + addDefinitionPropertyDescriptor(object); + addDirectedUsagePropertyDescriptor(object); addNestedActionPropertyDescriptor(object); addNestedAllocationPropertyDescriptor(object); addNestedAnalysisCasePropertyDescriptor(object); diff --git a/backend/metamodel/syson-sysml-metamodel-edit/src/main/resources/plugin.properties b/backend/metamodel/syson-sysml-metamodel-edit/src/main/resources/plugin.properties index 42f4530..c5d4d0a 100644 --- a/backend/metamodel/syson-sysml-metamodel-edit/src/main/resources/plugin.properties +++ b/backend/metamodel/syson-sysml-metamodel-edit/src/main/resources/plugin.properties @@ -249,15 +249,15 @@ _UI_Conjugation_originalType_feature = Original Type _UI_Conjugation_owningType_feature = Owning Type _UI_ConnectionDefinition_connectionEnd_feature = Connection End _UI_ConnectionUsage_connectionDefinition_feature = Connection Definition +_UI_Connector_isDirected_feature = Is Directed _UI_Connector_association_feature = Association _UI_Connector_connectorEnd_feature = Connector End -_UI_Connector_isDirected_feature = Is Directed _UI_Connector_relatedFeature_feature = Related Feature _UI_Connector_sourceFeature_feature = Source Feature _UI_Connector_targetFeature_feature = Target Feature _UI_ConstraintUsage_constraintDefinition_feature = Constraint Definition -_UI_Definition_directedUsage_feature = Directed Usage _UI_Definition_isVariation_feature = Is Variation +_UI_Definition_directedUsage_feature = Directed Usage _UI_Definition_ownedAction_feature = Owned Action _UI_Definition_ownedAllocation_feature = Owned Allocation _UI_Definition_ownedAnalysisCase_feature = Owned Analysis Case @@ -299,11 +299,13 @@ _UI_Documentation_documentedElement_feature = Documented Element _UI_Element_aliasIds_feature = Alias Ids _UI_Element_declaredName_feature = Declared Name _UI_Element_declaredShortName_feature = Declared Short Name -_UI_Element_documentation_feature = Documentation _UI_Element_elementId_feature = Element Id _UI_Element_isImpliedIncluded_feature = Is Implied Included _UI_Element_isLibraryElement_feature = Is Library Element _UI_Element_name_feature = Name +_UI_Element_qualifiedName_feature = Qualified Name +_UI_Element_shortName_feature = Short Name +_UI_Element_documentation_feature = Documentation _UI_Element_ownedAnnotation_feature = Owned Annotation _UI_Element_ownedElement_feature = Owned Element _UI_Element_ownedRelationship_feature = Owned Relationship @@ -311,21 +313,16 @@ _UI_Element_owner_feature = Owner _UI_Element_owningMembership_feature = Owning Membership _UI_Element_owningNamespace_feature = Owning Namespace _UI_Element_owningRelationship_feature = Owning Relationship -_UI_Element_qualifiedName_feature = Qualified Name -_UI_Element_shortName_feature = Short Name _UI_Element_textualRepresentation_feature = Textual Representation _UI_ElementFilterMembership_condition_feature = Condition _UI_EnumerationDefinition_enumeratedValue_feature = Enumerated Value _UI_EnumerationUsage_enumerationDefinition_feature = Enumeration Definition _UI_EventOccurrenceUsage_eventOccurrence_feature = Event Occurrence _UI_ExhibitStateUsage_exhibitedState_feature = Exhibited State -_UI_Expression_function_feature = Function _UI_Expression_isModelLevelEvaluable_feature = Is Model Level Evaluable +_UI_Expression_function_feature = Function _UI_Expression_result_feature = Result -_UI_Feature_chainingFeature_feature = Chaining Feature _UI_Feature_direction_feature = Direction -_UI_Feature_endOwningType_feature = End Owning Type -_UI_Feature_featuringType_feature = Featuring Type _UI_Feature_isComposite_feature = Is Composite _UI_Feature_isDerived_feature = Is Derived _UI_Feature_isEnd_feature = Is End @@ -334,6 +331,9 @@ _UI_Feature_isOrdered_feature = Is Ordered _UI_Feature_isPortion_feature = Is Portion _UI_Feature_isReadOnly_feature = Is Read Only _UI_Feature_isUnique_feature = Is Unique +_UI_Feature_chainingFeature_feature = Chaining Feature +_UI_Feature_endOwningType_feature = End Owning Type +_UI_Feature_featuringType_feature = Featuring Type _UI_Feature_ownedFeatureChaining_feature = Owned Feature Chaining _UI_Feature_ownedFeatureInverting_feature = Owned Feature Inverting _UI_Feature_ownedRedefinition_feature = Owned Redefinition @@ -356,9 +356,9 @@ _UI_FeatureReferenceExpression_referent_feature = Referent _UI_FeatureTyping_owningFeature_feature = Owning Feature _UI_FeatureTyping_type_feature = Type _UI_FeatureTyping_typedFeature_feature = Typed Feature -_UI_FeatureValue_featureWithValue_feature = Feature With Value _UI_FeatureValue_isDefault_feature = Is Default _UI_FeatureValue_isInitial_feature = Is Initial +_UI_FeatureValue_featureWithValue_feature = Feature With Value _UI_FeatureValue_value_feature = Value _UI_Featuring_feature_feature = Feature _UI_Featuring_type_feature = Type @@ -367,17 +367,17 @@ _UI_ForLoopActionUsage_loopVariable_feature = Loop Variable _UI_ForLoopActionUsage_seqArgument_feature = Seq Argument _UI_FramedConcernMembership_ownedConcern_feature = Owned Concern _UI_FramedConcernMembership_referencedConcern_feature = Referenced Concern -_UI_Function_expression_feature = Expression _UI_Function_isModelLevelEvaluable_feature = Is Model Level Evaluable +_UI_Function_expression_feature = Expression _UI_Function_result_feature = Result _UI_IfActionUsage_elseAction_feature = Else Action _UI_IfActionUsage_ifArgument_feature = If Argument _UI_IfActionUsage_thenAction_feature = Then Action -_UI_Import_importedElement_feature = Imported Element -_UI_Import_importOwningNamespace_feature = Import Owning Namespace _UI_Import_isImportAll_feature = Is Import All _UI_Import_isRecursive_feature = Is Recursive _UI_Import_visibility_feature = Visibility +_UI_Import_importedElement_feature = Imported Element +_UI_Import_importOwningNamespace_feature = Import Owning Namespace _UI_IncludeUseCaseUsage_useCaseIncluded_feature = Use Case Included _UI_InterfaceDefinition_interfaceEnd_feature = Interface End _UI_InterfaceUsage_interfaceDefinition_feature = Interface Definition @@ -398,12 +398,12 @@ _UI_LiteralInteger_value_feature = Value _UI_LiteralRational_value_feature = Value _UI_LiteralString_value_feature = Value _UI_LoopActionUsage_bodyAction_feature = Body Action -_UI_Membership_memberElement_feature = Member Element _UI_Membership_memberElementId_feature = Member Element Id _UI_Membership_memberName_feature = Member Name -_UI_Membership_membershipOwningNamespace_feature = Membership Owning Namespace _UI_Membership_memberShortName_feature = Member Short Name _UI_Membership_visibility_feature = Visibility +_UI_Membership_memberElement_feature = Member Element +_UI_Membership_membershipOwningNamespace_feature = Membership Owning Namespace _UI_MembershipImport_importedMembership_feature = Imported Membership _UI_MetadataAccessExpression_referencedElement_feature = Referenced Element _UI_MetadataFeature_metaclass_feature = Metaclass @@ -421,16 +421,16 @@ _UI_NamespaceImport_importedNamespace_feature = Imported Namespace _UI_ObjectiveMembership_ownedObjectiveRequirement_feature = Owned Objective Requirement _UI_OccurrenceDefinition_isIndividual_feature = Is Individual _UI_OccurrenceDefinition_lifeClass_feature = Life Class -_UI_OccurrenceUsage_individualDefinition_feature = Individual Definition _UI_OccurrenceUsage_isIndividual_feature = Is Individual -_UI_OccurrenceUsage_occurrenceDefinition_feature = Occurrence Definition _UI_OccurrenceUsage_portionKind_feature = Portion Kind -_UI_OperatorExpression_operand_feature = Operand +_UI_OccurrenceUsage_individualDefinition_feature = Individual Definition +_UI_OccurrenceUsage_occurrenceDefinition_feature = Occurrence Definition _UI_OperatorExpression_operator_feature = Operator -_UI_OwningMembership_ownedMemberElement_feature = Owned Member Element +_UI_OperatorExpression_operand_feature = Operand _UI_OwningMembership_ownedMemberElementId_feature = Owned Member Element Id _UI_OwningMembership_ownedMemberName_feature = Owned Member Name _UI_OwningMembership_ownedMemberShortName_feature = Owned Member Short Name +_UI_OwningMembership_ownedMemberElement_feature = Owned Member Element _UI_Package_filterCondition_feature = Filter Condition _UI_ParameterMembership_ownedMemberParameter_feature = Owned Member Parameter _UI_PartUsage_partDefinition_feature = Part Definition @@ -454,23 +454,23 @@ _UI_RenderingUsage_renderingDefinition_feature = Rendering Definition _UI_RequirementConstraintMembership_kind_feature = Kind _UI_RequirementConstraintMembership_ownedConstraint_feature = Owned Constraint _UI_RequirementConstraintMembership_referencedConstraint_feature = Referenced Constraint +_UI_RequirementDefinition_reqId_feature = Req Id +_UI_RequirementDefinition_text_feature = Text _UI_RequirementDefinition_actorParameter_feature = Actor Parameter _UI_RequirementDefinition_assumedConstraint_feature = Assumed Constraint _UI_RequirementDefinition_framedConcern_feature = Framed Concern -_UI_RequirementDefinition_reqId_feature = Req Id _UI_RequirementDefinition_requiredConstraint_feature = Required Constraint _UI_RequirementDefinition_stakeholderParameter_feature = Stakeholder Parameter _UI_RequirementDefinition_subjectParameter_feature = Subject Parameter -_UI_RequirementDefinition_text_feature = Text +_UI_RequirementUsage_reqId_feature = Req Id +_UI_RequirementUsage_text_feature = Text _UI_RequirementUsage_actorParameter_feature = Actor Parameter _UI_RequirementUsage_assumedConstraint_feature = Assumed Constraint _UI_RequirementUsage_framedConcern_feature = Framed Concern -_UI_RequirementUsage_reqId_feature = Req Id _UI_RequirementUsage_requiredConstraint_feature = Required Constraint _UI_RequirementUsage_requirementDefinition_feature = Requirement Definition _UI_RequirementUsage_stakeholderParameter_feature = Stakeholder Parameter _UI_RequirementUsage_subjectParameter_feature = Subject Parameter -_UI_RequirementUsage_text_feature = Text _UI_RequirementVerificationMembership_ownedRequirement_feature = Owned Requirement _UI_RequirementVerificationMembership_verifiedRequirement_feature = Verified Requirement _UI_ResultExpressionMembership_ownedResultExpression_feature = Owned Result Expression @@ -483,17 +483,17 @@ _UI_Specialization_general_feature = General _UI_Specialization_owningType_feature = Owning Type _UI_Specialization_specific_feature = Specific _UI_StakeholderMembership_ownedStakeholderParameter_feature = Owned Stakeholder Parameter +_UI_StateDefinition_isParallel_feature = Is Parallel _UI_StateDefinition_doAction_feature = Do Action _UI_StateDefinition_entryAction_feature = Entry Action _UI_StateDefinition_exitAction_feature = Exit Action -_UI_StateDefinition_isParallel_feature = Is Parallel _UI_StateDefinition_state_feature = State -_UI_StateSubactionMembership_action_feature = Action _UI_StateSubactionMembership_kind_feature = Kind +_UI_StateSubactionMembership_action_feature = Action +_UI_StateUsage_isParallel_feature = Is Parallel _UI_StateUsage_doAction_feature = Do Action _UI_StateUsage_entryAction_feature = Entry Action _UI_StateUsage_exitAction_feature = Exit Action -_UI_StateUsage_isParallel_feature = Is Parallel _UI_StateUsage_stateDefinition_feature = State Definition _UI_Step_behavior_feature = Behavior _UI_Step_parameter_feature = Parameter @@ -520,6 +520,9 @@ _UI_TransitionUsage_succession_feature = Succession _UI_TransitionUsage_target_feature = Target _UI_TransitionUsage_triggerAction_feature = Trigger Action _UI_TriggerInvocationExpression_kind_feature = Kind +_UI_Type_isAbstract_feature = Is Abstract +_UI_Type_isConjugated_feature = Is Conjugated +_UI_Type_isSufficient_feature = Is Sufficient _UI_Type_differencingType_feature = Differencing Type _UI_Type_directedFeature_feature = Directed Feature _UI_Type_endFeature_feature = End Feature @@ -529,9 +532,6 @@ _UI_Type_inheritedFeature_feature = Inherited Feature _UI_Type_inheritedMembership_feature = Inherited Membership _UI_Type_input_feature = Input _UI_Type_intersectingType_feature = Intersecting Type -_UI_Type_isAbstract_feature = Is Abstract -_UI_Type_isConjugated_feature = Is Conjugated -_UI_Type_isSufficient_feature = Is Sufficient _UI_Type_multiplicity_feature = Multiplicity _UI_Type_output_feature = Output _UI_Type_ownedConjugator_feature = Owned Conjugator @@ -549,10 +549,10 @@ _UI_TypeFeaturing_featuringType_feature = Featuring Type _UI_TypeFeaturing_owningFeatureOfType_feature = Owning Feature Of Type _UI_Unioning_typeUnioned_feature = Type Unioned _UI_Unioning_unioningType_feature = Unioning Type -_UI_Usage_definition_feature = Definition -_UI_Usage_directedUsage_feature = Directed Usage _UI_Usage_isReference_feature = Is Reference _UI_Usage_isVariation_feature = Is Variation +_UI_Usage_definition_feature = Definition +_UI_Usage_directedUsage_feature = Directed Usage _UI_Usage_nestedAction_feature = Nested Action _UI_Usage_nestedAllocation_feature = Nested Allocation _UI_Usage_nestedAnalysisCase_feature = Nested Analysis Case diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AcceptActionUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AcceptActionUsageImpl.java index 432baf1..9d5a022 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AcceptActionUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/AcceptActionUsageImpl.java @@ -64,8 +64,8 @@ protected EClass eStaticClass() { */ @Override public Expression getPayloadArgument() { - Expression payloadArgument = this.basicGetPayloadArgument(); - return payloadArgument != null && payloadArgument.eIsProxy() ? (Expression)this.eResolveProxy((InternalEObject)payloadArgument) : payloadArgument; + Expression payloadArgument = basicGetPayloadArgument(); + return payloadArgument != null && payloadArgument.eIsProxy() ? (Expression)eResolveProxy((InternalEObject)payloadArgument) : payloadArgument; } /** @@ -87,8 +87,8 @@ public Expression basicGetPayloadArgument() { */ @Override public ReferenceUsage getPayloadParameter() { - ReferenceUsage payloadParameter = this.basicGetPayloadParameter(); - return payloadParameter != null && payloadParameter.eIsProxy() ? (ReferenceUsage)this.eResolveProxy((InternalEObject)payloadParameter) : payloadParameter; + ReferenceUsage payloadParameter = basicGetPayloadParameter(); + return payloadParameter != null && payloadParameter.eIsProxy() ? (ReferenceUsage)eResolveProxy((InternalEObject)payloadParameter) : payloadParameter; } /** @@ -110,8 +110,8 @@ public ReferenceUsage basicGetPayloadParameter() { */ @Override public Expression getReceiverArgument() { - Expression receiverArgument = this.basicGetReceiverArgument(); - return receiverArgument != null && receiverArgument.eIsProxy() ? (Expression)this.eResolveProxy((InternalEObject)receiverArgument) : receiverArgument; + Expression receiverArgument = basicGetReceiverArgument(); + return receiverArgument != null && receiverArgument.eIsProxy() ? (Expression)eResolveProxy((InternalEObject)receiverArgument) : receiverArgument; } /** @@ -145,14 +145,14 @@ public boolean isTriggerAction() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.ACCEPT_ACTION_USAGE__PAYLOAD_ARGUMENT: - if (resolve) return this.getPayloadArgument(); - return this.basicGetPayloadArgument(); + if (resolve) return getPayloadArgument(); + return basicGetPayloadArgument(); case SysmlPackage.ACCEPT_ACTION_USAGE__PAYLOAD_PARAMETER: - if (resolve) return this.getPayloadParameter(); - return this.basicGetPayloadParameter(); + if (resolve) return getPayloadParameter(); + return basicGetPayloadParameter(); case SysmlPackage.ACCEPT_ACTION_USAGE__RECEIVER_ARGUMENT: - if (resolve) return this.getReceiverArgument(); - return this.basicGetReceiverArgument(); + if (resolve) return getReceiverArgument(); + return basicGetReceiverArgument(); } return super.eGet(featureID, resolve, coreType); } @@ -166,11 +166,11 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.ACCEPT_ACTION_USAGE__PAYLOAD_ARGUMENT: - return this.basicGetPayloadArgument() != null; + return basicGetPayloadArgument() != null; case SysmlPackage.ACCEPT_ACTION_USAGE__PAYLOAD_PARAMETER: - return this.basicGetPayloadParameter() != null; + return basicGetPayloadParameter() != null; case SysmlPackage.ACCEPT_ACTION_USAGE__RECEIVER_ARGUMENT: - return this.basicGetReceiverArgument() != null; + return basicGetReceiverArgument() != null; } return super.eIsSet(featureID); } @@ -184,7 +184,7 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.ACCEPT_ACTION_USAGE___IS_TRIGGER_ACTION: - return this.isTriggerAction(); + return isTriggerAction(); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ActionUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ActionUsageImpl.java index 1e2eaf0..215b96f 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ActionUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ActionUsageImpl.java @@ -150,11 +150,11 @@ public boolean isSubactionUsage() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.ACTION_USAGE__BEHAVIOR: - return this.getBehavior(); + return getBehavior(); case SysmlPackage.ACTION_USAGE__PARAMETER: - return this.getParameter(); + return getParameter(); case SysmlPackage.ACTION_USAGE__ACTION_DEFINITION: - return this.getActionDefinition(); + return getActionDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -168,11 +168,11 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.ACTION_USAGE__BEHAVIOR: - return !this.getBehavior().isEmpty(); + return !getBehavior().isEmpty(); case SysmlPackage.ACTION_USAGE__PARAMETER: - return !this.getParameter().isEmpty(); + return !getParameter().isEmpty(); case SysmlPackage.ACTION_USAGE__ACTION_DEFINITION: - return !this.getActionDefinition().isEmpty(); + return !getActionDefinition().isEmpty(); } return super.eIsSet(featureID); } @@ -220,13 +220,13 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.ACTION_USAGE___ARGUMENT__INT: - return this.argument((Integer)arguments.get(0)); + return argument((Integer)arguments.get(0)); case SysmlPackage.ACTION_USAGE___INPUT_PARAMETER__INT: - return this.inputParameter((Integer)arguments.get(0)); + return inputParameter((Integer)arguments.get(0)); case SysmlPackage.ACTION_USAGE___INPUT_PARAMETERS: - return this.inputParameters(); + return inputParameters(); case SysmlPackage.ACTION_USAGE___IS_SUBACTION_USAGE: - return this.isSubactionUsage(); + return isSubactionUsage(); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationDefinitionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationDefinitionImpl.java index 622a311..15f78d1 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationDefinitionImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationDefinitionImpl.java @@ -101,8 +101,8 @@ public boolean isIsModelLevelEvaluable() { */ @Override public Feature getResult() { - Feature result = this.basicGetResult(); - return result != null && result.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)result) : result; + Feature result = basicGetResult(); + return result != null && result.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)result) : result; } /** @@ -137,14 +137,14 @@ public EList getCalculation() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.CALCULATION_DEFINITION__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable(); + return isIsModelLevelEvaluable(); case SysmlPackage.CALCULATION_DEFINITION__EXPRESSION: - return this.getExpression(); + return getExpression(); case SysmlPackage.CALCULATION_DEFINITION__RESULT: - if (resolve) return this.getResult(); - return this.basicGetResult(); + if (resolve) return getResult(); + return basicGetResult(); case SysmlPackage.CALCULATION_DEFINITION__CALCULATION: - return this.getCalculation(); + return getCalculation(); } return super.eGet(featureID, resolve, coreType); } @@ -158,13 +158,13 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.CALCULATION_DEFINITION__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; + return isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; case SysmlPackage.CALCULATION_DEFINITION__EXPRESSION: - return !this.getExpression().isEmpty(); + return !getExpression().isEmpty(); case SysmlPackage.CALCULATION_DEFINITION__RESULT: - return this.basicGetResult() != null; + return basicGetResult() != null; case SysmlPackage.CALCULATION_DEFINITION__CALCULATION: - return !this.getCalculation().isEmpty(); + return !getCalculation().isEmpty(); } return super.eIsSet(featureID); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationUsageImpl.java index 5829667..5c621ee 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/CalculationUsageImpl.java @@ -77,8 +77,8 @@ protected EClass eStaticClass() { */ @Override public Function getFunction() { - Function function = this.basicGetFunction(); - return function != null && function.eIsProxy() ? (Function)this.eResolveProxy((InternalEObject)function) : function; + Function function = basicGetFunction(); + return function != null && function.eIsProxy() ? (Function)eResolveProxy((InternalEObject)function) : function; } /** @@ -110,8 +110,8 @@ public boolean isIsModelLevelEvaluable() { */ @Override public Feature getResult() { - Feature result = this.basicGetResult(); - return result != null && result.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)result) : result; + Feature result = basicGetResult(); + return result != null && result.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)result) : result; } /** @@ -133,8 +133,8 @@ public Feature basicGetResult() { */ @Override public Function getCalculationDefinition() { - Function calculationDefinition = this.basicGetCalculationDefinition(); - return calculationDefinition != null && calculationDefinition.eIsProxy() ? (Function)this.eResolveProxy((InternalEObject)calculationDefinition) : calculationDefinition; + Function calculationDefinition = basicGetCalculationDefinition(); + return calculationDefinition != null && calculationDefinition.eIsProxy() ? (Function)eResolveProxy((InternalEObject)calculationDefinition) : calculationDefinition; } /** @@ -190,16 +190,16 @@ public boolean modelLevelEvaluable(EList visited) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.CALCULATION_USAGE__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable(); + return isIsModelLevelEvaluable(); case SysmlPackage.CALCULATION_USAGE__FUNCTION: - if (resolve) return this.getFunction(); - return this.basicGetFunction(); + if (resolve) return getFunction(); + return basicGetFunction(); case SysmlPackage.CALCULATION_USAGE__RESULT: - if (resolve) return this.getResult(); - return this.basicGetResult(); + if (resolve) return getResult(); + return basicGetResult(); case SysmlPackage.CALCULATION_USAGE__CALCULATION_DEFINITION: - if (resolve) return this.getCalculationDefinition(); - return this.basicGetCalculationDefinition(); + if (resolve) return getCalculationDefinition(); + return basicGetCalculationDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -213,13 +213,13 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.CALCULATION_USAGE__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; + return isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; case SysmlPackage.CALCULATION_USAGE__FUNCTION: - return this.basicGetFunction() != null; + return basicGetFunction() != null; case SysmlPackage.CALCULATION_USAGE__RESULT: - return this.basicGetResult() != null; + return basicGetResult() != null; case SysmlPackage.CALCULATION_USAGE__CALCULATION_DEFINITION: - return this.basicGetCalculationDefinition() != null; + return basicGetCalculationDefinition() != null; } return super.eIsSet(featureID); } @@ -288,11 +288,11 @@ public int eDerivedOperationID(int baseOperationID, Class baseClass) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.CALCULATION_USAGE___CHECK_CONDITION__ELEMENT: - return this.checkCondition((Element)arguments.get(0)); + return checkCondition((Element)arguments.get(0)); case SysmlPackage.CALCULATION_USAGE___EVALUATE__ELEMENT: - return this.evaluate((Element)arguments.get(0)); + return evaluate((Element)arguments.get(0)); case SysmlPackage.CALCULATION_USAGE___MODEL_LEVEL_EVALUABLE__ELIST: - return this.modelLevelEvaluable((EList)arguments.get(0)); + return modelLevelEvaluable((EList)arguments.get(0)); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionUsageImpl.java index 90a40be..1d40388 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectionUsageImpl.java @@ -118,8 +118,8 @@ protected EClass eStaticClass() { */ @Override public OccurrenceDefinition getIndividualDefinition() { - OccurrenceDefinition individualDefinition = this.basicGetIndividualDefinition(); - return individualDefinition != null && individualDefinition.eIsProxy() ? (OccurrenceDefinition)this.eResolveProxy((InternalEObject)individualDefinition) : individualDefinition; + OccurrenceDefinition individualDefinition = basicGetIndividualDefinition(); + return individualDefinition != null && individualDefinition.eIsProxy() ? (OccurrenceDefinition)eResolveProxy((InternalEObject)individualDefinition) : individualDefinition; } /** @@ -141,7 +141,7 @@ public OccurrenceDefinition basicGetIndividualDefinition() { */ @Override public boolean isIsIndividual() { - return this.isIndividual; + return isIndividual; } /** @@ -151,10 +151,10 @@ public boolean isIsIndividual() { */ @Override public void setIsIndividual(boolean newIsIndividual) { - boolean oldIsIndividual = this.isIndividual; - this.isIndividual = newIsIndividual; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTION_USAGE__IS_INDIVIDUAL, oldIsIndividual, this.isIndividual)); + boolean oldIsIndividual = isIndividual; + isIndividual = newIsIndividual; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTION_USAGE__IS_INDIVIDUAL, oldIsIndividual, isIndividual)); } /** @@ -175,7 +175,7 @@ public EList getOccurrenceDefinition() { */ @Override public PortionKind getPortionKind() { - return this.portionKind; + return portionKind; } /** @@ -185,10 +185,10 @@ public PortionKind getPortionKind() { */ @Override public void setPortionKind(PortionKind newPortionKind) { - PortionKind oldPortionKind = this.portionKind; - this.portionKind = newPortionKind == null ? PORTION_KIND_EDEFAULT : newPortionKind; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTION_USAGE__PORTION_KIND, oldPortionKind, this.portionKind)); + PortionKind oldPortionKind = portionKind; + portionKind = newPortionKind == null ? PORTION_KIND_EDEFAULT : newPortionKind; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTION_USAGE__PORTION_KIND, oldPortionKind, portionKind)); } /** @@ -233,20 +233,20 @@ public EList getConnectionDefinition() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.CONNECTION_USAGE__IS_INDIVIDUAL: - return this.isIsIndividual(); + return isIsIndividual(); case SysmlPackage.CONNECTION_USAGE__PORTION_KIND: - return this.getPortionKind(); + return getPortionKind(); case SysmlPackage.CONNECTION_USAGE__INDIVIDUAL_DEFINITION: - if (resolve) return this.getIndividualDefinition(); - return this.basicGetIndividualDefinition(); + if (resolve) return getIndividualDefinition(); + return basicGetIndividualDefinition(); case SysmlPackage.CONNECTION_USAGE__OCCURRENCE_DEFINITION: - return this.getOccurrenceDefinition(); + return getOccurrenceDefinition(); case SysmlPackage.CONNECTION_USAGE__ITEM_DEFINITION: - return this.getItemDefinition(); + return getItemDefinition(); case SysmlPackage.CONNECTION_USAGE__PART_DEFINITION: - return this.getPartDefinition(); + return getPartDefinition(); case SysmlPackage.CONNECTION_USAGE__CONNECTION_DEFINITION: - return this.getConnectionDefinition(); + return getConnectionDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -261,10 +261,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.CONNECTION_USAGE__IS_INDIVIDUAL: - this.setIsIndividual((Boolean)newValue); + setIsIndividual((Boolean)newValue); return; case SysmlPackage.CONNECTION_USAGE__PORTION_KIND: - this.setPortionKind((PortionKind)newValue); + setPortionKind((PortionKind)newValue); return; } super.eSet(featureID, newValue); @@ -279,10 +279,10 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.CONNECTION_USAGE__IS_INDIVIDUAL: - this.setIsIndividual(IS_INDIVIDUAL_EDEFAULT); + setIsIndividual(IS_INDIVIDUAL_EDEFAULT); return; case SysmlPackage.CONNECTION_USAGE__PORTION_KIND: - this.setPortionKind(PORTION_KIND_EDEFAULT); + setPortionKind(PORTION_KIND_EDEFAULT); return; } super.eUnset(featureID); @@ -297,19 +297,19 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.CONNECTION_USAGE__IS_INDIVIDUAL: - return this.isIndividual != IS_INDIVIDUAL_EDEFAULT; + return isIndividual != IS_INDIVIDUAL_EDEFAULT; case SysmlPackage.CONNECTION_USAGE__PORTION_KIND: - return this.portionKind != PORTION_KIND_EDEFAULT; + return portionKind != PORTION_KIND_EDEFAULT; case SysmlPackage.CONNECTION_USAGE__INDIVIDUAL_DEFINITION: - return this.basicGetIndividualDefinition() != null; + return basicGetIndividualDefinition() != null; case SysmlPackage.CONNECTION_USAGE__OCCURRENCE_DEFINITION: - return !this.getOccurrenceDefinition().isEmpty(); + return !getOccurrenceDefinition().isEmpty(); case SysmlPackage.CONNECTION_USAGE__ITEM_DEFINITION: - return !this.getItemDefinition().isEmpty(); + return !getItemDefinition().isEmpty(); case SysmlPackage.CONNECTION_USAGE__PART_DEFINITION: - return !this.getPartDefinition().isEmpty(); + return !getPartDefinition().isEmpty(); case SysmlPackage.CONNECTION_USAGE__CONNECTION_DEFINITION: - return !this.getConnectionDefinition().isEmpty(); + return !getConnectionDefinition().isEmpty(); } return super.eIsSet(featureID); } @@ -383,13 +383,13 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { */ @Override public String toString() { - if (this.eIsProxy()) return super.toString(); + if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); result.append(" (isIndividual: "); - result.append(this.isIndividual); + result.append(isIndividual); result.append(", portionKind: "); - result.append(this.portionKind); + result.append(portionKind); result.append(')'); return result.toString(); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorAsUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorAsUsageImpl.java index 01fb9b4..210f324 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorAsUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConnectorAsUsageImpl.java @@ -156,7 +156,7 @@ protected EClass eStaticClass() { */ @Override public boolean isIsImplied() { - return this.isImplied; + return isImplied; } /** @@ -166,10 +166,10 @@ public boolean isIsImplied() { */ @Override public void setIsImplied(boolean newIsImplied) { - boolean oldIsImplied = this.isImplied; - this.isImplied = newIsImplied; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED, oldIsImplied, this.isImplied)); + boolean oldIsImplied = isImplied; + isImplied = newIsImplied; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED, oldIsImplied, isImplied)); } /** @@ -179,10 +179,10 @@ public void setIsImplied(boolean newIsImplied) { */ @Override public EList getOwnedRelatedElement() { - if (this.ownedRelatedElement == null) { - this.ownedRelatedElement = new EObjectContainmentWithInverseEList(Element.class, this, SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT, SysmlPackage.ELEMENT__OWNING_RELATIONSHIP); + if (ownedRelatedElement == null) { + ownedRelatedElement = new EObjectContainmentWithInverseEList(Element.class, this, SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT, SysmlPackage.ELEMENT__OWNING_RELATIONSHIP); } - return this.ownedRelatedElement; + return ownedRelatedElement; } /** @@ -192,8 +192,8 @@ public EList getOwnedRelatedElement() { */ @Override public Element getOwningRelatedElement() { - if (this.eContainerFeatureID() != SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT) return null; - return (Element)this.eInternalContainer(); + if (eContainerFeatureID() != SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT) return null; + return (Element)eInternalContainer(); } /** @@ -202,7 +202,7 @@ public Element getOwningRelatedElement() { * @generated */ public NotificationChain basicSetOwningRelatedElement(Element newOwningRelatedElement, NotificationChain msgs) { - msgs = this.eBasicSetContainer((InternalEObject)newOwningRelatedElement, SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT, msgs); + msgs = eBasicSetContainer((InternalEObject)newOwningRelatedElement, SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT, msgs); return msgs; } @@ -213,19 +213,19 @@ public NotificationChain basicSetOwningRelatedElement(Element newOwningRelatedEl */ @Override public void setOwningRelatedElement(Element newOwningRelatedElement) { - if (newOwningRelatedElement != this.eInternalContainer() || (this.eContainerFeatureID() != SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT && newOwningRelatedElement != null)) { + if (newOwningRelatedElement != eInternalContainer() || (eContainerFeatureID() != SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT && newOwningRelatedElement != null)) { if (EcoreUtil.isAncestor(this, newOwningRelatedElement)) - throw new IllegalArgumentException("Recursive containment not allowed for " + this.toString()); + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); NotificationChain msgs = null; - if (this.eInternalContainer() != null) - msgs = this.eBasicRemoveFromContainer(msgs); + if (eInternalContainer() != null) + msgs = eBasicRemoveFromContainer(msgs); if (newOwningRelatedElement != null) msgs = ((InternalEObject)newOwningRelatedElement).eInverseAdd(this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, Element.class, msgs); - msgs = this.basicSetOwningRelatedElement(newOwningRelatedElement, msgs); + msgs = basicSetOwningRelatedElement(newOwningRelatedElement, msgs); if (msgs != null) msgs.dispatch(); } - else if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT, newOwningRelatedElement, newOwningRelatedElement)); + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT, newOwningRelatedElement, newOwningRelatedElement)); } /** @@ -246,10 +246,10 @@ public EList getRelatedElement() { */ @Override public EList getSource() { - if (this.source == null) { - this.source = new EObjectResolvingEList(Element.class, this, SysmlPackage.CONNECTOR_AS_USAGE__SOURCE); + if (source == null) { + source = new EObjectResolvingEList(Element.class, this, SysmlPackage.CONNECTOR_AS_USAGE__SOURCE); } - return this.source; + return source; } /** @@ -259,10 +259,10 @@ public EList getSource() { */ @Override public EList getTarget() { - if (this.target == null) { - this.target = new EObjectResolvingEList(Element.class, this, SysmlPackage.CONNECTOR_AS_USAGE__TARGET); + if (target == null) { + target = new EObjectResolvingEList(Element.class, this, SysmlPackage.CONNECTOR_AS_USAGE__TARGET); } - return this.target; + return target; } /** @@ -294,7 +294,7 @@ public EList getConnectorEnd() { */ @Override public boolean isIsDirected() { - return this.isDirected; + return isDirected; } /** @@ -304,10 +304,10 @@ public boolean isIsDirected() { */ @Override public void setIsDirected(boolean newIsDirected) { - boolean oldIsDirected = this.isDirected; - this.isDirected = newIsDirected; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED, oldIsDirected, this.isDirected)); + boolean oldIsDirected = isDirected; + isDirected = newIsDirected; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED, oldIsDirected, isDirected)); } /** @@ -328,8 +328,8 @@ public EList getRelatedFeature() { */ @Override public Feature getSourceFeature() { - Feature sourceFeature = this.basicGetSourceFeature(); - return sourceFeature != null && sourceFeature.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)sourceFeature) : sourceFeature; + Feature sourceFeature = basicGetSourceFeature(); + return sourceFeature != null && sourceFeature.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)sourceFeature) : sourceFeature; } /** @@ -365,11 +365,11 @@ public EList getTargetFeature() { public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT: - return ((InternalEList)(InternalEList)this.getOwnedRelatedElement()).basicAdd(otherEnd, msgs); + return ((InternalEList)(InternalEList)getOwnedRelatedElement()).basicAdd(otherEnd, msgs); case SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT: - if (this.eInternalContainer() != null) - msgs = this.eBasicRemoveFromContainer(msgs); - return this.basicSetOwningRelatedElement((Element)otherEnd, msgs); + if (eInternalContainer() != null) + msgs = eBasicRemoveFromContainer(msgs); + return basicSetOwningRelatedElement((Element)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -383,9 +383,9 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT: - return ((InternalEList)this.getOwnedRelatedElement()).basicRemove(otherEnd, msgs); + return ((InternalEList)getOwnedRelatedElement()).basicRemove(otherEnd, msgs); case SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT: - return this.basicSetOwningRelatedElement(null, msgs); + return basicSetOwningRelatedElement(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -397,9 +397,9 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, */ @Override public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) { - switch (this.eContainerFeatureID()) { + switch (eContainerFeatureID()) { case SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT: - return this.eInternalContainer().eInverseRemove(this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, Element.class, msgs); + return eInternalContainer().eInverseRemove(this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, Element.class, msgs); } return super.eBasicRemoveFromContainerFeature(msgs); } @@ -413,30 +413,30 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED: - return this.isIsImplied(); + return isIsImplied(); case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT: - return this.getOwnedRelatedElement(); + return getOwnedRelatedElement(); case SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT: - return this.getOwningRelatedElement(); + return getOwningRelatedElement(); case SysmlPackage.CONNECTOR_AS_USAGE__RELATED_ELEMENT: - return this.getRelatedElement(); + return getRelatedElement(); case SysmlPackage.CONNECTOR_AS_USAGE__SOURCE: - return this.getSource(); + return getSource(); case SysmlPackage.CONNECTOR_AS_USAGE__TARGET: - return this.getTarget(); + return getTarget(); case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED: - return this.isIsDirected(); + return isIsDirected(); case SysmlPackage.CONNECTOR_AS_USAGE__ASSOCIATION: - return this.getAssociation(); + return getAssociation(); case SysmlPackage.CONNECTOR_AS_USAGE__CONNECTOR_END: - return this.getConnectorEnd(); + return getConnectorEnd(); case SysmlPackage.CONNECTOR_AS_USAGE__RELATED_FEATURE: - return this.getRelatedFeature(); + return getRelatedFeature(); case SysmlPackage.CONNECTOR_AS_USAGE__SOURCE_FEATURE: - if (resolve) return this.getSourceFeature(); - return this.basicGetSourceFeature(); + if (resolve) return getSourceFeature(); + return basicGetSourceFeature(); case SysmlPackage.CONNECTOR_AS_USAGE__TARGET_FEATURE: - return this.getTargetFeature(); + return getTargetFeature(); } return super.eGet(featureID, resolve, coreType); } @@ -451,25 +451,25 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED: - this.setIsImplied((Boolean)newValue); + setIsImplied((Boolean)newValue); return; case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT: - this.getOwnedRelatedElement().clear(); - this.getOwnedRelatedElement().addAll((Collection)newValue); + getOwnedRelatedElement().clear(); + getOwnedRelatedElement().addAll((Collection)newValue); return; case SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT: - this.setOwningRelatedElement((Element)newValue); + setOwningRelatedElement((Element)newValue); return; case SysmlPackage.CONNECTOR_AS_USAGE__SOURCE: - this.getSource().clear(); - this.getSource().addAll((Collection)newValue); + getSource().clear(); + getSource().addAll((Collection)newValue); return; case SysmlPackage.CONNECTOR_AS_USAGE__TARGET: - this.getTarget().clear(); - this.getTarget().addAll((Collection)newValue); + getTarget().clear(); + getTarget().addAll((Collection)newValue); return; case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED: - this.setIsDirected((Boolean)newValue); + setIsDirected((Boolean)newValue); return; } super.eSet(featureID, newValue); @@ -484,22 +484,22 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED: - this.setIsImplied(IS_IMPLIED_EDEFAULT); + setIsImplied(IS_IMPLIED_EDEFAULT); return; case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT: - this.getOwnedRelatedElement().clear(); + getOwnedRelatedElement().clear(); return; case SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT: - this.setOwningRelatedElement((Element)null); + setOwningRelatedElement((Element)null); return; case SysmlPackage.CONNECTOR_AS_USAGE__SOURCE: - this.getSource().clear(); + getSource().clear(); return; case SysmlPackage.CONNECTOR_AS_USAGE__TARGET: - this.getTarget().clear(); + getTarget().clear(); return; case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED: - this.setIsDirected(IS_DIRECTED_EDEFAULT); + setIsDirected(IS_DIRECTED_EDEFAULT); return; } super.eUnset(featureID); @@ -514,29 +514,29 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED: - return this.isImplied != IS_IMPLIED_EDEFAULT; + return isImplied != IS_IMPLIED_EDEFAULT; case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT: - return this.ownedRelatedElement != null && !this.ownedRelatedElement.isEmpty(); + return ownedRelatedElement != null && !ownedRelatedElement.isEmpty(); case SysmlPackage.CONNECTOR_AS_USAGE__OWNING_RELATED_ELEMENT: - return this.getOwningRelatedElement() != null; + return getOwningRelatedElement() != null; case SysmlPackage.CONNECTOR_AS_USAGE__RELATED_ELEMENT: - return !this.getRelatedElement().isEmpty(); + return !getRelatedElement().isEmpty(); case SysmlPackage.CONNECTOR_AS_USAGE__SOURCE: - return this.source != null && !this.source.isEmpty(); + return source != null && !source.isEmpty(); case SysmlPackage.CONNECTOR_AS_USAGE__TARGET: - return this.target != null && !this.target.isEmpty(); + return target != null && !target.isEmpty(); case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED: - return this.isDirected != IS_DIRECTED_EDEFAULT; + return isDirected != IS_DIRECTED_EDEFAULT; case SysmlPackage.CONNECTOR_AS_USAGE__ASSOCIATION: - return !this.getAssociation().isEmpty(); + return !getAssociation().isEmpty(); case SysmlPackage.CONNECTOR_AS_USAGE__CONNECTOR_END: - return !this.getConnectorEnd().isEmpty(); + return !getConnectorEnd().isEmpty(); case SysmlPackage.CONNECTOR_AS_USAGE__RELATED_FEATURE: - return !this.getRelatedFeature().isEmpty(); + return !getRelatedFeature().isEmpty(); case SysmlPackage.CONNECTOR_AS_USAGE__SOURCE_FEATURE: - return this.basicGetSourceFeature() != null; + return basicGetSourceFeature() != null; case SysmlPackage.CONNECTOR_AS_USAGE__TARGET_FEATURE: - return !this.getTargetFeature().isEmpty(); + return !getTargetFeature().isEmpty(); } return super.eIsSet(featureID); } @@ -612,13 +612,13 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { */ @Override public String toString() { - if (this.eIsProxy()) return super.toString(); + if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); result.append(" (isImplied: "); - result.append(this.isImplied); + result.append(isImplied); result.append(", isDirected: "); - result.append(this.isDirected); + result.append(isDirected); result.append(')'); return result.toString(); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintDefinitionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintDefinitionImpl.java index d7d87fe..01137e5 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintDefinitionImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintDefinitionImpl.java @@ -126,8 +126,8 @@ public boolean isIsModelLevelEvaluable() { */ @Override public Feature getResult() { - Feature result = this.basicGetResult(); - return result != null && result.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)result) : result; + Feature result = basicGetResult(); + return result != null && result.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)result) : result; } /** @@ -151,16 +151,16 @@ public Feature basicGetResult() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.CONSTRAINT_DEFINITION__PARAMETER: - return this.getParameter(); + return getParameter(); case SysmlPackage.CONSTRAINT_DEFINITION__STEP: - return this.getStep(); + return getStep(); case SysmlPackage.CONSTRAINT_DEFINITION__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable(); + return isIsModelLevelEvaluable(); case SysmlPackage.CONSTRAINT_DEFINITION__EXPRESSION: - return this.getExpression(); + return getExpression(); case SysmlPackage.CONSTRAINT_DEFINITION__RESULT: - if (resolve) return this.getResult(); - return this.basicGetResult(); + if (resolve) return getResult(); + return basicGetResult(); } return super.eGet(featureID, resolve, coreType); } @@ -174,15 +174,15 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.CONSTRAINT_DEFINITION__PARAMETER: - return !this.getParameter().isEmpty(); + return !getParameter().isEmpty(); case SysmlPackage.CONSTRAINT_DEFINITION__STEP: - return !this.getStep().isEmpty(); + return !getStep().isEmpty(); case SysmlPackage.CONSTRAINT_DEFINITION__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; + return isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; case SysmlPackage.CONSTRAINT_DEFINITION__EXPRESSION: - return !this.getExpression().isEmpty(); + return !getExpression().isEmpty(); case SysmlPackage.CONSTRAINT_DEFINITION__RESULT: - return this.basicGetResult() != null; + return basicGetResult() != null; } return super.eIsSet(featureID); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintUsageImpl.java index 85e5186..04b322b 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConstraintUsageImpl.java @@ -110,8 +110,8 @@ public EList getParameter() { */ @Override public Function getFunction() { - Function function = this.basicGetFunction(); - return function != null && function.eIsProxy() ? (Function)this.eResolveProxy((InternalEObject)function) : function; + Function function = basicGetFunction(); + return function != null && function.eIsProxy() ? (Function)eResolveProxy((InternalEObject)function) : function; } /** @@ -143,8 +143,8 @@ public boolean isIsModelLevelEvaluable() { */ @Override public Feature getResult() { - Feature result = this.basicGetResult(); - return result != null && result.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)result) : result; + Feature result = basicGetResult(); + return result != null && result.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)result) : result; } /** @@ -166,8 +166,8 @@ public Feature basicGetResult() { */ @Override public Predicate getPredicate() { - Predicate predicate = this.basicGetPredicate(); - return predicate != null && predicate.eIsProxy() ? (Predicate)this.eResolveProxy((InternalEObject)predicate) : predicate; + Predicate predicate = basicGetPredicate(); + return predicate != null && predicate.eIsProxy() ? (Predicate)eResolveProxy((InternalEObject)predicate) : predicate; } /** @@ -189,8 +189,8 @@ public Predicate basicGetPredicate() { */ @Override public Predicate getConstraintDefinition() { - Predicate constraintDefinition = this.basicGetConstraintDefinition(); - return constraintDefinition != null && constraintDefinition.eIsProxy() ? (Predicate)this.eResolveProxy((InternalEObject)constraintDefinition) : constraintDefinition; + Predicate constraintDefinition = basicGetConstraintDefinition(); + return constraintDefinition != null && constraintDefinition.eIsProxy() ? (Predicate)eResolveProxy((InternalEObject)constraintDefinition) : constraintDefinition; } /** @@ -246,23 +246,23 @@ public boolean modelLevelEvaluable(EList visited) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.CONSTRAINT_USAGE__BEHAVIOR: - return this.getBehavior(); + return getBehavior(); case SysmlPackage.CONSTRAINT_USAGE__PARAMETER: - return this.getParameter(); + return getParameter(); case SysmlPackage.CONSTRAINT_USAGE__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable(); + return isIsModelLevelEvaluable(); case SysmlPackage.CONSTRAINT_USAGE__FUNCTION: - if (resolve) return this.getFunction(); - return this.basicGetFunction(); + if (resolve) return getFunction(); + return basicGetFunction(); case SysmlPackage.CONSTRAINT_USAGE__RESULT: - if (resolve) return this.getResult(); - return this.basicGetResult(); + if (resolve) return getResult(); + return basicGetResult(); case SysmlPackage.CONSTRAINT_USAGE__PREDICATE: - if (resolve) return this.getPredicate(); - return this.basicGetPredicate(); + if (resolve) return getPredicate(); + return basicGetPredicate(); case SysmlPackage.CONSTRAINT_USAGE__CONSTRAINT_DEFINITION: - if (resolve) return this.getConstraintDefinition(); - return this.basicGetConstraintDefinition(); + if (resolve) return getConstraintDefinition(); + return basicGetConstraintDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -276,19 +276,19 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.CONSTRAINT_USAGE__BEHAVIOR: - return !this.getBehavior().isEmpty(); + return !getBehavior().isEmpty(); case SysmlPackage.CONSTRAINT_USAGE__PARAMETER: - return !this.getParameter().isEmpty(); + return !getParameter().isEmpty(); case SysmlPackage.CONSTRAINT_USAGE__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; + return isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; case SysmlPackage.CONSTRAINT_USAGE__FUNCTION: - return this.basicGetFunction() != null; + return basicGetFunction() != null; case SysmlPackage.CONSTRAINT_USAGE__RESULT: - return this.basicGetResult() != null; + return basicGetResult() != null; case SysmlPackage.CONSTRAINT_USAGE__PREDICATE: - return this.basicGetPredicate() != null; + return basicGetPredicate() != null; case SysmlPackage.CONSTRAINT_USAGE__CONSTRAINT_DEFINITION: - return this.basicGetConstraintDefinition() != null; + return basicGetConstraintDefinition() != null; } return super.eIsSet(featureID); } @@ -393,11 +393,11 @@ public int eDerivedOperationID(int baseOperationID, Class baseClass) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.CONSTRAINT_USAGE___CHECK_CONDITION__ELEMENT: - return this.checkCondition((Element)arguments.get(0)); + return checkCondition((Element)arguments.get(0)); case SysmlPackage.CONSTRAINT_USAGE___EVALUATE__ELEMENT: - return this.evaluate((Element)arguments.get(0)); + return evaluate((Element)arguments.get(0)); case SysmlPackage.CONSTRAINT_USAGE___MODEL_LEVEL_EVALUABLE__ELIST: - return this.modelLevelEvaluable((EList)arguments.get(0)); + return modelLevelEvaluable((EList)arguments.get(0)); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ControlNodeImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ControlNodeImpl.java index 5614f81..265a5f9 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ControlNodeImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ControlNodeImpl.java @@ -66,7 +66,7 @@ public boolean multiplicityHasBounds(Multiplicity mult, int lower, int upper) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.CONTROL_NODE___MULTIPLICITY_HAS_BOUNDS__MULTIPLICITY_INT_INT: - return this.multiplicityHasBounds((Multiplicity)arguments.get(0), (Integer)arguments.get(1), (Integer)arguments.get(2)); + return multiplicityHasBounds((Multiplicity)arguments.get(0), (Integer)arguments.get(1), (Integer)arguments.get(2)); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementImpl.java index 833fe2a..fbdd8b1 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ElementImpl.java @@ -236,10 +236,10 @@ protected EClass eStaticClass() { */ @Override public EList getAliasIds() { - if (this.aliasIds == null) { - this.aliasIds = new EDataTypeUniqueEList<>(String.class, this, SysmlPackage.ELEMENT__ALIAS_IDS); + if (aliasIds == null) { + aliasIds = new EDataTypeUniqueEList(String.class, this, SysmlPackage.ELEMENT__ALIAS_IDS); } - return this.aliasIds; + return aliasIds; } /** @@ -249,7 +249,7 @@ public EList getAliasIds() { */ @Override public String getDeclaredName() { - return this.declaredName; + return declaredName; } /** @@ -259,10 +259,10 @@ public String getDeclaredName() { */ @Override public void setDeclaredName(String newDeclaredName) { - String oldDeclaredName = this.declaredName; - this.declaredName = newDeclaredName; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__DECLARED_NAME, oldDeclaredName, this.declaredName)); + String oldDeclaredName = declaredName; + declaredName = newDeclaredName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__DECLARED_NAME, oldDeclaredName, declaredName)); } /** @@ -272,7 +272,7 @@ public void setDeclaredName(String newDeclaredName) { */ @Override public String getDeclaredShortName() { - return this.declaredShortName; + return declaredShortName; } /** @@ -282,10 +282,10 @@ public String getDeclaredShortName() { */ @Override public void setDeclaredShortName(String newDeclaredShortName) { - String oldDeclaredShortName = this.declaredShortName; - this.declaredShortName = newDeclaredShortName; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__DECLARED_SHORT_NAME, oldDeclaredShortName, this.declaredShortName)); + String oldDeclaredShortName = declaredShortName; + declaredShortName = newDeclaredShortName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__DECLARED_SHORT_NAME, oldDeclaredShortName, declaredShortName)); } /** @@ -306,7 +306,7 @@ public EList getDocumentation() { */ @Override public String getElementId() { - return this.elementId; + return elementId; } /** @@ -316,10 +316,10 @@ public String getElementId() { */ @Override public void setElementId(String newElementId) { - String oldElementId = this.elementId; - this.elementId = newElementId; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__ELEMENT_ID, oldElementId, this.elementId)); + String oldElementId = elementId; + elementId = newElementId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__ELEMENT_ID, oldElementId, elementId)); } /** @@ -329,7 +329,7 @@ public void setElementId(String newElementId) { */ @Override public boolean isIsImpliedIncluded() { - return this.isImpliedIncluded; + return isImpliedIncluded; } /** @@ -339,10 +339,10 @@ public boolean isIsImpliedIncluded() { */ @Override public void setIsImpliedIncluded(boolean newIsImpliedIncluded) { - boolean oldIsImpliedIncluded = this.isImpliedIncluded; - this.isImpliedIncluded = newIsImpliedIncluded; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__IS_IMPLIED_INCLUDED, oldIsImpliedIncluded, this.isImpliedIncluded)); + boolean oldIsImpliedIncluded = isImpliedIncluded; + isImpliedIncluded = newIsImpliedIncluded; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__IS_IMPLIED_INCLUDED, oldIsImpliedIncluded, isImpliedIncluded)); } /** @@ -394,10 +394,10 @@ public EList getOwnedElement() { */ @Override public EList getOwnedRelationship() { - if (this.ownedRelationship == null) { - this.ownedRelationship = new EObjectContainmentWithInverseEList<>(Relationship.class, this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, SysmlPackage.RELATIONSHIP__OWNING_RELATED_ELEMENT); + if (ownedRelationship == null) { + ownedRelationship = new EObjectContainmentWithInverseEList(Relationship.class, this, SysmlPackage.ELEMENT__OWNED_RELATIONSHIP, SysmlPackage.RELATIONSHIP__OWNING_RELATED_ELEMENT); } - return this.ownedRelationship; + return ownedRelationship; } /** @@ -407,8 +407,8 @@ public EList getOwnedRelationship() { */ @Override public Element getOwner() { - Element owner = this.basicGetOwner(); - return owner != null && owner.eIsProxy() ? (Element)this.eResolveProxy((InternalEObject)owner) : owner; + Element owner = basicGetOwner(); + return owner != null && owner.eIsProxy() ? (Element)eResolveProxy((InternalEObject)owner) : owner; } /** @@ -430,8 +430,8 @@ public Element basicGetOwner() { */ @Override public OwningMembership getOwningMembership() { - OwningMembership owningMembership = this.basicGetOwningMembership(); - return owningMembership != null && owningMembership.eIsProxy() ? (OwningMembership)this.eResolveProxy((InternalEObject)owningMembership) : owningMembership; + OwningMembership owningMembership = basicGetOwningMembership(); + return owningMembership != null && owningMembership.eIsProxy() ? (OwningMembership)eResolveProxy((InternalEObject)owningMembership) : owningMembership; } /** @@ -453,8 +453,8 @@ public OwningMembership basicGetOwningMembership() { */ @Override public Namespace getOwningNamespace() { - Namespace owningNamespace = this.basicGetOwningNamespace(); - return owningNamespace != null && owningNamespace.eIsProxy() ? (Namespace)this.eResolveProxy((InternalEObject)owningNamespace) : owningNamespace; + Namespace owningNamespace = basicGetOwningNamespace(); + return owningNamespace != null && owningNamespace.eIsProxy() ? (Namespace)eResolveProxy((InternalEObject)owningNamespace) : owningNamespace; } /** @@ -476,8 +476,8 @@ public Namespace basicGetOwningNamespace() { */ @Override public Relationship getOwningRelationship() { - if (this.eContainerFeatureID() != SysmlPackage.ELEMENT__OWNING_RELATIONSHIP) return null; - return (Relationship)this.eInternalContainer(); + if (eContainerFeatureID() != SysmlPackage.ELEMENT__OWNING_RELATIONSHIP) return null; + return (Relationship)eInternalContainer(); } /** @@ -486,7 +486,7 @@ public Relationship getOwningRelationship() { * @generated */ public NotificationChain basicSetOwningRelationship(Relationship newOwningRelationship, NotificationChain msgs) { - msgs = this.eBasicSetContainer((InternalEObject)newOwningRelationship, SysmlPackage.ELEMENT__OWNING_RELATIONSHIP, msgs); + msgs = eBasicSetContainer((InternalEObject)newOwningRelationship, SysmlPackage.ELEMENT__OWNING_RELATIONSHIP, msgs); return msgs; } @@ -497,19 +497,19 @@ public NotificationChain basicSetOwningRelationship(Relationship newOwningRelati */ @Override public void setOwningRelationship(Relationship newOwningRelationship) { - if (newOwningRelationship != this.eInternalContainer() || (this.eContainerFeatureID() != SysmlPackage.ELEMENT__OWNING_RELATIONSHIP && newOwningRelationship != null)) { + if (newOwningRelationship != eInternalContainer() || (eContainerFeatureID() != SysmlPackage.ELEMENT__OWNING_RELATIONSHIP && newOwningRelationship != null)) { if (EcoreUtil.isAncestor(this, newOwningRelationship)) - throw new IllegalArgumentException("Recursive containment not allowed for " + this.toString()); + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); NotificationChain msgs = null; - if (this.eInternalContainer() != null) - msgs = this.eBasicRemoveFromContainer(msgs); + if (eInternalContainer() != null) + msgs = eBasicRemoveFromContainer(msgs); if (newOwningRelationship != null) msgs = ((InternalEObject)newOwningRelationship).eInverseAdd(this, SysmlPackage.RELATIONSHIP__OWNED_RELATED_ELEMENT, Relationship.class, msgs); - msgs = this.basicSetOwningRelationship(newOwningRelationship, msgs); + msgs = basicSetOwningRelationship(newOwningRelationship, msgs); if (msgs != null) msgs.dispatch(); } - else if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__OWNING_RELATIONSHIP, newOwningRelationship, newOwningRelationship)); + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.ELEMENT__OWNING_RELATIONSHIP, newOwningRelationship, newOwningRelationship)); } /** @@ -537,7 +537,6 @@ public String getQualifiedName() { @Override public String getShortName() { return this.getDeclaredShortName(); - } /** @@ -609,11 +608,11 @@ public Namespace libraryNamespace() { public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case SysmlPackage.ELEMENT__OWNED_RELATIONSHIP: - return ((InternalEList)(InternalEList)this.getOwnedRelationship()).basicAdd(otherEnd, msgs); + return ((InternalEList)(InternalEList)getOwnedRelationship()).basicAdd(otherEnd, msgs); case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP: - if (this.eInternalContainer() != null) - msgs = this.eBasicRemoveFromContainer(msgs); - return this.basicSetOwningRelationship((Relationship)otherEnd, msgs); + if (eInternalContainer() != null) + msgs = eBasicRemoveFromContainer(msgs); + return basicSetOwningRelationship((Relationship)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -627,9 +626,9 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case SysmlPackage.ELEMENT__OWNED_RELATIONSHIP: - return ((InternalEList)this.getOwnedRelationship()).basicRemove(otherEnd, msgs); + return ((InternalEList)getOwnedRelationship()).basicRemove(otherEnd, msgs); case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP: - return this.basicSetOwningRelationship(null, msgs); + return basicSetOwningRelationship(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -641,9 +640,9 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, */ @Override public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) { - switch (this.eContainerFeatureID()) { + switch (eContainerFeatureID()) { case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP: - return this.eInternalContainer().eInverseRemove(this, SysmlPackage.RELATIONSHIP__OWNED_RELATED_ELEMENT, Relationship.class, msgs); + return eInternalContainer().eInverseRemove(this, SysmlPackage.RELATIONSHIP__OWNED_RELATED_ELEMENT, Relationship.class, msgs); } return super.eBasicRemoveFromContainerFeature(msgs); } @@ -657,44 +656,44 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.ELEMENT__ALIAS_IDS: - return this.getAliasIds(); + return getAliasIds(); case SysmlPackage.ELEMENT__DECLARED_NAME: - return this.getDeclaredName(); + return getDeclaredName(); case SysmlPackage.ELEMENT__DECLARED_SHORT_NAME: - return this.getDeclaredShortName(); + return getDeclaredShortName(); case SysmlPackage.ELEMENT__ELEMENT_ID: - return this.getElementId(); + return getElementId(); case SysmlPackage.ELEMENT__IS_IMPLIED_INCLUDED: - return this.isIsImpliedIncluded(); + return isIsImpliedIncluded(); case SysmlPackage.ELEMENT__IS_LIBRARY_ELEMENT: - return this.isIsLibraryElement(); + return isIsLibraryElement(); case SysmlPackage.ELEMENT__NAME: - return this.getName(); + return getName(); case SysmlPackage.ELEMENT__QUALIFIED_NAME: - return this.getQualifiedName(); + return getQualifiedName(); case SysmlPackage.ELEMENT__SHORT_NAME: - return this.getShortName(); + return getShortName(); case SysmlPackage.ELEMENT__DOCUMENTATION: - return this.getDocumentation(); + return getDocumentation(); case SysmlPackage.ELEMENT__OWNED_ANNOTATION: - return this.getOwnedAnnotation(); + return getOwnedAnnotation(); case SysmlPackage.ELEMENT__OWNED_ELEMENT: - return this.getOwnedElement(); + return getOwnedElement(); case SysmlPackage.ELEMENT__OWNED_RELATIONSHIP: - return this.getOwnedRelationship(); + return getOwnedRelationship(); case SysmlPackage.ELEMENT__OWNER: - if (resolve) return this.getOwner(); - return this.basicGetOwner(); + if (resolve) return getOwner(); + return basicGetOwner(); case SysmlPackage.ELEMENT__OWNING_MEMBERSHIP: - if (resolve) return this.getOwningMembership(); - return this.basicGetOwningMembership(); + if (resolve) return getOwningMembership(); + return basicGetOwningMembership(); case SysmlPackage.ELEMENT__OWNING_NAMESPACE: - if (resolve) return this.getOwningNamespace(); - return this.basicGetOwningNamespace(); + if (resolve) return getOwningNamespace(); + return basicGetOwningNamespace(); case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP: - return this.getOwningRelationship(); + return getOwningRelationship(); case SysmlPackage.ELEMENT__TEXTUAL_REPRESENTATION: - return this.getTextualRepresentation(); + return getTextualRepresentation(); } return super.eGet(featureID, resolve, coreType); } @@ -709,27 +708,27 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.ELEMENT__ALIAS_IDS: - this.getAliasIds().clear(); - this.getAliasIds().addAll((Collection)newValue); + getAliasIds().clear(); + getAliasIds().addAll((Collection)newValue); return; case SysmlPackage.ELEMENT__DECLARED_NAME: - this.setDeclaredName((String)newValue); + setDeclaredName((String)newValue); return; case SysmlPackage.ELEMENT__DECLARED_SHORT_NAME: - this.setDeclaredShortName((String)newValue); + setDeclaredShortName((String)newValue); return; case SysmlPackage.ELEMENT__ELEMENT_ID: - this.setElementId((String)newValue); + setElementId((String)newValue); return; case SysmlPackage.ELEMENT__IS_IMPLIED_INCLUDED: - this.setIsImpliedIncluded((Boolean)newValue); + setIsImpliedIncluded((Boolean)newValue); return; case SysmlPackage.ELEMENT__OWNED_RELATIONSHIP: - this.getOwnedRelationship().clear(); - this.getOwnedRelationship().addAll((Collection)newValue); + getOwnedRelationship().clear(); + getOwnedRelationship().addAll((Collection)newValue); return; case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP: - this.setOwningRelationship((Relationship)newValue); + setOwningRelationship((Relationship)newValue); return; } super.eSet(featureID, newValue); @@ -744,25 +743,25 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.ELEMENT__ALIAS_IDS: - this.getAliasIds().clear(); + getAliasIds().clear(); return; case SysmlPackage.ELEMENT__DECLARED_NAME: - this.setDeclaredName(DECLARED_NAME_EDEFAULT); + setDeclaredName(DECLARED_NAME_EDEFAULT); return; case SysmlPackage.ELEMENT__DECLARED_SHORT_NAME: - this.setDeclaredShortName(DECLARED_SHORT_NAME_EDEFAULT); + setDeclaredShortName(DECLARED_SHORT_NAME_EDEFAULT); return; case SysmlPackage.ELEMENT__ELEMENT_ID: - this.setElementId(ELEMENT_ID_EDEFAULT); + setElementId(ELEMENT_ID_EDEFAULT); return; case SysmlPackage.ELEMENT__IS_IMPLIED_INCLUDED: - this.setIsImpliedIncluded(IS_IMPLIED_INCLUDED_EDEFAULT); + setIsImpliedIncluded(IS_IMPLIED_INCLUDED_EDEFAULT); return; case SysmlPackage.ELEMENT__OWNED_RELATIONSHIP: - this.getOwnedRelationship().clear(); + getOwnedRelationship().clear(); return; case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP: - this.setOwningRelationship((Relationship)null); + setOwningRelationship((Relationship)null); return; } super.eUnset(featureID); @@ -777,41 +776,41 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.ELEMENT__ALIAS_IDS: - return this.aliasIds != null && !this.aliasIds.isEmpty(); + return aliasIds != null && !aliasIds.isEmpty(); case SysmlPackage.ELEMENT__DECLARED_NAME: - return DECLARED_NAME_EDEFAULT == null ? this.declaredName != null : !DECLARED_NAME_EDEFAULT.equals(this.declaredName); + return DECLARED_NAME_EDEFAULT == null ? declaredName != null : !DECLARED_NAME_EDEFAULT.equals(declaredName); case SysmlPackage.ELEMENT__DECLARED_SHORT_NAME: - return DECLARED_SHORT_NAME_EDEFAULT == null ? this.declaredShortName != null : !DECLARED_SHORT_NAME_EDEFAULT.equals(this.declaredShortName); + return DECLARED_SHORT_NAME_EDEFAULT == null ? declaredShortName != null : !DECLARED_SHORT_NAME_EDEFAULT.equals(declaredShortName); case SysmlPackage.ELEMENT__ELEMENT_ID: - return ELEMENT_ID_EDEFAULT == null ? this.elementId != null : !ELEMENT_ID_EDEFAULT.equals(this.elementId); + return ELEMENT_ID_EDEFAULT == null ? elementId != null : !ELEMENT_ID_EDEFAULT.equals(elementId); case SysmlPackage.ELEMENT__IS_IMPLIED_INCLUDED: - return this.isImpliedIncluded != IS_IMPLIED_INCLUDED_EDEFAULT; + return isImpliedIncluded != IS_IMPLIED_INCLUDED_EDEFAULT; case SysmlPackage.ELEMENT__IS_LIBRARY_ELEMENT: - return this.isIsLibraryElement() != IS_LIBRARY_ELEMENT_EDEFAULT; + return isIsLibraryElement() != IS_LIBRARY_ELEMENT_EDEFAULT; case SysmlPackage.ELEMENT__NAME: - return NAME_EDEFAULT == null ? this.getName() != null : !NAME_EDEFAULT.equals(this.getName()); + return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName()); case SysmlPackage.ELEMENT__QUALIFIED_NAME: - return QUALIFIED_NAME_EDEFAULT == null ? this.getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(this.getQualifiedName()); + return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName()); case SysmlPackage.ELEMENT__SHORT_NAME: - return SHORT_NAME_EDEFAULT == null ? this.getShortName() != null : !SHORT_NAME_EDEFAULT.equals(this.getShortName()); + return SHORT_NAME_EDEFAULT == null ? getShortName() != null : !SHORT_NAME_EDEFAULT.equals(getShortName()); case SysmlPackage.ELEMENT__DOCUMENTATION: - return !this.getDocumentation().isEmpty(); + return !getDocumentation().isEmpty(); case SysmlPackage.ELEMENT__OWNED_ANNOTATION: - return !this.getOwnedAnnotation().isEmpty(); + return !getOwnedAnnotation().isEmpty(); case SysmlPackage.ELEMENT__OWNED_ELEMENT: - return !this.getOwnedElement().isEmpty(); + return !getOwnedElement().isEmpty(); case SysmlPackage.ELEMENT__OWNED_RELATIONSHIP: - return this.ownedRelationship != null && !this.ownedRelationship.isEmpty(); + return ownedRelationship != null && !ownedRelationship.isEmpty(); case SysmlPackage.ELEMENT__OWNER: - return this.basicGetOwner() != null; + return basicGetOwner() != null; case SysmlPackage.ELEMENT__OWNING_MEMBERSHIP: - return this.basicGetOwningMembership() != null; + return basicGetOwningMembership() != null; case SysmlPackage.ELEMENT__OWNING_NAMESPACE: - return this.basicGetOwningNamespace() != null; + return basicGetOwningNamespace() != null; case SysmlPackage.ELEMENT__OWNING_RELATIONSHIP: - return this.getOwningRelationship() != null; + return getOwningRelationship() != null; case SysmlPackage.ELEMENT__TEXTUAL_REPRESENTATION: - return !this.getTextualRepresentation().isEmpty(); + return !getTextualRepresentation().isEmpty(); } return super.eIsSet(featureID); } @@ -825,13 +824,13 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.ELEMENT___EFFECTIVE_NAME: - return this.effectiveName(); + return effectiveName(); case SysmlPackage.ELEMENT___EFFECTIVE_SHORT_NAME: - return this.effectiveShortName(); + return effectiveShortName(); case SysmlPackage.ELEMENT___ESCAPED_NAME: - return this.escapedName(); + return escapedName(); case SysmlPackage.ELEMENT___LIBRARY_NAMESPACE: - return this.libraryNamespace(); + return libraryNamespace(); } return super.eInvoke(operationID, arguments); } @@ -843,19 +842,19 @@ public Object eInvoke(int operationID, EList arguments) throws InvocationTarg */ @Override public String toString() { - if (this.eIsProxy()) return super.toString(); + if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); result.append(" (aliasIds: "); - result.append(this.aliasIds); + result.append(aliasIds); result.append(", declaredName: "); - result.append(this.declaredName); + result.append(declaredName); result.append(", declaredShortName: "); - result.append(this.declaredShortName); + result.append(declaredShortName); result.append(", elementId: "); - result.append(this.elementId); + result.append(elementId); result.append(", isImpliedIncluded: "); - result.append(this.isImpliedIncluded); + result.append(isImpliedIncluded); result.append(')'); return result.toString(); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EnumerationDefinitionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EnumerationDefinitionImpl.java index 0a11069..7f03335 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EnumerationDefinitionImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/EnumerationDefinitionImpl.java @@ -75,7 +75,7 @@ public EList getEnumeratedValue() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.ENUMERATION_DEFINITION__ENUMERATED_VALUE: - return this.getEnumeratedValue(); + return getEnumeratedValue(); } return super.eGet(featureID, resolve, coreType); } @@ -89,7 +89,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.ENUMERATION_DEFINITION__ENUMERATED_VALUE: - return !this.getEnumeratedValue().isEmpty(); + return !getEnumeratedValue().isEmpty(); } return super.eIsSet(featureID); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExpressionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExpressionImpl.java index 95a3b64..fa94c4f 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExpressionImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ExpressionImpl.java @@ -75,8 +75,8 @@ protected EClass eStaticClass() { */ @Override public Function getFunction() { - Function function = this.basicGetFunction(); - return function != null && function.eIsProxy() ? (Function)this.eResolveProxy((InternalEObject)function) : function; + Function function = basicGetFunction(); + return function != null && function.eIsProxy() ? (Function)eResolveProxy((InternalEObject)function) : function; } /** @@ -108,8 +108,8 @@ public boolean isIsModelLevelEvaluable() { */ @Override public Feature getResult() { - Feature result = this.basicGetResult(); - return result != null && result.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)result) : result; + Feature result = basicGetResult(); + return result != null && result.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)result) : result; } /** @@ -165,13 +165,13 @@ public boolean modelLevelEvaluable(EList visited) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.EXPRESSION__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable(); + return isIsModelLevelEvaluable(); case SysmlPackage.EXPRESSION__FUNCTION: - if (resolve) return this.getFunction(); - return this.basicGetFunction(); + if (resolve) return getFunction(); + return basicGetFunction(); case SysmlPackage.EXPRESSION__RESULT: - if (resolve) return this.getResult(); - return this.basicGetResult(); + if (resolve) return getResult(); + return basicGetResult(); } return super.eGet(featureID, resolve, coreType); } @@ -185,11 +185,11 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.EXPRESSION__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; + return isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; case SysmlPackage.EXPRESSION__FUNCTION: - return this.basicGetFunction() != null; + return basicGetFunction() != null; case SysmlPackage.EXPRESSION__RESULT: - return this.basicGetResult() != null; + return basicGetResult() != null; } return super.eIsSet(featureID); } @@ -204,11 +204,11 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.EXPRESSION___CHECK_CONDITION__ELEMENT: - return this.checkCondition((Element)arguments.get(0)); + return checkCondition((Element)arguments.get(0)); case SysmlPackage.EXPRESSION___EVALUATE__ELEMENT: - return this.evaluate((Element)arguments.get(0)); + return evaluate((Element)arguments.get(0)); case SysmlPackage.EXPRESSION___MODEL_LEVEL_EVALUABLE__ELIST: - return this.modelLevelEvaluable((EList)arguments.get(0)); + return modelLevelEvaluable((EList)arguments.get(0)); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureImpl.java index 69d1c03..9dbf11f 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureImpl.java @@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EcoreEList; -import org.eclipse.syson.sysml.AttributeUsage; import org.eclipse.syson.sysml.Feature; import org.eclipse.syson.sysml.FeatureChaining; import org.eclipse.syson.sysml.FeatureDirectionKind; @@ -278,7 +277,7 @@ public EList getChainingFeature() { */ @Override public FeatureDirectionKind getDirection() { - return this.direction; + return direction; } /** @@ -288,10 +287,10 @@ public FeatureDirectionKind getDirection() { */ @Override public void setDirection(FeatureDirectionKind newDirection) { - FeatureDirectionKind oldDirection = this.direction; - this.direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__DIRECTION, oldDirection, this.direction)); + FeatureDirectionKind oldDirection = direction; + direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__DIRECTION, oldDirection, direction)); } /** @@ -301,8 +300,8 @@ public void setDirection(FeatureDirectionKind newDirection) { */ @Override public Type getEndOwningType() { - Type endOwningType = this.basicGetEndOwningType(); - return endOwningType != null && endOwningType.eIsProxy() ? (Type)this.eResolveProxy((InternalEObject)endOwningType) : endOwningType; + Type endOwningType = basicGetEndOwningType(); + return endOwningType != null && endOwningType.eIsProxy() ? (Type)eResolveProxy((InternalEObject)endOwningType) : endOwningType; } /** @@ -335,7 +334,7 @@ public EList getFeaturingType() { */ @Override public boolean isIsComposite() { - return this.isComposite; + return isComposite; } /** @@ -345,10 +344,10 @@ public boolean isIsComposite() { */ @Override public void setIsComposite(boolean newIsComposite) { - boolean oldIsComposite = this.isComposite; - this.isComposite = newIsComposite; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_COMPOSITE, oldIsComposite, this.isComposite)); + boolean oldIsComposite = isComposite; + isComposite = newIsComposite; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_COMPOSITE, oldIsComposite, isComposite)); } /** @@ -358,7 +357,7 @@ public void setIsComposite(boolean newIsComposite) { */ @Override public boolean isIsDerived() { - return this.isDerived; + return isDerived; } /** @@ -368,10 +367,10 @@ public boolean isIsDerived() { */ @Override public void setIsDerived(boolean newIsDerived) { - boolean oldIsDerived = this.isDerived; - this.isDerived = newIsDerived; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_DERIVED, oldIsDerived, this.isDerived)); + boolean oldIsDerived = isDerived; + isDerived = newIsDerived; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_DERIVED, oldIsDerived, isDerived)); } /** @@ -381,7 +380,7 @@ public void setIsDerived(boolean newIsDerived) { */ @Override public boolean isIsEnd() { - return this.isEnd; + return isEnd; } /** @@ -391,10 +390,10 @@ public boolean isIsEnd() { */ @Override public void setIsEnd(boolean newIsEnd) { - boolean oldIsEnd = this.isEnd; - this.isEnd = newIsEnd; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_END, oldIsEnd, this.isEnd)); + boolean oldIsEnd = isEnd; + isEnd = newIsEnd; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_END, oldIsEnd, isEnd)); } /** @@ -414,7 +413,7 @@ public boolean isIsNonunique() { */ @Override public boolean isIsOrdered() { - return this.isOrdered; + return isOrdered; } /** @@ -424,10 +423,10 @@ public boolean isIsOrdered() { */ @Override public void setIsOrdered(boolean newIsOrdered) { - boolean oldIsOrdered = this.isOrdered; - this.isOrdered = newIsOrdered; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_ORDERED, oldIsOrdered, this.isOrdered)); + boolean oldIsOrdered = isOrdered; + isOrdered = newIsOrdered; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_ORDERED, oldIsOrdered, isOrdered)); } /** @@ -437,7 +436,7 @@ public void setIsOrdered(boolean newIsOrdered) { */ @Override public boolean isIsPortion() { - return this.isPortion; + return isPortion; } /** @@ -447,10 +446,10 @@ public boolean isIsPortion() { */ @Override public void setIsPortion(boolean newIsPortion) { - boolean oldIsPortion = this.isPortion; - this.isPortion = newIsPortion; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_PORTION, oldIsPortion, this.isPortion)); + boolean oldIsPortion = isPortion; + isPortion = newIsPortion; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_PORTION, oldIsPortion, isPortion)); } /** @@ -460,7 +459,7 @@ public void setIsPortion(boolean newIsPortion) { */ @Override public boolean isIsReadOnly() { - return this.isReadOnly; + return isReadOnly; } /** @@ -470,10 +469,10 @@ public boolean isIsReadOnly() { */ @Override public void setIsReadOnly(boolean newIsReadOnly) { - boolean oldIsReadOnly = this.isReadOnly; - this.isReadOnly = newIsReadOnly; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_READ_ONLY, oldIsReadOnly, this.isReadOnly)); + boolean oldIsReadOnly = isReadOnly; + isReadOnly = newIsReadOnly; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_READ_ONLY, oldIsReadOnly, isReadOnly)); } /** @@ -483,7 +482,7 @@ public void setIsReadOnly(boolean newIsReadOnly) { */ @Override public boolean isIsUnique() { - return this.isUnique; + return isUnique; } /** @@ -493,10 +492,10 @@ public boolean isIsUnique() { */ @Override public void setIsUnique(boolean newIsUnique) { - boolean oldIsUnique = this.isUnique; - this.isUnique = newIsUnique; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_UNIQUE, oldIsUnique, this.isUnique)); + boolean oldIsUnique = isUnique; + isUnique = newIsUnique; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE__IS_UNIQUE, oldIsUnique, isUnique)); } /** @@ -543,8 +542,8 @@ public EList getOwnedRedefinition() { */ @Override public ReferenceSubsetting getOwnedReferenceSubsetting() { - ReferenceSubsetting ownedReferenceSubsetting = this.basicGetOwnedReferenceSubsetting(); - return ownedReferenceSubsetting != null && ownedReferenceSubsetting.eIsProxy() ? (ReferenceSubsetting)this.eResolveProxy((InternalEObject)ownedReferenceSubsetting) : ownedReferenceSubsetting; + ReferenceSubsetting ownedReferenceSubsetting = basicGetOwnedReferenceSubsetting(); + return ownedReferenceSubsetting != null && ownedReferenceSubsetting.eIsProxy() ? (ReferenceSubsetting)eResolveProxy((InternalEObject)ownedReferenceSubsetting) : ownedReferenceSubsetting; } /** @@ -599,8 +598,8 @@ public EList getOwnedTyping() { */ @Override public FeatureMembership getOwningFeatureMembership() { - FeatureMembership owningFeatureMembership = this.basicGetOwningFeatureMembership(); - return owningFeatureMembership != null && owningFeatureMembership.eIsProxy() ? (FeatureMembership)this.eResolveProxy((InternalEObject)owningFeatureMembership) : owningFeatureMembership; + FeatureMembership owningFeatureMembership = basicGetOwningFeatureMembership(); + return owningFeatureMembership != null && owningFeatureMembership.eIsProxy() ? (FeatureMembership)eResolveProxy((InternalEObject)owningFeatureMembership) : owningFeatureMembership; } /** @@ -622,8 +621,8 @@ public FeatureMembership basicGetOwningFeatureMembership() { */ @Override public Type getOwningType() { - Type owningType = this.basicGetOwningType(); - return owningType != null && owningType.eIsProxy() ? (Type)this.eResolveProxy((InternalEObject)owningType) : owningType; + Type owningType = basicGetOwningType(); + return owningType != null && owningType.eIsProxy() ? (Type)eResolveProxy((InternalEObject)owningType) : owningType; } /** @@ -722,53 +721,53 @@ public boolean subsetsChain(Feature first, Feature second) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.FEATURE__DIRECTION: - return this.getDirection(); + return getDirection(); case SysmlPackage.FEATURE__IS_COMPOSITE: - return this.isIsComposite(); + return isIsComposite(); case SysmlPackage.FEATURE__IS_DERIVED: - return this.isIsDerived(); + return isIsDerived(); case SysmlPackage.FEATURE__IS_END: - return this.isIsEnd(); + return isIsEnd(); case SysmlPackage.FEATURE__IS_NONUNIQUE: - return this.isIsNonunique(); + return isIsNonunique(); case SysmlPackage.FEATURE__IS_ORDERED: - return this.isIsOrdered(); + return isIsOrdered(); case SysmlPackage.FEATURE__IS_PORTION: - return this.isIsPortion(); + return isIsPortion(); case SysmlPackage.FEATURE__IS_READ_ONLY: - return this.isIsReadOnly(); + return isIsReadOnly(); case SysmlPackage.FEATURE__IS_UNIQUE: - return this.isIsUnique(); + return isIsUnique(); case SysmlPackage.FEATURE__CHAINING_FEATURE: - return this.getChainingFeature(); + return getChainingFeature(); case SysmlPackage.FEATURE__END_OWNING_TYPE: - if (resolve) return this.getEndOwningType(); - return this.basicGetEndOwningType(); + if (resolve) return getEndOwningType(); + return basicGetEndOwningType(); case SysmlPackage.FEATURE__FEATURING_TYPE: - return this.getFeaturingType(); + return getFeaturingType(); case SysmlPackage.FEATURE__OWNED_FEATURE_CHAINING: - return this.getOwnedFeatureChaining(); + return getOwnedFeatureChaining(); case SysmlPackage.FEATURE__OWNED_FEATURE_INVERTING: - return this.getOwnedFeatureInverting(); + return getOwnedFeatureInverting(); case SysmlPackage.FEATURE__OWNED_REDEFINITION: - return this.getOwnedRedefinition(); + return getOwnedRedefinition(); case SysmlPackage.FEATURE__OWNED_REFERENCE_SUBSETTING: - if (resolve) return this.getOwnedReferenceSubsetting(); - return this.basicGetOwnedReferenceSubsetting(); + if (resolve) return getOwnedReferenceSubsetting(); + return basicGetOwnedReferenceSubsetting(); case SysmlPackage.FEATURE__OWNED_SUBSETTING: - return this.getOwnedSubsetting(); + return getOwnedSubsetting(); case SysmlPackage.FEATURE__OWNED_TYPE_FEATURING: - return this.getOwnedTypeFeaturing(); + return getOwnedTypeFeaturing(); case SysmlPackage.FEATURE__OWNED_TYPING: - return this.getOwnedTyping(); + return getOwnedTyping(); case SysmlPackage.FEATURE__OWNING_FEATURE_MEMBERSHIP: - if (resolve) return this.getOwningFeatureMembership(); - return this.basicGetOwningFeatureMembership(); + if (resolve) return getOwningFeatureMembership(); + return basicGetOwningFeatureMembership(); case SysmlPackage.FEATURE__OWNING_TYPE: - if (resolve) return this.getOwningType(); - return this.basicGetOwningType(); + if (resolve) return getOwningType(); + return basicGetOwningType(); case SysmlPackage.FEATURE__TYPE: - return this.getType(); + return getType(); } return super.eGet(featureID, resolve, coreType); } @@ -783,28 +782,28 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.FEATURE__DIRECTION: - this.setDirection((FeatureDirectionKind)newValue); + setDirection((FeatureDirectionKind)newValue); return; case SysmlPackage.FEATURE__IS_COMPOSITE: - this.setIsComposite((Boolean)newValue); + setIsComposite((Boolean)newValue); return; case SysmlPackage.FEATURE__IS_DERIVED: - this.setIsDerived((Boolean)newValue); + setIsDerived((Boolean)newValue); return; case SysmlPackage.FEATURE__IS_END: - this.setIsEnd((Boolean)newValue); + setIsEnd((Boolean)newValue); return; case SysmlPackage.FEATURE__IS_ORDERED: - this.setIsOrdered((Boolean)newValue); + setIsOrdered((Boolean)newValue); return; case SysmlPackage.FEATURE__IS_PORTION: - this.setIsPortion((Boolean)newValue); + setIsPortion((Boolean)newValue); return; case SysmlPackage.FEATURE__IS_READ_ONLY: - this.setIsReadOnly((Boolean)newValue); + setIsReadOnly((Boolean)newValue); return; case SysmlPackage.FEATURE__IS_UNIQUE: - this.setIsUnique((Boolean)newValue); + setIsUnique((Boolean)newValue); return; } super.eSet(featureID, newValue); @@ -819,28 +818,28 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.FEATURE__DIRECTION: - this.setDirection(DIRECTION_EDEFAULT); + setDirection(DIRECTION_EDEFAULT); return; case SysmlPackage.FEATURE__IS_COMPOSITE: - this.setIsComposite(IS_COMPOSITE_EDEFAULT); + setIsComposite(IS_COMPOSITE_EDEFAULT); return; case SysmlPackage.FEATURE__IS_DERIVED: - this.setIsDerived(IS_DERIVED_EDEFAULT); + setIsDerived(IS_DERIVED_EDEFAULT); return; case SysmlPackage.FEATURE__IS_END: - this.setIsEnd(IS_END_EDEFAULT); + setIsEnd(IS_END_EDEFAULT); return; case SysmlPackage.FEATURE__IS_ORDERED: - this.setIsOrdered(IS_ORDERED_EDEFAULT); + setIsOrdered(IS_ORDERED_EDEFAULT); return; case SysmlPackage.FEATURE__IS_PORTION: - this.setIsPortion(IS_PORTION_EDEFAULT); + setIsPortion(IS_PORTION_EDEFAULT); return; case SysmlPackage.FEATURE__IS_READ_ONLY: - this.setIsReadOnly(IS_READ_ONLY_EDEFAULT); + setIsReadOnly(IS_READ_ONLY_EDEFAULT); return; case SysmlPackage.FEATURE__IS_UNIQUE: - this.setIsUnique(IS_UNIQUE_EDEFAULT); + setIsUnique(IS_UNIQUE_EDEFAULT); return; } super.eUnset(featureID); @@ -855,49 +854,49 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.FEATURE__DIRECTION: - return this.direction != DIRECTION_EDEFAULT; + return direction != DIRECTION_EDEFAULT; case SysmlPackage.FEATURE__IS_COMPOSITE: - return this.isComposite != IS_COMPOSITE_EDEFAULT; + return isComposite != IS_COMPOSITE_EDEFAULT; case SysmlPackage.FEATURE__IS_DERIVED: - return this.isDerived != IS_DERIVED_EDEFAULT; + return isDerived != IS_DERIVED_EDEFAULT; case SysmlPackage.FEATURE__IS_END: - return this.isEnd != IS_END_EDEFAULT; + return isEnd != IS_END_EDEFAULT; case SysmlPackage.FEATURE__IS_NONUNIQUE: - return this.isIsNonunique() != IS_NONUNIQUE_EDEFAULT; + return isIsNonunique() != IS_NONUNIQUE_EDEFAULT; case SysmlPackage.FEATURE__IS_ORDERED: - return this.isOrdered != IS_ORDERED_EDEFAULT; + return isOrdered != IS_ORDERED_EDEFAULT; case SysmlPackage.FEATURE__IS_PORTION: - return this.isPortion != IS_PORTION_EDEFAULT; + return isPortion != IS_PORTION_EDEFAULT; case SysmlPackage.FEATURE__IS_READ_ONLY: - return this.isReadOnly != IS_READ_ONLY_EDEFAULT; + return isReadOnly != IS_READ_ONLY_EDEFAULT; case SysmlPackage.FEATURE__IS_UNIQUE: - return this.isUnique != IS_UNIQUE_EDEFAULT; + return isUnique != IS_UNIQUE_EDEFAULT; case SysmlPackage.FEATURE__CHAINING_FEATURE: - return !this.getChainingFeature().isEmpty(); + return !getChainingFeature().isEmpty(); case SysmlPackage.FEATURE__END_OWNING_TYPE: - return this.basicGetEndOwningType() != null; + return basicGetEndOwningType() != null; case SysmlPackage.FEATURE__FEATURING_TYPE: - return !this.getFeaturingType().isEmpty(); + return !getFeaturingType().isEmpty(); case SysmlPackage.FEATURE__OWNED_FEATURE_CHAINING: - return !this.getOwnedFeatureChaining().isEmpty(); + return !getOwnedFeatureChaining().isEmpty(); case SysmlPackage.FEATURE__OWNED_FEATURE_INVERTING: - return !this.getOwnedFeatureInverting().isEmpty(); + return !getOwnedFeatureInverting().isEmpty(); case SysmlPackage.FEATURE__OWNED_REDEFINITION: - return !this.getOwnedRedefinition().isEmpty(); + return !getOwnedRedefinition().isEmpty(); case SysmlPackage.FEATURE__OWNED_REFERENCE_SUBSETTING: - return this.basicGetOwnedReferenceSubsetting() != null; + return basicGetOwnedReferenceSubsetting() != null; case SysmlPackage.FEATURE__OWNED_SUBSETTING: - return !this.getOwnedSubsetting().isEmpty(); + return !getOwnedSubsetting().isEmpty(); case SysmlPackage.FEATURE__OWNED_TYPE_FEATURING: - return !this.getOwnedTypeFeaturing().isEmpty(); + return !getOwnedTypeFeaturing().isEmpty(); case SysmlPackage.FEATURE__OWNED_TYPING: - return !this.getOwnedTyping().isEmpty(); + return !getOwnedTyping().isEmpty(); case SysmlPackage.FEATURE__OWNING_FEATURE_MEMBERSHIP: - return this.basicGetOwningFeatureMembership() != null; + return basicGetOwningFeatureMembership() != null; case SysmlPackage.FEATURE__OWNING_TYPE: - return this.basicGetOwningType() != null; + return basicGetOwningType() != null; case SysmlPackage.FEATURE__TYPE: - return !this.getType().isEmpty(); + return !getType().isEmpty(); } return super.eIsSet(featureID); } @@ -911,17 +910,17 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.FEATURE___DIRECTION_FOR__TYPE: - return this.directionFor((Type)arguments.get(0)); + return directionFor((Type)arguments.get(0)); case SysmlPackage.FEATURE___IS_FEATURED_WITHIN__TYPE: - return this.isFeaturedWithin((Type)arguments.get(0)); + return isFeaturedWithin((Type)arguments.get(0)); case SysmlPackage.FEATURE___NAMING_FEATURE: - return this.namingFeature(); + return namingFeature(); case SysmlPackage.FEATURE___REDEFINES__FEATURE: - return this.redefines((Feature)arguments.get(0)); + return redefines((Feature)arguments.get(0)); case SysmlPackage.FEATURE___REDEFINES_FROM_LIBRARY__STRING: - return this.redefinesFromLibrary((String)arguments.get(0)); + return redefinesFromLibrary((String)arguments.get(0)); case SysmlPackage.FEATURE___SUBSETS_CHAIN__FEATURE_FEATURE: - return this.subsetsChain((Feature)arguments.get(0), (Feature)arguments.get(1)); + return subsetsChain((Feature)arguments.get(0), (Feature)arguments.get(1)); } return super.eInvoke(operationID, arguments); } @@ -933,25 +932,25 @@ public Object eInvoke(int operationID, EList arguments) throws InvocationTarg */ @Override public String toString() { - if (this.eIsProxy()) return super.toString(); + if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); result.append(" (direction: "); - result.append(this.direction); + result.append(direction); result.append(", isComposite: "); - result.append(this.isComposite); + result.append(isComposite); result.append(", isDerived: "); - result.append(this.isDerived); + result.append(isDerived); result.append(", isEnd: "); - result.append(this.isEnd); + result.append(isEnd); result.append(", isOrdered: "); - result.append(this.isOrdered); + result.append(isOrdered); result.append(", isPortion: "); - result.append(this.isPortion); + result.append(isPortion); result.append(", isReadOnly: "); - result.append(this.isReadOnly); + result.append(isReadOnly); result.append(", isUnique: "); - result.append(this.isUnique); + result.append(isUnique); result.append(')'); return result.toString(); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FlowConnectionUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FlowConnectionUsageImpl.java index 143db96..c313d7e 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FlowConnectionUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FlowConnectionUsageImpl.java @@ -127,8 +127,8 @@ public EList getInteraction() { */ @Override public ItemFeature getItemFeature() { - ItemFeature itemFeature = this.basicGetItemFeature(); - return itemFeature != null && itemFeature.eIsProxy() ? (ItemFeature)this.eResolveProxy((InternalEObject)itemFeature) : itemFeature; + ItemFeature itemFeature = basicGetItemFeature(); + return itemFeature != null && itemFeature.eIsProxy() ? (ItemFeature)eResolveProxy((InternalEObject)itemFeature) : itemFeature; } /** @@ -172,8 +172,8 @@ public EList getItemType() { */ @Override public Feature getSourceOutputFeature() { - Feature sourceOutputFeature = this.basicGetSourceOutputFeature(); - return sourceOutputFeature != null && sourceOutputFeature.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)sourceOutputFeature) : sourceOutputFeature; + Feature sourceOutputFeature = basicGetSourceOutputFeature(); + return sourceOutputFeature != null && sourceOutputFeature.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)sourceOutputFeature) : sourceOutputFeature; } /** @@ -195,8 +195,8 @@ public Feature basicGetSourceOutputFeature() { */ @Override public Feature getTargetInputFeature() { - Feature targetInputFeature = this.basicGetTargetInputFeature(); - return targetInputFeature != null && targetInputFeature.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)targetInputFeature) : targetInputFeature; + Feature targetInputFeature = basicGetTargetInputFeature(); + return targetInputFeature != null && targetInputFeature.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)targetInputFeature) : targetInputFeature; } /** @@ -277,28 +277,28 @@ public boolean isSubactionUsage() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.FLOW_CONNECTION_USAGE__BEHAVIOR: - return this.getBehavior(); + return getBehavior(); case SysmlPackage.FLOW_CONNECTION_USAGE__PARAMETER: - return this.getParameter(); + return getParameter(); case SysmlPackage.FLOW_CONNECTION_USAGE__ACTION_DEFINITION: - return this.getActionDefinition(); + return getActionDefinition(); case SysmlPackage.FLOW_CONNECTION_USAGE__INTERACTION: - return this.getInteraction(); + return getInteraction(); case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_FEATURE: - if (resolve) return this.getItemFeature(); - return this.basicGetItemFeature(); + if (resolve) return getItemFeature(); + return basicGetItemFeature(); case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_FLOW_END: - return this.getItemFlowEnd(); + return getItemFlowEnd(); case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_TYPE: - return this.getItemType(); + return getItemType(); case SysmlPackage.FLOW_CONNECTION_USAGE__SOURCE_OUTPUT_FEATURE: - if (resolve) return this.getSourceOutputFeature(); - return this.basicGetSourceOutputFeature(); + if (resolve) return getSourceOutputFeature(); + return basicGetSourceOutputFeature(); case SysmlPackage.FLOW_CONNECTION_USAGE__TARGET_INPUT_FEATURE: - if (resolve) return this.getTargetInputFeature(); - return this.basicGetTargetInputFeature(); + if (resolve) return getTargetInputFeature(); + return basicGetTargetInputFeature(); case SysmlPackage.FLOW_CONNECTION_USAGE__FLOW_CONNECTION_DEFINITION: - return this.getFlowConnectionDefinition(); + return getFlowConnectionDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -312,25 +312,25 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.FLOW_CONNECTION_USAGE__BEHAVIOR: - return !this.getBehavior().isEmpty(); + return !getBehavior().isEmpty(); case SysmlPackage.FLOW_CONNECTION_USAGE__PARAMETER: - return !this.getParameter().isEmpty(); + return !getParameter().isEmpty(); case SysmlPackage.FLOW_CONNECTION_USAGE__ACTION_DEFINITION: - return !this.getActionDefinition().isEmpty(); + return !getActionDefinition().isEmpty(); case SysmlPackage.FLOW_CONNECTION_USAGE__INTERACTION: - return !this.getInteraction().isEmpty(); + return !getInteraction().isEmpty(); case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_FEATURE: - return this.basicGetItemFeature() != null; + return basicGetItemFeature() != null; case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_FLOW_END: - return !this.getItemFlowEnd().isEmpty(); + return !getItemFlowEnd().isEmpty(); case SysmlPackage.FLOW_CONNECTION_USAGE__ITEM_TYPE: - return !this.getItemType().isEmpty(); + return !getItemType().isEmpty(); case SysmlPackage.FLOW_CONNECTION_USAGE__SOURCE_OUTPUT_FEATURE: - return this.basicGetSourceOutputFeature() != null; + return basicGetSourceOutputFeature() != null; case SysmlPackage.FLOW_CONNECTION_USAGE__TARGET_INPUT_FEATURE: - return this.basicGetTargetInputFeature() != null; + return basicGetTargetInputFeature() != null; case SysmlPackage.FLOW_CONNECTION_USAGE__FLOW_CONNECTION_DEFINITION: - return !this.getFlowConnectionDefinition().isEmpty(); + return !getFlowConnectionDefinition().isEmpty(); } return super.eIsSet(featureID); } @@ -441,13 +441,13 @@ public int eDerivedOperationID(int baseOperationID, Class baseClass) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.FLOW_CONNECTION_USAGE___ARGUMENT__INT: - return this.argument((Integer)arguments.get(0)); + return argument((Integer)arguments.get(0)); case SysmlPackage.FLOW_CONNECTION_USAGE___INPUT_PARAMETER__INT: - return this.inputParameter((Integer)arguments.get(0)); + return inputParameter((Integer)arguments.get(0)); case SysmlPackage.FLOW_CONNECTION_USAGE___INPUT_PARAMETERS: - return this.inputParameters(); + return inputParameters(); case SysmlPackage.FLOW_CONNECTION_USAGE___IS_SUBACTION_USAGE: - return this.isSubactionUsage(); + return isSubactionUsage(); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FunctionImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FunctionImpl.java index 8537cf5..b796dbc 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FunctionImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FunctionImpl.java @@ -98,8 +98,8 @@ public boolean isIsModelLevelEvaluable() { */ @Override public Feature getResult() { - Feature result = this.basicGetResult(); - return result != null && result.eIsProxy() ? (Feature)this.eResolveProxy((InternalEObject)result) : result; + Feature result = basicGetResult(); + return result != null && result.eIsProxy() ? (Feature)eResolveProxy((InternalEObject)result) : result; } /** @@ -123,12 +123,12 @@ public Feature basicGetResult() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.FUNCTION__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable(); + return isIsModelLevelEvaluable(); case SysmlPackage.FUNCTION__EXPRESSION: - return this.getExpression(); + return getExpression(); case SysmlPackage.FUNCTION__RESULT: - if (resolve) return this.getResult(); - return this.basicGetResult(); + if (resolve) return getResult(); + return basicGetResult(); } return super.eGet(featureID, resolve, coreType); } @@ -142,11 +142,11 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.FUNCTION__IS_MODEL_LEVEL_EVALUABLE: - return this.isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; + return isIsModelLevelEvaluable() != IS_MODEL_LEVEL_EVALUABLE_EDEFAULT; case SysmlPackage.FUNCTION__EXPRESSION: - return !this.getExpression().isEmpty(); + return !getExpression().isEmpty(); case SysmlPackage.FUNCTION__RESULT: - return this.basicGetResult() != null; + return basicGetResult() != null; } return super.eIsSet(featureID); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/InterfaceUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/InterfaceUsageImpl.java index ba93be9..7b12db3 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/InterfaceUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/InterfaceUsageImpl.java @@ -75,7 +75,7 @@ public EList getInterfaceDefinition() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.INTERFACE_USAGE__INTERFACE_DEFINITION: - return this.getInterfaceDefinition(); + return getInterfaceDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -89,7 +89,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.INTERFACE_USAGE__INTERFACE_DEFINITION: - return !this.getInterfaceDefinition().isEmpty(); + return !getInterfaceDefinition().isEmpty(); } return super.eIsSet(featureID); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImpl.java index 0e6d593..fc5a187 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MembershipImpl.java @@ -150,15 +150,15 @@ protected EClass eStaticClass() { */ @Override public Element getMemberElement() { - if (this.memberElement != null && this.memberElement.eIsProxy()) { - InternalEObject oldMemberElement = (InternalEObject)this.memberElement; - this.memberElement = (Element)this.eResolveProxy(oldMemberElement); - if (this.memberElement != oldMemberElement) { - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT, oldMemberElement, this.memberElement)); + if (memberElement != null && memberElement.eIsProxy()) { + InternalEObject oldMemberElement = (InternalEObject)memberElement; + memberElement = (Element)eResolveProxy(oldMemberElement); + if (memberElement != oldMemberElement) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT, oldMemberElement, memberElement)); } } - return this.memberElement; + return memberElement; } /** @@ -167,7 +167,7 @@ public Element getMemberElement() { * @generated */ public Element basicGetMemberElement() { - return this.memberElement; + return memberElement; } /** @@ -177,10 +177,10 @@ public Element basicGetMemberElement() { */ @Override public void setMemberElement(Element newMemberElement) { - Element oldMemberElement = this.memberElement; - this.memberElement = newMemberElement; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT, oldMemberElement, this.memberElement)); + Element oldMemberElement = memberElement; + memberElement = newMemberElement; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT, oldMemberElement, memberElement)); } /** @@ -202,7 +202,7 @@ public String getMemberElementId() { */ @Override public String getMemberName() { - return this.memberName; + return memberName; } /** @@ -212,10 +212,10 @@ public String getMemberName() { */ @Override public void setMemberName(String newMemberName) { - String oldMemberName = this.memberName; - this.memberName = newMemberName; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_NAME, oldMemberName, this.memberName)); + String oldMemberName = memberName; + memberName = newMemberName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_NAME, oldMemberName, memberName)); } /** @@ -225,8 +225,8 @@ public void setMemberName(String newMemberName) { */ @Override public Namespace getMembershipOwningNamespace() { - Namespace membershipOwningNamespace = this.basicGetMembershipOwningNamespace(); - return membershipOwningNamespace != null && membershipOwningNamespace.eIsProxy() ? (Namespace)this.eResolveProxy((InternalEObject)membershipOwningNamespace) : membershipOwningNamespace; + Namespace membershipOwningNamespace = basicGetMembershipOwningNamespace(); + return membershipOwningNamespace != null && membershipOwningNamespace.eIsProxy() ? (Namespace)eResolveProxy((InternalEObject)membershipOwningNamespace) : membershipOwningNamespace; } /** @@ -248,7 +248,7 @@ public Namespace basicGetMembershipOwningNamespace() { */ @Override public String getMemberShortName() { - return this.memberShortName; + return memberShortName; } /** @@ -258,10 +258,10 @@ public String getMemberShortName() { */ @Override public void setMemberShortName(String newMemberShortName) { - String oldMemberShortName = this.memberShortName; - this.memberShortName = newMemberShortName; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_SHORT_NAME, oldMemberShortName, this.memberShortName)); + String oldMemberShortName = memberShortName; + memberShortName = newMemberShortName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__MEMBER_SHORT_NAME, oldMemberShortName, memberShortName)); } /** @@ -271,7 +271,7 @@ public void setMemberShortName(String newMemberShortName) { */ @Override public VisibilityKind getVisibility() { - return this.visibility; + return visibility; } /** @@ -281,10 +281,10 @@ public VisibilityKind getVisibility() { */ @Override public void setVisibility(VisibilityKind newVisibility) { - VisibilityKind oldVisibility = this.visibility; - this.visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__VISIBILITY, oldVisibility, this.visibility)); + VisibilityKind oldVisibility = visibility; + visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.MEMBERSHIP__VISIBILITY, oldVisibility, visibility)); } /** @@ -306,19 +306,19 @@ public boolean isDistinguishableFrom(Membership other) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT_ID: - return this.getMemberElementId(); + return getMemberElementId(); case SysmlPackage.MEMBERSHIP__MEMBER_NAME: - return this.getMemberName(); + return getMemberName(); case SysmlPackage.MEMBERSHIP__MEMBER_SHORT_NAME: - return this.getMemberShortName(); + return getMemberShortName(); case SysmlPackage.MEMBERSHIP__VISIBILITY: - return this.getVisibility(); + return getVisibility(); case SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT: - if (resolve) return this.getMemberElement(); - return this.basicGetMemberElement(); + if (resolve) return getMemberElement(); + return basicGetMemberElement(); case SysmlPackage.MEMBERSHIP__MEMBERSHIP_OWNING_NAMESPACE: - if (resolve) return this.getMembershipOwningNamespace(); - return this.basicGetMembershipOwningNamespace(); + if (resolve) return getMembershipOwningNamespace(); + return basicGetMembershipOwningNamespace(); } return super.eGet(featureID, resolve, coreType); } @@ -332,16 +332,16 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.MEMBERSHIP__MEMBER_NAME: - this.setMemberName((String)newValue); + setMemberName((String)newValue); return; case SysmlPackage.MEMBERSHIP__MEMBER_SHORT_NAME: - this.setMemberShortName((String)newValue); + setMemberShortName((String)newValue); return; case SysmlPackage.MEMBERSHIP__VISIBILITY: - this.setVisibility((VisibilityKind)newValue); + setVisibility((VisibilityKind)newValue); return; case SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT: - this.setMemberElement((Element)newValue); + setMemberElement((Element)newValue); return; } super.eSet(featureID, newValue); @@ -356,16 +356,16 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.MEMBERSHIP__MEMBER_NAME: - this.setMemberName(MEMBER_NAME_EDEFAULT); + setMemberName(MEMBER_NAME_EDEFAULT); return; case SysmlPackage.MEMBERSHIP__MEMBER_SHORT_NAME: - this.setMemberShortName(MEMBER_SHORT_NAME_EDEFAULT); + setMemberShortName(MEMBER_SHORT_NAME_EDEFAULT); return; case SysmlPackage.MEMBERSHIP__VISIBILITY: - this.setVisibility(VISIBILITY_EDEFAULT); + setVisibility(VISIBILITY_EDEFAULT); return; case SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT: - this.setMemberElement((Element)null); + setMemberElement((Element)null); return; } super.eUnset(featureID); @@ -380,17 +380,17 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT_ID: - return MEMBER_ELEMENT_ID_EDEFAULT == null ? this.getMemberElementId() != null : !MEMBER_ELEMENT_ID_EDEFAULT.equals(this.getMemberElementId()); + return MEMBER_ELEMENT_ID_EDEFAULT == null ? getMemberElementId() != null : !MEMBER_ELEMENT_ID_EDEFAULT.equals(getMemberElementId()); case SysmlPackage.MEMBERSHIP__MEMBER_NAME: - return MEMBER_NAME_EDEFAULT == null ? this.memberName != null : !MEMBER_NAME_EDEFAULT.equals(this.memberName); + return MEMBER_NAME_EDEFAULT == null ? memberName != null : !MEMBER_NAME_EDEFAULT.equals(memberName); case SysmlPackage.MEMBERSHIP__MEMBER_SHORT_NAME: - return MEMBER_SHORT_NAME_EDEFAULT == null ? this.memberShortName != null : !MEMBER_SHORT_NAME_EDEFAULT.equals(this.memberShortName); + return MEMBER_SHORT_NAME_EDEFAULT == null ? memberShortName != null : !MEMBER_SHORT_NAME_EDEFAULT.equals(memberShortName); case SysmlPackage.MEMBERSHIP__VISIBILITY: - return this.visibility != VISIBILITY_EDEFAULT; + return visibility != VISIBILITY_EDEFAULT; case SysmlPackage.MEMBERSHIP__MEMBER_ELEMENT: - return this.memberElement != null; + return memberElement != null; case SysmlPackage.MEMBERSHIP__MEMBERSHIP_OWNING_NAMESPACE: - return this.basicGetMembershipOwningNamespace() != null; + return basicGetMembershipOwningNamespace() != null; } return super.eIsSet(featureID); } @@ -404,7 +404,7 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.MEMBERSHIP___IS_DISTINGUISHABLE_FROM__MEMBERSHIP: - return this.isDistinguishableFrom((Membership)arguments.get(0)); + return isDistinguishableFrom((Membership)arguments.get(0)); } return super.eInvoke(operationID, arguments); } @@ -416,15 +416,15 @@ public Object eInvoke(int operationID, EList arguments) throws InvocationTarg */ @Override public String toString() { - if (this.eIsProxy()) return super.toString(); + if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); result.append(" (memberName: "); - result.append(this.memberName); + result.append(memberName); result.append(", memberShortName: "); - result.append(this.memberShortName); + result.append(memberShortName); result.append(", visibility: "); - result.append(this.visibility); + result.append(visibility); result.append(')'); return result.toString(); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataFeatureImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataFeatureImpl.java index 22e41b3..76f48d8 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataFeatureImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataFeatureImpl.java @@ -96,10 +96,10 @@ public EList getAnnotatedElement() { */ @Override public EList getAnnotation() { - if (this.annotation == null) { - this.annotation = new EObjectWithInverseResolvingEList<>(Annotation.class, this, SysmlPackage.METADATA_FEATURE__ANNOTATION, SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT); + if (annotation == null) { + annotation = new EObjectWithInverseResolvingEList(Annotation.class, this, SysmlPackage.METADATA_FEATURE__ANNOTATION, SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT); } - return this.annotation; + return annotation; } /** @@ -109,8 +109,8 @@ public EList getAnnotation() { */ @Override public Metaclass getMetaclass() { - Metaclass metaclass = this.basicGetMetaclass(); - return metaclass != null && metaclass.eIsProxy() ? (Metaclass)this.eResolveProxy((InternalEObject)metaclass) : metaclass; + Metaclass metaclass = basicGetMetaclass(); + return metaclass != null && metaclass.eIsProxy() ? (Metaclass)eResolveProxy((InternalEObject)metaclass) : metaclass; } /** @@ -179,7 +179,7 @@ public Element syntaxElement() { public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case SysmlPackage.METADATA_FEATURE__ANNOTATION: - return ((InternalEList)(InternalEList)this.getAnnotation()).basicAdd(otherEnd, msgs); + return ((InternalEList)(InternalEList)getAnnotation()).basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -193,7 +193,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case SysmlPackage.METADATA_FEATURE__ANNOTATION: - return ((InternalEList)this.getAnnotation()).basicRemove(otherEnd, msgs); + return ((InternalEList)getAnnotation()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -207,12 +207,12 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.METADATA_FEATURE__ANNOTATED_ELEMENT: - return this.getAnnotatedElement(); + return getAnnotatedElement(); case SysmlPackage.METADATA_FEATURE__ANNOTATION: - return this.getAnnotation(); + return getAnnotation(); case SysmlPackage.METADATA_FEATURE__METACLASS: - if (resolve) return this.getMetaclass(); - return this.basicGetMetaclass(); + if (resolve) return getMetaclass(); + return basicGetMetaclass(); } return super.eGet(featureID, resolve, coreType); } @@ -227,8 +227,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.METADATA_FEATURE__ANNOTATION: - this.getAnnotation().clear(); - this.getAnnotation().addAll((Collection)newValue); + getAnnotation().clear(); + getAnnotation().addAll((Collection)newValue); return; } super.eSet(featureID, newValue); @@ -243,7 +243,7 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.METADATA_FEATURE__ANNOTATION: - this.getAnnotation().clear(); + getAnnotation().clear(); return; } super.eUnset(featureID); @@ -258,11 +258,11 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.METADATA_FEATURE__ANNOTATED_ELEMENT: - return !this.getAnnotatedElement().isEmpty(); + return !getAnnotatedElement().isEmpty(); case SysmlPackage.METADATA_FEATURE__ANNOTATION: - return this.annotation != null && !this.annotation.isEmpty(); + return annotation != null && !annotation.isEmpty(); case SysmlPackage.METADATA_FEATURE__METACLASS: - return this.basicGetMetaclass() != null; + return basicGetMetaclass() != null; } return super.eIsSet(featureID); } @@ -310,13 +310,13 @@ public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.METADATA_FEATURE___EVALUATE_FEATURE__FEATURE: - return this.evaluateFeature((Feature)arguments.get(0)); + return evaluateFeature((Feature)arguments.get(0)); case SysmlPackage.METADATA_FEATURE___IS_SEMANTIC: - return this.isSemantic(); + return isSemantic(); case SysmlPackage.METADATA_FEATURE___IS_SYNTACTIC: - return this.isSyntactic(); + return isSyntactic(); case SysmlPackage.METADATA_FEATURE___SYNTAX_ELEMENT: - return this.syntaxElement(); + return syntaxElement(); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java index 40378c7..e3e4dae 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java @@ -98,10 +98,10 @@ public EList getAnnotatedElement() { */ @Override public EList getAnnotation() { - if (this.annotation == null) { - this.annotation = new EObjectWithInverseResolvingEList<>(Annotation.class, this, SysmlPackage.METADATA_USAGE__ANNOTATION, SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT); + if (annotation == null) { + annotation = new EObjectWithInverseResolvingEList(Annotation.class, this, SysmlPackage.METADATA_USAGE__ANNOTATION, SysmlPackage.ANNOTATION__ANNOTATING_ELEMENT); } - return this.annotation; + return annotation; } /** @@ -111,8 +111,8 @@ public EList getAnnotation() { */ @Override public Metaclass getMetaclass() { - Metaclass metaclass = this.basicGetMetaclass(); - return metaclass != null && metaclass.eIsProxy() ? (Metaclass)this.eResolveProxy((InternalEObject)metaclass) : metaclass; + Metaclass metaclass = basicGetMetaclass(); + return metaclass != null && metaclass.eIsProxy() ? (Metaclass)eResolveProxy((InternalEObject)metaclass) : metaclass; } /** @@ -134,8 +134,8 @@ public Metaclass basicGetMetaclass() { */ @Override public Metaclass getMetadataDefinition() { - Metaclass metadataDefinition = this.basicGetMetadataDefinition(); - return metadataDefinition != null && metadataDefinition.eIsProxy() ? (Metaclass)this.eResolveProxy((InternalEObject)metadataDefinition) : metadataDefinition; + Metaclass metadataDefinition = basicGetMetadataDefinition(); + return metadataDefinition != null && metadataDefinition.eIsProxy() ? (Metaclass)eResolveProxy((InternalEObject)metadataDefinition) : metadataDefinition; } /** @@ -204,7 +204,7 @@ public Element syntaxElement() { public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case SysmlPackage.METADATA_USAGE__ANNOTATION: - return ((InternalEList)(InternalEList)this.getAnnotation()).basicAdd(otherEnd, msgs); + return ((InternalEList)(InternalEList)getAnnotation()).basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -218,7 +218,7 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case SysmlPackage.METADATA_USAGE__ANNOTATION: - return ((InternalEList)this.getAnnotation()).basicRemove(otherEnd, msgs); + return ((InternalEList)getAnnotation()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -232,15 +232,15 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.METADATA_USAGE__ANNOTATED_ELEMENT: - return this.getAnnotatedElement(); + return getAnnotatedElement(); case SysmlPackage.METADATA_USAGE__ANNOTATION: - return this.getAnnotation(); + return getAnnotation(); case SysmlPackage.METADATA_USAGE__METACLASS: - if (resolve) return this.getMetaclass(); - return this.basicGetMetaclass(); + if (resolve) return getMetaclass(); + return basicGetMetaclass(); case SysmlPackage.METADATA_USAGE__METADATA_DEFINITION: - if (resolve) return this.getMetadataDefinition(); - return this.basicGetMetadataDefinition(); + if (resolve) return getMetadataDefinition(); + return basicGetMetadataDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -255,8 +255,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.METADATA_USAGE__ANNOTATION: - this.getAnnotation().clear(); - this.getAnnotation().addAll((Collection)newValue); + getAnnotation().clear(); + getAnnotation().addAll((Collection)newValue); return; } super.eSet(featureID, newValue); @@ -271,7 +271,7 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.METADATA_USAGE__ANNOTATION: - this.getAnnotation().clear(); + getAnnotation().clear(); return; } super.eUnset(featureID); @@ -286,13 +286,13 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.METADATA_USAGE__ANNOTATED_ELEMENT: - return !this.getAnnotatedElement().isEmpty(); + return !getAnnotatedElement().isEmpty(); case SysmlPackage.METADATA_USAGE__ANNOTATION: - return this.annotation != null && !this.annotation.isEmpty(); + return annotation != null && !annotation.isEmpty(); case SysmlPackage.METADATA_USAGE__METACLASS: - return this.basicGetMetaclass() != null; + return basicGetMetaclass() != null; case SysmlPackage.METADATA_USAGE__METADATA_DEFINITION: - return this.basicGetMetadataDefinition() != null; + return basicGetMetadataDefinition() != null; } return super.eIsSet(featureID); } @@ -376,13 +376,13 @@ public int eDerivedOperationID(int baseOperationID, Class baseClass) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.METADATA_USAGE___EVALUATE_FEATURE__FEATURE: - return this.evaluateFeature((Feature)arguments.get(0)); + return evaluateFeature((Feature)arguments.get(0)); case SysmlPackage.METADATA_USAGE___IS_SEMANTIC: - return this.isSemantic(); + return isSemantic(); case SysmlPackage.METADATA_USAGE___IS_SYNTACTIC: - return this.isSyntactic(); + return isSyntactic(); case SysmlPackage.METADATA_USAGE___SYNTAX_ELEMENT: - return this.syntaxElement(); + return syntaxElement(); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MultiplicityRangeImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MultiplicityRangeImpl.java index fa24138..f780843 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MultiplicityRangeImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MultiplicityRangeImpl.java @@ -78,8 +78,8 @@ public EList getBound() { */ @Override public Expression getLowerBound() { - Expression lowerBound = this.basicGetLowerBound(); - return lowerBound != null && lowerBound.eIsProxy() ? (Expression)this.eResolveProxy((InternalEObject)lowerBound) : lowerBound; + Expression lowerBound = basicGetLowerBound(); + return lowerBound != null && lowerBound.eIsProxy() ? (Expression)eResolveProxy((InternalEObject)lowerBound) : lowerBound; } /** @@ -101,8 +101,8 @@ public Expression basicGetLowerBound() { */ @Override public Expression getUpperBound() { - Expression upperBound = this.basicGetUpperBound(); - return upperBound != null && upperBound.eIsProxy() ? (Expression)this.eResolveProxy((InternalEObject)upperBound) : upperBound; + Expression upperBound = basicGetUpperBound(); + return upperBound != null && upperBound.eIsProxy() ? (Expression)eResolveProxy((InternalEObject)upperBound) : upperBound; } /** @@ -146,13 +146,13 @@ public int valueOf(Expression bound) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.MULTIPLICITY_RANGE__BOUND: - return this.getBound(); + return getBound(); case SysmlPackage.MULTIPLICITY_RANGE__LOWER_BOUND: - if (resolve) return this.getLowerBound(); - return this.basicGetLowerBound(); + if (resolve) return getLowerBound(); + return basicGetLowerBound(); case SysmlPackage.MULTIPLICITY_RANGE__UPPER_BOUND: - if (resolve) return this.getUpperBound(); - return this.basicGetUpperBound(); + if (resolve) return getUpperBound(); + return basicGetUpperBound(); } return super.eGet(featureID, resolve, coreType); } @@ -166,11 +166,11 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.MULTIPLICITY_RANGE__BOUND: - return !this.getBound().isEmpty(); + return !getBound().isEmpty(); case SysmlPackage.MULTIPLICITY_RANGE__LOWER_BOUND: - return this.basicGetLowerBound() != null; + return basicGetLowerBound() != null; case SysmlPackage.MULTIPLICITY_RANGE__UPPER_BOUND: - return this.basicGetUpperBound() != null; + return basicGetUpperBound() != null; } return super.eIsSet(featureID); } @@ -184,9 +184,9 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.MULTIPLICITY_RANGE___HAS_BOUNDS__INT_INT: - return this.hasBounds((Integer)arguments.get(0), (Integer)arguments.get(1)); + return hasBounds((Integer)arguments.get(0), (Integer)arguments.get(1)); case SysmlPackage.MULTIPLICITY_RANGE___VALUE_OF__EXPRESSION: - return this.valueOf((Expression)arguments.get(0)); + return valueOf((Expression)arguments.get(0)); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImpl.java index 94c7115..92b9822 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/NamespaceImpl.java @@ -265,17 +265,17 @@ public EList visibleMemberships(EList excluded, boolean i public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.NAMESPACE__IMPORTED_MEMBERSHIP: - return this.getImportedMembership(); + return getImportedMembership(); case SysmlPackage.NAMESPACE__MEMBER: - return this.getMember(); + return getMember(); case SysmlPackage.NAMESPACE__MEMBERSHIP: - return this.getMembership(); + return getMembership(); case SysmlPackage.NAMESPACE__OWNED_IMPORT: - return this.getOwnedImport(); + return getOwnedImport(); case SysmlPackage.NAMESPACE__OWNED_MEMBER: - return this.getOwnedMember(); + return getOwnedMember(); case SysmlPackage.NAMESPACE__OWNED_MEMBERSHIP: - return this.getOwnedMembership(); + return getOwnedMembership(); } return super.eGet(featureID, resolve, coreType); } @@ -289,17 +289,17 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.NAMESPACE__IMPORTED_MEMBERSHIP: - return !this.getImportedMembership().isEmpty(); + return !getImportedMembership().isEmpty(); case SysmlPackage.NAMESPACE__MEMBER: - return !this.getMember().isEmpty(); + return !getMember().isEmpty(); case SysmlPackage.NAMESPACE__MEMBERSHIP: - return !this.getMembership().isEmpty(); + return !getMembership().isEmpty(); case SysmlPackage.NAMESPACE__OWNED_IMPORT: - return !this.getOwnedImport().isEmpty(); + return !getOwnedImport().isEmpty(); case SysmlPackage.NAMESPACE__OWNED_MEMBER: - return !this.getOwnedMember().isEmpty(); + return !getOwnedMember().isEmpty(); case SysmlPackage.NAMESPACE__OWNED_MEMBERSHIP: - return !this.getOwnedMembership().isEmpty(); + return !getOwnedMembership().isEmpty(); } return super.eIsSet(featureID); } @@ -314,25 +314,25 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.NAMESPACE___IMPORTED_MEMBERSHIPS__ELIST: - return this.importedMemberships((EList)arguments.get(0)); + return importedMemberships((EList)arguments.get(0)); case SysmlPackage.NAMESPACE___NAMES_OF__ELEMENT: - return this.namesOf((Element)arguments.get(0)); + return namesOf((Element)arguments.get(0)); case SysmlPackage.NAMESPACE___QUALIFICATION_OF__STRING: - return this.qualificationOf((String)arguments.get(0)); + return qualificationOf((String)arguments.get(0)); case SysmlPackage.NAMESPACE___RESOLVE__STRING: - return this.resolve((String)arguments.get(0)); + return resolve((String)arguments.get(0)); case SysmlPackage.NAMESPACE___RESOLVE_GLOBAL__STRING: - return this.resolveGlobal((String)arguments.get(0)); + return resolveGlobal((String)arguments.get(0)); case SysmlPackage.NAMESPACE___RESOLVE_LOCAL__STRING: - return this.resolveLocal((String)arguments.get(0)); + return resolveLocal((String)arguments.get(0)); case SysmlPackage.NAMESPACE___RESOLVE_VISIBLE__STRING: - return this.resolveVisible((String)arguments.get(0)); + return resolveVisible((String)arguments.get(0)); case SysmlPackage.NAMESPACE___UNQUALIFIED_NAME_OF__STRING: - return this.unqualifiedNameOf((String)arguments.get(0)); + return unqualifiedNameOf((String)arguments.get(0)); case SysmlPackage.NAMESPACE___VISIBILITY_OF__MEMBERSHIP: - return this.visibilityOf((Membership)arguments.get(0)); + return visibilityOf((Membership)arguments.get(0)); case SysmlPackage.NAMESPACE___VISIBLE_MEMBERSHIPS__ELIST_BOOLEAN_BOOLEAN: - return this.visibleMemberships((EList)arguments.get(0), (Boolean)arguments.get(1), (Boolean)arguments.get(2)); + return visibleMemberships((EList)arguments.get(0), (Boolean)arguments.get(1), (Boolean)arguments.get(2)); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PackageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PackageImpl.java index 600b4ee..8e6ed55 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PackageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PackageImpl.java @@ -86,7 +86,7 @@ public boolean includeAsMember(Element element) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.PACKAGE__FILTER_CONDITION: - return this.getFilterCondition(); + return getFilterCondition(); } return super.eGet(featureID, resolve, coreType); } @@ -100,7 +100,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.PACKAGE__FILTER_CONDITION: - return !this.getFilterCondition().isEmpty(); + return !getFilterCondition().isEmpty(); } return super.eIsSet(featureID); } @@ -114,7 +114,7 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.PACKAGE___INCLUDE_AS_MEMBER__ELEMENT: - return this.includeAsMember((Element)arguments.get(0)); + return includeAsMember((Element)arguments.get(0)); } return super.eInvoke(operationID, arguments); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PartUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PartUsageImpl.java index 5b758fd..647d434 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PartUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PartUsageImpl.java @@ -21,7 +21,6 @@ import org.eclipse.syson.sysml.FeatureTyping; import org.eclipse.syson.sysml.PartDefinition; import org.eclipse.syson.sysml.PartUsage; -import org.eclipse.syson.sysml.PortDefinition; import org.eclipse.syson.sysml.SysmlPackage; /** diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PortUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PortUsageImpl.java index dffd3d5..a7cab7c 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PortUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/PortUsageImpl.java @@ -18,15 +18,10 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.util.EcoreEList; -import org.eclipse.syson.sysml.FeatureMembership; import org.eclipse.syson.sysml.FeatureTyping; -import org.eclipse.syson.sysml.ItemUsage; -import org.eclipse.syson.sysml.PartDefinition; import org.eclipse.syson.sysml.PortDefinition; import org.eclipse.syson.sysml.PortUsage; -import org.eclipse.syson.sysml.Relationship; import org.eclipse.syson.sysml.SysmlPackage; -import org.eclipse.syson.sysml.Type; /** * diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateUsageImpl.java index e84cb24..7ac138c 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateUsageImpl.java @@ -92,8 +92,8 @@ protected EClass eStaticClass() { */ @Override public ActionUsage getDoAction() { - ActionUsage doAction = this.basicGetDoAction(); - return doAction != null && doAction.eIsProxy() ? (ActionUsage)this.eResolveProxy((InternalEObject)doAction) : doAction; + ActionUsage doAction = basicGetDoAction(); + return doAction != null && doAction.eIsProxy() ? (ActionUsage)eResolveProxy((InternalEObject)doAction) : doAction; } /** @@ -115,8 +115,8 @@ public ActionUsage basicGetDoAction() { */ @Override public ActionUsage getEntryAction() { - ActionUsage entryAction = this.basicGetEntryAction(); - return entryAction != null && entryAction.eIsProxy() ? (ActionUsage)this.eResolveProxy((InternalEObject)entryAction) : entryAction; + ActionUsage entryAction = basicGetEntryAction(); + return entryAction != null && entryAction.eIsProxy() ? (ActionUsage)eResolveProxy((InternalEObject)entryAction) : entryAction; } /** @@ -138,8 +138,8 @@ public ActionUsage basicGetEntryAction() { */ @Override public ActionUsage getExitAction() { - ActionUsage exitAction = this.basicGetExitAction(); - return exitAction != null && exitAction.eIsProxy() ? (ActionUsage)this.eResolveProxy((InternalEObject)exitAction) : exitAction; + ActionUsage exitAction = basicGetExitAction(); + return exitAction != null && exitAction.eIsProxy() ? (ActionUsage)eResolveProxy((InternalEObject)exitAction) : exitAction; } /** @@ -161,7 +161,7 @@ public ActionUsage basicGetExitAction() { */ @Override public boolean isIsParallel() { - return this.isParallel; + return isParallel; } /** @@ -171,10 +171,10 @@ public boolean isIsParallel() { */ @Override public void setIsParallel(boolean newIsParallel) { - boolean oldIsParallel = this.isParallel; - this.isParallel = newIsParallel; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.STATE_USAGE__IS_PARALLEL, oldIsParallel, this.isParallel)); + boolean oldIsParallel = isParallel; + isParallel = newIsParallel; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.STATE_USAGE__IS_PARALLEL, oldIsParallel, isParallel)); } /** @@ -207,18 +207,18 @@ public boolean isSubstateUsage(boolean isParallel) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.STATE_USAGE__IS_PARALLEL: - return this.isIsParallel(); + return isIsParallel(); case SysmlPackage.STATE_USAGE__DO_ACTION: - if (resolve) return this.getDoAction(); - return this.basicGetDoAction(); + if (resolve) return getDoAction(); + return basicGetDoAction(); case SysmlPackage.STATE_USAGE__ENTRY_ACTION: - if (resolve) return this.getEntryAction(); - return this.basicGetEntryAction(); + if (resolve) return getEntryAction(); + return basicGetEntryAction(); case SysmlPackage.STATE_USAGE__EXIT_ACTION: - if (resolve) return this.getExitAction(); - return this.basicGetExitAction(); + if (resolve) return getExitAction(); + return basicGetExitAction(); case SysmlPackage.STATE_USAGE__STATE_DEFINITION: - return this.getStateDefinition(); + return getStateDefinition(); } return super.eGet(featureID, resolve, coreType); } @@ -233,7 +233,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.STATE_USAGE__IS_PARALLEL: - this.setIsParallel((Boolean)newValue); + setIsParallel((Boolean)newValue); return; } super.eSet(featureID, newValue); @@ -248,7 +248,7 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.STATE_USAGE__IS_PARALLEL: - this.setIsParallel(IS_PARALLEL_EDEFAULT); + setIsParallel(IS_PARALLEL_EDEFAULT); return; } super.eUnset(featureID); @@ -263,15 +263,15 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.STATE_USAGE__IS_PARALLEL: - return this.isParallel != IS_PARALLEL_EDEFAULT; + return isParallel != IS_PARALLEL_EDEFAULT; case SysmlPackage.STATE_USAGE__DO_ACTION: - return this.basicGetDoAction() != null; + return basicGetDoAction() != null; case SysmlPackage.STATE_USAGE__ENTRY_ACTION: - return this.basicGetEntryAction() != null; + return basicGetEntryAction() != null; case SysmlPackage.STATE_USAGE__EXIT_ACTION: - return this.basicGetExitAction() != null; + return basicGetExitAction() != null; case SysmlPackage.STATE_USAGE__STATE_DEFINITION: - return !this.getStateDefinition().isEmpty(); + return !getStateDefinition().isEmpty(); } return super.eIsSet(featureID); } @@ -285,7 +285,7 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.STATE_USAGE___IS_SUBSTATE_USAGE__BOOLEAN: - return this.isSubstateUsage((Boolean)arguments.get(0)); + return isSubstateUsage((Boolean)arguments.get(0)); } return super.eInvoke(operationID, arguments); } @@ -297,11 +297,11 @@ public Object eInvoke(int operationID, EList arguments) throws InvocationTarg */ @Override public String toString() { - if (this.eIsProxy()) return super.toString(); + if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); result.append(" (isParallel: "); - result.append(this.isParallel); + result.append(isParallel); result.append(')'); return result.toString(); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeImpl.java index 4223ba0..41d9b2e 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/TypeImpl.java @@ -248,7 +248,7 @@ public EList getIntersectingType() { */ @Override public boolean isIsAbstract() { - return this.isAbstract; + return isAbstract; } /** @@ -258,10 +258,10 @@ public boolean isIsAbstract() { */ @Override public void setIsAbstract(boolean newIsAbstract) { - boolean oldIsAbstract = this.isAbstract; - this.isAbstract = newIsAbstract; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TYPE__IS_ABSTRACT, oldIsAbstract, this.isAbstract)); + boolean oldIsAbstract = isAbstract; + isAbstract = newIsAbstract; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TYPE__IS_ABSTRACT, oldIsAbstract, isAbstract)); } /** @@ -281,7 +281,7 @@ public boolean isIsConjugated() { */ @Override public boolean isIsSufficient() { - return this.isSufficient; + return isSufficient; } /** @@ -291,10 +291,10 @@ public boolean isIsSufficient() { */ @Override public void setIsSufficient(boolean newIsSufficient) { - boolean oldIsSufficient = this.isSufficient; - this.isSufficient = newIsSufficient; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TYPE__IS_SUFFICIENT, oldIsSufficient, this.isSufficient)); + boolean oldIsSufficient = isSufficient; + isSufficient = newIsSufficient; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.TYPE__IS_SUFFICIENT, oldIsSufficient, isSufficient)); } /** @@ -304,8 +304,8 @@ public void setIsSufficient(boolean newIsSufficient) { */ @Override public Multiplicity getMultiplicity() { - Multiplicity multiplicity = this.basicGetMultiplicity(); - return multiplicity != null && multiplicity.eIsProxy() ? (Multiplicity)this.eResolveProxy((InternalEObject)multiplicity) : multiplicity; + Multiplicity multiplicity = basicGetMultiplicity(); + return multiplicity != null && multiplicity.eIsProxy() ? (Multiplicity)eResolveProxy((InternalEObject)multiplicity) : multiplicity; } /** @@ -338,8 +338,8 @@ public EList getOutput() { */ @Override public Conjugation getOwnedConjugator() { - Conjugation ownedConjugator = this.basicGetOwnedConjugator(); - return ownedConjugator != null && ownedConjugator.eIsProxy() ? (Conjugation)this.eResolveProxy((InternalEObject)ownedConjugator) : ownedConjugator; + Conjugation ownedConjugator = basicGetOwnedConjugator(); + return ownedConjugator != null && ownedConjugator.eIsProxy() ? (Conjugation)eResolveProxy((InternalEObject)ownedConjugator) : ownedConjugator; } /** @@ -518,55 +518,55 @@ public boolean specializesFromLibrary(String libraryTypeName) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.TYPE__IS_ABSTRACT: - return this.isIsAbstract(); + return isIsAbstract(); case SysmlPackage.TYPE__IS_CONJUGATED: - return this.isIsConjugated(); + return isIsConjugated(); case SysmlPackage.TYPE__IS_SUFFICIENT: - return this.isIsSufficient(); + return isIsSufficient(); case SysmlPackage.TYPE__DIFFERENCING_TYPE: - return this.getDifferencingType(); + return getDifferencingType(); case SysmlPackage.TYPE__DIRECTED_FEATURE: - return this.getDirectedFeature(); + return getDirectedFeature(); case SysmlPackage.TYPE__END_FEATURE: - return this.getEndFeature(); + return getEndFeature(); case SysmlPackage.TYPE__FEATURE: - return this.getFeature(); + return getFeature(); case SysmlPackage.TYPE__FEATURE_MEMBERSHIP: - return this.getFeatureMembership(); + return getFeatureMembership(); case SysmlPackage.TYPE__INHERITED_FEATURE: - return this.getInheritedFeature(); + return getInheritedFeature(); case SysmlPackage.TYPE__INHERITED_MEMBERSHIP: - return this.getInheritedMembership(); + return getInheritedMembership(); case SysmlPackage.TYPE__INPUT: - return this.getInput(); + return getInput(); case SysmlPackage.TYPE__INTERSECTING_TYPE: - return this.getIntersectingType(); + return getIntersectingType(); case SysmlPackage.TYPE__MULTIPLICITY: - if (resolve) return this.getMultiplicity(); - return this.basicGetMultiplicity(); + if (resolve) return getMultiplicity(); + return basicGetMultiplicity(); case SysmlPackage.TYPE__OUTPUT: - return this.getOutput(); + return getOutput(); case SysmlPackage.TYPE__OWNED_CONJUGATOR: - if (resolve) return this.getOwnedConjugator(); - return this.basicGetOwnedConjugator(); + if (resolve) return getOwnedConjugator(); + return basicGetOwnedConjugator(); case SysmlPackage.TYPE__OWNED_DIFFERENCING: - return this.getOwnedDifferencing(); + return getOwnedDifferencing(); case SysmlPackage.TYPE__OWNED_DISJOINING: - return this.getOwnedDisjoining(); + return getOwnedDisjoining(); case SysmlPackage.TYPE__OWNED_END_FEATURE: - return this.getOwnedEndFeature(); + return getOwnedEndFeature(); case SysmlPackage.TYPE__OWNED_FEATURE: - return this.getOwnedFeature(); + return getOwnedFeature(); case SysmlPackage.TYPE__OWNED_FEATURE_MEMBERSHIP: - return this.getOwnedFeatureMembership(); + return getOwnedFeatureMembership(); case SysmlPackage.TYPE__OWNED_INTERSECTING: - return this.getOwnedIntersecting(); + return getOwnedIntersecting(); case SysmlPackage.TYPE__OWNED_SPECIALIZATION: - return this.getOwnedSpecialization(); + return getOwnedSpecialization(); case SysmlPackage.TYPE__OWNED_UNIONING: - return this.getOwnedUnioning(); + return getOwnedUnioning(); case SysmlPackage.TYPE__UNIONING_TYPE: - return this.getUnioningType(); + return getUnioningType(); } return super.eGet(featureID, resolve, coreType); } @@ -581,10 +581,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.TYPE__IS_ABSTRACT: - this.setIsAbstract((Boolean)newValue); + setIsAbstract((Boolean)newValue); return; case SysmlPackage.TYPE__IS_SUFFICIENT: - this.setIsSufficient((Boolean)newValue); + setIsSufficient((Boolean)newValue); return; } super.eSet(featureID, newValue); @@ -599,10 +599,10 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.TYPE__IS_ABSTRACT: - this.setIsAbstract(IS_ABSTRACT_EDEFAULT); + setIsAbstract(IS_ABSTRACT_EDEFAULT); return; case SysmlPackage.TYPE__IS_SUFFICIENT: - this.setIsSufficient(IS_SUFFICIENT_EDEFAULT); + setIsSufficient(IS_SUFFICIENT_EDEFAULT); return; } super.eUnset(featureID); @@ -617,53 +617,53 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.TYPE__IS_ABSTRACT: - return this.isAbstract != IS_ABSTRACT_EDEFAULT; + return isAbstract != IS_ABSTRACT_EDEFAULT; case SysmlPackage.TYPE__IS_CONJUGATED: - return this.isIsConjugated() != IS_CONJUGATED_EDEFAULT; + return isIsConjugated() != IS_CONJUGATED_EDEFAULT; case SysmlPackage.TYPE__IS_SUFFICIENT: - return this.isSufficient != IS_SUFFICIENT_EDEFAULT; + return isSufficient != IS_SUFFICIENT_EDEFAULT; case SysmlPackage.TYPE__DIFFERENCING_TYPE: - return !this.getDifferencingType().isEmpty(); + return !getDifferencingType().isEmpty(); case SysmlPackage.TYPE__DIRECTED_FEATURE: - return !this.getDirectedFeature().isEmpty(); + return !getDirectedFeature().isEmpty(); case SysmlPackage.TYPE__END_FEATURE: - return !this.getEndFeature().isEmpty(); + return !getEndFeature().isEmpty(); case SysmlPackage.TYPE__FEATURE: - return !this.getFeature().isEmpty(); + return !getFeature().isEmpty(); case SysmlPackage.TYPE__FEATURE_MEMBERSHIP: - return !this.getFeatureMembership().isEmpty(); + return !getFeatureMembership().isEmpty(); case SysmlPackage.TYPE__INHERITED_FEATURE: - return !this.getInheritedFeature().isEmpty(); + return !getInheritedFeature().isEmpty(); case SysmlPackage.TYPE__INHERITED_MEMBERSHIP: - return !this.getInheritedMembership().isEmpty(); + return !getInheritedMembership().isEmpty(); case SysmlPackage.TYPE__INPUT: - return !this.getInput().isEmpty(); + return !getInput().isEmpty(); case SysmlPackage.TYPE__INTERSECTING_TYPE: - return !this.getIntersectingType().isEmpty(); + return !getIntersectingType().isEmpty(); case SysmlPackage.TYPE__MULTIPLICITY: - return this.basicGetMultiplicity() != null; + return basicGetMultiplicity() != null; case SysmlPackage.TYPE__OUTPUT: - return !this.getOutput().isEmpty(); + return !getOutput().isEmpty(); case SysmlPackage.TYPE__OWNED_CONJUGATOR: - return this.basicGetOwnedConjugator() != null; + return basicGetOwnedConjugator() != null; case SysmlPackage.TYPE__OWNED_DIFFERENCING: - return !this.getOwnedDifferencing().isEmpty(); + return !getOwnedDifferencing().isEmpty(); case SysmlPackage.TYPE__OWNED_DISJOINING: - return !this.getOwnedDisjoining().isEmpty(); + return !getOwnedDisjoining().isEmpty(); case SysmlPackage.TYPE__OWNED_END_FEATURE: - return !this.getOwnedEndFeature().isEmpty(); + return !getOwnedEndFeature().isEmpty(); case SysmlPackage.TYPE__OWNED_FEATURE: - return !this.getOwnedFeature().isEmpty(); + return !getOwnedFeature().isEmpty(); case SysmlPackage.TYPE__OWNED_FEATURE_MEMBERSHIP: - return !this.getOwnedFeatureMembership().isEmpty(); + return !getOwnedFeatureMembership().isEmpty(); case SysmlPackage.TYPE__OWNED_INTERSECTING: - return !this.getOwnedIntersecting().isEmpty(); + return !getOwnedIntersecting().isEmpty(); case SysmlPackage.TYPE__OWNED_SPECIALIZATION: - return !this.getOwnedSpecialization().isEmpty(); + return !getOwnedSpecialization().isEmpty(); case SysmlPackage.TYPE__OWNED_UNIONING: - return !this.getOwnedUnioning().isEmpty(); + return !getOwnedUnioning().isEmpty(); case SysmlPackage.TYPE__UNIONING_TYPE: - return !this.getUnioningType().isEmpty(); + return !getUnioningType().isEmpty(); } return super.eIsSet(featureID); } @@ -678,15 +678,15 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.TYPE___ALL_SUPERTYPES: - return this.allSupertypes(); + return allSupertypes(); case SysmlPackage.TYPE___DIRECTION_OF__FEATURE: - return this.directionOf((Feature)arguments.get(0)); + return directionOf((Feature)arguments.get(0)); case SysmlPackage.TYPE___INHERITED_MEMBERSHIPS__ELIST: - return this.inheritedMemberships((EList)arguments.get(0)); + return inheritedMemberships((EList)arguments.get(0)); case SysmlPackage.TYPE___SPECIALIZES__TYPE: - return this.specializes((Type)arguments.get(0)); + return specializes((Type)arguments.get(0)); case SysmlPackage.TYPE___SPECIALIZES_FROM_LIBRARY__STRING: - return this.specializesFromLibrary((String)arguments.get(0)); + return specializesFromLibrary((String)arguments.get(0)); } return super.eInvoke(operationID, arguments); } @@ -698,13 +698,13 @@ public Object eInvoke(int operationID, EList arguments) throws InvocationTarg */ @Override public String toString() { - if (this.eIsProxy()) return super.toString(); + if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); result.append(" (isAbstract: "); - result.append(this.isAbstract); + result.append(isAbstract); result.append(", isSufficient: "); - result.append(this.isSufficient); + result.append(isSufficient); result.append(')'); return result.toString(); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java index 4086a38..92a8fac 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java @@ -191,7 +191,7 @@ public boolean isIsReference() { */ @Override public boolean isIsVariation() { - return this.isVariation; + return isVariation; } /** @@ -201,10 +201,10 @@ public boolean isIsVariation() { */ @Override public void setIsVariation(boolean newIsVariation) { - boolean oldIsVariation = this.isVariation; - this.isVariation = newIsVariation; - if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.USAGE__IS_VARIATION, oldIsVariation, this.isVariation)); + boolean oldIsVariation = isVariation; + isVariation = newIsVariation; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.USAGE__IS_VARIATION, oldIsVariation, isVariation)); } /** @@ -539,8 +539,8 @@ public EList getNestedViewpoint() { */ @Override public Definition getOwningDefinition() { - Definition owningDefinition = this.basicGetOwningDefinition(); - return owningDefinition != null && owningDefinition.eIsProxy() ? (Definition)this.eResolveProxy((InternalEObject)owningDefinition) : owningDefinition; + Definition owningDefinition = basicGetOwningDefinition(); + return owningDefinition != null && owningDefinition.eIsProxy() ? (Definition)eResolveProxy((InternalEObject)owningDefinition) : owningDefinition; } /** @@ -562,8 +562,8 @@ public Definition basicGetOwningDefinition() { */ @Override public Usage getOwningUsage() { - Usage owningUsage = this.basicGetOwningUsage(); - return owningUsage != null && owningUsage.eIsProxy() ? (Usage)this.eResolveProxy((InternalEObject)owningUsage) : owningUsage; + Usage owningUsage = basicGetOwningUsage(); + return owningUsage != null && owningUsage.eIsProxy() ? (Usage)eResolveProxy((InternalEObject)owningUsage) : owningUsage; } /** @@ -620,79 +620,79 @@ public EList getVariantMembership() { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.USAGE__IS_REFERENCE: - return this.isIsReference(); + return isIsReference(); case SysmlPackage.USAGE__IS_VARIATION: - return this.isIsVariation(); + return isIsVariation(); case SysmlPackage.USAGE__DEFINITION: - return this.getDefinition(); + return getDefinition(); case SysmlPackage.USAGE__DIRECTED_USAGE: - return this.getDirectedUsage(); + return getDirectedUsage(); case SysmlPackage.USAGE__NESTED_ACTION: - return this.getNestedAction(); + return getNestedAction(); case SysmlPackage.USAGE__NESTED_ALLOCATION: - return this.getNestedAllocation(); + return getNestedAllocation(); case SysmlPackage.USAGE__NESTED_ANALYSIS_CASE: - return this.getNestedAnalysisCase(); + return getNestedAnalysisCase(); case SysmlPackage.USAGE__NESTED_ATTRIBUTE: - return this.getNestedAttribute(); + return getNestedAttribute(); case SysmlPackage.USAGE__NESTED_CALCULATION: - return this.getNestedCalculation(); + return getNestedCalculation(); case SysmlPackage.USAGE__NESTED_CASE: - return this.getNestedCase(); + return getNestedCase(); case SysmlPackage.USAGE__NESTED_CONCERN: - return this.getNestedConcern(); + return getNestedConcern(); case SysmlPackage.USAGE__NESTED_CONNECTION: - return this.getNestedConnection(); + return getNestedConnection(); case SysmlPackage.USAGE__NESTED_CONSTRAINT: - return this.getNestedConstraint(); + return getNestedConstraint(); case SysmlPackage.USAGE__NESTED_ENUMERATION: - return this.getNestedEnumeration(); + return getNestedEnumeration(); case SysmlPackage.USAGE__NESTED_FLOW: - return this.getNestedFlow(); + return getNestedFlow(); case SysmlPackage.USAGE__NESTED_INTERFACE: - return this.getNestedInterface(); + return getNestedInterface(); case SysmlPackage.USAGE__NESTED_ITEM: - return this.getNestedItem(); + return getNestedItem(); case SysmlPackage.USAGE__NESTED_METADATA: - return this.getNestedMetadata(); + return getNestedMetadata(); case SysmlPackage.USAGE__NESTED_OCCURRENCE: - return this.getNestedOccurrence(); + return getNestedOccurrence(); case SysmlPackage.USAGE__NESTED_PART: - return this.getNestedPart(); + return getNestedPart(); case SysmlPackage.USAGE__NESTED_PORT: - return this.getNestedPort(); + return getNestedPort(); case SysmlPackage.USAGE__NESTED_REFERENCE: - return this.getNestedReference(); + return getNestedReference(); case SysmlPackage.USAGE__NESTED_RENDERING: - return this.getNestedRendering(); + return getNestedRendering(); case SysmlPackage.USAGE__NESTED_REQUIREMENT: - return this.getNestedRequirement(); + return getNestedRequirement(); case SysmlPackage.USAGE__NESTED_STATE: - return this.getNestedState(); + return getNestedState(); case SysmlPackage.USAGE__NESTED_TRANSITION: - return this.getNestedTransition(); + return getNestedTransition(); case SysmlPackage.USAGE__NESTED_USAGE: - return this.getNestedUsage(); + return getNestedUsage(); case SysmlPackage.USAGE__NESTED_USE_CASE: - return this.getNestedUseCase(); + return getNestedUseCase(); case SysmlPackage.USAGE__NESTED_VERIFICATION_CASE: - return this.getNestedVerificationCase(); + return getNestedVerificationCase(); case SysmlPackage.USAGE__NESTED_VIEW: - return this.getNestedView(); + return getNestedView(); case SysmlPackage.USAGE__NESTED_VIEWPOINT: - return this.getNestedViewpoint(); + return getNestedViewpoint(); case SysmlPackage.USAGE__OWNING_DEFINITION: - if (resolve) return this.getOwningDefinition(); - return this.basicGetOwningDefinition(); + if (resolve) return getOwningDefinition(); + return basicGetOwningDefinition(); case SysmlPackage.USAGE__OWNING_USAGE: - if (resolve) return this.getOwningUsage(); - return this.basicGetOwningUsage(); + if (resolve) return getOwningUsage(); + return basicGetOwningUsage(); case SysmlPackage.USAGE__USAGE: - return this.getUsage(); + return getUsage(); case SysmlPackage.USAGE__VARIANT: - return this.getVariant(); + return getVariant(); case SysmlPackage.USAGE__VARIANT_MEMBERSHIP: - return this.getVariantMembership(); + return getVariantMembership(); } return super.eGet(featureID, resolve, coreType); } @@ -707,7 +707,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { case SysmlPackage.USAGE__IS_VARIATION: - this.setIsVariation((Boolean)newValue); + setIsVariation((Boolean)newValue); return; } super.eSet(featureID, newValue); @@ -722,7 +722,7 @@ public void eSet(int featureID, Object newValue) { public void eUnset(int featureID) { switch (featureID) { case SysmlPackage.USAGE__IS_VARIATION: - this.setIsVariation(IS_VARIATION_EDEFAULT); + setIsVariation(IS_VARIATION_EDEFAULT); return; } super.eUnset(featureID); @@ -737,77 +737,77 @@ public void eUnset(int featureID) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.USAGE__IS_REFERENCE: - return this.isIsReference() != IS_REFERENCE_EDEFAULT; + return isIsReference() != IS_REFERENCE_EDEFAULT; case SysmlPackage.USAGE__IS_VARIATION: - return this.isVariation != IS_VARIATION_EDEFAULT; + return isVariation != IS_VARIATION_EDEFAULT; case SysmlPackage.USAGE__DEFINITION: - return !this.getDefinition().isEmpty(); + return !getDefinition().isEmpty(); case SysmlPackage.USAGE__DIRECTED_USAGE: - return !this.getDirectedUsage().isEmpty(); + return !getDirectedUsage().isEmpty(); case SysmlPackage.USAGE__NESTED_ACTION: - return !this.getNestedAction().isEmpty(); + return !getNestedAction().isEmpty(); case SysmlPackage.USAGE__NESTED_ALLOCATION: - return !this.getNestedAllocation().isEmpty(); + return !getNestedAllocation().isEmpty(); case SysmlPackage.USAGE__NESTED_ANALYSIS_CASE: - return !this.getNestedAnalysisCase().isEmpty(); + return !getNestedAnalysisCase().isEmpty(); case SysmlPackage.USAGE__NESTED_ATTRIBUTE: - return !this.getNestedAttribute().isEmpty(); + return !getNestedAttribute().isEmpty(); case SysmlPackage.USAGE__NESTED_CALCULATION: - return !this.getNestedCalculation().isEmpty(); + return !getNestedCalculation().isEmpty(); case SysmlPackage.USAGE__NESTED_CASE: - return !this.getNestedCase().isEmpty(); + return !getNestedCase().isEmpty(); case SysmlPackage.USAGE__NESTED_CONCERN: - return !this.getNestedConcern().isEmpty(); + return !getNestedConcern().isEmpty(); case SysmlPackage.USAGE__NESTED_CONNECTION: - return !this.getNestedConnection().isEmpty(); + return !getNestedConnection().isEmpty(); case SysmlPackage.USAGE__NESTED_CONSTRAINT: - return !this.getNestedConstraint().isEmpty(); + return !getNestedConstraint().isEmpty(); case SysmlPackage.USAGE__NESTED_ENUMERATION: - return !this.getNestedEnumeration().isEmpty(); + return !getNestedEnumeration().isEmpty(); case SysmlPackage.USAGE__NESTED_FLOW: - return !this.getNestedFlow().isEmpty(); + return !getNestedFlow().isEmpty(); case SysmlPackage.USAGE__NESTED_INTERFACE: - return !this.getNestedInterface().isEmpty(); + return !getNestedInterface().isEmpty(); case SysmlPackage.USAGE__NESTED_ITEM: - return !this.getNestedItem().isEmpty(); + return !getNestedItem().isEmpty(); case SysmlPackage.USAGE__NESTED_METADATA: - return !this.getNestedMetadata().isEmpty(); + return !getNestedMetadata().isEmpty(); case SysmlPackage.USAGE__NESTED_OCCURRENCE: - return !this.getNestedOccurrence().isEmpty(); + return !getNestedOccurrence().isEmpty(); case SysmlPackage.USAGE__NESTED_PART: - return !this.getNestedPart().isEmpty(); + return !getNestedPart().isEmpty(); case SysmlPackage.USAGE__NESTED_PORT: - return !this.getNestedPort().isEmpty(); + return !getNestedPort().isEmpty(); case SysmlPackage.USAGE__NESTED_REFERENCE: - return !this.getNestedReference().isEmpty(); + return !getNestedReference().isEmpty(); case SysmlPackage.USAGE__NESTED_RENDERING: - return !this.getNestedRendering().isEmpty(); + return !getNestedRendering().isEmpty(); case SysmlPackage.USAGE__NESTED_REQUIREMENT: - return !this.getNestedRequirement().isEmpty(); + return !getNestedRequirement().isEmpty(); case SysmlPackage.USAGE__NESTED_STATE: - return !this.getNestedState().isEmpty(); + return !getNestedState().isEmpty(); case SysmlPackage.USAGE__NESTED_TRANSITION: - return !this.getNestedTransition().isEmpty(); + return !getNestedTransition().isEmpty(); case SysmlPackage.USAGE__NESTED_USAGE: - return !this.getNestedUsage().isEmpty(); + return !getNestedUsage().isEmpty(); case SysmlPackage.USAGE__NESTED_USE_CASE: - return !this.getNestedUseCase().isEmpty(); + return !getNestedUseCase().isEmpty(); case SysmlPackage.USAGE__NESTED_VERIFICATION_CASE: - return !this.getNestedVerificationCase().isEmpty(); + return !getNestedVerificationCase().isEmpty(); case SysmlPackage.USAGE__NESTED_VIEW: - return !this.getNestedView().isEmpty(); + return !getNestedView().isEmpty(); case SysmlPackage.USAGE__NESTED_VIEWPOINT: - return !this.getNestedViewpoint().isEmpty(); + return !getNestedViewpoint().isEmpty(); case SysmlPackage.USAGE__OWNING_DEFINITION: - return this.basicGetOwningDefinition() != null; + return basicGetOwningDefinition() != null; case SysmlPackage.USAGE__OWNING_USAGE: - return this.basicGetOwningUsage() != null; + return basicGetOwningUsage() != null; case SysmlPackage.USAGE__USAGE: - return !this.getUsage().isEmpty(); + return !getUsage().isEmpty(); case SysmlPackage.USAGE__VARIANT: - return !this.getVariant().isEmpty(); + return !getVariant().isEmpty(); case SysmlPackage.USAGE__VARIANT_MEMBERSHIP: - return !this.getVariantMembership().isEmpty(); + return !getVariantMembership().isEmpty(); } return super.eIsSet(featureID); } @@ -819,11 +819,11 @@ public boolean eIsSet(int featureID) { */ @Override public String toString() { - if (this.eIsProxy()) return super.toString(); + if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); result.append(" (isVariation: "); - result.append(this.isVariation); + result.append(isVariation); result.append(')'); return result.toString(); } diff --git a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewUsageImpl.java b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewUsageImpl.java index 4cb3fb1..3beb596 100644 --- a/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewUsageImpl.java +++ b/backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ViewUsageImpl.java @@ -106,8 +106,8 @@ public EList getViewCondition() { */ @Override public ViewDefinition getViewDefinition() { - ViewDefinition viewDefinition = this.basicGetViewDefinition(); - return viewDefinition != null && viewDefinition.eIsProxy() ? (ViewDefinition)this.eResolveProxy((InternalEObject)viewDefinition) : viewDefinition; + ViewDefinition viewDefinition = basicGetViewDefinition(); + return viewDefinition != null && viewDefinition.eIsProxy() ? (ViewDefinition)eResolveProxy((InternalEObject)viewDefinition) : viewDefinition; } /** @@ -129,8 +129,8 @@ public ViewDefinition basicGetViewDefinition() { */ @Override public RenderingUsage getViewRendering() { - RenderingUsage viewRendering = this.basicGetViewRendering(); - return viewRendering != null && viewRendering.eIsProxy() ? (RenderingUsage)this.eResolveProxy((InternalEObject)viewRendering) : viewRendering; + RenderingUsage viewRendering = basicGetViewRendering(); + return viewRendering != null && viewRendering.eIsProxy() ? (RenderingUsage)eResolveProxy((InternalEObject)viewRendering) : viewRendering; } /** @@ -164,17 +164,17 @@ public boolean includeAsExposed(Element element) { public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case SysmlPackage.VIEW_USAGE__EXPOSED_ELEMENT: - return this.getExposedElement(); + return getExposedElement(); case SysmlPackage.VIEW_USAGE__SATISFIED_VIEWPOINT: - return this.getSatisfiedViewpoint(); + return getSatisfiedViewpoint(); case SysmlPackage.VIEW_USAGE__VIEW_CONDITION: - return this.getViewCondition(); + return getViewCondition(); case SysmlPackage.VIEW_USAGE__VIEW_DEFINITION: - if (resolve) return this.getViewDefinition(); - return this.basicGetViewDefinition(); + if (resolve) return getViewDefinition(); + return basicGetViewDefinition(); case SysmlPackage.VIEW_USAGE__VIEW_RENDERING: - if (resolve) return this.getViewRendering(); - return this.basicGetViewRendering(); + if (resolve) return getViewRendering(); + return basicGetViewRendering(); } return super.eGet(featureID, resolve, coreType); } @@ -188,15 +188,15 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public boolean eIsSet(int featureID) { switch (featureID) { case SysmlPackage.VIEW_USAGE__EXPOSED_ELEMENT: - return !this.getExposedElement().isEmpty(); + return !getExposedElement().isEmpty(); case SysmlPackage.VIEW_USAGE__SATISFIED_VIEWPOINT: - return !this.getSatisfiedViewpoint().isEmpty(); + return !getSatisfiedViewpoint().isEmpty(); case SysmlPackage.VIEW_USAGE__VIEW_CONDITION: - return !this.getViewCondition().isEmpty(); + return !getViewCondition().isEmpty(); case SysmlPackage.VIEW_USAGE__VIEW_DEFINITION: - return this.basicGetViewDefinition() != null; + return basicGetViewDefinition() != null; case SysmlPackage.VIEW_USAGE__VIEW_RENDERING: - return this.basicGetViewRendering() != null; + return basicGetViewRendering() != null; } return super.eIsSet(featureID); } @@ -210,7 +210,7 @@ public boolean eIsSet(int featureID) { public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { switch (operationID) { case SysmlPackage.VIEW_USAGE___INCLUDE_AS_EXPOSED__ELEMENT: - return this.includeAsExposed((Element)arguments.get(0)); + return includeAsExposed((Element)arguments.get(0)); } return super.eInvoke(operationID, arguments); } diff --git a/backend/pom.xml b/backend/pom.xml new file mode 100644 index 0000000..bc20f57 --- /dev/null +++ b/backend/pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + org.eclipse.syson + syson-backend-parent + 2023.10.8 + + syson-backend-parent + SysON Backend Parent + pom + + + /application + /metamodel + /views + + diff --git a/backend/views/pom.xml b/backend/views/pom.xml new file mode 100644 index 0000000..fc9cf90 --- /dev/null +++ b/backend/views/pom.xml @@ -0,0 +1,29 @@ + + + + 4.0.0 + + org.eclipse.syson + syson-views-parent + 2023.10.8 + + syson-views-parent + SysON Views Parent + pom + + + syson-diagram-general-view + + diff --git a/backend/views/syson-diagram-general-view/.checkstyle b/backend/views/syson-diagram-general-view/.checkstyle index b2201ea..73959a6 100644 --- a/backend/views/syson-diagram-general-view/.checkstyle +++ b/backend/views/syson-diagram-general-view/.checkstyle @@ -6,5 +6,6 @@ + diff --git a/backend/views/syson-diagram-general-view/.classpath b/backend/views/syson-diagram-general-view/.classpath index 2a5a91b..9fc384a 100644 --- a/backend/views/syson-diagram-general-view/.classpath +++ b/backend/views/syson-diagram-general-view/.classpath @@ -36,22 +36,5 @@ - - - - - - - - - - - - - - - - - diff --git a/backend/views/syson-diagram-general-view/pom.xml b/backend/views/syson-diagram-general-view/pom.xml index c4c5c86..281f8c7 100644 --- a/backend/views/syson-diagram-general-view/pom.xml +++ b/backend/views/syson-diagram-general-view/pom.xml @@ -30,6 +30,7 @@ 17 2023.10.8 + 4.10.1 @@ -82,6 +83,11 @@ sirius-web-services ${sirius.web.version} + + org.antlr + antlr4-runtime + ${antlr.version} + org.eclipse.syson syson-sysml-metamodel @@ -102,6 +108,23 @@ + + org.antlr + antlr4-maven-plugin + ${antlr.version} + + ${basedir}/src/main/resources + ${basedir}/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated + UTF-8 + + + + + antlr4 + + + + org.apache.maven.plugins maven-checkstyle-plugin @@ -109,6 +132,7 @@ ../../releng/syson-resources/checkstyle/CheckstyleConfiguration.xml true + org/eclipse/syson/diagram/general/view/directedit/grammars/generated/* true true diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/GeneralViewDirectEditListener.java b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/GeneralViewDirectEditListener.java new file mode 100644 index 0000000..48aea7f --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/GeneralViewDirectEditListener.java @@ -0,0 +1,93 @@ +/******************************************************************************* + * Copyright (c) 2023 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.syson.diagram.general.view.directedit; + +import java.util.Objects; + +import org.antlr.v4.runtime.tree.ErrorNode; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EClassifier; +import org.eclipse.syson.diagram.general.view.directedit.grammars.generated.DirectEditBaseListener; +import org.eclipse.syson.diagram.general.view.directedit.grammars.generated.DirectEditParser.ExpressionContext; +import org.eclipse.syson.diagram.general.view.directedit.grammars.generated.DirectEditParser.TypingExpressionContext; +import org.eclipse.syson.diagram.general.view.directedit.grammars.generated.DirectEditParser.ValueExpressionContext; +import org.eclipse.syson.diagram.general.view.services.GeneralViewUtilService; +import org.eclipse.syson.sysml.Definition; +import org.eclipse.syson.sysml.Element; +import org.eclipse.syson.sysml.FeatureTyping; +import org.eclipse.syson.sysml.SysmlFactory; +import org.eclipse.syson.sysml.SysmlPackage; +import org.eclipse.syson.sysml.Usage; + +/** + * The ANTLR Listener for the direct edit grammar for General View. + * + * @author arichard + */ +public class GeneralViewDirectEditListener extends DirectEditBaseListener { + + private final Element element; + + private final GeneralViewUtilService generalViewUtilService; + + public GeneralViewDirectEditListener(Element element) { + this.element = Objects.requireNonNull(element); + this.generalViewUtilService = new GeneralViewUtilService(); + } + + @Override + public void exitExpression(ExpressionContext ctx) { + var identifier = ctx.Ident(); + this.element.setDeclaredName(identifier.getText()); + } + + @Override + public void exitTypingExpression(TypingExpressionContext ctx) { + if (this.element instanceof Usage) { + var identifier = ctx.Ident(); + var typeAsString = identifier.getText(); + var definition = this.generalViewUtilService.findDefinitionByName(this.element, typeAsString); + if (definition == null) { + var containerPackage = this.generalViewUtilService.getContainerPackage(this.element); + var newMembership = SysmlFactory.eINSTANCE.createOwningMembership(); + containerPackage.getOwnedMembership().add(newMembership); + EClassifier eClassifier = SysmlPackage.eINSTANCE.getEClassifier(this.element.eClass().getInstanceTypeName().replace("Usage", "Definition")); + if (eClassifier instanceof EClass eClass) { + definition = (Definition) SysmlFactory.eINSTANCE.create(eClass); + definition.setDeclaredName(typeAsString); + } + } + var featureTyping = this.element.getOwnedRelationship().stream() + .filter(FeatureTyping.class::isInstance) + .map(FeatureTyping.class::cast) + .findFirst(); + if (featureTyping.isPresent()) { + featureTyping.get().setType(definition); + } else { + var newFeatureTyping = SysmlFactory.eINSTANCE.createFeatureTyping(); + this.element.getOwnedRelationship().add(newFeatureTyping); + featureTyping.get().setType(definition); + } + } + } + + @Override + public void exitValueExpression(ValueExpressionContext ctx) { + super.exitValueExpression(ctx); + } + + @Override + public void visitErrorNode(ErrorNode node) { + super.visitErrorNode(node); + } +} diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEdit.interp b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEdit.interp new file mode 100644 index 0000000..066d550 --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEdit.interp @@ -0,0 +1,222 @@ +token literal names: +null +':' +'=' +'.*' +null +null +null +null +null +'about' +'abstract' +'alias' +'all' +'and' +'as' +'assign' +'assoc' +'behavior' +'binding' +'bool' +'by' +'chains' +'class' +'classifier' +'comment' +'composite' +'conjugate' +'conjugates' +'conjugation' +'connector' +'datatype' +'default' +'dependency' +'derived' +'differences' +'disjoining' +'disjoint' +'doc' +'else' +'END' +'expr' +'false' +'feature' +'featured' +'featuring' +'filter' +'first' +'flow' +'for' +'from' +'function' +'hastype' +'if' +'intersects' +'implies' +'import' +'in' +'inout' +'interaction' +'inv' +'inverse' +'inverting' +'istype' +'language' +'member' +'metaclass' +'metadata' +'multiplicity' +'namespace' +'nonunique' +'not' +'null' +'of' +'or' +'ordered' +'out' +'package' +'portion' +'predicate' +'private' +'protected' +'public' +'readonly' +'redefines' +'redefinition' +'references' +'rep' +'return' +'specialization' +'specializes' +'step' +'struct' +'subclassifier' +'subset' +'subsets' +'subtype' +'succession' +'then' +'to' +'true' +'type' +'typed' +'typing' +'unions' +'xor' + +token symbolic names: +null +null +null +null +WS +Integer +Real +String +Ident +ABOUT +ABSTRACT +ALIAS +ALL +AND +AS +ASSIGN +ASSOC +BEAHVIOR +BINDING +BOOL +BY +CHAINS +CLASS +CLASSIFIER +COMMENT +COMPOSITE +CONJUGATE +CONJUGATES +CONJUGATION +CONNECTOR +DATATYPE +DEFAULT +DEPENDENCY +DERIVED +DIFFERENCES +DISJOINING +DISJOINT +DOC +ELSE +END +EXPR +FALSE +FEATURE +FEATURED +FEATURING +FILTER +FIRST +FLOW +FOR +FROM +FUNCTION +HASTYPE +IF +INTERSECTS +IMPLIES +IMPORT +IN +INPUT +INTERACTION +INV +INVERSE +INVERTING +ISTYPE +LANGUAGE +MEMBER +METACLASS +METADATA +MULTIPLICITY +NAMESPACE +NONUNIQUE +NOT +NULL +OF +OR +ORDERED +OUT +PACKAGE +PORTION +PREDICATE +PRIAVTE +PROTECTED +PUBLIC +READONLY +REDEFINES +REDEFINITION +RFERENCES +REP +RETURN +SPECIALIZTION +SPECIALIZES +STEP +STRCUT +SUBCLASSIFIER +SUBSET +SUBSETS +SUBTYPE +SUCCESSION +THEN +TO +TRUE +TYPE +TYPED +TYPING +UNIONS +XOR + +rule names: +expression +typingExpression +valueExpression + + +atn: +[4, 1, 104, 22, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 1, 0, 1, 0, 3, 0, 9, 8, 0, 1, 0, 3, 0, 12, 8, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 3, 0, 2, 4, 0, 0, 20, 0, 6, 1, 0, 0, 0, 2, 15, 1, 0, 0, 0, 4, 18, 1, 0, 0, 0, 6, 8, 5, 8, 0, 0, 7, 9, 3, 2, 1, 0, 8, 7, 1, 0, 0, 0, 8, 9, 1, 0, 0, 0, 9, 11, 1, 0, 0, 0, 10, 12, 3, 4, 2, 0, 11, 10, 1, 0, 0, 0, 11, 12, 1, 0, 0, 0, 12, 13, 1, 0, 0, 0, 13, 14, 5, 0, 0, 1, 14, 1, 1, 0, 0, 0, 15, 16, 5, 1, 0, 0, 16, 17, 5, 8, 0, 0, 17, 3, 1, 0, 0, 0, 18, 19, 5, 2, 0, 0, 19, 20, 5, 3, 0, 0, 20, 5, 1, 0, 0, 0, 2, 8, 11] \ No newline at end of file diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEdit.tokens b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEdit.tokens new file mode 100644 index 0000000..d8e5e9d --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEdit.tokens @@ -0,0 +1,203 @@ +T__0=1 +T__1=2 +T__2=3 +WS=4 +Integer=5 +Real=6 +String=7 +Ident=8 +ABOUT=9 +ABSTRACT=10 +ALIAS=11 +ALL=12 +AND=13 +AS=14 +ASSIGN=15 +ASSOC=16 +BEAHVIOR=17 +BINDING=18 +BOOL=19 +BY=20 +CHAINS=21 +CLASS=22 +CLASSIFIER=23 +COMMENT=24 +COMPOSITE=25 +CONJUGATE=26 +CONJUGATES=27 +CONJUGATION=28 +CONNECTOR=29 +DATATYPE=30 +DEFAULT=31 +DEPENDENCY=32 +DERIVED=33 +DIFFERENCES=34 +DISJOINING=35 +DISJOINT=36 +DOC=37 +ELSE=38 +END=39 +EXPR=40 +FALSE=41 +FEATURE=42 +FEATURED=43 +FEATURING=44 +FILTER=45 +FIRST=46 +FLOW=47 +FOR=48 +FROM=49 +FUNCTION=50 +HASTYPE=51 +IF=52 +INTERSECTS=53 +IMPLIES=54 +IMPORT=55 +IN=56 +INPUT=57 +INTERACTION=58 +INV=59 +INVERSE=60 +INVERTING=61 +ISTYPE=62 +LANGUAGE=63 +MEMBER=64 +METACLASS=65 +METADATA=66 +MULTIPLICITY=67 +NAMESPACE=68 +NONUNIQUE=69 +NOT=70 +NULL=71 +OF=72 +OR=73 +ORDERED=74 +OUT=75 +PACKAGE=76 +PORTION=77 +PREDICATE=78 +PRIAVTE=79 +PROTECTED=80 +PUBLIC=81 +READONLY=82 +REDEFINES=83 +REDEFINITION=84 +RFERENCES=85 +REP=86 +RETURN=87 +SPECIALIZTION=88 +SPECIALIZES=89 +STEP=90 +STRCUT=91 +SUBCLASSIFIER=92 +SUBSET=93 +SUBSETS=94 +SUBTYPE=95 +SUCCESSION=96 +THEN=97 +TO=98 +TRUE=99 +TYPE=100 +TYPED=101 +TYPING=102 +UNIONS=103 +XOR=104 +':'=1 +'='=2 +'.*'=3 +'about'=9 +'abstract'=10 +'alias'=11 +'all'=12 +'and'=13 +'as'=14 +'assign'=15 +'assoc'=16 +'behavior'=17 +'binding'=18 +'bool'=19 +'by'=20 +'chains'=21 +'class'=22 +'classifier'=23 +'comment'=24 +'composite'=25 +'conjugate'=26 +'conjugates'=27 +'conjugation'=28 +'connector'=29 +'datatype'=30 +'default'=31 +'dependency'=32 +'derived'=33 +'differences'=34 +'disjoining'=35 +'disjoint'=36 +'doc'=37 +'else'=38 +'END'=39 +'expr'=40 +'false'=41 +'feature'=42 +'featured'=43 +'featuring'=44 +'filter'=45 +'first'=46 +'flow'=47 +'for'=48 +'from'=49 +'function'=50 +'hastype'=51 +'if'=52 +'intersects'=53 +'implies'=54 +'import'=55 +'in'=56 +'inout'=57 +'interaction'=58 +'inv'=59 +'inverse'=60 +'inverting'=61 +'istype'=62 +'language'=63 +'member'=64 +'metaclass'=65 +'metadata'=66 +'multiplicity'=67 +'namespace'=68 +'nonunique'=69 +'not'=70 +'null'=71 +'of'=72 +'or'=73 +'ordered'=74 +'out'=75 +'package'=76 +'portion'=77 +'predicate'=78 +'private'=79 +'protected'=80 +'public'=81 +'readonly'=82 +'redefines'=83 +'redefinition'=84 +'references'=85 +'rep'=86 +'return'=87 +'specialization'=88 +'specializes'=89 +'step'=90 +'struct'=91 +'subclassifier'=92 +'subset'=93 +'subsets'=94 +'subtype'=95 +'succession'=96 +'then'=97 +'to'=98 +'true'=99 +'type'=100 +'typed'=101 +'typing'=102 +'unions'=103 +'xor'=104 diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditBaseListener.java b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditBaseListener.java new file mode 100644 index 0000000..1a9fb98 --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditBaseListener.java @@ -0,0 +1,89 @@ +// Generated from DirectEdit.g4 by ANTLR 4.10.1 + +/******************************************************************************* + * Copyright (c) 2023 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.syson.diagram.general.view.directedit.grammars.generated; + + +import org.antlr.v4.runtime.ParserRuleContext; +import org.antlr.v4.runtime.tree.ErrorNode; +import org.antlr.v4.runtime.tree.TerminalNode; + +/** + * This class provides an empty implementation of {@link DirectEditListener}, + * which can be extended to create a listener which only needs to handle a subset + * of the available methods. + */ +public class DirectEditBaseListener implements DirectEditListener { + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterExpression(DirectEditParser.ExpressionContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitExpression(DirectEditParser.ExpressionContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterTypingExpression(DirectEditParser.TypingExpressionContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitTypingExpression(DirectEditParser.TypingExpressionContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterValueExpression(DirectEditParser.ValueExpressionContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitValueExpression(DirectEditParser.ValueExpressionContext ctx) { } + + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterEveryRule(ParserRuleContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitEveryRule(ParserRuleContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void visitTerminal(TerminalNode node) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void visitErrorNode(ErrorNode node) { } +} \ No newline at end of file diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.interp b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.interp new file mode 100644 index 0000000..c14f42a --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.interp @@ -0,0 +1,331 @@ +token literal names: +null +':' +'=' +'.*' +null +null +null +null +null +'about' +'abstract' +'alias' +'all' +'and' +'as' +'assign' +'assoc' +'behavior' +'binding' +'bool' +'by' +'chains' +'class' +'classifier' +'comment' +'composite' +'conjugate' +'conjugates' +'conjugation' +'connector' +'datatype' +'default' +'dependency' +'derived' +'differences' +'disjoining' +'disjoint' +'doc' +'else' +'END' +'expr' +'false' +'feature' +'featured' +'featuring' +'filter' +'first' +'flow' +'for' +'from' +'function' +'hastype' +'if' +'intersects' +'implies' +'import' +'in' +'inout' +'interaction' +'inv' +'inverse' +'inverting' +'istype' +'language' +'member' +'metaclass' +'metadata' +'multiplicity' +'namespace' +'nonunique' +'not' +'null' +'of' +'or' +'ordered' +'out' +'package' +'portion' +'predicate' +'private' +'protected' +'public' +'readonly' +'redefines' +'redefinition' +'references' +'rep' +'return' +'specialization' +'specializes' +'step' +'struct' +'subclassifier' +'subset' +'subsets' +'subtype' +'succession' +'then' +'to' +'true' +'type' +'typed' +'typing' +'unions' +'xor' + +token symbolic names: +null +null +null +null +WS +Integer +Real +String +Ident +ABOUT +ABSTRACT +ALIAS +ALL +AND +AS +ASSIGN +ASSOC +BEAHVIOR +BINDING +BOOL +BY +CHAINS +CLASS +CLASSIFIER +COMMENT +COMPOSITE +CONJUGATE +CONJUGATES +CONJUGATION +CONNECTOR +DATATYPE +DEFAULT +DEPENDENCY +DERIVED +DIFFERENCES +DISJOINING +DISJOINT +DOC +ELSE +END +EXPR +FALSE +FEATURE +FEATURED +FEATURING +FILTER +FIRST +FLOW +FOR +FROM +FUNCTION +HASTYPE +IF +INTERSECTS +IMPLIES +IMPORT +IN +INPUT +INTERACTION +INV +INVERSE +INVERTING +ISTYPE +LANGUAGE +MEMBER +METACLASS +METADATA +MULTIPLICITY +NAMESPACE +NONUNIQUE +NOT +NULL +OF +OR +ORDERED +OUT +PACKAGE +PORTION +PREDICATE +PRIAVTE +PROTECTED +PUBLIC +READONLY +REDEFINES +REDEFINITION +RFERENCES +REP +RETURN +SPECIALIZTION +SPECIALIZES +STEP +STRCUT +SUBCLASSIFIER +SUBSET +SUBSETS +SUBTYPE +SUCCESSION +THEN +TO +TRUE +TYPE +TYPED +TYPING +UNIONS +XOR + +rule names: +T__0 +T__1 +T__2 +WS +Integer +Real +String +Escape +Ident +Letter +ABOUT +ABSTRACT +ALIAS +ALL +AND +AS +ASSIGN +ASSOC +BEAHVIOR +BINDING +BOOL +BY +CHAINS +CLASS +CLASSIFIER +COMMENT +COMPOSITE +CONJUGATE +CONJUGATES +CONJUGATION +CONNECTOR +DATATYPE +DEFAULT +DEPENDENCY +DERIVED +DIFFERENCES +DISJOINING +DISJOINT +DOC +ELSE +END +EXPR +FALSE +FEATURE +FEATURED +FEATURING +FILTER +FIRST +FLOW +FOR +FROM +FUNCTION +HASTYPE +IF +INTERSECTS +IMPLIES +IMPORT +IN +INPUT +INTERACTION +INV +INVERSE +INVERTING +ISTYPE +LANGUAGE +MEMBER +METACLASS +METADATA +MULTIPLICITY +NAMESPACE +NONUNIQUE +NOT +NULL +OF +OR +ORDERED +OUT +PACKAGE +PORTION +PREDICATE +PRIAVTE +PROTECTED +PUBLIC +READONLY +REDEFINES +REDEFINITION +RFERENCES +REP +RETURN +SPECIALIZTION +SPECIALIZES +STEP +STRCUT +SUBCLASSIFIER +SUBSET +SUBSETS +SUBTYPE +SUCCESSION +THEN +TO +TRUE +TYPE +TYPED +TYPING +UNIONS +XOR + +channel names: +DEFAULT_TOKEN_CHANNEL +HIDDEN + +mode names: +DEFAULT_MODE + +atn: +[4, 0, 104, 998, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 2, 81, 7, 81, 2, 82, 7, 82, 2, 83, 7, 83, 2, 84, 7, 84, 2, 85, 7, 85, 2, 86, 7, 86, 2, 87, 7, 87, 2, 88, 7, 88, 2, 89, 7, 89, 2, 90, 7, 90, 2, 91, 7, 91, 2, 92, 7, 92, 2, 93, 7, 93, 2, 94, 7, 94, 2, 95, 7, 95, 2, 96, 7, 96, 2, 97, 7, 97, 2, 98, 7, 98, 2, 99, 7, 99, 2, 100, 7, 100, 2, 101, 7, 101, 2, 102, 7, 102, 2, 103, 7, 103, 2, 104, 7, 104, 2, 105, 7, 105, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 3, 4, 3, 222, 8, 3, 11, 3, 12, 3, 223, 1, 3, 1, 3, 1, 4, 4, 4, 229, 8, 4, 11, 4, 12, 4, 230, 1, 5, 4, 5, 234, 8, 5, 11, 5, 12, 5, 235, 1, 5, 1, 5, 4, 5, 240, 8, 5, 11, 5, 12, 5, 241, 1, 6, 1, 6, 1, 6, 5, 6, 247, 8, 6, 10, 6, 12, 6, 250, 9, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 258, 8, 7, 1, 8, 3, 8, 261, 8, 8, 1, 8, 1, 8, 1, 8, 5, 8, 266, 8, 8, 10, 8, 12, 8, 269, 9, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 1, 56, 1, 56, 1, 56, 1, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 58, 1, 58, 1, 58, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 60, 1, 60, 1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 63, 1, 63, 1, 63, 1, 63, 1, 63, 1, 63, 1, 63, 1, 64, 1, 64, 1, 64, 1, 64, 1, 64, 1, 64, 1, 64, 1, 64, 1, 64, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 66, 1, 66, 1, 66, 1, 66, 1, 66, 1, 66, 1, 66, 1, 66, 1, 66, 1, 66, 1, 67, 1, 67, 1, 67, 1, 67, 1, 67, 1, 67, 1, 67, 1, 67, 1, 67, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 70, 1, 70, 1, 70, 1, 70, 1, 70, 1, 70, 1, 70, 1, 70, 1, 70, 1, 70, 1, 71, 1, 71, 1, 71, 1, 71, 1, 72, 1, 72, 1, 72, 1, 72, 1, 72, 1, 73, 1, 73, 1, 73, 1, 74, 1, 74, 1, 74, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 76, 1, 76, 1, 76, 1, 76, 1, 77, 1, 77, 1, 77, 1, 77, 1, 77, 1, 77, 1, 77, 1, 77, 1, 78, 1, 78, 1, 78, 1, 78, 1, 78, 1, 78, 1, 78, 1, 78, 1, 79, 1, 79, 1, 79, 1, 79, 1, 79, 1, 79, 1, 79, 1, 79, 1, 79, 1, 79, 1, 80, 1, 80, 1, 80, 1, 80, 1, 80, 1, 80, 1, 80, 1, 80, 1, 81, 1, 81, 1, 81, 1, 81, 1, 81, 1, 81, 1, 81, 1, 81, 1, 81, 1, 81, 1, 82, 1, 82, 1, 82, 1, 82, 1, 82, 1, 82, 1, 82, 1, 83, 1, 83, 1, 83, 1, 83, 1, 83, 1, 83, 1, 83, 1, 83, 1, 83, 1, 84, 1, 84, 1, 84, 1, 84, 1, 84, 1, 84, 1, 84, 1, 84, 1, 84, 1, 84, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 85, 1, 86, 1, 86, 1, 86, 1, 86, 1, 86, 1, 86, 1, 86, 1, 86, 1, 86, 1, 86, 1, 86, 1, 87, 1, 87, 1, 87, 1, 87, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 91, 1, 91, 1, 91, 1, 91, 1, 91, 1, 92, 1, 92, 1, 92, 1, 92, 1, 92, 1, 92, 1, 92, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 93, 1, 94, 1, 94, 1, 94, 1, 94, 1, 94, 1, 94, 1, 94, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 96, 1, 96, 1, 96, 1, 96, 1, 96, 1, 96, 1, 96, 1, 96, 1, 97, 1, 97, 1, 97, 1, 97, 1, 97, 1, 97, 1, 97, 1, 97, 1, 97, 1, 97, 1, 97, 1, 98, 1, 98, 1, 98, 1, 98, 1, 98, 1, 99, 1, 99, 1, 99, 1, 100, 1, 100, 1, 100, 1, 100, 1, 100, 1, 101, 1, 101, 1, 101, 1, 101, 1, 101, 1, 102, 1, 102, 1, 102, 1, 102, 1, 102, 1, 102, 1, 103, 1, 103, 1, 103, 1, 103, 1, 103, 1, 103, 1, 103, 1, 104, 1, 104, 1, 104, 1, 104, 1, 104, 1, 104, 1, 104, 1, 105, 1, 105, 1, 105, 1, 105, 1, 248, 0, 106, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 0, 17, 8, 19, 0, 21, 9, 23, 10, 25, 11, 27, 12, 29, 13, 31, 14, 33, 15, 35, 16, 37, 17, 39, 18, 41, 19, 43, 20, 45, 21, 47, 22, 49, 23, 51, 24, 53, 25, 55, 26, 57, 27, 59, 28, 61, 29, 63, 30, 65, 31, 67, 32, 69, 33, 71, 34, 73, 35, 75, 36, 77, 37, 79, 38, 81, 39, 83, 40, 85, 41, 87, 42, 89, 43, 91, 44, 93, 45, 95, 46, 97, 47, 99, 48, 101, 49, 103, 50, 105, 51, 107, 52, 109, 53, 111, 54, 113, 55, 115, 56, 117, 57, 119, 58, 121, 59, 123, 60, 125, 61, 127, 62, 129, 63, 131, 64, 133, 65, 135, 66, 137, 67, 139, 68, 141, 69, 143, 70, 145, 71, 147, 72, 149, 73, 151, 74, 153, 75, 155, 76, 157, 77, 159, 78, 161, 79, 163, 80, 165, 81, 167, 82, 169, 83, 171, 84, 173, 85, 175, 86, 177, 87, 179, 88, 181, 89, 183, 90, 185, 91, 187, 92, 189, 93, 191, 94, 193, 95, 195, 96, 197, 97, 199, 98, 201, 99, 203, 100, 205, 101, 207, 102, 209, 103, 211, 104, 1, 0, 4, 3, 0, 9, 10, 12, 13, 32, 32, 1, 0, 48, 57, 2, 0, 48, 57, 95, 95, 2, 0, 65, 90, 97, 122, 1005, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 0, 95, 1, 0, 0, 0, 0, 97, 1, 0, 0, 0, 0, 99, 1, 0, 0, 0, 0, 101, 1, 0, 0, 0, 0, 103, 1, 0, 0, 0, 0, 105, 1, 0, 0, 0, 0, 107, 1, 0, 0, 0, 0, 109, 1, 0, 0, 0, 0, 111, 1, 0, 0, 0, 0, 113, 1, 0, 0, 0, 0, 115, 1, 0, 0, 0, 0, 117, 1, 0, 0, 0, 0, 119, 1, 0, 0, 0, 0, 121, 1, 0, 0, 0, 0, 123, 1, 0, 0, 0, 0, 125, 1, 0, 0, 0, 0, 127, 1, 0, 0, 0, 0, 129, 1, 0, 0, 0, 0, 131, 1, 0, 0, 0, 0, 133, 1, 0, 0, 0, 0, 135, 1, 0, 0, 0, 0, 137, 1, 0, 0, 0, 0, 139, 1, 0, 0, 0, 0, 141, 1, 0, 0, 0, 0, 143, 1, 0, 0, 0, 0, 145, 1, 0, 0, 0, 0, 147, 1, 0, 0, 0, 0, 149, 1, 0, 0, 0, 0, 151, 1, 0, 0, 0, 0, 153, 1, 0, 0, 0, 0, 155, 1, 0, 0, 0, 0, 157, 1, 0, 0, 0, 0, 159, 1, 0, 0, 0, 0, 161, 1, 0, 0, 0, 0, 163, 1, 0, 0, 0, 0, 165, 1, 0, 0, 0, 0, 167, 1, 0, 0, 0, 0, 169, 1, 0, 0, 0, 0, 171, 1, 0, 0, 0, 0, 173, 1, 0, 0, 0, 0, 175, 1, 0, 0, 0, 0, 177, 1, 0, 0, 0, 0, 179, 1, 0, 0, 0, 0, 181, 1, 0, 0, 0, 0, 183, 1, 0, 0, 0, 0, 185, 1, 0, 0, 0, 0, 187, 1, 0, 0, 0, 0, 189, 1, 0, 0, 0, 0, 191, 1, 0, 0, 0, 0, 193, 1, 0, 0, 0, 0, 195, 1, 0, 0, 0, 0, 197, 1, 0, 0, 0, 0, 199, 1, 0, 0, 0, 0, 201, 1, 0, 0, 0, 0, 203, 1, 0, 0, 0, 0, 205, 1, 0, 0, 0, 0, 207, 1, 0, 0, 0, 0, 209, 1, 0, 0, 0, 0, 211, 1, 0, 0, 0, 1, 213, 1, 0, 0, 0, 3, 215, 1, 0, 0, 0, 5, 217, 1, 0, 0, 0, 7, 221, 1, 0, 0, 0, 9, 228, 1, 0, 0, 0, 11, 233, 1, 0, 0, 0, 13, 243, 1, 0, 0, 0, 15, 257, 1, 0, 0, 0, 17, 260, 1, 0, 0, 0, 19, 270, 1, 0, 0, 0, 21, 272, 1, 0, 0, 0, 23, 278, 1, 0, 0, 0, 25, 287, 1, 0, 0, 0, 27, 293, 1, 0, 0, 0, 29, 297, 1, 0, 0, 0, 31, 301, 1, 0, 0, 0, 33, 304, 1, 0, 0, 0, 35, 311, 1, 0, 0, 0, 37, 317, 1, 0, 0, 0, 39, 326, 1, 0, 0, 0, 41, 334, 1, 0, 0, 0, 43, 339, 1, 0, 0, 0, 45, 342, 1, 0, 0, 0, 47, 349, 1, 0, 0, 0, 49, 355, 1, 0, 0, 0, 51, 366, 1, 0, 0, 0, 53, 374, 1, 0, 0, 0, 55, 384, 1, 0, 0, 0, 57, 394, 1, 0, 0, 0, 59, 405, 1, 0, 0, 0, 61, 417, 1, 0, 0, 0, 63, 427, 1, 0, 0, 0, 65, 436, 1, 0, 0, 0, 67, 444, 1, 0, 0, 0, 69, 455, 1, 0, 0, 0, 71, 463, 1, 0, 0, 0, 73, 475, 1, 0, 0, 0, 75, 486, 1, 0, 0, 0, 77, 495, 1, 0, 0, 0, 79, 499, 1, 0, 0, 0, 81, 504, 1, 0, 0, 0, 83, 508, 1, 0, 0, 0, 85, 513, 1, 0, 0, 0, 87, 519, 1, 0, 0, 0, 89, 527, 1, 0, 0, 0, 91, 536, 1, 0, 0, 0, 93, 546, 1, 0, 0, 0, 95, 553, 1, 0, 0, 0, 97, 559, 1, 0, 0, 0, 99, 564, 1, 0, 0, 0, 101, 568, 1, 0, 0, 0, 103, 573, 1, 0, 0, 0, 105, 582, 1, 0, 0, 0, 107, 590, 1, 0, 0, 0, 109, 593, 1, 0, 0, 0, 111, 604, 1, 0, 0, 0, 113, 612, 1, 0, 0, 0, 115, 619, 1, 0, 0, 0, 117, 622, 1, 0, 0, 0, 119, 628, 1, 0, 0, 0, 121, 640, 1, 0, 0, 0, 123, 644, 1, 0, 0, 0, 125, 652, 1, 0, 0, 0, 127, 662, 1, 0, 0, 0, 129, 669, 1, 0, 0, 0, 131, 678, 1, 0, 0, 0, 133, 685, 1, 0, 0, 0, 135, 695, 1, 0, 0, 0, 137, 704, 1, 0, 0, 0, 139, 717, 1, 0, 0, 0, 141, 727, 1, 0, 0, 0, 143, 737, 1, 0, 0, 0, 145, 741, 1, 0, 0, 0, 147, 746, 1, 0, 0, 0, 149, 749, 1, 0, 0, 0, 151, 752, 1, 0, 0, 0, 153, 760, 1, 0, 0, 0, 155, 764, 1, 0, 0, 0, 157, 772, 1, 0, 0, 0, 159, 780, 1, 0, 0, 0, 161, 790, 1, 0, 0, 0, 163, 798, 1, 0, 0, 0, 165, 808, 1, 0, 0, 0, 167, 815, 1, 0, 0, 0, 169, 824, 1, 0, 0, 0, 171, 834, 1, 0, 0, 0, 173, 847, 1, 0, 0, 0, 175, 858, 1, 0, 0, 0, 177, 862, 1, 0, 0, 0, 179, 869, 1, 0, 0, 0, 181, 884, 1, 0, 0, 0, 183, 896, 1, 0, 0, 0, 185, 901, 1, 0, 0, 0, 187, 908, 1, 0, 0, 0, 189, 922, 1, 0, 0, 0, 191, 929, 1, 0, 0, 0, 193, 937, 1, 0, 0, 0, 195, 945, 1, 0, 0, 0, 197, 956, 1, 0, 0, 0, 199, 961, 1, 0, 0, 0, 201, 964, 1, 0, 0, 0, 203, 969, 1, 0, 0, 0, 205, 974, 1, 0, 0, 0, 207, 980, 1, 0, 0, 0, 209, 987, 1, 0, 0, 0, 211, 994, 1, 0, 0, 0, 213, 214, 5, 58, 0, 0, 214, 2, 1, 0, 0, 0, 215, 216, 5, 61, 0, 0, 216, 4, 1, 0, 0, 0, 217, 218, 5, 46, 0, 0, 218, 219, 5, 42, 0, 0, 219, 6, 1, 0, 0, 0, 220, 222, 7, 0, 0, 0, 221, 220, 1, 0, 0, 0, 222, 223, 1, 0, 0, 0, 223, 221, 1, 0, 0, 0, 223, 224, 1, 0, 0, 0, 224, 225, 1, 0, 0, 0, 225, 226, 6, 3, 0, 0, 226, 8, 1, 0, 0, 0, 227, 229, 7, 1, 0, 0, 228, 227, 1, 0, 0, 0, 229, 230, 1, 0, 0, 0, 230, 228, 1, 0, 0, 0, 230, 231, 1, 0, 0, 0, 231, 10, 1, 0, 0, 0, 232, 234, 7, 1, 0, 0, 233, 232, 1, 0, 0, 0, 234, 235, 1, 0, 0, 0, 235, 233, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 237, 1, 0, 0, 0, 237, 239, 5, 46, 0, 0, 238, 240, 7, 1, 0, 0, 239, 238, 1, 0, 0, 0, 240, 241, 1, 0, 0, 0, 241, 239, 1, 0, 0, 0, 241, 242, 1, 0, 0, 0, 242, 12, 1, 0, 0, 0, 243, 248, 5, 39, 0, 0, 244, 247, 3, 15, 7, 0, 245, 247, 9, 0, 0, 0, 246, 244, 1, 0, 0, 0, 246, 245, 1, 0, 0, 0, 247, 250, 1, 0, 0, 0, 248, 249, 1, 0, 0, 0, 248, 246, 1, 0, 0, 0, 249, 251, 1, 0, 0, 0, 250, 248, 1, 0, 0, 0, 251, 252, 5, 39, 0, 0, 252, 14, 1, 0, 0, 0, 253, 254, 5, 92, 0, 0, 254, 258, 5, 92, 0, 0, 255, 256, 5, 92, 0, 0, 256, 258, 5, 39, 0, 0, 257, 253, 1, 0, 0, 0, 257, 255, 1, 0, 0, 0, 258, 16, 1, 0, 0, 0, 259, 261, 5, 95, 0, 0, 260, 259, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261, 262, 1, 0, 0, 0, 262, 267, 3, 19, 9, 0, 263, 266, 3, 19, 9, 0, 264, 266, 7, 2, 0, 0, 265, 263, 1, 0, 0, 0, 265, 264, 1, 0, 0, 0, 266, 269, 1, 0, 0, 0, 267, 265, 1, 0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 18, 1, 0, 0, 0, 269, 267, 1, 0, 0, 0, 270, 271, 7, 3, 0, 0, 271, 20, 1, 0, 0, 0, 272, 273, 5, 97, 0, 0, 273, 274, 5, 98, 0, 0, 274, 275, 5, 111, 0, 0, 275, 276, 5, 117, 0, 0, 276, 277, 5, 116, 0, 0, 277, 22, 1, 0, 0, 0, 278, 279, 5, 97, 0, 0, 279, 280, 5, 98, 0, 0, 280, 281, 5, 115, 0, 0, 281, 282, 5, 116, 0, 0, 282, 283, 5, 114, 0, 0, 283, 284, 5, 97, 0, 0, 284, 285, 5, 99, 0, 0, 285, 286, 5, 116, 0, 0, 286, 24, 1, 0, 0, 0, 287, 288, 5, 97, 0, 0, 288, 289, 5, 108, 0, 0, 289, 290, 5, 105, 0, 0, 290, 291, 5, 97, 0, 0, 291, 292, 5, 115, 0, 0, 292, 26, 1, 0, 0, 0, 293, 294, 5, 97, 0, 0, 294, 295, 5, 108, 0, 0, 295, 296, 5, 108, 0, 0, 296, 28, 1, 0, 0, 0, 297, 298, 5, 97, 0, 0, 298, 299, 5, 110, 0, 0, 299, 300, 5, 100, 0, 0, 300, 30, 1, 0, 0, 0, 301, 302, 5, 97, 0, 0, 302, 303, 5, 115, 0, 0, 303, 32, 1, 0, 0, 0, 304, 305, 5, 97, 0, 0, 305, 306, 5, 115, 0, 0, 306, 307, 5, 115, 0, 0, 307, 308, 5, 105, 0, 0, 308, 309, 5, 103, 0, 0, 309, 310, 5, 110, 0, 0, 310, 34, 1, 0, 0, 0, 311, 312, 5, 97, 0, 0, 312, 313, 5, 115, 0, 0, 313, 314, 5, 115, 0, 0, 314, 315, 5, 111, 0, 0, 315, 316, 5, 99, 0, 0, 316, 36, 1, 0, 0, 0, 317, 318, 5, 98, 0, 0, 318, 319, 5, 101, 0, 0, 319, 320, 5, 104, 0, 0, 320, 321, 5, 97, 0, 0, 321, 322, 5, 118, 0, 0, 322, 323, 5, 105, 0, 0, 323, 324, 5, 111, 0, 0, 324, 325, 5, 114, 0, 0, 325, 38, 1, 0, 0, 0, 326, 327, 5, 98, 0, 0, 327, 328, 5, 105, 0, 0, 328, 329, 5, 110, 0, 0, 329, 330, 5, 100, 0, 0, 330, 331, 5, 105, 0, 0, 331, 332, 5, 110, 0, 0, 332, 333, 5, 103, 0, 0, 333, 40, 1, 0, 0, 0, 334, 335, 5, 98, 0, 0, 335, 336, 5, 111, 0, 0, 336, 337, 5, 111, 0, 0, 337, 338, 5, 108, 0, 0, 338, 42, 1, 0, 0, 0, 339, 340, 5, 98, 0, 0, 340, 341, 5, 121, 0, 0, 341, 44, 1, 0, 0, 0, 342, 343, 5, 99, 0, 0, 343, 344, 5, 104, 0, 0, 344, 345, 5, 97, 0, 0, 345, 346, 5, 105, 0, 0, 346, 347, 5, 110, 0, 0, 347, 348, 5, 115, 0, 0, 348, 46, 1, 0, 0, 0, 349, 350, 5, 99, 0, 0, 350, 351, 5, 108, 0, 0, 351, 352, 5, 97, 0, 0, 352, 353, 5, 115, 0, 0, 353, 354, 5, 115, 0, 0, 354, 48, 1, 0, 0, 0, 355, 356, 5, 99, 0, 0, 356, 357, 5, 108, 0, 0, 357, 358, 5, 97, 0, 0, 358, 359, 5, 115, 0, 0, 359, 360, 5, 115, 0, 0, 360, 361, 5, 105, 0, 0, 361, 362, 5, 102, 0, 0, 362, 363, 5, 105, 0, 0, 363, 364, 5, 101, 0, 0, 364, 365, 5, 114, 0, 0, 365, 50, 1, 0, 0, 0, 366, 367, 5, 99, 0, 0, 367, 368, 5, 111, 0, 0, 368, 369, 5, 109, 0, 0, 369, 370, 5, 109, 0, 0, 370, 371, 5, 101, 0, 0, 371, 372, 5, 110, 0, 0, 372, 373, 5, 116, 0, 0, 373, 52, 1, 0, 0, 0, 374, 375, 5, 99, 0, 0, 375, 376, 5, 111, 0, 0, 376, 377, 5, 109, 0, 0, 377, 378, 5, 112, 0, 0, 378, 379, 5, 111, 0, 0, 379, 380, 5, 115, 0, 0, 380, 381, 5, 105, 0, 0, 381, 382, 5, 116, 0, 0, 382, 383, 5, 101, 0, 0, 383, 54, 1, 0, 0, 0, 384, 385, 5, 99, 0, 0, 385, 386, 5, 111, 0, 0, 386, 387, 5, 110, 0, 0, 387, 388, 5, 106, 0, 0, 388, 389, 5, 117, 0, 0, 389, 390, 5, 103, 0, 0, 390, 391, 5, 97, 0, 0, 391, 392, 5, 116, 0, 0, 392, 393, 5, 101, 0, 0, 393, 56, 1, 0, 0, 0, 394, 395, 5, 99, 0, 0, 395, 396, 5, 111, 0, 0, 396, 397, 5, 110, 0, 0, 397, 398, 5, 106, 0, 0, 398, 399, 5, 117, 0, 0, 399, 400, 5, 103, 0, 0, 400, 401, 5, 97, 0, 0, 401, 402, 5, 116, 0, 0, 402, 403, 5, 101, 0, 0, 403, 404, 5, 115, 0, 0, 404, 58, 1, 0, 0, 0, 405, 406, 5, 99, 0, 0, 406, 407, 5, 111, 0, 0, 407, 408, 5, 110, 0, 0, 408, 409, 5, 106, 0, 0, 409, 410, 5, 117, 0, 0, 410, 411, 5, 103, 0, 0, 411, 412, 5, 97, 0, 0, 412, 413, 5, 116, 0, 0, 413, 414, 5, 105, 0, 0, 414, 415, 5, 111, 0, 0, 415, 416, 5, 110, 0, 0, 416, 60, 1, 0, 0, 0, 417, 418, 5, 99, 0, 0, 418, 419, 5, 111, 0, 0, 419, 420, 5, 110, 0, 0, 420, 421, 5, 110, 0, 0, 421, 422, 5, 101, 0, 0, 422, 423, 5, 99, 0, 0, 423, 424, 5, 116, 0, 0, 424, 425, 5, 111, 0, 0, 425, 426, 5, 114, 0, 0, 426, 62, 1, 0, 0, 0, 427, 428, 5, 100, 0, 0, 428, 429, 5, 97, 0, 0, 429, 430, 5, 116, 0, 0, 430, 431, 5, 97, 0, 0, 431, 432, 5, 116, 0, 0, 432, 433, 5, 121, 0, 0, 433, 434, 5, 112, 0, 0, 434, 435, 5, 101, 0, 0, 435, 64, 1, 0, 0, 0, 436, 437, 5, 100, 0, 0, 437, 438, 5, 101, 0, 0, 438, 439, 5, 102, 0, 0, 439, 440, 5, 97, 0, 0, 440, 441, 5, 117, 0, 0, 441, 442, 5, 108, 0, 0, 442, 443, 5, 116, 0, 0, 443, 66, 1, 0, 0, 0, 444, 445, 5, 100, 0, 0, 445, 446, 5, 101, 0, 0, 446, 447, 5, 112, 0, 0, 447, 448, 5, 101, 0, 0, 448, 449, 5, 110, 0, 0, 449, 450, 5, 100, 0, 0, 450, 451, 5, 101, 0, 0, 451, 452, 5, 110, 0, 0, 452, 453, 5, 99, 0, 0, 453, 454, 5, 121, 0, 0, 454, 68, 1, 0, 0, 0, 455, 456, 5, 100, 0, 0, 456, 457, 5, 101, 0, 0, 457, 458, 5, 114, 0, 0, 458, 459, 5, 105, 0, 0, 459, 460, 5, 118, 0, 0, 460, 461, 5, 101, 0, 0, 461, 462, 5, 100, 0, 0, 462, 70, 1, 0, 0, 0, 463, 464, 5, 100, 0, 0, 464, 465, 5, 105, 0, 0, 465, 466, 5, 102, 0, 0, 466, 467, 5, 102, 0, 0, 467, 468, 5, 101, 0, 0, 468, 469, 5, 114, 0, 0, 469, 470, 5, 101, 0, 0, 470, 471, 5, 110, 0, 0, 471, 472, 5, 99, 0, 0, 472, 473, 5, 101, 0, 0, 473, 474, 5, 115, 0, 0, 474, 72, 1, 0, 0, 0, 475, 476, 5, 100, 0, 0, 476, 477, 5, 105, 0, 0, 477, 478, 5, 115, 0, 0, 478, 479, 5, 106, 0, 0, 479, 480, 5, 111, 0, 0, 480, 481, 5, 105, 0, 0, 481, 482, 5, 110, 0, 0, 482, 483, 5, 105, 0, 0, 483, 484, 5, 110, 0, 0, 484, 485, 5, 103, 0, 0, 485, 74, 1, 0, 0, 0, 486, 487, 5, 100, 0, 0, 487, 488, 5, 105, 0, 0, 488, 489, 5, 115, 0, 0, 489, 490, 5, 106, 0, 0, 490, 491, 5, 111, 0, 0, 491, 492, 5, 105, 0, 0, 492, 493, 5, 110, 0, 0, 493, 494, 5, 116, 0, 0, 494, 76, 1, 0, 0, 0, 495, 496, 5, 100, 0, 0, 496, 497, 5, 111, 0, 0, 497, 498, 5, 99, 0, 0, 498, 78, 1, 0, 0, 0, 499, 500, 5, 101, 0, 0, 500, 501, 5, 108, 0, 0, 501, 502, 5, 115, 0, 0, 502, 503, 5, 101, 0, 0, 503, 80, 1, 0, 0, 0, 504, 505, 5, 69, 0, 0, 505, 506, 5, 78, 0, 0, 506, 507, 5, 68, 0, 0, 507, 82, 1, 0, 0, 0, 508, 509, 5, 101, 0, 0, 509, 510, 5, 120, 0, 0, 510, 511, 5, 112, 0, 0, 511, 512, 5, 114, 0, 0, 512, 84, 1, 0, 0, 0, 513, 514, 5, 102, 0, 0, 514, 515, 5, 97, 0, 0, 515, 516, 5, 108, 0, 0, 516, 517, 5, 115, 0, 0, 517, 518, 5, 101, 0, 0, 518, 86, 1, 0, 0, 0, 519, 520, 5, 102, 0, 0, 520, 521, 5, 101, 0, 0, 521, 522, 5, 97, 0, 0, 522, 523, 5, 116, 0, 0, 523, 524, 5, 117, 0, 0, 524, 525, 5, 114, 0, 0, 525, 526, 5, 101, 0, 0, 526, 88, 1, 0, 0, 0, 527, 528, 5, 102, 0, 0, 528, 529, 5, 101, 0, 0, 529, 530, 5, 97, 0, 0, 530, 531, 5, 116, 0, 0, 531, 532, 5, 117, 0, 0, 532, 533, 5, 114, 0, 0, 533, 534, 5, 101, 0, 0, 534, 535, 5, 100, 0, 0, 535, 90, 1, 0, 0, 0, 536, 537, 5, 102, 0, 0, 537, 538, 5, 101, 0, 0, 538, 539, 5, 97, 0, 0, 539, 540, 5, 116, 0, 0, 540, 541, 5, 117, 0, 0, 541, 542, 5, 114, 0, 0, 542, 543, 5, 105, 0, 0, 543, 544, 5, 110, 0, 0, 544, 545, 5, 103, 0, 0, 545, 92, 1, 0, 0, 0, 546, 547, 5, 102, 0, 0, 547, 548, 5, 105, 0, 0, 548, 549, 5, 108, 0, 0, 549, 550, 5, 116, 0, 0, 550, 551, 5, 101, 0, 0, 551, 552, 5, 114, 0, 0, 552, 94, 1, 0, 0, 0, 553, 554, 5, 102, 0, 0, 554, 555, 5, 105, 0, 0, 555, 556, 5, 114, 0, 0, 556, 557, 5, 115, 0, 0, 557, 558, 5, 116, 0, 0, 558, 96, 1, 0, 0, 0, 559, 560, 5, 102, 0, 0, 560, 561, 5, 108, 0, 0, 561, 562, 5, 111, 0, 0, 562, 563, 5, 119, 0, 0, 563, 98, 1, 0, 0, 0, 564, 565, 5, 102, 0, 0, 565, 566, 5, 111, 0, 0, 566, 567, 5, 114, 0, 0, 567, 100, 1, 0, 0, 0, 568, 569, 5, 102, 0, 0, 569, 570, 5, 114, 0, 0, 570, 571, 5, 111, 0, 0, 571, 572, 5, 109, 0, 0, 572, 102, 1, 0, 0, 0, 573, 574, 5, 102, 0, 0, 574, 575, 5, 117, 0, 0, 575, 576, 5, 110, 0, 0, 576, 577, 5, 99, 0, 0, 577, 578, 5, 116, 0, 0, 578, 579, 5, 105, 0, 0, 579, 580, 5, 111, 0, 0, 580, 581, 5, 110, 0, 0, 581, 104, 1, 0, 0, 0, 582, 583, 5, 104, 0, 0, 583, 584, 5, 97, 0, 0, 584, 585, 5, 115, 0, 0, 585, 586, 5, 116, 0, 0, 586, 587, 5, 121, 0, 0, 587, 588, 5, 112, 0, 0, 588, 589, 5, 101, 0, 0, 589, 106, 1, 0, 0, 0, 590, 591, 5, 105, 0, 0, 591, 592, 5, 102, 0, 0, 592, 108, 1, 0, 0, 0, 593, 594, 5, 105, 0, 0, 594, 595, 5, 110, 0, 0, 595, 596, 5, 116, 0, 0, 596, 597, 5, 101, 0, 0, 597, 598, 5, 114, 0, 0, 598, 599, 5, 115, 0, 0, 599, 600, 5, 101, 0, 0, 600, 601, 5, 99, 0, 0, 601, 602, 5, 116, 0, 0, 602, 603, 5, 115, 0, 0, 603, 110, 1, 0, 0, 0, 604, 605, 5, 105, 0, 0, 605, 606, 5, 109, 0, 0, 606, 607, 5, 112, 0, 0, 607, 608, 5, 108, 0, 0, 608, 609, 5, 105, 0, 0, 609, 610, 5, 101, 0, 0, 610, 611, 5, 115, 0, 0, 611, 112, 1, 0, 0, 0, 612, 613, 5, 105, 0, 0, 613, 614, 5, 109, 0, 0, 614, 615, 5, 112, 0, 0, 615, 616, 5, 111, 0, 0, 616, 617, 5, 114, 0, 0, 617, 618, 5, 116, 0, 0, 618, 114, 1, 0, 0, 0, 619, 620, 5, 105, 0, 0, 620, 621, 5, 110, 0, 0, 621, 116, 1, 0, 0, 0, 622, 623, 5, 105, 0, 0, 623, 624, 5, 110, 0, 0, 624, 625, 5, 111, 0, 0, 625, 626, 5, 117, 0, 0, 626, 627, 5, 116, 0, 0, 627, 118, 1, 0, 0, 0, 628, 629, 5, 105, 0, 0, 629, 630, 5, 110, 0, 0, 630, 631, 5, 116, 0, 0, 631, 632, 5, 101, 0, 0, 632, 633, 5, 114, 0, 0, 633, 634, 5, 97, 0, 0, 634, 635, 5, 99, 0, 0, 635, 636, 5, 116, 0, 0, 636, 637, 5, 105, 0, 0, 637, 638, 5, 111, 0, 0, 638, 639, 5, 110, 0, 0, 639, 120, 1, 0, 0, 0, 640, 641, 5, 105, 0, 0, 641, 642, 5, 110, 0, 0, 642, 643, 5, 118, 0, 0, 643, 122, 1, 0, 0, 0, 644, 645, 5, 105, 0, 0, 645, 646, 5, 110, 0, 0, 646, 647, 5, 118, 0, 0, 647, 648, 5, 101, 0, 0, 648, 649, 5, 114, 0, 0, 649, 650, 5, 115, 0, 0, 650, 651, 5, 101, 0, 0, 651, 124, 1, 0, 0, 0, 652, 653, 5, 105, 0, 0, 653, 654, 5, 110, 0, 0, 654, 655, 5, 118, 0, 0, 655, 656, 5, 101, 0, 0, 656, 657, 5, 114, 0, 0, 657, 658, 5, 116, 0, 0, 658, 659, 5, 105, 0, 0, 659, 660, 5, 110, 0, 0, 660, 661, 5, 103, 0, 0, 661, 126, 1, 0, 0, 0, 662, 663, 5, 105, 0, 0, 663, 664, 5, 115, 0, 0, 664, 665, 5, 116, 0, 0, 665, 666, 5, 121, 0, 0, 666, 667, 5, 112, 0, 0, 667, 668, 5, 101, 0, 0, 668, 128, 1, 0, 0, 0, 669, 670, 5, 108, 0, 0, 670, 671, 5, 97, 0, 0, 671, 672, 5, 110, 0, 0, 672, 673, 5, 103, 0, 0, 673, 674, 5, 117, 0, 0, 674, 675, 5, 97, 0, 0, 675, 676, 5, 103, 0, 0, 676, 677, 5, 101, 0, 0, 677, 130, 1, 0, 0, 0, 678, 679, 5, 109, 0, 0, 679, 680, 5, 101, 0, 0, 680, 681, 5, 109, 0, 0, 681, 682, 5, 98, 0, 0, 682, 683, 5, 101, 0, 0, 683, 684, 5, 114, 0, 0, 684, 132, 1, 0, 0, 0, 685, 686, 5, 109, 0, 0, 686, 687, 5, 101, 0, 0, 687, 688, 5, 116, 0, 0, 688, 689, 5, 97, 0, 0, 689, 690, 5, 99, 0, 0, 690, 691, 5, 108, 0, 0, 691, 692, 5, 97, 0, 0, 692, 693, 5, 115, 0, 0, 693, 694, 5, 115, 0, 0, 694, 134, 1, 0, 0, 0, 695, 696, 5, 109, 0, 0, 696, 697, 5, 101, 0, 0, 697, 698, 5, 116, 0, 0, 698, 699, 5, 97, 0, 0, 699, 700, 5, 100, 0, 0, 700, 701, 5, 97, 0, 0, 701, 702, 5, 116, 0, 0, 702, 703, 5, 97, 0, 0, 703, 136, 1, 0, 0, 0, 704, 705, 5, 109, 0, 0, 705, 706, 5, 117, 0, 0, 706, 707, 5, 108, 0, 0, 707, 708, 5, 116, 0, 0, 708, 709, 5, 105, 0, 0, 709, 710, 5, 112, 0, 0, 710, 711, 5, 108, 0, 0, 711, 712, 5, 105, 0, 0, 712, 713, 5, 99, 0, 0, 713, 714, 5, 105, 0, 0, 714, 715, 5, 116, 0, 0, 715, 716, 5, 121, 0, 0, 716, 138, 1, 0, 0, 0, 717, 718, 5, 110, 0, 0, 718, 719, 5, 97, 0, 0, 719, 720, 5, 109, 0, 0, 720, 721, 5, 101, 0, 0, 721, 722, 5, 115, 0, 0, 722, 723, 5, 112, 0, 0, 723, 724, 5, 97, 0, 0, 724, 725, 5, 99, 0, 0, 725, 726, 5, 101, 0, 0, 726, 140, 1, 0, 0, 0, 727, 728, 5, 110, 0, 0, 728, 729, 5, 111, 0, 0, 729, 730, 5, 110, 0, 0, 730, 731, 5, 117, 0, 0, 731, 732, 5, 110, 0, 0, 732, 733, 5, 105, 0, 0, 733, 734, 5, 113, 0, 0, 734, 735, 5, 117, 0, 0, 735, 736, 5, 101, 0, 0, 736, 142, 1, 0, 0, 0, 737, 738, 5, 110, 0, 0, 738, 739, 5, 111, 0, 0, 739, 740, 5, 116, 0, 0, 740, 144, 1, 0, 0, 0, 741, 742, 5, 110, 0, 0, 742, 743, 5, 117, 0, 0, 743, 744, 5, 108, 0, 0, 744, 745, 5, 108, 0, 0, 745, 146, 1, 0, 0, 0, 746, 747, 5, 111, 0, 0, 747, 748, 5, 102, 0, 0, 748, 148, 1, 0, 0, 0, 749, 750, 5, 111, 0, 0, 750, 751, 5, 114, 0, 0, 751, 150, 1, 0, 0, 0, 752, 753, 5, 111, 0, 0, 753, 754, 5, 114, 0, 0, 754, 755, 5, 100, 0, 0, 755, 756, 5, 101, 0, 0, 756, 757, 5, 114, 0, 0, 757, 758, 5, 101, 0, 0, 758, 759, 5, 100, 0, 0, 759, 152, 1, 0, 0, 0, 760, 761, 5, 111, 0, 0, 761, 762, 5, 117, 0, 0, 762, 763, 5, 116, 0, 0, 763, 154, 1, 0, 0, 0, 764, 765, 5, 112, 0, 0, 765, 766, 5, 97, 0, 0, 766, 767, 5, 99, 0, 0, 767, 768, 5, 107, 0, 0, 768, 769, 5, 97, 0, 0, 769, 770, 5, 103, 0, 0, 770, 771, 5, 101, 0, 0, 771, 156, 1, 0, 0, 0, 772, 773, 5, 112, 0, 0, 773, 774, 5, 111, 0, 0, 774, 775, 5, 114, 0, 0, 775, 776, 5, 116, 0, 0, 776, 777, 5, 105, 0, 0, 777, 778, 5, 111, 0, 0, 778, 779, 5, 110, 0, 0, 779, 158, 1, 0, 0, 0, 780, 781, 5, 112, 0, 0, 781, 782, 5, 114, 0, 0, 782, 783, 5, 101, 0, 0, 783, 784, 5, 100, 0, 0, 784, 785, 5, 105, 0, 0, 785, 786, 5, 99, 0, 0, 786, 787, 5, 97, 0, 0, 787, 788, 5, 116, 0, 0, 788, 789, 5, 101, 0, 0, 789, 160, 1, 0, 0, 0, 790, 791, 5, 112, 0, 0, 791, 792, 5, 114, 0, 0, 792, 793, 5, 105, 0, 0, 793, 794, 5, 118, 0, 0, 794, 795, 5, 97, 0, 0, 795, 796, 5, 116, 0, 0, 796, 797, 5, 101, 0, 0, 797, 162, 1, 0, 0, 0, 798, 799, 5, 112, 0, 0, 799, 800, 5, 114, 0, 0, 800, 801, 5, 111, 0, 0, 801, 802, 5, 116, 0, 0, 802, 803, 5, 101, 0, 0, 803, 804, 5, 99, 0, 0, 804, 805, 5, 116, 0, 0, 805, 806, 5, 101, 0, 0, 806, 807, 5, 100, 0, 0, 807, 164, 1, 0, 0, 0, 808, 809, 5, 112, 0, 0, 809, 810, 5, 117, 0, 0, 810, 811, 5, 98, 0, 0, 811, 812, 5, 108, 0, 0, 812, 813, 5, 105, 0, 0, 813, 814, 5, 99, 0, 0, 814, 166, 1, 0, 0, 0, 815, 816, 5, 114, 0, 0, 816, 817, 5, 101, 0, 0, 817, 818, 5, 97, 0, 0, 818, 819, 5, 100, 0, 0, 819, 820, 5, 111, 0, 0, 820, 821, 5, 110, 0, 0, 821, 822, 5, 108, 0, 0, 822, 823, 5, 121, 0, 0, 823, 168, 1, 0, 0, 0, 824, 825, 5, 114, 0, 0, 825, 826, 5, 101, 0, 0, 826, 827, 5, 100, 0, 0, 827, 828, 5, 101, 0, 0, 828, 829, 5, 102, 0, 0, 829, 830, 5, 105, 0, 0, 830, 831, 5, 110, 0, 0, 831, 832, 5, 101, 0, 0, 832, 833, 5, 115, 0, 0, 833, 170, 1, 0, 0, 0, 834, 835, 5, 114, 0, 0, 835, 836, 5, 101, 0, 0, 836, 837, 5, 100, 0, 0, 837, 838, 5, 101, 0, 0, 838, 839, 5, 102, 0, 0, 839, 840, 5, 105, 0, 0, 840, 841, 5, 110, 0, 0, 841, 842, 5, 105, 0, 0, 842, 843, 5, 116, 0, 0, 843, 844, 5, 105, 0, 0, 844, 845, 5, 111, 0, 0, 845, 846, 5, 110, 0, 0, 846, 172, 1, 0, 0, 0, 847, 848, 5, 114, 0, 0, 848, 849, 5, 101, 0, 0, 849, 850, 5, 102, 0, 0, 850, 851, 5, 101, 0, 0, 851, 852, 5, 114, 0, 0, 852, 853, 5, 101, 0, 0, 853, 854, 5, 110, 0, 0, 854, 855, 5, 99, 0, 0, 855, 856, 5, 101, 0, 0, 856, 857, 5, 115, 0, 0, 857, 174, 1, 0, 0, 0, 858, 859, 5, 114, 0, 0, 859, 860, 5, 101, 0, 0, 860, 861, 5, 112, 0, 0, 861, 176, 1, 0, 0, 0, 862, 863, 5, 114, 0, 0, 863, 864, 5, 101, 0, 0, 864, 865, 5, 116, 0, 0, 865, 866, 5, 117, 0, 0, 866, 867, 5, 114, 0, 0, 867, 868, 5, 110, 0, 0, 868, 178, 1, 0, 0, 0, 869, 870, 5, 115, 0, 0, 870, 871, 5, 112, 0, 0, 871, 872, 5, 101, 0, 0, 872, 873, 5, 99, 0, 0, 873, 874, 5, 105, 0, 0, 874, 875, 5, 97, 0, 0, 875, 876, 5, 108, 0, 0, 876, 877, 5, 105, 0, 0, 877, 878, 5, 122, 0, 0, 878, 879, 5, 97, 0, 0, 879, 880, 5, 116, 0, 0, 880, 881, 5, 105, 0, 0, 881, 882, 5, 111, 0, 0, 882, 883, 5, 110, 0, 0, 883, 180, 1, 0, 0, 0, 884, 885, 5, 115, 0, 0, 885, 886, 5, 112, 0, 0, 886, 887, 5, 101, 0, 0, 887, 888, 5, 99, 0, 0, 888, 889, 5, 105, 0, 0, 889, 890, 5, 97, 0, 0, 890, 891, 5, 108, 0, 0, 891, 892, 5, 105, 0, 0, 892, 893, 5, 122, 0, 0, 893, 894, 5, 101, 0, 0, 894, 895, 5, 115, 0, 0, 895, 182, 1, 0, 0, 0, 896, 897, 5, 115, 0, 0, 897, 898, 5, 116, 0, 0, 898, 899, 5, 101, 0, 0, 899, 900, 5, 112, 0, 0, 900, 184, 1, 0, 0, 0, 901, 902, 5, 115, 0, 0, 902, 903, 5, 116, 0, 0, 903, 904, 5, 114, 0, 0, 904, 905, 5, 117, 0, 0, 905, 906, 5, 99, 0, 0, 906, 907, 5, 116, 0, 0, 907, 186, 1, 0, 0, 0, 908, 909, 5, 115, 0, 0, 909, 910, 5, 117, 0, 0, 910, 911, 5, 98, 0, 0, 911, 912, 5, 99, 0, 0, 912, 913, 5, 108, 0, 0, 913, 914, 5, 97, 0, 0, 914, 915, 5, 115, 0, 0, 915, 916, 5, 115, 0, 0, 916, 917, 5, 105, 0, 0, 917, 918, 5, 102, 0, 0, 918, 919, 5, 105, 0, 0, 919, 920, 5, 101, 0, 0, 920, 921, 5, 114, 0, 0, 921, 188, 1, 0, 0, 0, 922, 923, 5, 115, 0, 0, 923, 924, 5, 117, 0, 0, 924, 925, 5, 98, 0, 0, 925, 926, 5, 115, 0, 0, 926, 927, 5, 101, 0, 0, 927, 928, 5, 116, 0, 0, 928, 190, 1, 0, 0, 0, 929, 930, 5, 115, 0, 0, 930, 931, 5, 117, 0, 0, 931, 932, 5, 98, 0, 0, 932, 933, 5, 115, 0, 0, 933, 934, 5, 101, 0, 0, 934, 935, 5, 116, 0, 0, 935, 936, 5, 115, 0, 0, 936, 192, 1, 0, 0, 0, 937, 938, 5, 115, 0, 0, 938, 939, 5, 117, 0, 0, 939, 940, 5, 98, 0, 0, 940, 941, 5, 116, 0, 0, 941, 942, 5, 121, 0, 0, 942, 943, 5, 112, 0, 0, 943, 944, 5, 101, 0, 0, 944, 194, 1, 0, 0, 0, 945, 946, 5, 115, 0, 0, 946, 947, 5, 117, 0, 0, 947, 948, 5, 99, 0, 0, 948, 949, 5, 99, 0, 0, 949, 950, 5, 101, 0, 0, 950, 951, 5, 115, 0, 0, 951, 952, 5, 115, 0, 0, 952, 953, 5, 105, 0, 0, 953, 954, 5, 111, 0, 0, 954, 955, 5, 110, 0, 0, 955, 196, 1, 0, 0, 0, 956, 957, 5, 116, 0, 0, 957, 958, 5, 104, 0, 0, 958, 959, 5, 101, 0, 0, 959, 960, 5, 110, 0, 0, 960, 198, 1, 0, 0, 0, 961, 962, 5, 116, 0, 0, 962, 963, 5, 111, 0, 0, 963, 200, 1, 0, 0, 0, 964, 965, 5, 116, 0, 0, 965, 966, 5, 114, 0, 0, 966, 967, 5, 117, 0, 0, 967, 968, 5, 101, 0, 0, 968, 202, 1, 0, 0, 0, 969, 970, 5, 116, 0, 0, 970, 971, 5, 121, 0, 0, 971, 972, 5, 112, 0, 0, 972, 973, 5, 101, 0, 0, 973, 204, 1, 0, 0, 0, 974, 975, 5, 116, 0, 0, 975, 976, 5, 121, 0, 0, 976, 977, 5, 112, 0, 0, 977, 978, 5, 101, 0, 0, 978, 979, 5, 100, 0, 0, 979, 206, 1, 0, 0, 0, 980, 981, 5, 116, 0, 0, 981, 982, 5, 121, 0, 0, 982, 983, 5, 112, 0, 0, 983, 984, 5, 105, 0, 0, 984, 985, 5, 110, 0, 0, 985, 986, 5, 103, 0, 0, 986, 208, 1, 0, 0, 0, 987, 988, 5, 117, 0, 0, 988, 989, 5, 110, 0, 0, 989, 990, 5, 105, 0, 0, 990, 991, 5, 111, 0, 0, 991, 992, 5, 110, 0, 0, 992, 993, 5, 115, 0, 0, 993, 210, 1, 0, 0, 0, 994, 995, 5, 120, 0, 0, 995, 996, 5, 111, 0, 0, 996, 997, 5, 114, 0, 0, 997, 212, 1, 0, 0, 0, 11, 0, 223, 230, 235, 241, 246, 248, 257, 260, 265, 267, 1, 6, 0, 0] \ No newline at end of file diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.java b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.java new file mode 100644 index 0000000..492b77d --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.java @@ -0,0 +1,762 @@ +// Generated from DirectEdit.g4 by ANTLR 4.10.1 + +/******************************************************************************* + * Copyright (c) 2023 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.syson.diagram.general.view.directedit.grammars.generated; + +import org.antlr.v4.runtime.Lexer; +import org.antlr.v4.runtime.CharStream; +import org.antlr.v4.runtime.Token; +import org.antlr.v4.runtime.TokenStream; +import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.dfa.DFA; +import org.antlr.v4.runtime.misc.*; + +@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) +public class DirectEditLexer extends Lexer { + static { RuntimeMetaData.checkVersion("4.10.1", RuntimeMetaData.VERSION); } + + protected static final DFA[] _decisionToDFA; + protected static final PredictionContextCache _sharedContextCache = + new PredictionContextCache(); + public static final int + T__0=1, T__1=2, T__2=3, WS=4, Integer=5, Real=6, String=7, Ident=8, ABOUT=9, + ABSTRACT=10, ALIAS=11, ALL=12, AND=13, AS=14, ASSIGN=15, ASSOC=16, BEAHVIOR=17, + BINDING=18, BOOL=19, BY=20, CHAINS=21, CLASS=22, CLASSIFIER=23, COMMENT=24, + COMPOSITE=25, CONJUGATE=26, CONJUGATES=27, CONJUGATION=28, CONNECTOR=29, + DATATYPE=30, DEFAULT=31, DEPENDENCY=32, DERIVED=33, DIFFERENCES=34, DISJOINING=35, + DISJOINT=36, DOC=37, ELSE=38, END=39, EXPR=40, FALSE=41, FEATURE=42, FEATURED=43, + FEATURING=44, FILTER=45, FIRST=46, FLOW=47, FOR=48, FROM=49, FUNCTION=50, + HASTYPE=51, IF=52, INTERSECTS=53, IMPLIES=54, IMPORT=55, IN=56, INPUT=57, + INTERACTION=58, INV=59, INVERSE=60, INVERTING=61, ISTYPE=62, LANGUAGE=63, + MEMBER=64, METACLASS=65, METADATA=66, MULTIPLICITY=67, NAMESPACE=68, NONUNIQUE=69, + NOT=70, NULL=71, OF=72, OR=73, ORDERED=74, OUT=75, PACKAGE=76, PORTION=77, + PREDICATE=78, PRIAVTE=79, PROTECTED=80, PUBLIC=81, READONLY=82, REDEFINES=83, + REDEFINITION=84, RFERENCES=85, REP=86, RETURN=87, SPECIALIZTION=88, SPECIALIZES=89, + STEP=90, STRCUT=91, SUBCLASSIFIER=92, SUBSET=93, SUBSETS=94, SUBTYPE=95, + SUCCESSION=96, THEN=97, TO=98, TRUE=99, TYPE=100, TYPED=101, TYPING=102, + UNIONS=103, XOR=104; + public static String[] channelNames = { + "DEFAULT_TOKEN_CHANNEL", "HIDDEN" + }; + + public static String[] modeNames = { + "DEFAULT_MODE" + }; + + private static String[] makeRuleNames() { + return new String[] { + "T__0", "T__1", "T__2", "WS", "Integer", "Real", "String", "Escape", + "Ident", "Letter", "ABOUT", "ABSTRACT", "ALIAS", "ALL", "AND", "AS", + "ASSIGN", "ASSOC", "BEAHVIOR", "BINDING", "BOOL", "BY", "CHAINS", "CLASS", + "CLASSIFIER", "COMMENT", "COMPOSITE", "CONJUGATE", "CONJUGATES", "CONJUGATION", + "CONNECTOR", "DATATYPE", "DEFAULT", "DEPENDENCY", "DERIVED", "DIFFERENCES", + "DISJOINING", "DISJOINT", "DOC", "ELSE", "END", "EXPR", "FALSE", "FEATURE", + "FEATURED", "FEATURING", "FILTER", "FIRST", "FLOW", "FOR", "FROM", "FUNCTION", + "HASTYPE", "IF", "INTERSECTS", "IMPLIES", "IMPORT", "IN", "INPUT", "INTERACTION", + "INV", "INVERSE", "INVERTING", "ISTYPE", "LANGUAGE", "MEMBER", "METACLASS", + "METADATA", "MULTIPLICITY", "NAMESPACE", "NONUNIQUE", "NOT", "NULL", + "OF", "OR", "ORDERED", "OUT", "PACKAGE", "PORTION", "PREDICATE", "PRIAVTE", + "PROTECTED", "PUBLIC", "READONLY", "REDEFINES", "REDEFINITION", "RFERENCES", + "REP", "RETURN", "SPECIALIZTION", "SPECIALIZES", "STEP", "STRCUT", "SUBCLASSIFIER", + "SUBSET", "SUBSETS", "SUBTYPE", "SUCCESSION", "THEN", "TO", "TRUE", "TYPE", + "TYPED", "TYPING", "UNIONS", "XOR" + }; + } + public static final String[] ruleNames = makeRuleNames(); + + private static String[] makeLiteralNames() { + return new String[] { + null, "':'", "'='", "'.*'", null, null, null, null, null, "'about'", + "'abstract'", "'alias'", "'all'", "'and'", "'as'", "'assign'", "'assoc'", + "'behavior'", "'binding'", "'bool'", "'by'", "'chains'", "'class'", "'classifier'", + "'comment'", "'composite'", "'conjugate'", "'conjugates'", "'conjugation'", + "'connector'", "'datatype'", "'default'", "'dependency'", "'derived'", + "'differences'", "'disjoining'", "'disjoint'", "'doc'", "'else'", "'END'", + "'expr'", "'false'", "'feature'", "'featured'", "'featuring'", "'filter'", + "'first'", "'flow'", "'for'", "'from'", "'function'", "'hastype'", "'if'", + "'intersects'", "'implies'", "'import'", "'in'", "'inout'", "'interaction'", + "'inv'", "'inverse'", "'inverting'", "'istype'", "'language'", "'member'", + "'metaclass'", "'metadata'", "'multiplicity'", "'namespace'", "'nonunique'", + "'not'", "'null'", "'of'", "'or'", "'ordered'", "'out'", "'package'", + "'portion'", "'predicate'", "'private'", "'protected'", "'public'", "'readonly'", + "'redefines'", "'redefinition'", "'references'", "'rep'", "'return'", + "'specialization'", "'specializes'", "'step'", "'struct'", "'subclassifier'", + "'subset'", "'subsets'", "'subtype'", "'succession'", "'then'", "'to'", + "'true'", "'type'", "'typed'", "'typing'", "'unions'", "'xor'" + }; + } + private static final String[] _LITERAL_NAMES = makeLiteralNames(); + private static String[] makeSymbolicNames() { + return new String[] { + null, null, null, null, "WS", "Integer", "Real", "String", "Ident", "ABOUT", + "ABSTRACT", "ALIAS", "ALL", "AND", "AS", "ASSIGN", "ASSOC", "BEAHVIOR", + "BINDING", "BOOL", "BY", "CHAINS", "CLASS", "CLASSIFIER", "COMMENT", + "COMPOSITE", "CONJUGATE", "CONJUGATES", "CONJUGATION", "CONNECTOR", "DATATYPE", + "DEFAULT", "DEPENDENCY", "DERIVED", "DIFFERENCES", "DISJOINING", "DISJOINT", + "DOC", "ELSE", "END", "EXPR", "FALSE", "FEATURE", "FEATURED", "FEATURING", + "FILTER", "FIRST", "FLOW", "FOR", "FROM", "FUNCTION", "HASTYPE", "IF", + "INTERSECTS", "IMPLIES", "IMPORT", "IN", "INPUT", "INTERACTION", "INV", + "INVERSE", "INVERTING", "ISTYPE", "LANGUAGE", "MEMBER", "METACLASS", + "METADATA", "MULTIPLICITY", "NAMESPACE", "NONUNIQUE", "NOT", "NULL", + "OF", "OR", "ORDERED", "OUT", "PACKAGE", "PORTION", "PREDICATE", "PRIAVTE", + "PROTECTED", "PUBLIC", "READONLY", "REDEFINES", "REDEFINITION", "RFERENCES", + "REP", "RETURN", "SPECIALIZTION", "SPECIALIZES", "STEP", "STRCUT", "SUBCLASSIFIER", + "SUBSET", "SUBSETS", "SUBTYPE", "SUCCESSION", "THEN", "TO", "TRUE", "TYPE", + "TYPED", "TYPING", "UNIONS", "XOR" + }; + } + private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames(); + public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); + + /** + * @deprecated Use {@link #VOCABULARY} instead. + */ + @Deprecated + public static final String[] tokenNames; + static { + tokenNames = new String[_SYMBOLIC_NAMES.length]; + for (int i = 0; i < tokenNames.length; i++) { + tokenNames[i] = VOCABULARY.getLiteralName(i); + if (tokenNames[i] == null) { + tokenNames[i] = VOCABULARY.getSymbolicName(i); + } + + if (tokenNames[i] == null) { + tokenNames[i] = ""; + } + } + } + + @Override + @Deprecated + public String[] getTokenNames() { + return tokenNames; + } + + @Override + + public Vocabulary getVocabulary() { + return VOCABULARY; + } + + + public DirectEditLexer(CharStream input) { + super(input); + _interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache); + } + + @Override + public String getGrammarFileName() { return "DirectEdit.g4"; } + + @Override + public String[] getRuleNames() { return ruleNames; } + + @Override + public String getSerializedATN() { return _serializedATN; } + + @Override + public String[] getChannelNames() { return channelNames; } + + @Override + public String[] getModeNames() { return modeNames; } + + @Override + public ATN getATN() { return _ATN; } + + public static final String _serializedATN = + "\u0004\u0000h\u03e6\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+ + "\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+ + "\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+ + "\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b"+ + "\u0007\u000b\u0002\f\u0007\f\u0002\r\u0007\r\u0002\u000e\u0007\u000e\u0002"+ + "\u000f\u0007\u000f\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011\u0002"+ + "\u0012\u0007\u0012\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014\u0002"+ + "\u0015\u0007\u0015\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002"+ + "\u0018\u0007\u0018\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0002"+ + "\u001b\u0007\u001b\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d\u0002"+ + "\u001e\u0007\u001e\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007"+ + "!\u0002\"\u0007\"\u0002#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002&\u0007"+ + "&\u0002\'\u0007\'\u0002(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007"+ + "+\u0002,\u0007,\u0002-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u0007"+ + "0\u00021\u00071\u00022\u00072\u00023\u00073\u00024\u00074\u00025\u0007"+ + "5\u00026\u00076\u00027\u00077\u00028\u00078\u00029\u00079\u0002:\u0007"+ + ":\u0002;\u0007;\u0002<\u0007<\u0002=\u0007=\u0002>\u0007>\u0002?\u0007"+ + "?\u0002@\u0007@\u0002A\u0007A\u0002B\u0007B\u0002C\u0007C\u0002D\u0007"+ + "D\u0002E\u0007E\u0002F\u0007F\u0002G\u0007G\u0002H\u0007H\u0002I\u0007"+ + "I\u0002J\u0007J\u0002K\u0007K\u0002L\u0007L\u0002M\u0007M\u0002N\u0007"+ + "N\u0002O\u0007O\u0002P\u0007P\u0002Q\u0007Q\u0002R\u0007R\u0002S\u0007"+ + "S\u0002T\u0007T\u0002U\u0007U\u0002V\u0007V\u0002W\u0007W\u0002X\u0007"+ + "X\u0002Y\u0007Y\u0002Z\u0007Z\u0002[\u0007[\u0002\\\u0007\\\u0002]\u0007"+ + "]\u0002^\u0007^\u0002_\u0007_\u0002`\u0007`\u0002a\u0007a\u0002b\u0007"+ + "b\u0002c\u0007c\u0002d\u0007d\u0002e\u0007e\u0002f\u0007f\u0002g\u0007"+ + "g\u0002h\u0007h\u0002i\u0007i\u0001\u0000\u0001\u0000\u0001\u0001\u0001"+ + "\u0001\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003\u0004\u0003\u00de"+ + "\b\u0003\u000b\u0003\f\u0003\u00df\u0001\u0003\u0001\u0003\u0001\u0004"+ + "\u0004\u0004\u00e5\b\u0004\u000b\u0004\f\u0004\u00e6\u0001\u0005\u0004"+ + "\u0005\u00ea\b\u0005\u000b\u0005\f\u0005\u00eb\u0001\u0005\u0001\u0005"+ + "\u0004\u0005\u00f0\b\u0005\u000b\u0005\f\u0005\u00f1\u0001\u0006\u0001"+ + "\u0006\u0001\u0006\u0005\u0006\u00f7\b\u0006\n\u0006\f\u0006\u00fa\t\u0006"+ + "\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+ + "\u0003\u0007\u0102\b\u0007\u0001\b\u0003\b\u0105\b\b\u0001\b\u0001\b\u0001"+ + "\b\u0005\b\u010a\b\b\n\b\f\b\u010d\t\b\u0001\t\u0001\t\u0001\n\u0001\n"+ + "\u0001\n\u0001\n\u0001\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b\u0001"+ + "\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001"+ + "\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0001\r\u0001"+ + "\r\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f"+ + "\u0001\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010\u0001\u0010"+ + "\u0001\u0010\u0001\u0010\u0001\u0011\u0001\u0011\u0001\u0011\u0001\u0011"+ + "\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012"+ + "\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0012\u0001\u0013"+ + "\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013"+ + "\u0001\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014"+ + "\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016"+ + "\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017"+ + "\u0001\u0017\u0001\u0017\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018"+ + "\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0018"+ + "\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u0019"+ + "\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u001a"+ + "\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001a"+ + "\u0001\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001b"+ + "\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001b"+ + "\u0001\u001b\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c"+ + "\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c"+ + "\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d"+ + "\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d"+ + "\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001e"+ + "\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001f\u0001\u001f"+ + "\u0001\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001\u001f"+ + "\u0001\u001f\u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001"+ + "!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001!\u0001"+ + "!\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001"+ + "#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001"+ + "#\u0001#\u0001$\u0001$\u0001$\u0001$\u0001$\u0001$\u0001$\u0001$\u0001"+ + "$\u0001$\u0001$\u0001%\u0001%\u0001%\u0001%\u0001%\u0001%\u0001%\u0001"+ + "%\u0001%\u0001&\u0001&\u0001&\u0001&\u0001\'\u0001\'\u0001\'\u0001\'\u0001"+ + "\'\u0001(\u0001(\u0001(\u0001(\u0001)\u0001)\u0001)\u0001)\u0001)\u0001"+ + "*\u0001*\u0001*\u0001*\u0001*\u0001*\u0001+\u0001+\u0001+\u0001+\u0001"+ + "+\u0001+\u0001+\u0001+\u0001,\u0001,\u0001,\u0001,\u0001,\u0001,\u0001"+ + ",\u0001,\u0001,\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001-\u0001"+ + "-\u0001-\u0001-\u0001.\u0001.\u0001.\u0001.\u0001.\u0001.\u0001.\u0001"+ + "/\u0001/\u0001/\u0001/\u0001/\u0001/\u00010\u00010\u00010\u00010\u0001"+ + "0\u00011\u00011\u00011\u00011\u00012\u00012\u00012\u00012\u00012\u0001"+ + "3\u00013\u00013\u00013\u00013\u00013\u00013\u00013\u00013\u00014\u0001"+ + "4\u00014\u00014\u00014\u00014\u00014\u00014\u00015\u00015\u00015\u0001"+ + "6\u00016\u00016\u00016\u00016\u00016\u00016\u00016\u00016\u00016\u0001"+ + "6\u00017\u00017\u00017\u00017\u00017\u00017\u00017\u00017\u00018\u0001"+ + "8\u00018\u00018\u00018\u00018\u00018\u00019\u00019\u00019\u0001:\u0001"+ + ":\u0001:\u0001:\u0001:\u0001:\u0001;\u0001;\u0001;\u0001;\u0001;\u0001"+ + ";\u0001;\u0001;\u0001;\u0001;\u0001;\u0001;\u0001<\u0001<\u0001<\u0001"+ + "<\u0001=\u0001=\u0001=\u0001=\u0001=\u0001=\u0001=\u0001=\u0001>\u0001"+ + ">\u0001>\u0001>\u0001>\u0001>\u0001>\u0001>\u0001>\u0001>\u0001?\u0001"+ + "?\u0001?\u0001?\u0001?\u0001?\u0001?\u0001@\u0001@\u0001@\u0001@\u0001"+ + "@\u0001@\u0001@\u0001@\u0001@\u0001A\u0001A\u0001A\u0001A\u0001A\u0001"+ + "A\u0001A\u0001B\u0001B\u0001B\u0001B\u0001B\u0001B\u0001B\u0001B\u0001"+ + "B\u0001B\u0001C\u0001C\u0001C\u0001C\u0001C\u0001C\u0001C\u0001C\u0001"+ + "C\u0001D\u0001D\u0001D\u0001D\u0001D\u0001D\u0001D\u0001D\u0001D\u0001"+ + "D\u0001D\u0001D\u0001D\u0001E\u0001E\u0001E\u0001E\u0001E\u0001E\u0001"+ + "E\u0001E\u0001E\u0001E\u0001F\u0001F\u0001F\u0001F\u0001F\u0001F\u0001"+ + "F\u0001F\u0001F\u0001F\u0001G\u0001G\u0001G\u0001G\u0001H\u0001H\u0001"+ + "H\u0001H\u0001H\u0001I\u0001I\u0001I\u0001J\u0001J\u0001J\u0001K\u0001"+ + "K\u0001K\u0001K\u0001K\u0001K\u0001K\u0001K\u0001L\u0001L\u0001L\u0001"+ + "L\u0001M\u0001M\u0001M\u0001M\u0001M\u0001M\u0001M\u0001M\u0001N\u0001"+ + "N\u0001N\u0001N\u0001N\u0001N\u0001N\u0001N\u0001O\u0001O\u0001O\u0001"+ + "O\u0001O\u0001O\u0001O\u0001O\u0001O\u0001O\u0001P\u0001P\u0001P\u0001"+ + "P\u0001P\u0001P\u0001P\u0001P\u0001Q\u0001Q\u0001Q\u0001Q\u0001Q\u0001"+ + "Q\u0001Q\u0001Q\u0001Q\u0001Q\u0001R\u0001R\u0001R\u0001R\u0001R\u0001"+ + "R\u0001R\u0001S\u0001S\u0001S\u0001S\u0001S\u0001S\u0001S\u0001S\u0001"+ + "S\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001T\u0001"+ + "T\u0001U\u0001U\u0001U\u0001U\u0001U\u0001U\u0001U\u0001U\u0001U\u0001"+ + "U\u0001U\u0001U\u0001U\u0001V\u0001V\u0001V\u0001V\u0001V\u0001V\u0001"+ + "V\u0001V\u0001V\u0001V\u0001V\u0001W\u0001W\u0001W\u0001W\u0001X\u0001"+ + "X\u0001X\u0001X\u0001X\u0001X\u0001X\u0001Y\u0001Y\u0001Y\u0001Y\u0001"+ + "Y\u0001Y\u0001Y\u0001Y\u0001Y\u0001Y\u0001Y\u0001Y\u0001Y\u0001Y\u0001"+ + "Y\u0001Z\u0001Z\u0001Z\u0001Z\u0001Z\u0001Z\u0001Z\u0001Z\u0001Z\u0001"+ + "Z\u0001Z\u0001Z\u0001[\u0001[\u0001[\u0001[\u0001[\u0001\\\u0001\\\u0001"+ + "\\\u0001\\\u0001\\\u0001\\\u0001\\\u0001]\u0001]\u0001]\u0001]\u0001]"+ + "\u0001]\u0001]\u0001]\u0001]\u0001]\u0001]\u0001]\u0001]\u0001]\u0001"+ + "^\u0001^\u0001^\u0001^\u0001^\u0001^\u0001^\u0001_\u0001_\u0001_\u0001"+ + "_\u0001_\u0001_\u0001_\u0001_\u0001`\u0001`\u0001`\u0001`\u0001`\u0001"+ + "`\u0001`\u0001`\u0001a\u0001a\u0001a\u0001a\u0001a\u0001a\u0001a\u0001"+ + "a\u0001a\u0001a\u0001a\u0001b\u0001b\u0001b\u0001b\u0001b\u0001c\u0001"+ + "c\u0001c\u0001d\u0001d\u0001d\u0001d\u0001d\u0001e\u0001e\u0001e\u0001"+ + "e\u0001e\u0001f\u0001f\u0001f\u0001f\u0001f\u0001f\u0001g\u0001g\u0001"+ + "g\u0001g\u0001g\u0001g\u0001g\u0001h\u0001h\u0001h\u0001h\u0001h\u0001"+ + "h\u0001h\u0001i\u0001i\u0001i\u0001i\u0001\u00f8\u0000j\u0001\u0001\u0003"+ + "\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007\u000f\u0000"+ + "\u0011\b\u0013\u0000\u0015\t\u0017\n\u0019\u000b\u001b\f\u001d\r\u001f"+ + "\u000e!\u000f#\u0010%\u0011\'\u0012)\u0013+\u0014-\u0015/\u00161\u0017"+ + "3\u00185\u00197\u001a9\u001b;\u001c=\u001d?\u001eA\u001fC E!G\"I#K$M%"+ + "O&Q\'S(U)W*Y+[,]-_.a/c0e1g2i3k4m5o6q7s8u9w:y;{<}=\u007f>\u0081?\u0083"+ + "@\u0085A\u0087B\u0089C\u008bD\u008dE\u008fF\u0091G\u0093H\u0095I\u0097"+ + "J\u0099K\u009bL\u009dM\u009fN\u00a1O\u00a3P\u00a5Q\u00a7R\u00a9S\u00ab"+ + "T\u00adU\u00afV\u00b1W\u00b3X\u00b5Y\u00b7Z\u00b9[\u00bb\\\u00bd]\u00bf"+ + "^\u00c1_\u00c3`\u00c5a\u00c7b\u00c9c\u00cbd\u00cde\u00cff\u00d1g\u00d3"+ + "h\u0001\u0000\u0004\u0003\u0000\t\n\f\r \u0001\u000009\u0002\u000009"+ + "__\u0002\u0000AZaz\u03ed\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0003"+ + "\u0001\u0000\u0000\u0000\u0000\u0005\u0001\u0000\u0000\u0000\u0000\u0007"+ + "\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000\u0000\u0000\u0000\u000b\u0001"+ + "\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000"+ + "\u0000\u0000\u0000\u0015\u0001\u0000\u0000\u0000\u0000\u0017\u0001\u0000"+ + "\u0000\u0000\u0000\u0019\u0001\u0000\u0000\u0000\u0000\u001b\u0001\u0000"+ + "\u0000\u0000\u0000\u001d\u0001\u0000\u0000\u0000\u0000\u001f\u0001\u0000"+ + "\u0000\u0000\u0000!\u0001\u0000\u0000\u0000\u0000#\u0001\u0000\u0000\u0000"+ + "\u0000%\u0001\u0000\u0000\u0000\u0000\'\u0001\u0000\u0000\u0000\u0000"+ + ")\u0001\u0000\u0000\u0000\u0000+\u0001\u0000\u0000\u0000\u0000-\u0001"+ + "\u0000\u0000\u0000\u0000/\u0001\u0000\u0000\u0000\u00001\u0001\u0000\u0000"+ + "\u0000\u00003\u0001\u0000\u0000\u0000\u00005\u0001\u0000\u0000\u0000\u0000"+ + "7\u0001\u0000\u0000\u0000\u00009\u0001\u0000\u0000\u0000\u0000;\u0001"+ + "\u0000\u0000\u0000\u0000=\u0001\u0000\u0000\u0000\u0000?\u0001\u0000\u0000"+ + "\u0000\u0000A\u0001\u0000\u0000\u0000\u0000C\u0001\u0000\u0000\u0000\u0000"+ + "E\u0001\u0000\u0000\u0000\u0000G\u0001\u0000\u0000\u0000\u0000I\u0001"+ + "\u0000\u0000\u0000\u0000K\u0001\u0000\u0000\u0000\u0000M\u0001\u0000\u0000"+ + "\u0000\u0000O\u0001\u0000\u0000\u0000\u0000Q\u0001\u0000\u0000\u0000\u0000"+ + "S\u0001\u0000\u0000\u0000\u0000U\u0001\u0000\u0000\u0000\u0000W\u0001"+ + "\u0000\u0000\u0000\u0000Y\u0001\u0000\u0000\u0000\u0000[\u0001\u0000\u0000"+ + "\u0000\u0000]\u0001\u0000\u0000\u0000\u0000_\u0001\u0000\u0000\u0000\u0000"+ + "a\u0001\u0000\u0000\u0000\u0000c\u0001\u0000\u0000\u0000\u0000e\u0001"+ + "\u0000\u0000\u0000\u0000g\u0001\u0000\u0000\u0000\u0000i\u0001\u0000\u0000"+ + "\u0000\u0000k\u0001\u0000\u0000\u0000\u0000m\u0001\u0000\u0000\u0000\u0000"+ + "o\u0001\u0000\u0000\u0000\u0000q\u0001\u0000\u0000\u0000\u0000s\u0001"+ + "\u0000\u0000\u0000\u0000u\u0001\u0000\u0000\u0000\u0000w\u0001\u0000\u0000"+ + "\u0000\u0000y\u0001\u0000\u0000\u0000\u0000{\u0001\u0000\u0000\u0000\u0000"+ + "}\u0001\u0000\u0000\u0000\u0000\u007f\u0001\u0000\u0000\u0000\u0000\u0081"+ + "\u0001\u0000\u0000\u0000\u0000\u0083\u0001\u0000\u0000\u0000\u0000\u0085"+ + "\u0001\u0000\u0000\u0000\u0000\u0087\u0001\u0000\u0000\u0000\u0000\u0089"+ + "\u0001\u0000\u0000\u0000\u0000\u008b\u0001\u0000\u0000\u0000\u0000\u008d"+ + "\u0001\u0000\u0000\u0000\u0000\u008f\u0001\u0000\u0000\u0000\u0000\u0091"+ + "\u0001\u0000\u0000\u0000\u0000\u0093\u0001\u0000\u0000\u0000\u0000\u0095"+ + "\u0001\u0000\u0000\u0000\u0000\u0097\u0001\u0000\u0000\u0000\u0000\u0099"+ + "\u0001\u0000\u0000\u0000\u0000\u009b\u0001\u0000\u0000\u0000\u0000\u009d"+ + "\u0001\u0000\u0000\u0000\u0000\u009f\u0001\u0000\u0000\u0000\u0000\u00a1"+ + "\u0001\u0000\u0000\u0000\u0000\u00a3\u0001\u0000\u0000\u0000\u0000\u00a5"+ + "\u0001\u0000\u0000\u0000\u0000\u00a7\u0001\u0000\u0000\u0000\u0000\u00a9"+ + "\u0001\u0000\u0000\u0000\u0000\u00ab\u0001\u0000\u0000\u0000\u0000\u00ad"+ + "\u0001\u0000\u0000\u0000\u0000\u00af\u0001\u0000\u0000\u0000\u0000\u00b1"+ + "\u0001\u0000\u0000\u0000\u0000\u00b3\u0001\u0000\u0000\u0000\u0000\u00b5"+ + "\u0001\u0000\u0000\u0000\u0000\u00b7\u0001\u0000\u0000\u0000\u0000\u00b9"+ + "\u0001\u0000\u0000\u0000\u0000\u00bb\u0001\u0000\u0000\u0000\u0000\u00bd"+ + "\u0001\u0000\u0000\u0000\u0000\u00bf\u0001\u0000\u0000\u0000\u0000\u00c1"+ + "\u0001\u0000\u0000\u0000\u0000\u00c3\u0001\u0000\u0000\u0000\u0000\u00c5"+ + "\u0001\u0000\u0000\u0000\u0000\u00c7\u0001\u0000\u0000\u0000\u0000\u00c9"+ + "\u0001\u0000\u0000\u0000\u0000\u00cb\u0001\u0000\u0000\u0000\u0000\u00cd"+ + "\u0001\u0000\u0000\u0000\u0000\u00cf\u0001\u0000\u0000\u0000\u0000\u00d1"+ + "\u0001\u0000\u0000\u0000\u0000\u00d3\u0001\u0000\u0000\u0000\u0001\u00d5"+ + "\u0001\u0000\u0000\u0000\u0003\u00d7\u0001\u0000\u0000\u0000\u0005\u00d9"+ + "\u0001\u0000\u0000\u0000\u0007\u00dd\u0001\u0000\u0000\u0000\t\u00e4\u0001"+ + "\u0000\u0000\u0000\u000b\u00e9\u0001\u0000\u0000\u0000\r\u00f3\u0001\u0000"+ + "\u0000\u0000\u000f\u0101\u0001\u0000\u0000\u0000\u0011\u0104\u0001\u0000"+ + "\u0000\u0000\u0013\u010e\u0001\u0000\u0000\u0000\u0015\u0110\u0001\u0000"+ + "\u0000\u0000\u0017\u0116\u0001\u0000\u0000\u0000\u0019\u011f\u0001\u0000"+ + "\u0000\u0000\u001b\u0125\u0001\u0000\u0000\u0000\u001d\u0129\u0001\u0000"+ + "\u0000\u0000\u001f\u012d\u0001\u0000\u0000\u0000!\u0130\u0001\u0000\u0000"+ + "\u0000#\u0137\u0001\u0000\u0000\u0000%\u013d\u0001\u0000\u0000\u0000\'"+ + "\u0146\u0001\u0000\u0000\u0000)\u014e\u0001\u0000\u0000\u0000+\u0153\u0001"+ + "\u0000\u0000\u0000-\u0156\u0001\u0000\u0000\u0000/\u015d\u0001\u0000\u0000"+ + "\u00001\u0163\u0001\u0000\u0000\u00003\u016e\u0001\u0000\u0000\u00005"+ + "\u0176\u0001\u0000\u0000\u00007\u0180\u0001\u0000\u0000\u00009\u018a\u0001"+ + "\u0000\u0000\u0000;\u0195\u0001\u0000\u0000\u0000=\u01a1\u0001\u0000\u0000"+ + "\u0000?\u01ab\u0001\u0000\u0000\u0000A\u01b4\u0001\u0000\u0000\u0000C"+ + "\u01bc\u0001\u0000\u0000\u0000E\u01c7\u0001\u0000\u0000\u0000G\u01cf\u0001"+ + "\u0000\u0000\u0000I\u01db\u0001\u0000\u0000\u0000K\u01e6\u0001\u0000\u0000"+ + "\u0000M\u01ef\u0001\u0000\u0000\u0000O\u01f3\u0001\u0000\u0000\u0000Q"+ + "\u01f8\u0001\u0000\u0000\u0000S\u01fc\u0001\u0000\u0000\u0000U\u0201\u0001"+ + "\u0000\u0000\u0000W\u0207\u0001\u0000\u0000\u0000Y\u020f\u0001\u0000\u0000"+ + "\u0000[\u0218\u0001\u0000\u0000\u0000]\u0222\u0001\u0000\u0000\u0000_"+ + "\u0229\u0001\u0000\u0000\u0000a\u022f\u0001\u0000\u0000\u0000c\u0234\u0001"+ + "\u0000\u0000\u0000e\u0238\u0001\u0000\u0000\u0000g\u023d\u0001\u0000\u0000"+ + "\u0000i\u0246\u0001\u0000\u0000\u0000k\u024e\u0001\u0000\u0000\u0000m"+ + "\u0251\u0001\u0000\u0000\u0000o\u025c\u0001\u0000\u0000\u0000q\u0264\u0001"+ + "\u0000\u0000\u0000s\u026b\u0001\u0000\u0000\u0000u\u026e\u0001\u0000\u0000"+ + "\u0000w\u0274\u0001\u0000\u0000\u0000y\u0280\u0001\u0000\u0000\u0000{"+ + "\u0284\u0001\u0000\u0000\u0000}\u028c\u0001\u0000\u0000\u0000\u007f\u0296"+ + "\u0001\u0000\u0000\u0000\u0081\u029d\u0001\u0000\u0000\u0000\u0083\u02a6"+ + "\u0001\u0000\u0000\u0000\u0085\u02ad\u0001\u0000\u0000\u0000\u0087\u02b7"+ + "\u0001\u0000\u0000\u0000\u0089\u02c0\u0001\u0000\u0000\u0000\u008b\u02cd"+ + "\u0001\u0000\u0000\u0000\u008d\u02d7\u0001\u0000\u0000\u0000\u008f\u02e1"+ + "\u0001\u0000\u0000\u0000\u0091\u02e5\u0001\u0000\u0000\u0000\u0093\u02ea"+ + "\u0001\u0000\u0000\u0000\u0095\u02ed\u0001\u0000\u0000\u0000\u0097\u02f0"+ + "\u0001\u0000\u0000\u0000\u0099\u02f8\u0001\u0000\u0000\u0000\u009b\u02fc"+ + "\u0001\u0000\u0000\u0000\u009d\u0304\u0001\u0000\u0000\u0000\u009f\u030c"+ + "\u0001\u0000\u0000\u0000\u00a1\u0316\u0001\u0000\u0000\u0000\u00a3\u031e"+ + "\u0001\u0000\u0000\u0000\u00a5\u0328\u0001\u0000\u0000\u0000\u00a7\u032f"+ + "\u0001\u0000\u0000\u0000\u00a9\u0338\u0001\u0000\u0000\u0000\u00ab\u0342"+ + "\u0001\u0000\u0000\u0000\u00ad\u034f\u0001\u0000\u0000\u0000\u00af\u035a"+ + "\u0001\u0000\u0000\u0000\u00b1\u035e\u0001\u0000\u0000\u0000\u00b3\u0365"+ + "\u0001\u0000\u0000\u0000\u00b5\u0374\u0001\u0000\u0000\u0000\u00b7\u0380"+ + "\u0001\u0000\u0000\u0000\u00b9\u0385\u0001\u0000\u0000\u0000\u00bb\u038c"+ + "\u0001\u0000\u0000\u0000\u00bd\u039a\u0001\u0000\u0000\u0000\u00bf\u03a1"+ + "\u0001\u0000\u0000\u0000\u00c1\u03a9\u0001\u0000\u0000\u0000\u00c3\u03b1"+ + "\u0001\u0000\u0000\u0000\u00c5\u03bc\u0001\u0000\u0000\u0000\u00c7\u03c1"+ + "\u0001\u0000\u0000\u0000\u00c9\u03c4\u0001\u0000\u0000\u0000\u00cb\u03c9"+ + "\u0001\u0000\u0000\u0000\u00cd\u03ce\u0001\u0000\u0000\u0000\u00cf\u03d4"+ + "\u0001\u0000\u0000\u0000\u00d1\u03db\u0001\u0000\u0000\u0000\u00d3\u03e2"+ + "\u0001\u0000\u0000\u0000\u00d5\u00d6\u0005:\u0000\u0000\u00d6\u0002\u0001"+ + "\u0000\u0000\u0000\u00d7\u00d8\u0005=\u0000\u0000\u00d8\u0004\u0001\u0000"+ + "\u0000\u0000\u00d9\u00da\u0005.\u0000\u0000\u00da\u00db\u0005*\u0000\u0000"+ + "\u00db\u0006\u0001\u0000\u0000\u0000\u00dc\u00de\u0007\u0000\u0000\u0000"+ + "\u00dd\u00dc\u0001\u0000\u0000\u0000\u00de\u00df\u0001\u0000\u0000\u0000"+ + "\u00df\u00dd\u0001\u0000\u0000\u0000\u00df\u00e0\u0001\u0000\u0000\u0000"+ + "\u00e0\u00e1\u0001\u0000\u0000\u0000\u00e1\u00e2\u0006\u0003\u0000\u0000"+ + "\u00e2\b\u0001\u0000\u0000\u0000\u00e3\u00e5\u0007\u0001\u0000\u0000\u00e4"+ + "\u00e3\u0001\u0000\u0000\u0000\u00e5\u00e6\u0001\u0000\u0000\u0000\u00e6"+ + "\u00e4\u0001\u0000\u0000\u0000\u00e6\u00e7\u0001\u0000\u0000\u0000\u00e7"+ + "\n\u0001\u0000\u0000\u0000\u00e8\u00ea\u0007\u0001\u0000\u0000\u00e9\u00e8"+ + "\u0001\u0000\u0000\u0000\u00ea\u00eb\u0001\u0000\u0000\u0000\u00eb\u00e9"+ + "\u0001\u0000\u0000\u0000\u00eb\u00ec\u0001\u0000\u0000\u0000\u00ec\u00ed"+ + "\u0001\u0000\u0000\u0000\u00ed\u00ef\u0005.\u0000\u0000\u00ee\u00f0\u0007"+ + "\u0001\u0000\u0000\u00ef\u00ee\u0001\u0000\u0000\u0000\u00f0\u00f1\u0001"+ + "\u0000\u0000\u0000\u00f1\u00ef\u0001\u0000\u0000\u0000\u00f1\u00f2\u0001"+ + "\u0000\u0000\u0000\u00f2\f\u0001\u0000\u0000\u0000\u00f3\u00f8\u0005\'"+ + "\u0000\u0000\u00f4\u00f7\u0003\u000f\u0007\u0000\u00f5\u00f7\t\u0000\u0000"+ + "\u0000\u00f6\u00f4\u0001\u0000\u0000\u0000\u00f6\u00f5\u0001\u0000\u0000"+ + "\u0000\u00f7\u00fa\u0001\u0000\u0000\u0000\u00f8\u00f9\u0001\u0000\u0000"+ + "\u0000\u00f8\u00f6\u0001\u0000\u0000\u0000\u00f9\u00fb\u0001\u0000\u0000"+ + "\u0000\u00fa\u00f8\u0001\u0000\u0000\u0000\u00fb\u00fc\u0005\'\u0000\u0000"+ + "\u00fc\u000e\u0001\u0000\u0000\u0000\u00fd\u00fe\u0005\\\u0000\u0000\u00fe"+ + "\u0102\u0005\\\u0000\u0000\u00ff\u0100\u0005\\\u0000\u0000\u0100\u0102"+ + "\u0005\'\u0000\u0000\u0101\u00fd\u0001\u0000\u0000\u0000\u0101\u00ff\u0001"+ + "\u0000\u0000\u0000\u0102\u0010\u0001\u0000\u0000\u0000\u0103\u0105\u0005"+ + "_\u0000\u0000\u0104\u0103\u0001\u0000\u0000\u0000\u0104\u0105\u0001\u0000"+ + "\u0000\u0000\u0105\u0106\u0001\u0000\u0000\u0000\u0106\u010b\u0003\u0013"+ + "\t\u0000\u0107\u010a\u0003\u0013\t\u0000\u0108\u010a\u0007\u0002\u0000"+ + "\u0000\u0109\u0107\u0001\u0000\u0000\u0000\u0109\u0108\u0001\u0000\u0000"+ + "\u0000\u010a\u010d\u0001\u0000\u0000\u0000\u010b\u0109\u0001\u0000\u0000"+ + "\u0000\u010b\u010c\u0001\u0000\u0000\u0000\u010c\u0012\u0001\u0000\u0000"+ + "\u0000\u010d\u010b\u0001\u0000\u0000\u0000\u010e\u010f\u0007\u0003\u0000"+ + "\u0000\u010f\u0014\u0001\u0000\u0000\u0000\u0110\u0111\u0005a\u0000\u0000"+ + "\u0111\u0112\u0005b\u0000\u0000\u0112\u0113\u0005o\u0000\u0000\u0113\u0114"+ + "\u0005u\u0000\u0000\u0114\u0115\u0005t\u0000\u0000\u0115\u0016\u0001\u0000"+ + "\u0000\u0000\u0116\u0117\u0005a\u0000\u0000\u0117\u0118\u0005b\u0000\u0000"+ + "\u0118\u0119\u0005s\u0000\u0000\u0119\u011a\u0005t\u0000\u0000\u011a\u011b"+ + "\u0005r\u0000\u0000\u011b\u011c\u0005a\u0000\u0000\u011c\u011d\u0005c"+ + "\u0000\u0000\u011d\u011e\u0005t\u0000\u0000\u011e\u0018\u0001\u0000\u0000"+ + "\u0000\u011f\u0120\u0005a\u0000\u0000\u0120\u0121\u0005l\u0000\u0000\u0121"+ + "\u0122\u0005i\u0000\u0000\u0122\u0123\u0005a\u0000\u0000\u0123\u0124\u0005"+ + "s\u0000\u0000\u0124\u001a\u0001\u0000\u0000\u0000\u0125\u0126\u0005a\u0000"+ + "\u0000\u0126\u0127\u0005l\u0000\u0000\u0127\u0128\u0005l\u0000\u0000\u0128"+ + "\u001c\u0001\u0000\u0000\u0000\u0129\u012a\u0005a\u0000\u0000\u012a\u012b"+ + "\u0005n\u0000\u0000\u012b\u012c\u0005d\u0000\u0000\u012c\u001e\u0001\u0000"+ + "\u0000\u0000\u012d\u012e\u0005a\u0000\u0000\u012e\u012f\u0005s\u0000\u0000"+ + "\u012f \u0001\u0000\u0000\u0000\u0130\u0131\u0005a\u0000\u0000\u0131\u0132"+ + "\u0005s\u0000\u0000\u0132\u0133\u0005s\u0000\u0000\u0133\u0134\u0005i"+ + "\u0000\u0000\u0134\u0135\u0005g\u0000\u0000\u0135\u0136\u0005n\u0000\u0000"+ + "\u0136\"\u0001\u0000\u0000\u0000\u0137\u0138\u0005a\u0000\u0000\u0138"+ + "\u0139\u0005s\u0000\u0000\u0139\u013a\u0005s\u0000\u0000\u013a\u013b\u0005"+ + "o\u0000\u0000\u013b\u013c\u0005c\u0000\u0000\u013c$\u0001\u0000\u0000"+ + "\u0000\u013d\u013e\u0005b\u0000\u0000\u013e\u013f\u0005e\u0000\u0000\u013f"+ + "\u0140\u0005h\u0000\u0000\u0140\u0141\u0005a\u0000\u0000\u0141\u0142\u0005"+ + "v\u0000\u0000\u0142\u0143\u0005i\u0000\u0000\u0143\u0144\u0005o\u0000"+ + "\u0000\u0144\u0145\u0005r\u0000\u0000\u0145&\u0001\u0000\u0000\u0000\u0146"+ + "\u0147\u0005b\u0000\u0000\u0147\u0148\u0005i\u0000\u0000\u0148\u0149\u0005"+ + "n\u0000\u0000\u0149\u014a\u0005d\u0000\u0000\u014a\u014b\u0005i\u0000"+ + "\u0000\u014b\u014c\u0005n\u0000\u0000\u014c\u014d\u0005g\u0000\u0000\u014d"+ + "(\u0001\u0000\u0000\u0000\u014e\u014f\u0005b\u0000\u0000\u014f\u0150\u0005"+ + "o\u0000\u0000\u0150\u0151\u0005o\u0000\u0000\u0151\u0152\u0005l\u0000"+ + "\u0000\u0152*\u0001\u0000\u0000\u0000\u0153\u0154\u0005b\u0000\u0000\u0154"+ + "\u0155\u0005y\u0000\u0000\u0155,\u0001\u0000\u0000\u0000\u0156\u0157\u0005"+ + "c\u0000\u0000\u0157\u0158\u0005h\u0000\u0000\u0158\u0159\u0005a\u0000"+ + "\u0000\u0159\u015a\u0005i\u0000\u0000\u015a\u015b\u0005n\u0000\u0000\u015b"+ + "\u015c\u0005s\u0000\u0000\u015c.\u0001\u0000\u0000\u0000\u015d\u015e\u0005"+ + "c\u0000\u0000\u015e\u015f\u0005l\u0000\u0000\u015f\u0160\u0005a\u0000"+ + "\u0000\u0160\u0161\u0005s\u0000\u0000\u0161\u0162\u0005s\u0000\u0000\u0162"+ + "0\u0001\u0000\u0000\u0000\u0163\u0164\u0005c\u0000\u0000\u0164\u0165\u0005"+ + "l\u0000\u0000\u0165\u0166\u0005a\u0000\u0000\u0166\u0167\u0005s\u0000"+ + "\u0000\u0167\u0168\u0005s\u0000\u0000\u0168\u0169\u0005i\u0000\u0000\u0169"+ + "\u016a\u0005f\u0000\u0000\u016a\u016b\u0005i\u0000\u0000\u016b\u016c\u0005"+ + "e\u0000\u0000\u016c\u016d\u0005r\u0000\u0000\u016d2\u0001\u0000\u0000"+ + "\u0000\u016e\u016f\u0005c\u0000\u0000\u016f\u0170\u0005o\u0000\u0000\u0170"+ + "\u0171\u0005m\u0000\u0000\u0171\u0172\u0005m\u0000\u0000\u0172\u0173\u0005"+ + "e\u0000\u0000\u0173\u0174\u0005n\u0000\u0000\u0174\u0175\u0005t\u0000"+ + "\u0000\u01754\u0001\u0000\u0000\u0000\u0176\u0177\u0005c\u0000\u0000\u0177"+ + "\u0178\u0005o\u0000\u0000\u0178\u0179\u0005m\u0000\u0000\u0179\u017a\u0005"+ + "p\u0000\u0000\u017a\u017b\u0005o\u0000\u0000\u017b\u017c\u0005s\u0000"+ + "\u0000\u017c\u017d\u0005i\u0000\u0000\u017d\u017e\u0005t\u0000\u0000\u017e"+ + "\u017f\u0005e\u0000\u0000\u017f6\u0001\u0000\u0000\u0000\u0180\u0181\u0005"+ + "c\u0000\u0000\u0181\u0182\u0005o\u0000\u0000\u0182\u0183\u0005n\u0000"+ + "\u0000\u0183\u0184\u0005j\u0000\u0000\u0184\u0185\u0005u\u0000\u0000\u0185"+ + "\u0186\u0005g\u0000\u0000\u0186\u0187\u0005a\u0000\u0000\u0187\u0188\u0005"+ + "t\u0000\u0000\u0188\u0189\u0005e\u0000\u0000\u01898\u0001\u0000\u0000"+ + "\u0000\u018a\u018b\u0005c\u0000\u0000\u018b\u018c\u0005o\u0000\u0000\u018c"+ + "\u018d\u0005n\u0000\u0000\u018d\u018e\u0005j\u0000\u0000\u018e\u018f\u0005"+ + "u\u0000\u0000\u018f\u0190\u0005g\u0000\u0000\u0190\u0191\u0005a\u0000"+ + "\u0000\u0191\u0192\u0005t\u0000\u0000\u0192\u0193\u0005e\u0000\u0000\u0193"+ + "\u0194\u0005s\u0000\u0000\u0194:\u0001\u0000\u0000\u0000\u0195\u0196\u0005"+ + "c\u0000\u0000\u0196\u0197\u0005o\u0000\u0000\u0197\u0198\u0005n\u0000"+ + "\u0000\u0198\u0199\u0005j\u0000\u0000\u0199\u019a\u0005u\u0000\u0000\u019a"+ + "\u019b\u0005g\u0000\u0000\u019b\u019c\u0005a\u0000\u0000\u019c\u019d\u0005"+ + "t\u0000\u0000\u019d\u019e\u0005i\u0000\u0000\u019e\u019f\u0005o\u0000"+ + "\u0000\u019f\u01a0\u0005n\u0000\u0000\u01a0<\u0001\u0000\u0000\u0000\u01a1"+ + "\u01a2\u0005c\u0000\u0000\u01a2\u01a3\u0005o\u0000\u0000\u01a3\u01a4\u0005"+ + "n\u0000\u0000\u01a4\u01a5\u0005n\u0000\u0000\u01a5\u01a6\u0005e\u0000"+ + "\u0000\u01a6\u01a7\u0005c\u0000\u0000\u01a7\u01a8\u0005t\u0000\u0000\u01a8"+ + "\u01a9\u0005o\u0000\u0000\u01a9\u01aa\u0005r\u0000\u0000\u01aa>\u0001"+ + "\u0000\u0000\u0000\u01ab\u01ac\u0005d\u0000\u0000\u01ac\u01ad\u0005a\u0000"+ + "\u0000\u01ad\u01ae\u0005t\u0000\u0000\u01ae\u01af\u0005a\u0000\u0000\u01af"+ + "\u01b0\u0005t\u0000\u0000\u01b0\u01b1\u0005y\u0000\u0000\u01b1\u01b2\u0005"+ + "p\u0000\u0000\u01b2\u01b3\u0005e\u0000\u0000\u01b3@\u0001\u0000\u0000"+ + "\u0000\u01b4\u01b5\u0005d\u0000\u0000\u01b5\u01b6\u0005e\u0000\u0000\u01b6"+ + "\u01b7\u0005f\u0000\u0000\u01b7\u01b8\u0005a\u0000\u0000\u01b8\u01b9\u0005"+ + "u\u0000\u0000\u01b9\u01ba\u0005l\u0000\u0000\u01ba\u01bb\u0005t\u0000"+ + "\u0000\u01bbB\u0001\u0000\u0000\u0000\u01bc\u01bd\u0005d\u0000\u0000\u01bd"+ + "\u01be\u0005e\u0000\u0000\u01be\u01bf\u0005p\u0000\u0000\u01bf\u01c0\u0005"+ + "e\u0000\u0000\u01c0\u01c1\u0005n\u0000\u0000\u01c1\u01c2\u0005d\u0000"+ + "\u0000\u01c2\u01c3\u0005e\u0000\u0000\u01c3\u01c4\u0005n\u0000\u0000\u01c4"+ + "\u01c5\u0005c\u0000\u0000\u01c5\u01c6\u0005y\u0000\u0000\u01c6D\u0001"+ + "\u0000\u0000\u0000\u01c7\u01c8\u0005d\u0000\u0000\u01c8\u01c9\u0005e\u0000"+ + "\u0000\u01c9\u01ca\u0005r\u0000\u0000\u01ca\u01cb\u0005i\u0000\u0000\u01cb"+ + "\u01cc\u0005v\u0000\u0000\u01cc\u01cd\u0005e\u0000\u0000\u01cd\u01ce\u0005"+ + "d\u0000\u0000\u01ceF\u0001\u0000\u0000\u0000\u01cf\u01d0\u0005d\u0000"+ + "\u0000\u01d0\u01d1\u0005i\u0000\u0000\u01d1\u01d2\u0005f\u0000\u0000\u01d2"+ + "\u01d3\u0005f\u0000\u0000\u01d3\u01d4\u0005e\u0000\u0000\u01d4\u01d5\u0005"+ + "r\u0000\u0000\u01d5\u01d6\u0005e\u0000\u0000\u01d6\u01d7\u0005n\u0000"+ + "\u0000\u01d7\u01d8\u0005c\u0000\u0000\u01d8\u01d9\u0005e\u0000\u0000\u01d9"+ + "\u01da\u0005s\u0000\u0000\u01daH\u0001\u0000\u0000\u0000\u01db\u01dc\u0005"+ + "d\u0000\u0000\u01dc\u01dd\u0005i\u0000\u0000\u01dd\u01de\u0005s\u0000"+ + "\u0000\u01de\u01df\u0005j\u0000\u0000\u01df\u01e0\u0005o\u0000\u0000\u01e0"+ + "\u01e1\u0005i\u0000\u0000\u01e1\u01e2\u0005n\u0000\u0000\u01e2\u01e3\u0005"+ + "i\u0000\u0000\u01e3\u01e4\u0005n\u0000\u0000\u01e4\u01e5\u0005g\u0000"+ + "\u0000\u01e5J\u0001\u0000\u0000\u0000\u01e6\u01e7\u0005d\u0000\u0000\u01e7"+ + "\u01e8\u0005i\u0000\u0000\u01e8\u01e9\u0005s\u0000\u0000\u01e9\u01ea\u0005"+ + "j\u0000\u0000\u01ea\u01eb\u0005o\u0000\u0000\u01eb\u01ec\u0005i\u0000"+ + "\u0000\u01ec\u01ed\u0005n\u0000\u0000\u01ed\u01ee\u0005t\u0000\u0000\u01ee"+ + "L\u0001\u0000\u0000\u0000\u01ef\u01f0\u0005d\u0000\u0000\u01f0\u01f1\u0005"+ + "o\u0000\u0000\u01f1\u01f2\u0005c\u0000\u0000\u01f2N\u0001\u0000\u0000"+ + "\u0000\u01f3\u01f4\u0005e\u0000\u0000\u01f4\u01f5\u0005l\u0000\u0000\u01f5"+ + "\u01f6\u0005s\u0000\u0000\u01f6\u01f7\u0005e\u0000\u0000\u01f7P\u0001"+ + "\u0000\u0000\u0000\u01f8\u01f9\u0005E\u0000\u0000\u01f9\u01fa\u0005N\u0000"+ + "\u0000\u01fa\u01fb\u0005D\u0000\u0000\u01fbR\u0001\u0000\u0000\u0000\u01fc"+ + "\u01fd\u0005e\u0000\u0000\u01fd\u01fe\u0005x\u0000\u0000\u01fe\u01ff\u0005"+ + "p\u0000\u0000\u01ff\u0200\u0005r\u0000\u0000\u0200T\u0001\u0000\u0000"+ + "\u0000\u0201\u0202\u0005f\u0000\u0000\u0202\u0203\u0005a\u0000\u0000\u0203"+ + "\u0204\u0005l\u0000\u0000\u0204\u0205\u0005s\u0000\u0000\u0205\u0206\u0005"+ + "e\u0000\u0000\u0206V\u0001\u0000\u0000\u0000\u0207\u0208\u0005f\u0000"+ + "\u0000\u0208\u0209\u0005e\u0000\u0000\u0209\u020a\u0005a\u0000\u0000\u020a"+ + "\u020b\u0005t\u0000\u0000\u020b\u020c\u0005u\u0000\u0000\u020c\u020d\u0005"+ + "r\u0000\u0000\u020d\u020e\u0005e\u0000\u0000\u020eX\u0001\u0000\u0000"+ + "\u0000\u020f\u0210\u0005f\u0000\u0000\u0210\u0211\u0005e\u0000\u0000\u0211"+ + "\u0212\u0005a\u0000\u0000\u0212\u0213\u0005t\u0000\u0000\u0213\u0214\u0005"+ + "u\u0000\u0000\u0214\u0215\u0005r\u0000\u0000\u0215\u0216\u0005e\u0000"+ + "\u0000\u0216\u0217\u0005d\u0000\u0000\u0217Z\u0001\u0000\u0000\u0000\u0218"+ + "\u0219\u0005f\u0000\u0000\u0219\u021a\u0005e\u0000\u0000\u021a\u021b\u0005"+ + "a\u0000\u0000\u021b\u021c\u0005t\u0000\u0000\u021c\u021d\u0005u\u0000"+ + "\u0000\u021d\u021e\u0005r\u0000\u0000\u021e\u021f\u0005i\u0000\u0000\u021f"+ + "\u0220\u0005n\u0000\u0000\u0220\u0221\u0005g\u0000\u0000\u0221\\\u0001"+ + "\u0000\u0000\u0000\u0222\u0223\u0005f\u0000\u0000\u0223\u0224\u0005i\u0000"+ + "\u0000\u0224\u0225\u0005l\u0000\u0000\u0225\u0226\u0005t\u0000\u0000\u0226"+ + "\u0227\u0005e\u0000\u0000\u0227\u0228\u0005r\u0000\u0000\u0228^\u0001"+ + "\u0000\u0000\u0000\u0229\u022a\u0005f\u0000\u0000\u022a\u022b\u0005i\u0000"+ + "\u0000\u022b\u022c\u0005r\u0000\u0000\u022c\u022d\u0005s\u0000\u0000\u022d"+ + "\u022e\u0005t\u0000\u0000\u022e`\u0001\u0000\u0000\u0000\u022f\u0230\u0005"+ + "f\u0000\u0000\u0230\u0231\u0005l\u0000\u0000\u0231\u0232\u0005o\u0000"+ + "\u0000\u0232\u0233\u0005w\u0000\u0000\u0233b\u0001\u0000\u0000\u0000\u0234"+ + "\u0235\u0005f\u0000\u0000\u0235\u0236\u0005o\u0000\u0000\u0236\u0237\u0005"+ + "r\u0000\u0000\u0237d\u0001\u0000\u0000\u0000\u0238\u0239\u0005f\u0000"+ + "\u0000\u0239\u023a\u0005r\u0000\u0000\u023a\u023b\u0005o\u0000\u0000\u023b"+ + "\u023c\u0005m\u0000\u0000\u023cf\u0001\u0000\u0000\u0000\u023d\u023e\u0005"+ + "f\u0000\u0000\u023e\u023f\u0005u\u0000\u0000\u023f\u0240\u0005n\u0000"+ + "\u0000\u0240\u0241\u0005c\u0000\u0000\u0241\u0242\u0005t\u0000\u0000\u0242"+ + "\u0243\u0005i\u0000\u0000\u0243\u0244\u0005o\u0000\u0000\u0244\u0245\u0005"+ + "n\u0000\u0000\u0245h\u0001\u0000\u0000\u0000\u0246\u0247\u0005h\u0000"+ + "\u0000\u0247\u0248\u0005a\u0000\u0000\u0248\u0249\u0005s\u0000\u0000\u0249"+ + "\u024a\u0005t\u0000\u0000\u024a\u024b\u0005y\u0000\u0000\u024b\u024c\u0005"+ + "p\u0000\u0000\u024c\u024d\u0005e\u0000\u0000\u024dj\u0001\u0000\u0000"+ + "\u0000\u024e\u024f\u0005i\u0000\u0000\u024f\u0250\u0005f\u0000\u0000\u0250"+ + "l\u0001\u0000\u0000\u0000\u0251\u0252\u0005i\u0000\u0000\u0252\u0253\u0005"+ + "n\u0000\u0000\u0253\u0254\u0005t\u0000\u0000\u0254\u0255\u0005e\u0000"+ + "\u0000\u0255\u0256\u0005r\u0000\u0000\u0256\u0257\u0005s\u0000\u0000\u0257"+ + "\u0258\u0005e\u0000\u0000\u0258\u0259\u0005c\u0000\u0000\u0259\u025a\u0005"+ + "t\u0000\u0000\u025a\u025b\u0005s\u0000\u0000\u025bn\u0001\u0000\u0000"+ + "\u0000\u025c\u025d\u0005i\u0000\u0000\u025d\u025e\u0005m\u0000\u0000\u025e"+ + "\u025f\u0005p\u0000\u0000\u025f\u0260\u0005l\u0000\u0000\u0260\u0261\u0005"+ + "i\u0000\u0000\u0261\u0262\u0005e\u0000\u0000\u0262\u0263\u0005s\u0000"+ + "\u0000\u0263p\u0001\u0000\u0000\u0000\u0264\u0265\u0005i\u0000\u0000\u0265"+ + "\u0266\u0005m\u0000\u0000\u0266\u0267\u0005p\u0000\u0000\u0267\u0268\u0005"+ + "o\u0000\u0000\u0268\u0269\u0005r\u0000\u0000\u0269\u026a\u0005t\u0000"+ + "\u0000\u026ar\u0001\u0000\u0000\u0000\u026b\u026c\u0005i\u0000\u0000\u026c"+ + "\u026d\u0005n\u0000\u0000\u026dt\u0001\u0000\u0000\u0000\u026e\u026f\u0005"+ + "i\u0000\u0000\u026f\u0270\u0005n\u0000\u0000\u0270\u0271\u0005o\u0000"+ + "\u0000\u0271\u0272\u0005u\u0000\u0000\u0272\u0273\u0005t\u0000\u0000\u0273"+ + "v\u0001\u0000\u0000\u0000\u0274\u0275\u0005i\u0000\u0000\u0275\u0276\u0005"+ + "n\u0000\u0000\u0276\u0277\u0005t\u0000\u0000\u0277\u0278\u0005e\u0000"+ + "\u0000\u0278\u0279\u0005r\u0000\u0000\u0279\u027a\u0005a\u0000\u0000\u027a"+ + "\u027b\u0005c\u0000\u0000\u027b\u027c\u0005t\u0000\u0000\u027c\u027d\u0005"+ + "i\u0000\u0000\u027d\u027e\u0005o\u0000\u0000\u027e\u027f\u0005n\u0000"+ + "\u0000\u027fx\u0001\u0000\u0000\u0000\u0280\u0281\u0005i\u0000\u0000\u0281"+ + "\u0282\u0005n\u0000\u0000\u0282\u0283\u0005v\u0000\u0000\u0283z\u0001"+ + "\u0000\u0000\u0000\u0284\u0285\u0005i\u0000\u0000\u0285\u0286\u0005n\u0000"+ + "\u0000\u0286\u0287\u0005v\u0000\u0000\u0287\u0288\u0005e\u0000\u0000\u0288"+ + "\u0289\u0005r\u0000\u0000\u0289\u028a\u0005s\u0000\u0000\u028a\u028b\u0005"+ + "e\u0000\u0000\u028b|\u0001\u0000\u0000\u0000\u028c\u028d\u0005i\u0000"+ + "\u0000\u028d\u028e\u0005n\u0000\u0000\u028e\u028f\u0005v\u0000\u0000\u028f"+ + "\u0290\u0005e\u0000\u0000\u0290\u0291\u0005r\u0000\u0000\u0291\u0292\u0005"+ + "t\u0000\u0000\u0292\u0293\u0005i\u0000\u0000\u0293\u0294\u0005n\u0000"+ + "\u0000\u0294\u0295\u0005g\u0000\u0000\u0295~\u0001\u0000\u0000\u0000\u0296"+ + "\u0297\u0005i\u0000\u0000\u0297\u0298\u0005s\u0000\u0000\u0298\u0299\u0005"+ + "t\u0000\u0000\u0299\u029a\u0005y\u0000\u0000\u029a\u029b\u0005p\u0000"+ + "\u0000\u029b\u029c\u0005e\u0000\u0000\u029c\u0080\u0001\u0000\u0000\u0000"+ + "\u029d\u029e\u0005l\u0000\u0000\u029e\u029f\u0005a\u0000\u0000\u029f\u02a0"+ + "\u0005n\u0000\u0000\u02a0\u02a1\u0005g\u0000\u0000\u02a1\u02a2\u0005u"+ + "\u0000\u0000\u02a2\u02a3\u0005a\u0000\u0000\u02a3\u02a4\u0005g\u0000\u0000"+ + "\u02a4\u02a5\u0005e\u0000\u0000\u02a5\u0082\u0001\u0000\u0000\u0000\u02a6"+ + "\u02a7\u0005m\u0000\u0000\u02a7\u02a8\u0005e\u0000\u0000\u02a8\u02a9\u0005"+ + "m\u0000\u0000\u02a9\u02aa\u0005b\u0000\u0000\u02aa\u02ab\u0005e\u0000"+ + "\u0000\u02ab\u02ac\u0005r\u0000\u0000\u02ac\u0084\u0001\u0000\u0000\u0000"+ + "\u02ad\u02ae\u0005m\u0000\u0000\u02ae\u02af\u0005e\u0000\u0000\u02af\u02b0"+ + "\u0005t\u0000\u0000\u02b0\u02b1\u0005a\u0000\u0000\u02b1\u02b2\u0005c"+ + "\u0000\u0000\u02b2\u02b3\u0005l\u0000\u0000\u02b3\u02b4\u0005a\u0000\u0000"+ + "\u02b4\u02b5\u0005s\u0000\u0000\u02b5\u02b6\u0005s\u0000\u0000\u02b6\u0086"+ + "\u0001\u0000\u0000\u0000\u02b7\u02b8\u0005m\u0000\u0000\u02b8\u02b9\u0005"+ + "e\u0000\u0000\u02b9\u02ba\u0005t\u0000\u0000\u02ba\u02bb\u0005a\u0000"+ + "\u0000\u02bb\u02bc\u0005d\u0000\u0000\u02bc\u02bd\u0005a\u0000\u0000\u02bd"+ + "\u02be\u0005t\u0000\u0000\u02be\u02bf\u0005a\u0000\u0000\u02bf\u0088\u0001"+ + "\u0000\u0000\u0000\u02c0\u02c1\u0005m\u0000\u0000\u02c1\u02c2\u0005u\u0000"+ + "\u0000\u02c2\u02c3\u0005l\u0000\u0000\u02c3\u02c4\u0005t\u0000\u0000\u02c4"+ + "\u02c5\u0005i\u0000\u0000\u02c5\u02c6\u0005p\u0000\u0000\u02c6\u02c7\u0005"+ + "l\u0000\u0000\u02c7\u02c8\u0005i\u0000\u0000\u02c8\u02c9\u0005c\u0000"+ + "\u0000\u02c9\u02ca\u0005i\u0000\u0000\u02ca\u02cb\u0005t\u0000\u0000\u02cb"+ + "\u02cc\u0005y\u0000\u0000\u02cc\u008a\u0001\u0000\u0000\u0000\u02cd\u02ce"+ + "\u0005n\u0000\u0000\u02ce\u02cf\u0005a\u0000\u0000\u02cf\u02d0\u0005m"+ + "\u0000\u0000\u02d0\u02d1\u0005e\u0000\u0000\u02d1\u02d2\u0005s\u0000\u0000"+ + "\u02d2\u02d3\u0005p\u0000\u0000\u02d3\u02d4\u0005a\u0000\u0000\u02d4\u02d5"+ + "\u0005c\u0000\u0000\u02d5\u02d6\u0005e\u0000\u0000\u02d6\u008c\u0001\u0000"+ + "\u0000\u0000\u02d7\u02d8\u0005n\u0000\u0000\u02d8\u02d9\u0005o\u0000\u0000"+ + "\u02d9\u02da\u0005n\u0000\u0000\u02da\u02db\u0005u\u0000\u0000\u02db\u02dc"+ + "\u0005n\u0000\u0000\u02dc\u02dd\u0005i\u0000\u0000\u02dd\u02de\u0005q"+ + "\u0000\u0000\u02de\u02df\u0005u\u0000\u0000\u02df\u02e0\u0005e\u0000\u0000"+ + "\u02e0\u008e\u0001\u0000\u0000\u0000\u02e1\u02e2\u0005n\u0000\u0000\u02e2"+ + "\u02e3\u0005o\u0000\u0000\u02e3\u02e4\u0005t\u0000\u0000\u02e4\u0090\u0001"+ + "\u0000\u0000\u0000\u02e5\u02e6\u0005n\u0000\u0000\u02e6\u02e7\u0005u\u0000"+ + "\u0000\u02e7\u02e8\u0005l\u0000\u0000\u02e8\u02e9\u0005l\u0000\u0000\u02e9"+ + "\u0092\u0001\u0000\u0000\u0000\u02ea\u02eb\u0005o\u0000\u0000\u02eb\u02ec"+ + "\u0005f\u0000\u0000\u02ec\u0094\u0001\u0000\u0000\u0000\u02ed\u02ee\u0005"+ + "o\u0000\u0000\u02ee\u02ef\u0005r\u0000\u0000\u02ef\u0096\u0001\u0000\u0000"+ + "\u0000\u02f0\u02f1\u0005o\u0000\u0000\u02f1\u02f2\u0005r\u0000\u0000\u02f2"+ + "\u02f3\u0005d\u0000\u0000\u02f3\u02f4\u0005e\u0000\u0000\u02f4\u02f5\u0005"+ + "r\u0000\u0000\u02f5\u02f6\u0005e\u0000\u0000\u02f6\u02f7\u0005d\u0000"+ + "\u0000\u02f7\u0098\u0001\u0000\u0000\u0000\u02f8\u02f9\u0005o\u0000\u0000"+ + "\u02f9\u02fa\u0005u\u0000\u0000\u02fa\u02fb\u0005t\u0000\u0000\u02fb\u009a"+ + "\u0001\u0000\u0000\u0000\u02fc\u02fd\u0005p\u0000\u0000\u02fd\u02fe\u0005"+ + "a\u0000\u0000\u02fe\u02ff\u0005c\u0000\u0000\u02ff\u0300\u0005k\u0000"+ + "\u0000\u0300\u0301\u0005a\u0000\u0000\u0301\u0302\u0005g\u0000\u0000\u0302"+ + "\u0303\u0005e\u0000\u0000\u0303\u009c\u0001\u0000\u0000\u0000\u0304\u0305"+ + "\u0005p\u0000\u0000\u0305\u0306\u0005o\u0000\u0000\u0306\u0307\u0005r"+ + "\u0000\u0000\u0307\u0308\u0005t\u0000\u0000\u0308\u0309\u0005i\u0000\u0000"+ + "\u0309\u030a\u0005o\u0000\u0000\u030a\u030b\u0005n\u0000\u0000\u030b\u009e"+ + "\u0001\u0000\u0000\u0000\u030c\u030d\u0005p\u0000\u0000\u030d\u030e\u0005"+ + "r\u0000\u0000\u030e\u030f\u0005e\u0000\u0000\u030f\u0310\u0005d\u0000"+ + "\u0000\u0310\u0311\u0005i\u0000\u0000\u0311\u0312\u0005c\u0000\u0000\u0312"+ + "\u0313\u0005a\u0000\u0000\u0313\u0314\u0005t\u0000\u0000\u0314\u0315\u0005"+ + "e\u0000\u0000\u0315\u00a0\u0001\u0000\u0000\u0000\u0316\u0317\u0005p\u0000"+ + "\u0000\u0317\u0318\u0005r\u0000\u0000\u0318\u0319\u0005i\u0000\u0000\u0319"+ + "\u031a\u0005v\u0000\u0000\u031a\u031b\u0005a\u0000\u0000\u031b\u031c\u0005"+ + "t\u0000\u0000\u031c\u031d\u0005e\u0000\u0000\u031d\u00a2\u0001\u0000\u0000"+ + "\u0000\u031e\u031f\u0005p\u0000\u0000\u031f\u0320\u0005r\u0000\u0000\u0320"+ + "\u0321\u0005o\u0000\u0000\u0321\u0322\u0005t\u0000\u0000\u0322\u0323\u0005"+ + "e\u0000\u0000\u0323\u0324\u0005c\u0000\u0000\u0324\u0325\u0005t\u0000"+ + "\u0000\u0325\u0326\u0005e\u0000\u0000\u0326\u0327\u0005d\u0000\u0000\u0327"+ + "\u00a4\u0001\u0000\u0000\u0000\u0328\u0329\u0005p\u0000\u0000\u0329\u032a"+ + "\u0005u\u0000\u0000\u032a\u032b\u0005b\u0000\u0000\u032b\u032c\u0005l"+ + "\u0000\u0000\u032c\u032d\u0005i\u0000\u0000\u032d\u032e\u0005c\u0000\u0000"+ + "\u032e\u00a6\u0001\u0000\u0000\u0000\u032f\u0330\u0005r\u0000\u0000\u0330"+ + "\u0331\u0005e\u0000\u0000\u0331\u0332\u0005a\u0000\u0000\u0332\u0333\u0005"+ + "d\u0000\u0000\u0333\u0334\u0005o\u0000\u0000\u0334\u0335\u0005n\u0000"+ + "\u0000\u0335\u0336\u0005l\u0000\u0000\u0336\u0337\u0005y\u0000\u0000\u0337"+ + "\u00a8\u0001\u0000\u0000\u0000\u0338\u0339\u0005r\u0000\u0000\u0339\u033a"+ + "\u0005e\u0000\u0000\u033a\u033b\u0005d\u0000\u0000\u033b\u033c\u0005e"+ + "\u0000\u0000\u033c\u033d\u0005f\u0000\u0000\u033d\u033e\u0005i\u0000\u0000"+ + "\u033e\u033f\u0005n\u0000\u0000\u033f\u0340\u0005e\u0000\u0000\u0340\u0341"+ + "\u0005s\u0000\u0000\u0341\u00aa\u0001\u0000\u0000\u0000\u0342\u0343\u0005"+ + "r\u0000\u0000\u0343\u0344\u0005e\u0000\u0000\u0344\u0345\u0005d\u0000"+ + "\u0000\u0345\u0346\u0005e\u0000\u0000\u0346\u0347\u0005f\u0000\u0000\u0347"+ + "\u0348\u0005i\u0000\u0000\u0348\u0349\u0005n\u0000\u0000\u0349\u034a\u0005"+ + "i\u0000\u0000\u034a\u034b\u0005t\u0000\u0000\u034b\u034c\u0005i\u0000"+ + "\u0000\u034c\u034d\u0005o\u0000\u0000\u034d\u034e\u0005n\u0000\u0000\u034e"+ + "\u00ac\u0001\u0000\u0000\u0000\u034f\u0350\u0005r\u0000\u0000\u0350\u0351"+ + "\u0005e\u0000\u0000\u0351\u0352\u0005f\u0000\u0000\u0352\u0353\u0005e"+ + "\u0000\u0000\u0353\u0354\u0005r\u0000\u0000\u0354\u0355\u0005e\u0000\u0000"+ + "\u0355\u0356\u0005n\u0000\u0000\u0356\u0357\u0005c\u0000\u0000\u0357\u0358"+ + "\u0005e\u0000\u0000\u0358\u0359\u0005s\u0000\u0000\u0359\u00ae\u0001\u0000"+ + "\u0000\u0000\u035a\u035b\u0005r\u0000\u0000\u035b\u035c\u0005e\u0000\u0000"+ + "\u035c\u035d\u0005p\u0000\u0000\u035d\u00b0\u0001\u0000\u0000\u0000\u035e"+ + "\u035f\u0005r\u0000\u0000\u035f\u0360\u0005e\u0000\u0000\u0360\u0361\u0005"+ + "t\u0000\u0000\u0361\u0362\u0005u\u0000\u0000\u0362\u0363\u0005r\u0000"+ + "\u0000\u0363\u0364\u0005n\u0000\u0000\u0364\u00b2\u0001\u0000\u0000\u0000"+ + "\u0365\u0366\u0005s\u0000\u0000\u0366\u0367\u0005p\u0000\u0000\u0367\u0368"+ + "\u0005e\u0000\u0000\u0368\u0369\u0005c\u0000\u0000\u0369\u036a\u0005i"+ + "\u0000\u0000\u036a\u036b\u0005a\u0000\u0000\u036b\u036c\u0005l\u0000\u0000"+ + "\u036c\u036d\u0005i\u0000\u0000\u036d\u036e\u0005z\u0000\u0000\u036e\u036f"+ + "\u0005a\u0000\u0000\u036f\u0370\u0005t\u0000\u0000\u0370\u0371\u0005i"+ + "\u0000\u0000\u0371\u0372\u0005o\u0000\u0000\u0372\u0373\u0005n\u0000\u0000"+ + "\u0373\u00b4\u0001\u0000\u0000\u0000\u0374\u0375\u0005s\u0000\u0000\u0375"+ + "\u0376\u0005p\u0000\u0000\u0376\u0377\u0005e\u0000\u0000\u0377\u0378\u0005"+ + "c\u0000\u0000\u0378\u0379\u0005i\u0000\u0000\u0379\u037a\u0005a\u0000"+ + "\u0000\u037a\u037b\u0005l\u0000\u0000\u037b\u037c\u0005i\u0000\u0000\u037c"+ + "\u037d\u0005z\u0000\u0000\u037d\u037e\u0005e\u0000\u0000\u037e\u037f\u0005"+ + "s\u0000\u0000\u037f\u00b6\u0001\u0000\u0000\u0000\u0380\u0381\u0005s\u0000"+ + "\u0000\u0381\u0382\u0005t\u0000\u0000\u0382\u0383\u0005e\u0000\u0000\u0383"+ + "\u0384\u0005p\u0000\u0000\u0384\u00b8\u0001\u0000\u0000\u0000\u0385\u0386"+ + "\u0005s\u0000\u0000\u0386\u0387\u0005t\u0000\u0000\u0387\u0388\u0005r"+ + "\u0000\u0000\u0388\u0389\u0005u\u0000\u0000\u0389\u038a\u0005c\u0000\u0000"+ + "\u038a\u038b\u0005t\u0000\u0000\u038b\u00ba\u0001\u0000\u0000\u0000\u038c"+ + "\u038d\u0005s\u0000\u0000\u038d\u038e\u0005u\u0000\u0000\u038e\u038f\u0005"+ + "b\u0000\u0000\u038f\u0390\u0005c\u0000\u0000\u0390\u0391\u0005l\u0000"+ + "\u0000\u0391\u0392\u0005a\u0000\u0000\u0392\u0393\u0005s\u0000\u0000\u0393"+ + "\u0394\u0005s\u0000\u0000\u0394\u0395\u0005i\u0000\u0000\u0395\u0396\u0005"+ + "f\u0000\u0000\u0396\u0397\u0005i\u0000\u0000\u0397\u0398\u0005e\u0000"+ + "\u0000\u0398\u0399\u0005r\u0000\u0000\u0399\u00bc\u0001\u0000\u0000\u0000"+ + "\u039a\u039b\u0005s\u0000\u0000\u039b\u039c\u0005u\u0000\u0000\u039c\u039d"+ + "\u0005b\u0000\u0000\u039d\u039e\u0005s\u0000\u0000\u039e\u039f\u0005e"+ + "\u0000\u0000\u039f\u03a0\u0005t\u0000\u0000\u03a0\u00be\u0001\u0000\u0000"+ + "\u0000\u03a1\u03a2\u0005s\u0000\u0000\u03a2\u03a3\u0005u\u0000\u0000\u03a3"+ + "\u03a4\u0005b\u0000\u0000\u03a4\u03a5\u0005s\u0000\u0000\u03a5\u03a6\u0005"+ + "e\u0000\u0000\u03a6\u03a7\u0005t\u0000\u0000\u03a7\u03a8\u0005s\u0000"+ + "\u0000\u03a8\u00c0\u0001\u0000\u0000\u0000\u03a9\u03aa\u0005s\u0000\u0000"+ + "\u03aa\u03ab\u0005u\u0000\u0000\u03ab\u03ac\u0005b\u0000\u0000\u03ac\u03ad"+ + "\u0005t\u0000\u0000\u03ad\u03ae\u0005y\u0000\u0000\u03ae\u03af\u0005p"+ + "\u0000\u0000\u03af\u03b0\u0005e\u0000\u0000\u03b0\u00c2\u0001\u0000\u0000"+ + "\u0000\u03b1\u03b2\u0005s\u0000\u0000\u03b2\u03b3\u0005u\u0000\u0000\u03b3"+ + "\u03b4\u0005c\u0000\u0000\u03b4\u03b5\u0005c\u0000\u0000\u03b5\u03b6\u0005"+ + "e\u0000\u0000\u03b6\u03b7\u0005s\u0000\u0000\u03b7\u03b8\u0005s\u0000"+ + "\u0000\u03b8\u03b9\u0005i\u0000\u0000\u03b9\u03ba\u0005o\u0000\u0000\u03ba"+ + "\u03bb\u0005n\u0000\u0000\u03bb\u00c4\u0001\u0000\u0000\u0000\u03bc\u03bd"+ + "\u0005t\u0000\u0000\u03bd\u03be\u0005h\u0000\u0000\u03be\u03bf\u0005e"+ + "\u0000\u0000\u03bf\u03c0\u0005n\u0000\u0000\u03c0\u00c6\u0001\u0000\u0000"+ + "\u0000\u03c1\u03c2\u0005t\u0000\u0000\u03c2\u03c3\u0005o\u0000\u0000\u03c3"+ + "\u00c8\u0001\u0000\u0000\u0000\u03c4\u03c5\u0005t\u0000\u0000\u03c5\u03c6"+ + "\u0005r\u0000\u0000\u03c6\u03c7\u0005u\u0000\u0000\u03c7\u03c8\u0005e"+ + "\u0000\u0000\u03c8\u00ca\u0001\u0000\u0000\u0000\u03c9\u03ca\u0005t\u0000"+ + "\u0000\u03ca\u03cb\u0005y\u0000\u0000\u03cb\u03cc\u0005p\u0000\u0000\u03cc"+ + "\u03cd\u0005e\u0000\u0000\u03cd\u00cc\u0001\u0000\u0000\u0000\u03ce\u03cf"+ + "\u0005t\u0000\u0000\u03cf\u03d0\u0005y\u0000\u0000\u03d0\u03d1\u0005p"+ + "\u0000\u0000\u03d1\u03d2\u0005e\u0000\u0000\u03d2\u03d3\u0005d\u0000\u0000"+ + "\u03d3\u00ce\u0001\u0000\u0000\u0000\u03d4\u03d5\u0005t\u0000\u0000\u03d5"+ + "\u03d6\u0005y\u0000\u0000\u03d6\u03d7\u0005p\u0000\u0000\u03d7\u03d8\u0005"+ + "i\u0000\u0000\u03d8\u03d9\u0005n\u0000\u0000\u03d9\u03da\u0005g\u0000"+ + "\u0000\u03da\u00d0\u0001\u0000\u0000\u0000\u03db\u03dc\u0005u\u0000\u0000"+ + "\u03dc\u03dd\u0005n\u0000\u0000\u03dd\u03de\u0005i\u0000\u0000\u03de\u03df"+ + "\u0005o\u0000\u0000\u03df\u03e0\u0005n\u0000\u0000\u03e0\u03e1\u0005s"+ + "\u0000\u0000\u03e1\u00d2\u0001\u0000\u0000\u0000\u03e2\u03e3\u0005x\u0000"+ + "\u0000\u03e3\u03e4\u0005o\u0000\u0000\u03e4\u03e5\u0005r\u0000\u0000\u03e5"+ + "\u00d4\u0001\u0000\u0000\u0000\u000b\u0000\u00df\u00e6\u00eb\u00f1\u00f6"+ + "\u00f8\u0101\u0104\u0109\u010b\u0001\u0006\u0000\u0000"; + public static final ATN _ATN = + new ATNDeserializer().deserialize(_serializedATN.toCharArray()); + static { + _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; + for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) { + _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); + } + } +} \ No newline at end of file diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.tokens b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.tokens new file mode 100644 index 0000000..d8e5e9d --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditLexer.tokens @@ -0,0 +1,203 @@ +T__0=1 +T__1=2 +T__2=3 +WS=4 +Integer=5 +Real=6 +String=7 +Ident=8 +ABOUT=9 +ABSTRACT=10 +ALIAS=11 +ALL=12 +AND=13 +AS=14 +ASSIGN=15 +ASSOC=16 +BEAHVIOR=17 +BINDING=18 +BOOL=19 +BY=20 +CHAINS=21 +CLASS=22 +CLASSIFIER=23 +COMMENT=24 +COMPOSITE=25 +CONJUGATE=26 +CONJUGATES=27 +CONJUGATION=28 +CONNECTOR=29 +DATATYPE=30 +DEFAULT=31 +DEPENDENCY=32 +DERIVED=33 +DIFFERENCES=34 +DISJOINING=35 +DISJOINT=36 +DOC=37 +ELSE=38 +END=39 +EXPR=40 +FALSE=41 +FEATURE=42 +FEATURED=43 +FEATURING=44 +FILTER=45 +FIRST=46 +FLOW=47 +FOR=48 +FROM=49 +FUNCTION=50 +HASTYPE=51 +IF=52 +INTERSECTS=53 +IMPLIES=54 +IMPORT=55 +IN=56 +INPUT=57 +INTERACTION=58 +INV=59 +INVERSE=60 +INVERTING=61 +ISTYPE=62 +LANGUAGE=63 +MEMBER=64 +METACLASS=65 +METADATA=66 +MULTIPLICITY=67 +NAMESPACE=68 +NONUNIQUE=69 +NOT=70 +NULL=71 +OF=72 +OR=73 +ORDERED=74 +OUT=75 +PACKAGE=76 +PORTION=77 +PREDICATE=78 +PRIAVTE=79 +PROTECTED=80 +PUBLIC=81 +READONLY=82 +REDEFINES=83 +REDEFINITION=84 +RFERENCES=85 +REP=86 +RETURN=87 +SPECIALIZTION=88 +SPECIALIZES=89 +STEP=90 +STRCUT=91 +SUBCLASSIFIER=92 +SUBSET=93 +SUBSETS=94 +SUBTYPE=95 +SUCCESSION=96 +THEN=97 +TO=98 +TRUE=99 +TYPE=100 +TYPED=101 +TYPING=102 +UNIONS=103 +XOR=104 +':'=1 +'='=2 +'.*'=3 +'about'=9 +'abstract'=10 +'alias'=11 +'all'=12 +'and'=13 +'as'=14 +'assign'=15 +'assoc'=16 +'behavior'=17 +'binding'=18 +'bool'=19 +'by'=20 +'chains'=21 +'class'=22 +'classifier'=23 +'comment'=24 +'composite'=25 +'conjugate'=26 +'conjugates'=27 +'conjugation'=28 +'connector'=29 +'datatype'=30 +'default'=31 +'dependency'=32 +'derived'=33 +'differences'=34 +'disjoining'=35 +'disjoint'=36 +'doc'=37 +'else'=38 +'END'=39 +'expr'=40 +'false'=41 +'feature'=42 +'featured'=43 +'featuring'=44 +'filter'=45 +'first'=46 +'flow'=47 +'for'=48 +'from'=49 +'function'=50 +'hastype'=51 +'if'=52 +'intersects'=53 +'implies'=54 +'import'=55 +'in'=56 +'inout'=57 +'interaction'=58 +'inv'=59 +'inverse'=60 +'inverting'=61 +'istype'=62 +'language'=63 +'member'=64 +'metaclass'=65 +'metadata'=66 +'multiplicity'=67 +'namespace'=68 +'nonunique'=69 +'not'=70 +'null'=71 +'of'=72 +'or'=73 +'ordered'=74 +'out'=75 +'package'=76 +'portion'=77 +'predicate'=78 +'private'=79 +'protected'=80 +'public'=81 +'readonly'=82 +'redefines'=83 +'redefinition'=84 +'references'=85 +'rep'=86 +'return'=87 +'specialization'=88 +'specializes'=89 +'step'=90 +'struct'=91 +'subclassifier'=92 +'subset'=93 +'subsets'=94 +'subtype'=95 +'succession'=96 +'then'=97 +'to'=98 +'true'=99 +'type'=100 +'typed'=101 +'typing'=102 +'unions'=103 +'xor'=104 diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditListener.java b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditListener.java new file mode 100644 index 0000000..1e6ac53 --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditListener.java @@ -0,0 +1,54 @@ +// Generated from DirectEdit.g4 by ANTLR 4.10.1 + +/******************************************************************************* + * Copyright (c) 2023 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.syson.diagram.general.view.directedit.grammars.generated; + +import org.antlr.v4.runtime.tree.ParseTreeListener; + +/** + * This interface defines a complete listener for a parse tree produced by + * {@link DirectEditParser}. + */ +public interface DirectEditListener extends ParseTreeListener { + /** + * Enter a parse tree produced by {@link DirectEditParser#expression}. + * @param ctx the parse tree + */ + void enterExpression(DirectEditParser.ExpressionContext ctx); + /** + * Exit a parse tree produced by {@link DirectEditParser#expression}. + * @param ctx the parse tree + */ + void exitExpression(DirectEditParser.ExpressionContext ctx); + /** + * Enter a parse tree produced by {@link DirectEditParser#typingExpression}. + * @param ctx the parse tree + */ + void enterTypingExpression(DirectEditParser.TypingExpressionContext ctx); + /** + * Exit a parse tree produced by {@link DirectEditParser#typingExpression}. + * @param ctx the parse tree + */ + void exitTypingExpression(DirectEditParser.TypingExpressionContext ctx); + /** + * Enter a parse tree produced by {@link DirectEditParser#valueExpression}. + * @param ctx the parse tree + */ + void enterValueExpression(DirectEditParser.ValueExpressionContext ctx); + /** + * Exit a parse tree produced by {@link DirectEditParser#valueExpression}. + * @param ctx the parse tree + */ + void exitValueExpression(DirectEditParser.ValueExpressionContext ctx); +} \ No newline at end of file diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditParser.java b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditParser.java new file mode 100644 index 0000000..1298bf3 --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/directedit/grammars/generated/DirectEditParser.java @@ -0,0 +1,318 @@ +// Generated from DirectEdit.g4 by ANTLR 4.10.1 + +/******************************************************************************* + * Copyright (c) 2023 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.syson.diagram.general.view.directedit.grammars.generated; + +import org.antlr.v4.runtime.atn.*; +import org.antlr.v4.runtime.dfa.DFA; +import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.misc.*; +import org.antlr.v4.runtime.tree.*; +import java.util.List; +import java.util.Iterator; +import java.util.ArrayList; + +@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) +public class DirectEditParser extends Parser { + static { RuntimeMetaData.checkVersion("4.10.1", RuntimeMetaData.VERSION); } + + protected static final DFA[] _decisionToDFA; + protected static final PredictionContextCache _sharedContextCache = + new PredictionContextCache(); + public static final int + T__0=1, T__1=2, T__2=3, WS=4, Integer=5, Real=6, String=7, Ident=8, ABOUT=9, + ABSTRACT=10, ALIAS=11, ALL=12, AND=13, AS=14, ASSIGN=15, ASSOC=16, BEAHVIOR=17, + BINDING=18, BOOL=19, BY=20, CHAINS=21, CLASS=22, CLASSIFIER=23, COMMENT=24, + COMPOSITE=25, CONJUGATE=26, CONJUGATES=27, CONJUGATION=28, CONNECTOR=29, + DATATYPE=30, DEFAULT=31, DEPENDENCY=32, DERIVED=33, DIFFERENCES=34, DISJOINING=35, + DISJOINT=36, DOC=37, ELSE=38, END=39, EXPR=40, FALSE=41, FEATURE=42, FEATURED=43, + FEATURING=44, FILTER=45, FIRST=46, FLOW=47, FOR=48, FROM=49, FUNCTION=50, + HASTYPE=51, IF=52, INTERSECTS=53, IMPLIES=54, IMPORT=55, IN=56, INPUT=57, + INTERACTION=58, INV=59, INVERSE=60, INVERTING=61, ISTYPE=62, LANGUAGE=63, + MEMBER=64, METACLASS=65, METADATA=66, MULTIPLICITY=67, NAMESPACE=68, NONUNIQUE=69, + NOT=70, NULL=71, OF=72, OR=73, ORDERED=74, OUT=75, PACKAGE=76, PORTION=77, + PREDICATE=78, PRIAVTE=79, PROTECTED=80, PUBLIC=81, READONLY=82, REDEFINES=83, + REDEFINITION=84, RFERENCES=85, REP=86, RETURN=87, SPECIALIZTION=88, SPECIALIZES=89, + STEP=90, STRCUT=91, SUBCLASSIFIER=92, SUBSET=93, SUBSETS=94, SUBTYPE=95, + SUCCESSION=96, THEN=97, TO=98, TRUE=99, TYPE=100, TYPED=101, TYPING=102, + UNIONS=103, XOR=104; + public static final int + RULE_expression = 0, RULE_typingExpression = 1, RULE_valueExpression = 2; + private static String[] makeRuleNames() { + return new String[] { + "expression", "typingExpression", "valueExpression" + }; + } + public static final String[] ruleNames = makeRuleNames(); + + private static String[] makeLiteralNames() { + return new String[] { + null, "':'", "'='", "'.*'", null, null, null, null, null, "'about'", + "'abstract'", "'alias'", "'all'", "'and'", "'as'", "'assign'", "'assoc'", + "'behavior'", "'binding'", "'bool'", "'by'", "'chains'", "'class'", "'classifier'", + "'comment'", "'composite'", "'conjugate'", "'conjugates'", "'conjugation'", + "'connector'", "'datatype'", "'default'", "'dependency'", "'derived'", + "'differences'", "'disjoining'", "'disjoint'", "'doc'", "'else'", "'END'", + "'expr'", "'false'", "'feature'", "'featured'", "'featuring'", "'filter'", + "'first'", "'flow'", "'for'", "'from'", "'function'", "'hastype'", "'if'", + "'intersects'", "'implies'", "'import'", "'in'", "'inout'", "'interaction'", + "'inv'", "'inverse'", "'inverting'", "'istype'", "'language'", "'member'", + "'metaclass'", "'metadata'", "'multiplicity'", "'namespace'", "'nonunique'", + "'not'", "'null'", "'of'", "'or'", "'ordered'", "'out'", "'package'", + "'portion'", "'predicate'", "'private'", "'protected'", "'public'", "'readonly'", + "'redefines'", "'redefinition'", "'references'", "'rep'", "'return'", + "'specialization'", "'specializes'", "'step'", "'struct'", "'subclassifier'", + "'subset'", "'subsets'", "'subtype'", "'succession'", "'then'", "'to'", + "'true'", "'type'", "'typed'", "'typing'", "'unions'", "'xor'" + }; + } + private static final String[] _LITERAL_NAMES = makeLiteralNames(); + private static String[] makeSymbolicNames() { + return new String[] { + null, null, null, null, "WS", "Integer", "Real", "String", "Ident", "ABOUT", + "ABSTRACT", "ALIAS", "ALL", "AND", "AS", "ASSIGN", "ASSOC", "BEAHVIOR", + "BINDING", "BOOL", "BY", "CHAINS", "CLASS", "CLASSIFIER", "COMMENT", + "COMPOSITE", "CONJUGATE", "CONJUGATES", "CONJUGATION", "CONNECTOR", "DATATYPE", + "DEFAULT", "DEPENDENCY", "DERIVED", "DIFFERENCES", "DISJOINING", "DISJOINT", + "DOC", "ELSE", "END", "EXPR", "FALSE", "FEATURE", "FEATURED", "FEATURING", + "FILTER", "FIRST", "FLOW", "FOR", "FROM", "FUNCTION", "HASTYPE", "IF", + "INTERSECTS", "IMPLIES", "IMPORT", "IN", "INPUT", "INTERACTION", "INV", + "INVERSE", "INVERTING", "ISTYPE", "LANGUAGE", "MEMBER", "METACLASS", + "METADATA", "MULTIPLICITY", "NAMESPACE", "NONUNIQUE", "NOT", "NULL", + "OF", "OR", "ORDERED", "OUT", "PACKAGE", "PORTION", "PREDICATE", "PRIAVTE", + "PROTECTED", "PUBLIC", "READONLY", "REDEFINES", "REDEFINITION", "RFERENCES", + "REP", "RETURN", "SPECIALIZTION", "SPECIALIZES", "STEP", "STRCUT", "SUBCLASSIFIER", + "SUBSET", "SUBSETS", "SUBTYPE", "SUCCESSION", "THEN", "TO", "TRUE", "TYPE", + "TYPED", "TYPING", "UNIONS", "XOR" + }; + } + private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames(); + public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); + + /** + * @deprecated Use {@link #VOCABULARY} instead. + */ + @Deprecated + public static final String[] tokenNames; + static { + tokenNames = new String[_SYMBOLIC_NAMES.length]; + for (int i = 0; i < tokenNames.length; i++) { + tokenNames[i] = VOCABULARY.getLiteralName(i); + if (tokenNames[i] == null) { + tokenNames[i] = VOCABULARY.getSymbolicName(i); + } + + if (tokenNames[i] == null) { + tokenNames[i] = ""; + } + } + } + + @Override + @Deprecated + public String[] getTokenNames() { + return tokenNames; + } + + @Override + + public Vocabulary getVocabulary() { + return VOCABULARY; + } + + @Override + public String getGrammarFileName() { return "DirectEdit.g4"; } + + @Override + public String[] getRuleNames() { return ruleNames; } + + @Override + public String getSerializedATN() { return _serializedATN; } + + @Override + public ATN getATN() { return _ATN; } + + public DirectEditParser(TokenStream input) { + super(input); + _interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache); + } + + public static class ExpressionContext extends ParserRuleContext { + public TerminalNode Ident() { return getToken(DirectEditParser.Ident, 0); } + public TerminalNode EOF() { return getToken(DirectEditParser.EOF, 0); } + public TypingExpressionContext typingExpression() { + return getRuleContext(TypingExpressionContext.class,0); + } + public ValueExpressionContext valueExpression() { + return getRuleContext(ValueExpressionContext.class,0); + } + public ExpressionContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_expression; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof DirectEditListener ) ((DirectEditListener)listener).enterExpression(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof DirectEditListener ) ((DirectEditListener)listener).exitExpression(this); + } + } + + public final ExpressionContext expression() throws RecognitionException { + ExpressionContext _localctx = new ExpressionContext(_ctx, getState()); + enterRule(_localctx, 0, RULE_expression); + int _la; + try { + enterOuterAlt(_localctx, 1); + { + setState(6); + match(Ident); + setState(8); + _errHandler.sync(this); + _la = _input.LA(1); + if (_la==T__0) { + { + setState(7); + typingExpression(); + } + } + + setState(11); + _errHandler.sync(this); + _la = _input.LA(1); + if (_la==T__1) { + { + setState(10); + valueExpression(); + } + } + + setState(13); + match(EOF); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + public static class TypingExpressionContext extends ParserRuleContext { + public TerminalNode Ident() { return getToken(DirectEditParser.Ident, 0); } + public TypingExpressionContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_typingExpression; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof DirectEditListener ) ((DirectEditListener)listener).enterTypingExpression(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof DirectEditListener ) ((DirectEditListener)listener).exitTypingExpression(this); + } + } + + public final TypingExpressionContext typingExpression() throws RecognitionException { + TypingExpressionContext _localctx = new TypingExpressionContext(_ctx, getState()); + enterRule(_localctx, 2, RULE_typingExpression); + try { + enterOuterAlt(_localctx, 1); + { + setState(15); + match(T__0); + setState(16); + match(Ident); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + public static class ValueExpressionContext extends ParserRuleContext { + public ValueExpressionContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_valueExpression; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof DirectEditListener ) ((DirectEditListener)listener).enterValueExpression(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof DirectEditListener ) ((DirectEditListener)listener).exitValueExpression(this); + } + } + + public final ValueExpressionContext valueExpression() throws RecognitionException { + ValueExpressionContext _localctx = new ValueExpressionContext(_ctx, getState()); + enterRule(_localctx, 4, RULE_valueExpression); + try { + enterOuterAlt(_localctx, 1); + { + setState(18); + match(T__1); + setState(19); + match(T__2); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + + public static final String _serializedATN = + "\u0004\u0001h\u0016\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+ + "\u0002\u0007\u0002\u0001\u0000\u0001\u0000\u0003\u0000\t\b\u0000\u0001"+ + "\u0000\u0003\u0000\f\b\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0001"+ + "\u0001\u0001\u0001\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0000"+ + "\u0000\u0003\u0000\u0002\u0004\u0000\u0000\u0014\u0000\u0006\u0001\u0000"+ + "\u0000\u0000\u0002\u000f\u0001\u0000\u0000\u0000\u0004\u0012\u0001\u0000"+ + "\u0000\u0000\u0006\b\u0005\b\u0000\u0000\u0007\t\u0003\u0002\u0001\u0000"+ + "\b\u0007\u0001\u0000\u0000\u0000\b\t\u0001\u0000\u0000\u0000\t\u000b\u0001"+ + "\u0000\u0000\u0000\n\f\u0003\u0004\u0002\u0000\u000b\n\u0001\u0000\u0000"+ + "\u0000\u000b\f\u0001\u0000\u0000\u0000\f\r\u0001\u0000\u0000\u0000\r\u000e"+ + "\u0005\u0000\u0000\u0001\u000e\u0001\u0001\u0000\u0000\u0000\u000f\u0010"+ + "\u0005\u0001\u0000\u0000\u0010\u0011\u0005\b\u0000\u0000\u0011\u0003\u0001"+ + "\u0000\u0000\u0000\u0012\u0013\u0005\u0002\u0000\u0000\u0013\u0014\u0005"+ + "\u0003\u0000\u0000\u0014\u0005\u0001\u0000\u0000\u0000\u0002\b\u000b"; + public static final ATN _ATN = + new ATNDeserializer().deserialize(_serializedATN.toCharArray()); + static { + _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()]; + for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) { + _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i); + } + } +} \ No newline at end of file diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/nodes/AbstractNodeDescriptionProvider.java b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/nodes/AbstractNodeDescriptionProvider.java index 9a445b7..05816d3 100644 --- a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/nodes/AbstractNodeDescriptionProvider.java +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/nodes/AbstractNodeDescriptionProvider.java @@ -282,15 +282,24 @@ protected NodeStyleDescription createUsageCompartmentItemNodeStyle() { } protected NodePalette createDefaultNodePalette() { - var changeContext = this.viewBuilderHelper.newChangeContext() + var callDeleteService = this.viewBuilderHelper.newChangeContext() .expression(AQLConstants.AQL_SELF + ".deleteFromModel()"); var deleteTool = this.diagramBuilderHelper.newDeleteTool() .name("Delete from Model") - .body(changeContext.build()); + .body(callDeleteService.build()); + + var callEditService = this.viewBuilderHelper.newChangeContext() + .expression(AQLConstants.AQL_SELF + ".directEdit(newLabel)"); + + var editTool = this.diagramBuilderHelper.newLabelEditTool() + .name("Edit") + .initialDirectEditLabelExpression(AQLConstants.AQL_SELF + ".getInitialDirectEditLabel()") + .body(callEditService.build()); return this.diagramBuilderHelper.newNodePalette() .deleteTool(deleteTool.build()) + .labelEditTool(editTool.build()) .build(); } diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/services/GeneralViewLabelService.java b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/services/GeneralViewLabelService.java index ef6d0ee..7b91bde 100644 --- a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/services/GeneralViewLabelService.java +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/services/GeneralViewLabelService.java @@ -12,8 +12,16 @@ *******************************************************************************/ package org.eclipse.syson.diagram.general.view.services; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.tree.ParseTree; +import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.eclipse.syson.diagram.general.view.GeneralViewDiagramDescriptionProvider; import org.eclipse.syson.diagram.general.view.LabelConstants; +import org.eclipse.syson.diagram.general.view.directedit.GeneralViewDirectEditListener; +import org.eclipse.syson.diagram.general.view.directedit.grammars.generated.DirectEditLexer; +import org.eclipse.syson.diagram.general.view.directedit.grammars.generated.DirectEditListener; +import org.eclipse.syson.diagram.general.view.directedit.grammars.generated.DirectEditParser; import org.eclipse.syson.sysml.Dependency; import org.eclipse.syson.sysml.Element; @@ -46,4 +54,35 @@ public String getDependencyEdgeLabel(Dependency dependency) { return LabelConstants.OPEN_QUOTE + "dependency" + LabelConstants.CLOSE_QUOTE + LabelConstants.CR + dependency.getDeclaredName(); } + /** + * Apply the direct edit result (i.e. the newLabel) to the given {@link Element}. + * + * @param element + * the given {@link Element}. + * @param newLabel + * the new value to apply. + * @return the given {@link Element}. + */ + public Element directEdit(Element element, String newLabel) { + DirectEditLexer lexer = new DirectEditLexer(CharStreams.fromString(newLabel)); + CommonTokenStream tokens = new CommonTokenStream(lexer); + DirectEditParser parser = new DirectEditParser(tokens); + ParseTree tree = parser.expression(); + + ParseTreeWalker walker = new ParseTreeWalker(); + DirectEditListener listener = new GeneralViewDirectEditListener(element); + walker.walk(listener, tree); + return element; + } + + /** + * Get the value to display when a direct edit has been called on the given {@link Element}. + * + * @param element + * the given {@link Element}. + * @return the value to display. + */ + public String getInitialDirectEditLabel(Element element) { + return element.getDeclaredName(); + } } diff --git a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/services/GeneralViewUtilService.java b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/services/GeneralViewUtilService.java index 5304e3d..445ca12 100644 --- a/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/services/GeneralViewUtilService.java +++ b/backend/views/syson-diagram-general-view/src/main/java/org/eclipse/syson/diagram/general/view/services/GeneralViewUtilService.java @@ -12,6 +12,9 @@ *******************************************************************************/ package org.eclipse.syson.diagram.general.view.services; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Spliterator; import java.util.Spliterators; @@ -21,12 +24,14 @@ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.syson.diagram.general.view.GeneralViewDiagramDescriptionProvider; import org.eclipse.syson.diagram.general.view.SysMLMetamodelHelper; +import org.eclipse.syson.sysml.Definition; import org.eclipse.syson.sysml.Element; import org.eclipse.syson.sysml.Package; @@ -127,6 +132,102 @@ public List getAllReachable(EObject eObject, EClass eClass, boolean wit } } + /** + * Find a {@link Definition} element that match the given name in the ResourceSet of the given element. + * + * @param object + * the object for which to find a corresponding type. + * @param typeName + * the type name to match. + * @return the found {@link Definition} element or null + */ + public Definition findDefinitionByName(EObject object, String typeName) { + final Definition result = this.findDefinitionByName(this.getAllRootsInResourceSet(object), typeName); + return result; + } + + /** + * Iterate over the given {@link Collection} of root elements to find a {@link Definition} element with the given + * name. + * + * @param roots + * the elements to inspect + * @param typeName + * the name to match + * @return the found {@link Definition} or null + */ + public Definition findDefinitionByName(Collection roots, String typeName) { + for (final EObject root : roots) { + final Definition result = this.findDefinitionByNameFrom(root, typeName); + if (result != null) { + return result; + } + } + return null; + } + + /** + * Iterate over the root children to find a {@link Definition} element with the given name. + * + * @param root + * the root object to iterate. + * @param typeName + * the name to match + * @return the found {@link Definition} or null + */ + private Definition findDefinitionByNameFrom(EObject root, String typeName) { + Definition definition = null; + + if (root instanceof Definition && this.nameMatches((Definition) root, typeName)) { + return (Definition) root; + } + + TreeIterator eAllContents = root.eAllContents(); + while (eAllContents.hasNext()) { + EObject obj = eAllContents.next(); + if (obj instanceof Definition && this.nameMatches((Definition) obj, typeName)) { + definition = (Definition) obj; + } + } + + return definition; + } + + /** + * Retrieves all the root elements of the resource in the resource set of the given context object. + * + * @param context + * the context object on which to execute this service. + * @return a {@link Collection} of all the root element of the current resource set. + */ + private Collection getAllRootsInResourceSet(EObject context) { + final Resource res = context.eResource(); + if (res != null && res.getResourceSet() != null) { + final Collection roots = new ArrayList<>(); + for (final Resource childRes : res.getResourceSet().getResources()) { + roots.addAll(childRes.getContents()); + } + return roots; + } + return Collections.emptyList(); + } + + /** + * Check if the given element's name match the given String. + * + * @param element + * the {@link Element} to check. + * @param name + * the name to match. + * @return true if the name match, false otherwise. + */ + private boolean nameMatches(Element element, String name) { + if (element != null && element.getName() != null && name != null) { + return element.getName().trim().equalsIgnoreCase(name.trim()); + } + return false; + } + private Stream getSysMLv2Resources(EList resources) { return resources.stream().filter(r -> !r.getContents().isEmpty() && r.getContents().get(0) instanceof Element); } diff --git a/backend/views/syson-diagram-general-view/src/main/resources/DirectEdit.g4 b/backend/views/syson-diagram-general-view/src/main/resources/DirectEdit.g4 new file mode 100644 index 0000000..a80d62c --- /dev/null +++ b/backend/views/syson-diagram-general-view/src/main/resources/DirectEdit.g4 @@ -0,0 +1,166 @@ +/******************************************************************************* + * Copyright (c) 2023 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +grammar DirectEdit; + +@header { +/******************************************************************************* + * Copyright (c) 2023 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.syson.diagram.general.view.directedit.grammars.generated; +} + +expression : + Ident (typingExpression)? (valueExpression)? EOF +; + +typingExpression : + ':' Ident +; + +valueExpression : + '=' '.*' +; + +WS : + [ \t\r\n\u000C]+ -> skip +; + +Integer : + [0-9]+ +; + +Real : + [0-9]+'.'[0-9]+ +; + +String : + '\'' (Escape|.)*? '\'' +; + +fragment Escape : '\\\\' | '\\\'' +; + +Ident : + '_'? Letter (Letter | [0-9] | '_')* +; + +fragment Letter : [a-zA-Z] +; + +// Reserved Keywords + +ABOUT : 'about'; +ABSTRACT : 'abstract'; +ALIAS : 'alias'; +ALL : 'all'; +AND : 'and'; +AS : 'as'; +ASSIGN : 'assign'; +ASSOC : 'assoc'; +BEAHVIOR : 'behavior'; +BINDING : 'binding'; +BOOL : 'bool'; +BY : 'by'; +CHAINS : 'chains'; +CLASS : 'class'; +CLASSIFIER : 'classifier'; +COMMENT : 'comment'; +COMPOSITE : 'composite'; +CONJUGATE : 'conjugate'; +CONJUGATES : 'conjugates'; +CONJUGATION : 'conjugation'; +CONNECTOR : 'connector'; +DATATYPE : 'datatype'; +DEFAULT : 'default'; +DEPENDENCY : 'dependency'; +DERIVED : 'derived'; +DIFFERENCES : 'differences'; +DISJOINING : 'disjoining'; +DISJOINT : 'disjoint'; +DOC : 'doc'; +ELSE : 'else'; +END : 'END'; +EXPR : 'expr'; +FALSE : 'false'; +FEATURE : 'feature'; +FEATURED : 'featured'; +FEATURING : 'featuring'; +FILTER : 'filter'; +FIRST : 'first'; +FLOW : 'flow'; +FOR : 'for'; +FROM : 'from'; +FUNCTION : 'function'; +HASTYPE: 'hastype'; +IF : 'if'; +INTERSECTS : 'intersects'; +IMPLIES : 'implies'; +IMPORT : 'import'; +IN : 'in'; +INPUT : 'inout'; +INTERACTION : 'interaction'; +INV : 'inv'; +INVERSE : 'inverse'; +INVERTING : 'inverting'; +ISTYPE : 'istype'; +LANGUAGE : 'language'; +MEMBER : 'member'; +METACLASS : 'metaclass'; +METADATA : 'metadata'; +MULTIPLICITY : 'multiplicity'; +NAMESPACE : 'namespace'; +NONUNIQUE : 'nonunique'; +NOT : 'not'; +NULL : 'null'; +OF : 'of'; +OR : 'or'; +ORDERED : 'ordered'; +OUT : 'out'; +PACKAGE : 'package'; +PORTION : 'portion'; +PREDICATE : 'predicate'; +PRIAVTE : 'private'; +PROTECTED : 'protected'; +PUBLIC : 'public'; +READONLY : 'readonly'; +REDEFINES : 'redefines'; +REDEFINITION : 'redefinition'; +RFERENCES : 'references'; +REP : 'rep'; +RETURN : 'return'; +SPECIALIZTION : 'specialization'; +SPECIALIZES : 'specializes'; +STEP : 'step'; +STRCUT : 'struct'; +SUBCLASSIFIER : 'subclassifier'; +SUBSET : 'subset'; +SUBSETS : 'subsets'; +SUBTYPE : 'subtype'; +SUCCESSION : 'succession'; +THEN : 'then'; +TO : 'to'; +TRUE : 'true'; +TYPE : 'type'; +TYPED : 'typed'; +TYPING : 'typing'; +UNIONS : 'unions'; +XOR: 'xor'; diff --git a/doc/adrs/000_adopt_adrs.adoc b/doc/adrs/000_adopt_adrs.adoc new file mode 100644 index 0000000..0148916 --- /dev/null +++ b/doc/adrs/000_adopt_adrs.adoc @@ -0,0 +1,58 @@ += ADR-000 - Adopt Architecture Decision Records + +== Context + +Architecture for agile projects has to be described and defined differently. Not all decisions will be made at once, nor will all of them be done when the project begins. + +Agile methods are not opposed to documentation, only to valueless documentation. Documents that assist the team itself can have value, but only if they are kept up to date. Large documents are never kept up to date. Small, modular documents have at least a chance at being updated. + +Nobody ever reads large documents, either. Most developers have been on at least one project where the specification document was larger (in bytes) than the total source code size. Those documents are too large to open, read, or update. Bite sized pieces are easier for all stakeholders to consume. + +One of the hardest things to track during the life of a project is the motivation behind certain decisions. A new person coming on to a project may be perplexed, baffled, delighted, or infuriated by some past decision. Without understanding the rationale or consequences, this person has only two choices: + +1. _Blindly accept the decision._ This response may be OK, if the decision is still valid. It may not be good, however, if the context has changed and the decision should really be revisited. If the project accumulates too many decisions accepted without understanding, then the development team becomes afraid to change anything and the project collapses under its own weight. +2. _Blindly change it._ Again, this may be OK if the decision needs to be reversed. On the other hand, changing the decision without understanding its motivation or consequences could mean damaging the project's overall value without realizing it. (E.g., the decision supported a non-functional requirement that hasn't been tested yet.) + +It's better to avoid either blind acceptance or blind reversal. + +== Decision + +We will keep a collection of records for "architecturally significant" decisions: those that affect the structure, non-functional characteristics, dependencies, interfaces, or construction techniques. + +An architecture decision record is a short text file in a format similar to an Alexandrian pattern. (Though the decisions themselves are not necessarily patterns, they share the characteristic balancing of forces.) Each record describes a set of forces and a single decision in response to those forces. Note that the decision is the central piece here, so specific forces may appear in multiple ADRs. + +We will keep ADRs in the project repository under `doc/adrs/adr-NNN.md`. + +We should use a lightweight text formatting language like AsciiDoc. + +ADRs will be numbered sequentially and monotonically. Numbers will not be reused. + +If a decision is reversed, we will keep the old one around, but mark it as superseded. (It's still relevant to know that it was the decision, but is no longer the decision.) + +We will use a format with just a few parts, so each document is easy to digest. The format has just a few parts. + +* __Title__: These documents have names that are short noun phrases. For example, "ADR 1: Deployment on Ruby on Rails 3.0.10" or "ADR 9: LDAP for Multitenant Integration" +* __Context__: This section describes the forces at play, including technological, political, social, and project local. These forces are probably in tension, and should be called out as such. The language in this section is value-neutral. It is simply describing facts. +* __Decision__: This section describes our response to these forces. It is stated in full sentences, with active voice. "We will ..." +* __Status__: A decision may be "proposed" if the project stakeholders haven't agreed with it yet, or "accepted" once it is agreed. If a later ADR changes or reverses a decision, it may be marked as "deprecated" or "superseded" with a reference to its replacement. +* __Consequences__: This section describes the resulting context, after applying the decision. All consequences should be listed here, not just the "positive" ones. A particular decision may have positive, negative, and neutral consequences, but all of them affect the team and project in the future. + +The whole document should be one or two pages long. We will write each ADR as if it is a conversation with a future developer. This requires good writing style, with full sentences organized into paragraphs. Bullets are acceptable only for visual style, not as an excuse for writing sentence fragments. (Bullets kill people, even PowerPoint bullets.) + +== Status + +Accepted. + +== Consequences + +One ADR describes one significant decision for a specific project. It should be something that has an effect on how the rest of the project will run. + +The consequences of one ADR are very likely to become the context for subsequent ADRs. This is also similar to Alexander's idea of a pattern language: the large-scale responses create spaces for the smaller scale to fit into. + +Developers and project stakeholders can see the ADRs, even as the team composition changes over time. + +The motivation behind previous decisions is visible for everyone, present and future. Nobody is left scratching their heads to understand, "What were they thinking?" and the time to change old decisions will be clear from changes in the project's context. + +== References + +* http://thinkrelevance.com/blog/2011/11/15/documenting-architecture-decisions[The original article] from Michael Nygard. diff --git a/doc/adrs/001_support_direct_edit_in diagrams.adoc b/doc/adrs/001_support_direct_edit_in diagrams.adoc new file mode 100644 index 0000000..b712c44 --- /dev/null +++ b/doc/adrs/001_support_direct_edit_in diagrams.adoc @@ -0,0 +1,47 @@ += ADR-001 - Support direct edit in diagrams + +== Context + +In General View diagram (and maybe other diagrams existing in the future), we need to perform direct edit (e.g. renaming an element) on some diagram elements (i.e. nodes and edges). + +Change the name of a SysML element is the easiest case while performing a direct edit. +But there are many other direct edit much moe complex than simply change the name of an element. + +For example, the General View diagram displays `PartUsage` as container node. +These container node contains a compartment for its attributes (i.e. `AttributeUsage`). +An `AttributeUsage` may have a type, may redefine another `AttributeUsage`, may have a value (simple or complex) affected, ... +Furthermore, an `AttributeUsage` can be represented as a compartment node inside a `Usage`` container node, but can also be represented as a container node. +Depending on this kind of node, we do not want to display the same level of information, and we do not want to edit the same level of information. + +We also want to create elements on the fly. +For example, on an `AttributeUsage` that only have a name 'attr1', performing a direct edit from `attr1` to `attr1 : MyType` should create a `FeatureTyping` element and reference the type `MyType` in this newly created `FeatureTyping`. +But it should also create the type `MyType` if it does not exist. + +We also want to delete elements on the fly. +For example, on an `AttributeUsage` 'attr1' that redefines another `AttributeUsage` 'attr2' (meaning a `Redefinition` element exists under `attr1` and references `attr2`), performing a direct edit from `attr1 :>> attr2` to `attr1` should delete the `Redefinition` element existing under `attr1`. + +These examples give a small insight of what can be done with the direct edit. + +== Decision + +For simple cases, the usage of `String.split(...)` or a regular expression may be the technical solution to handle the direct edit. +For complex cases (like the ones described above), a parser could help to manage this complexity (several elements to update/create/delete, optional parts...). + +The decision is to use ANTLR parser to handle these complex cases. +It will be used to create grammars dedicated to parse these complex cases. +The first use case will be the direct edit of all `Usage` elements (`AttributeUsage`, `PartUsage`, `PortUsage`, ...) that are represented as compartment nodes inside node containers. +Other use cases (unknown at the moment) may also use the same grammar or new ones depending on the context. + +== Status + +To be reviewed. + +== Consequences + +`syson-diagram-general-view` will depend on `antlr4-runtime` as maven dependency. +The version used will be the same as Sirius Web, ANTLR 4.10.1. +SysON will keep its version of ANTLR synchronized with the Sirius Web one. + +== References + +- https://www.antlr.org/ \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..3fde3ba --- /dev/null +++ b/pom.xml @@ -0,0 +1,63 @@ + + + + 4.0.0 + + org.eclipse.syson + syson + 2023.10.8 + + syson + SysON + pom + + + + dash-licenses-snapshots + https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/ + + true + + + + + + /backend + + + + + verify-iplog + + + + org.eclipse.dash + license-tool-plugin + 0.0.1-SNAPSHOT + + + license-check + compile + + license-check + + + + + + + + +