Skip to content
Snippets Groups Projects
Commit 24abd606 authored by Alberto Debiasi's avatar Alberto Debiasi
Browse files

Reduce use of getStereotype()/ 

Change-Id: I74e0a2b01acd656759a8d89067ca1637cdc14ebc
parent dbd9ec25
Branches 111-Optimize-access-to-stereotypes
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
+ 53
− 53
View file @ 24abd606
......@@ -1157,9 +1157,9 @@ public class EntityUtil {
public EList<Property> getInstantiatedArchitecureElementsAsProperties(Class umlComponent) {
EList<Property> instantiatedArchitecureList = new BasicEList<Property>();
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION, umlComponent);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION, umlComponent);
for (Property umlProperty : ((Class) umlComponent).getAttributes()) {
if (umlProperty.getAppliedStereotypes().contains(stereotype)) {
if ((umlProperty.getAppliedStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION)!=null)) {
instantiatedArchitecureList.add(umlProperty);
}
}
......@@ -1168,9 +1168,9 @@ public class EntityUtil {
public EList<InstantiatedArchitectureConfiguration> getInstantiatedArchitecureConfigurations(Class umlComponent) {
EList<InstantiatedArchitectureConfiguration> instantiatedArchitecureList = new BasicEList<InstantiatedArchitectureConfiguration>();
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION, umlComponent);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION, umlComponent);
for (Property umlProperty : ((Class) umlComponent).getAttributes()) {
if (umlProperty.getAppliedStereotypes().contains(stereotype)) {
if ((umlProperty.getAppliedStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION)!=null)) {
instantiatedArchitecureList.add(getInstantiatedArchitectureConfiguration(umlProperty));
}
}
......@@ -1281,11 +1281,11 @@ public class EntityUtil {
if (!packageChildren.isEmpty()) {
Stereotype stereotype = StereotypeUtil.getSysMLStereotype(BLOCK, umlSelectedPackage);
Stereotype stereotype2 = StereotypeUtil.getCHESSContractStereotype(ContractEntityUtil.CONTRACT, umlSelectedPackage);
//Stereotype stereotype = StereotypeUtil.getSysMLStereotype(BLOCK, umlSelectedPackage);
//Stereotype stereotype2 = StereotypeUtil.getCHESSContractStereotype(ContractEntityUtil.CONTRACT, umlSelectedPackage);
blocksAsClasses = new ArrayList<Class>();
for (Element element : packageChildren) {
if (element.getAppliedStereotypes().contains(stereotype) && !element.getAppliedStereotypes().contains(stereotype2)) {
if ((element.getAppliedStereotype(BLOCK)!=null) && (element.getAppliedStereotype(ContractEntityUtil.CONTRACT)==null)) {
blocksAsClasses.add((Class) element);
}
}
......@@ -1462,13 +1462,13 @@ public class EntityUtil {
}
private boolean isFlowPort(Element umlElement) {
Stereotype stereotype = StereotypeUtil.getSysMLStereotype(FLOW_Port, umlElement);
return (umlElement instanceof Property && umlElement.getAppliedStereotypes().contains(stereotype));
//Stereotype stereotype = StereotypeUtil.getSysMLStereotype(FLOW_Port, umlElement);
return (umlElement instanceof Property && (umlElement.getAppliedStereotype(FLOW_Port)!=null));
}
private boolean isFlowPortMarte(Element umlElement) {
Stereotype stereotype = StereotypeUtil.getMarteStereotype(FLOW_Port_MARTE, umlElement);
return (umlElement instanceof Property && umlElement.getAppliedStereotypes().contains(stereotype));
//Stereotype stereotype = StereotypeUtil.getMarteStereotype(FLOW_Port_MARTE, umlElement);
return (umlElement instanceof Property && (umlElement.getAppliedStereotype(FLOW_Port_MARTE)!=null));
}
public void deleteComponentContract(Class clazz) {
......@@ -1476,13 +1476,13 @@ public class EntityUtil {
}
public boolean isComponentImplementation(Element umlElement) {
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(COMP_IMPL, umlElement);
return (umlElement instanceof Class && umlElement.getAppliedStereotypes().contains(stereotype));
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(COMP_IMPL, umlElement);
return (umlElement instanceof Class && (umlElement.getAppliedStereotype(COMP_IMPL)!=null));
}
public boolean isInstantiatedArchitecuture(Element umlElement) {
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION, umlElement);
return (umlElement instanceof Property && umlElement.getAppliedStereotypes().contains(stereotype));
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION, umlElement);
return (umlElement instanceof Property && (umlElement.getAppliedStereotype(INSTANTIATED_ARCHITECTURE_CONFIGURATION)!=null));
}
// modified method!!
......@@ -1560,8 +1560,8 @@ public class EntityUtil {
public boolean isRangeType(Type umlType) {
if (umlType != null) {
Stereotype stereotype = StereotypeUtil.getMarteStereotype(BOUNDED_TYPE, umlType);
if (umlType.getAppliedStereotypes().contains(stereotype)) {
//Stereotype stereotype = StereotypeUtil.getMarteStereotype(BOUNDED_TYPE, umlType);
if ((umlType.getAppliedStereotype(BOUNDED_TYPE)!=null)) {
return true;
}
}
......@@ -1650,48 +1650,48 @@ public class EntityUtil {
public boolean isBlock(Element umlClass) {
if(umlClass instanceof Class){
Stereotype stereotype = StereotypeUtil.getSysMLStereotype(BLOCK, umlClass);
return umlClass.getAppliedStereotypes().contains(stereotype);
//Stereotype stereotype = StereotypeUtil.getSysMLStereotype(BLOCK, umlClass);
return (umlClass.getAppliedStereotype(BLOCK)!=null);
}
return false;
}
public boolean isCompType(Element umlComponent) {
if(umlComponent instanceof Class){
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(COMP_TYPE, umlComponent);
return umlComponent.getAppliedStereotypes().contains(stereotype);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(COMP_TYPE, umlComponent);
return (umlComponent.getAppliedStereotype(COMP_TYPE)!=null);
}
return false;
}
public boolean isSystem(Element umlElement) {
if(umlElement instanceof Class){
Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(SYSTEM, umlElement);
return umlElement.getAppliedStereotypes().contains(stereotype);
//Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(SYSTEM, umlElement);
return (umlElement.getAppliedStereotype(SYSTEM)!=null);
}
return false;
}
public boolean isFaultyStateMachine(Element umlElement) {
if(umlElement instanceof StateMachine){
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(FAULTY_STATE_MACHINE, umlElement);
return umlElement.getAppliedStereotypes().contains(stereotype);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(FAULTY_STATE_MACHINE, umlElement);
return (umlElement.getAppliedStereotype(FAULTY_STATE_MACHINE)!=null);
}
return false;
}
public boolean isNominalStateMachine(Element umlElement) {
if(umlElement instanceof StateMachine){
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(FAULTY_STATE_MACHINE, umlElement);
return !umlElement.getAppliedStereotypes().contains(stereotype);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(FAULTY_STATE_MACHINE, umlElement);
return (umlElement.getAppliedStereotype(FAULTY_STATE_MACHINE)==null);
}
return false;
}
public boolean isPrioritizedTransition(Element umlElement) {
if(umlElement instanceof Transition){
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(PRIORITIZED_TRANSITION, umlElement);
return umlElement.getAppliedStereotypes().contains(stereotype);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(PRIORITIZED_TRANSITION, umlElement);
return (umlElement.getAppliedStereotype(PRIORITIZED_TRANSITION)!=null);
}
return false;
}
......@@ -1841,12 +1841,12 @@ public class EntityUtil {
if (umlModel != null) {
TreeIterator<EObject> allElements = umlModel.eResource().getAllContents();
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(FAULTY_STATE_MACHINE, umlModel);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(FAULTY_STATE_MACHINE, umlModel);
if (allElements != null) {
Collection<org.eclipse.uml2.uml.Class> classes = EcoreUtil
.getObjectsByType(iterator2Collection(allElements), UMLPackage.eINSTANCE.getClass_());
for (Class c : classes) {
if ((c instanceof StateMachine) && !c.getAppliedStereotypes().contains(stereotype)) {
if ((c instanceof StateMachine) && (c.getAppliedStereotype(FAULTY_STATE_MACHINE)==null)) {
stateMachines.add((StateMachine) c);
}
}
......@@ -1902,10 +1902,10 @@ public class EntityUtil {
if (umlSelectedComponent != null) {
EList<Behavior> behaviours = umlSelectedComponent.getOwnedBehaviors();
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(FAULTY_STATE_MACHINE, umlSelectedComponent);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(FAULTY_STATE_MACHINE, umlSelectedComponent);
if (behaviours != null) {
for (Class c : behaviours) {
if ((c instanceof StateMachine) && !c.getAppliedStereotypes().contains(stereotype)) {
if ((c instanceof StateMachine) && (c.getAppliedStereotype(FAULTY_STATE_MACHINE)==null)) {
stateMachines.add((StateMachine) c);
}
}
......@@ -2409,9 +2409,9 @@ public class EntityUtil {
}
public boolean isFormalProperty(Element umlConstraint) {
Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(FORMAL_PROP, umlConstraint);
//Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(FORMAL_PROP, umlConstraint);
if (umlConstraint instanceof Constraint) {
return umlConstraint.getAppliedStereotypes().contains(stereotype);
return (umlConstraint.getAppliedStereotype(FORMAL_PROP)!=null);
}
return false;
}
......@@ -2438,9 +2438,9 @@ public class EntityUtil {
EList<Constraint> constraints = new BasicEList<Constraint>();
if (isBlock(umlElement) || isCompType(umlElement) || isComponentImplementation(umlElement)) {
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(MACRO_DEFINITION, umlElement);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(MACRO_DEFINITION, umlElement);
for (Constraint umlConstraint : ((Class) umlElement).getOwnedRules()) {
if (umlConstraint.getAppliedStereotypes().contains(stereotype)) {
if ((umlConstraint.getAppliedStereotype(MACRO_DEFINITION)!=null)) {
constraints.add((Constraint) umlConstraint);
}
}
......@@ -2461,9 +2461,9 @@ public class EntityUtil {
* @return true if the given element is a Macro Definition
*/
public boolean isMacroDefinition(Element umlConstraint) {
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(MACRO_DEFINITION, umlConstraint);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(MACRO_DEFINITION, umlConstraint);
if (umlConstraint instanceof Constraint) {
return umlConstraint.getAppliedStereotypes().contains(stereotype);
return (umlConstraint.getAppliedStereotype(MACRO_DEFINITION)!=null);
}
return false;
}
......@@ -2490,17 +2490,17 @@ public class EntityUtil {
}
public boolean isDelegationConstraint(Element umlProperty) {
Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(DELEGATION_CONST, umlProperty);
return ((umlProperty instanceof Constraint) && umlProperty.getAppliedStereotypes().contains(stereotype));
//Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(DELEGATION_CONST, umlProperty);
return ((umlProperty instanceof Constraint) && (umlProperty.getAppliedStereotype(DELEGATION_CONST)!=null));
}
public EList<Constraint> getDelegationConstraintsAsUMLConstraints(Element umlElement) {
EList<Constraint> constraints = new BasicEList<Constraint>();
if (isBlock(umlElement) || isCompType(umlElement) || isComponentImplementation(umlElement)) {
Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(DELEGATION_CONST, umlElement);
//Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(DELEGATION_CONST, umlElement);
for (Constraint umlConstraint : ((Class) umlElement).getOwnedRules()) {
if (umlConstraint.getAppliedStereotypes().contains(stereotype)) {
if ((umlConstraint.getAppliedStereotype(DELEGATION_CONST)!=null)) {
constraints.add((Constraint) umlConstraint);
}
}
......@@ -3509,9 +3509,9 @@ public class EntityUtil {
EList<Constraint> constraints = new BasicEList<Constraint>();
if (isBlock(umlElement) || isCompType(umlElement) || isComponentImplementation(umlElement)) {
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(PARAMETER_ASSUMPTIONS, umlElement);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(PARAMETER_ASSUMPTIONS, umlElement);
for (Constraint umlConstraint : ((Class) umlElement).getOwnedRules()) {
if (umlConstraint.getAppliedStereotypes().contains(stereotype)) {
if ((umlConstraint.getAppliedStereotype(PARAMETER_ASSUMPTIONS)!=null)) {
constraints.add((Constraint) umlConstraint);
}
}
......@@ -3533,8 +3533,8 @@ public class EntityUtil {
*/
public boolean isParameterAssumptions(Element umlConstraint) {
if (umlConstraint instanceof Constraint) {
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(PARAMETER_ASSUMPTIONS, umlConstraint);
return umlConstraint.getAppliedStereotypes().contains(stereotype);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(PARAMETER_ASSUMPTIONS, umlConstraint);
return (umlConstraint.getAppliedStereotype(PARAMETER_ASSUMPTIONS)!=null);
}
return false;
}
......@@ -3600,9 +3600,9 @@ public class EntityUtil {
* @return the UML Constraint found
*/
public Constraint getParameterAssumptionsFromExpression(String parameterAssumptionsExpression, Class owner) {
Stereotype stereotype = StereotypeUtil.getCHESSStereotype(PARAMETER_ASSUMPTIONS, owner);
//Stereotype stereotype = StereotypeUtil.getCHESSStereotype(PARAMETER_ASSUMPTIONS, owner);
for (Constraint umlConstraint : ((Class) owner).getOwnedRules()) {
if (umlConstraint.getAppliedStereotypes().contains(stereotype)
if ((umlConstraint.getAppliedStereotype(PARAMETER_ASSUMPTIONS)!=null)
&& getConstraintBodyStr(umlConstraint, null).equals(parameterAssumptionsExpression)) {
return umlConstraint;
}
......@@ -3774,13 +3774,13 @@ public class EntityUtil {
if (model != null) {
TreeIterator<EObject> allElements = model.eResource().getAllContents();
Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(SYSTEM, model);
//Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(SYSTEM, model);
if (allElements != null) {
Collection<org.eclipse.uml2.uml.Class> classes = EcoreUtil
.getObjectsByType(iterator2Collection(allElements), UMLPackage.eINSTANCE.getClass_());
for (Class c : classes) {
if (c.getAppliedStereotypes().contains(stereotype)) {
if ((c.getAppliedStereotype(SYSTEM)!=null)) {
return c;
}
}
......@@ -3802,9 +3802,9 @@ public class EntityUtil {
if (pkg != null) {
final EList<Element> ownedElements = pkg.getOwnedElements();
Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(SYSTEM, pkg);
//Stereotype stereotype = StereotypeUtil.getCHESSContractStereotype(SYSTEM, pkg);
for (Element element : ownedElements) {
if (element.getAppliedStereotypes().contains(stereotype)) {
if ((element.getAppliedStereotype(SYSTEM)!=null)) {
if (!found) {
systemElement = element;
found = true;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent