diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
index 93553ebb080b2839c255dc2fd98d02ba9e1f5258..60b693a3699fc0aa9593537ba6e8959d5561d061 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorTab.java
@@ -76,7 +76,7 @@ public class CustomContractEditorTab extends ContractEditorTab {
if (selectedUmlElement instanceof Property) {
if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
- Element umlClass = entityUtil.getUMLType((Property) selectedUmlElement);
+ Element umlClass = entityUtil.getUmlType((Property) selectedUmlElement);
if (!contractEntityUtil.isContract(umlClass)) {
return umlClass;
@@ -105,11 +105,11 @@ public class CustomContractEditorTab extends ContractEditorTab {
if (selectedUmlElement instanceof Property) {
if (contractEntityUtil.isContractProperty((Property) selectedUmlElement)) {
- return entityUtil.getUMLType((Property) selectedUmlElement);
+ return entityUtil.getUmlType((Property) selectedUmlElement);
}
if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
- Element classType = entityUtil.getUMLType((Property) selectedUmlElement);
+ Element classType = entityUtil.getUmlType((Property) selectedUmlElement);
if (contractEntityUtil.isContract(classType)) {
return classType;
}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
index 1a4d58eef786d7f68daf8b25bbd43ecb0af14dad..86c82723d7f16eeb3d4d1d556eaf8da4947aa1c8 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.contractEditor/src/org/polarsys/chess/contracts/contractEditor/CustomContractEditorView.java
@@ -72,7 +72,7 @@ public class CustomContractEditorView extends ContractEditorView {
if (selectedUmlElement instanceof Property) {
if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
- Element classType = entityUtil.getUMLType((Property) selectedUmlElement);
+ Element classType = entityUtil.getUmlType((Property) selectedUmlElement);
if (!contractEntityUtil.isContract(classType)) {
return classType;
}
@@ -93,11 +93,11 @@ public class CustomContractEditorView extends ContractEditorView {
if (selectedUmlElement instanceof Property) {
if (contractEntityUtil.isContractProperty((Property) selectedUmlElement)) {
- return entityUtil.getUMLType((Property) selectedUmlElement);
+ return entityUtil.getUmlType((Property) selectedUmlElement);
}
if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
- Element classType = entityUtil.getUMLType((Property) selectedUmlElement);
+ Element classType = entityUtil.getUmlType((Property) selectedUmlElement);
if (contractEntityUtil.isContract(classType)) {
return classType;
}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
index 14b2ba4591de39bfb5119fa3ecd9538e262d558f..4b37085d8743c15db5d2718759cc03da36960a52 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSComponentNode.java
@@ -33,9 +33,9 @@ public class CHESSComponentNode extends ComponentNode {
@Override
public void createChildren(Object associatedObject, List<TreeNode> children) {
- for (Property umlProperty : ((Class) entityUtil.getUMLType((Property) associatedObject)).getAttributes()) {
+ for (Property umlProperty : ((Class) entityUtil.getUmlType((Property) associatedObject)).getAttributes()) {
if (contractEntityUtil.isContractProperty(umlProperty)) {
- children.add(new ContractNode(this, ((Class) entityUtil.getUMLType(umlProperty)).getName()));
+ children.add(new ContractNode(this, ((Class) entityUtil.getUmlType(umlProperty)).getName()));
} else if (entityUtil.isComponentInstance(umlProperty)) {
children.add(new CHESSComponentNode(this, umlProperty));
}
@@ -45,7 +45,7 @@ public class CHESSComponentNode extends ComponentNode {
@Override
public String getName(Object associatedObject) {
- String typeName = ((Class) entityUtil.getUMLType((Property) associatedObject)).getName();
+ String typeName = ((Class) entityUtil.getUmlType((Property) associatedObject)).getName();
String propertyName = ((Property) associatedObject).getName();
return propertyName + ":" + typeName;
}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
index 0073037f1ee490c494571ab58821eefaf49b4375..5b47ce2d719c6f867058d1a9eaecb016db0b2512 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView/src/org/polarsys/chess/contracts/hierarchicalContractView/treeElements/CHESSSystemNode.java
@@ -39,8 +39,8 @@ public class CHESSSystemNode extends SystemNode {
public void createChildren(Object system, List<TreeNode> children) {
for (Property umlProperty : ((Class) system).getAttributes()) {
- if (contractEntityUtil.isContractProperty(umlProperty)&&(entityUtil.getUMLType(umlProperty)!=null)) {
- children.add(new ContractNode(this, ((Class) entityUtil.getUMLType(umlProperty)).getName()));
+ if (contractEntityUtil.isContractProperty(umlProperty)&&(entityUtil.getUmlType(umlProperty)!=null)) {
+ children.add(new ContractNode(this, ((Class) entityUtil.getUmlType(umlProperty)).getName()));
} else if (entityUtil.isComponentInstance(umlProperty)) {
children.add(new CHESSComponentNode(this, umlProperty));
}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/ContractEntityUtil.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/ContractEntityUtil.java
index bad92a630b5ea331685b51cd4af04a51cbd1707e..d186bf006e2d09f5e310161cb0386bc8fb5066c7 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/ContractEntityUtil.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/ContractEntityUtil.java
@@ -82,7 +82,7 @@ public class ContractEntityUtil {
logger.debug("\n\n\n");
// The component instance containing the refining contract
- final Property refiningComponentInstance = entityUtil.getUMLComponentInstance(owner, componentName);
+ final Property refiningComponentInstance = entityUtil.getUmlComponentInstance(owner, componentName);
// The component type where the contract property is defined
final Class refiningComponent = (Class) refiningComponentInstance.getType();
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
index 9e1f2cc0fd68e965aa0ba1e338eb9f6cb30bc592..462159cdf1ca895f1ca7e31b00aa16e2a65aa4a4 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java
@@ -834,7 +834,7 @@ public class EntityUtil {
}
- public String getUMLElementName(String projectName, String fileModelPath, String elementID) throws Exception {
+ public String getUmlElementName(String projectName, String fileModelPath, String elementID) throws Exception {
Model model = loadModel(projectName, fileModelPath);
@@ -852,7 +852,7 @@ public class EntityUtil {
EList<Element> subComponents = new BasicEList<Element>();
for (Property umlProperty : getSubComponentsInstances((Class) element)) {
- subComponents.add(getUMLType(umlProperty));
+ subComponents.add(getUmlType(umlProperty));
}
return subComponents;
@@ -862,7 +862,7 @@ public class EntityUtil {
for (Property umlProperty : getSubComponentsInstances((Class) element)) {
if (umlProperty.getName().compareTo(componentName) == 0) {
- return getUMLType(umlProperty);
+ return getUmlType(umlProperty);
}
}
@@ -934,7 +934,7 @@ public class EntityUtil {
* the name of the instance
* @return the UML property representing the component instance
*/
- public Property getUMLComponentInstance(Class umlComponent, String componentName) {
+ public Property getUmlComponentInstance(Class umlComponent, String componentName) {
for (Property umlProperty : (umlComponent.getAttributes())) {
if (umlProperty.getName().equals(componentName) && isComponentInstance(umlProperty)) {
@@ -947,7 +947,7 @@ public class EntityUtil {
public String[] getEnumValuesFromComponentPorts(Class umlComponent) {
EList<String> enumValuesEList = new BasicEList<String>();
- for (Port port : getUMLPortsFromClass(umlComponent)) {
+ for (Port port : getUmlPortsFromClass(umlComponent)) {
if (isEnumerationAttribute(port)) {
Set<String> currValues = getListValuesForEnumeratorType(port.getType());
enumValuesEList.addAll(currValues);
@@ -984,21 +984,21 @@ public class EntityUtil {
return toArray(getSubComponentsNames(umlComponent));
}
- public EList<Port> getUMLPorts(Element umlElement, boolean isStaticPort) {
+ public EList<Port> getUmlPorts(Element umlElement, boolean isStaticPort) {
EList<Port> portsArr = new BasicEList<Port>();
if (isBlock(umlElement) || isCompType(umlElement) || isComponentImplementation(umlElement)) {
- portsArr.addAll(getUMLPortsFromClass((Class) umlElement, isStaticPort));
+ portsArr.addAll(getUmlPortsFromClass((Class) umlElement, isStaticPort));
}
if (isComponentInstance(umlElement)) {
- portsArr.addAll(getUMLPortsFromProperty((Property) umlElement, isStaticPort));
+ portsArr.addAll(getUmlPortsFromProperty((Property) umlElement, isStaticPort));
}
return portsArr;
}
- private EList<Port> getUMLPortsFromProperty(Property umlElement, boolean isStaticPort) {
- return getUMLPortsFromClass((Class) getUMLType((Property) umlElement), isStaticPort);
+ private EList<Port> getUmlPortsFromProperty(Property umlElement, boolean isStaticPort) {
+ return getUmlPortsFromClass((Class) getUmlType((Property) umlElement), isStaticPort);
}
/*
@@ -1008,24 +1008,24 @@ public class EntityUtil {
* umlElement),portDirection,isStaticPort); }
*/
- public EList<Port> getUMLPorts(Element umlElement, int portDirection, boolean isStaticPort) {
+ public EList<Port> getUmlPorts(Element umlElement, int portDirection, boolean isStaticPort) {
EList<Port> portsArr = new BasicEList<Port>();
if (isBlock(umlElement)) {
- portsArr.addAll(getUMLPortsFromClass((Class) umlElement, portDirection, isStaticPort));
+ portsArr.addAll(getUmlPortsFromClass((Class) umlElement, portDirection, isStaticPort));
}
if (isCompType(umlElement) || (isComponentImplementation(umlElement))) {
- portsArr.addAll(getUMLPortsFromComponent((Component) umlElement, portDirection, isStaticPort));
+ portsArr.addAll(getUmlPortsFromComponent((Component) umlElement, portDirection, isStaticPort));
}
if (isComponentInstance(umlElement)) {
- portsArr.addAll(getUMLPorts(getUMLType((Property) umlElement), portDirection, isStaticPort));
+ portsArr.addAll(getUmlPorts(getUmlType((Property) umlElement), portDirection, isStaticPort));
}
return portsArr;
}
- private EList<Port> getUMLPortsFromClass(Class umlComponent, int portDirection, boolean isStatic) {
+ private EList<Port> getUmlPortsFromClass(Class umlComponent, int portDirection, boolean isStatic) {
EList<Port> ports = new BasicEList<Port>();
for (Port umlPort : umlComponent.getOwnedPorts()) {
FlowPort fp = getFlowPort(umlPort);
@@ -1074,7 +1074,7 @@ public class EntityUtil {
}
}
- private Set<Port> getUMLPortsFromComponent(Component umlComponent, int portDirection, boolean isStaticPort) {
+ private Set<Port> getUmlPortsFromComponent(Component umlComponent, int portDirection, boolean isStaticPort) {
Set<Port> ports = new HashSet<Port>();
for (Port umlPort : umlComponent.getOwnedPorts()) {
@@ -1086,7 +1086,7 @@ public class EntityUtil {
return ports;
}
- private EList<Port> getUMLPortsFromClass(Class umlComponent, boolean isStaticPort) {
+ private EList<Port> getUmlPortsFromClass(Class umlComponent, boolean isStaticPort) {
EList<Port> ports = new BasicEList<Port>();
for (Port umlPort : umlComponent.getOwnedPorts()) {
if (umlPort.isStatic() == isStaticPort) {
@@ -1096,7 +1096,7 @@ public class EntityUtil {
return ports;
}
- private Set<Port> getUMLPortsFromClass(Class umlComponent) {
+ private Set<Port> getUmlPortsFromClass(Class umlComponent) {
Set<Port> ports = new HashSet<Port>();
for (Port umlPort : umlComponent.getOwnedPorts()) {
ports.add(umlPort);
@@ -1298,7 +1298,7 @@ public class EntityUtil {
return null;
}
- public Element getUMLType(Property umlProperty) {
+ public Element getUmlType(Property umlProperty) {
return ((Element) umlProperty.getType());
}
@@ -1350,7 +1350,7 @@ public class EntityUtil {
public String[] getPortsNames(Element umlElement, int portDirection, boolean isStaticPort) {
EList<String> portsNames = new BasicEList<String>();
- for (Port umlPort : getUMLPorts(umlElement, portDirection, isStaticPort)) {
+ for (Port umlPort : getUmlPorts(umlElement, portDirection, isStaticPort)) {
portsNames.add(umlPort.getName());
}
@@ -1382,7 +1382,7 @@ public class EntityUtil {
Set<Property> simpleAttributes = new HashSet<Property>();
if (isComponentInstance(umlElement)) {
- umlElement = getUMLType((Property) umlElement);
+ umlElement = getUmlType((Property) umlElement);
}
if (isBlock(umlElement) || (isCompType(umlElement) || (isComponentImplementation(umlElement)))) {
@@ -1431,7 +1431,7 @@ public class EntityUtil {
}
if (isComponentInstance(umlElement)) {
- integerAttributes.addAll(getIntegerAttributes(getUMLType((Property) umlElement)));
+ integerAttributes.addAll(getIntegerAttributes(getUmlType((Property) umlElement)));
}
return integerAttributes;
}
@@ -1675,7 +1675,7 @@ public class EntityUtil {
EList<Port> eventPorts = new BasicEList<Port>();
if (isComponentInstance(umlElement)) {
- umlElement = getUMLType((Property) umlElement);
+ umlElement = getUmlType((Property) umlElement);
}
if (isBlock(umlElement) || (isCompType(umlElement) || (isComponentImplementation(umlElement)))) {
@@ -1742,7 +1742,7 @@ public class EntityUtil {
* the function behavior
* @return the owner of the function behavior
*/
- public Element getUMLFunctionBehaviorOwner(FunctionBehavior function) {
+ public Element getUmlFunctionBehaviorOwner(FunctionBehavior function) {
return function.getOwner();
}
@@ -1776,25 +1776,25 @@ public class EntityUtil {
return false;
}
- public Collection<? extends Port> getUMLPortsExceptEvents(Element umlElement, int portDirection) {
+ public Collection<? extends Port> getUmlPortsExceptEvents(Element umlElement, int portDirection) {
if (isComponentInstance(umlElement)) {
- umlElement = getUMLType((Property) umlElement);
+ umlElement = getUmlType((Property) umlElement);
}
Set<Port> portsArr = new HashSet<Port>();
if (isBlock(umlElement)) {
- portsArr.addAll(getUMLPortsExceptEventsFromClass((Class) umlElement, portDirection));
+ portsArr.addAll(getUmlPortsExceptEventsFromClass((Class) umlElement, portDirection));
}
if (isCompType(umlElement) || (isComponentImplementation(umlElement))) {
- portsArr.addAll(getUMLPortsExceptEventsFromComponent((Component) umlElement, portDirection));
+ portsArr.addAll(getUmlPortsExceptEventsFromComponent((Component) umlElement, portDirection));
}
return portsArr;
}
- private Collection<? extends Port> getUMLPortsExceptEventsFromComponent(Component umlComponent, int portDirection) {
+ private Collection<? extends Port> getUmlPortsExceptEventsFromComponent(Component umlComponent, int portDirection) {
Set<Port> ports = new HashSet<Port>();
for (Port umlPort : umlComponent.getOwnedPorts()) {
@@ -1806,7 +1806,7 @@ public class EntityUtil {
return ports;
}
- private Collection<? extends Port> getUMLPortsExceptEventsFromClass(Class umlElement, int portDirection) {
+ private Collection<? extends Port> getUmlPortsExceptEventsFromClass(Class umlElement, int portDirection) {
Set<Port> ports = new HashSet<Port>();
for (Port umlPort : umlElement.getOwnedPorts()) {
FlowPort fp = getFlowPort(umlPort);
@@ -1944,7 +1944,7 @@ public class EntityUtil {
return (FormalProperty) umlConstraint.getStereotypeApplication(formalPropertyStereotype);
}
- public boolean isDelegationConstraints(Element umlProperty) {
+ public boolean isDelegationConstraint(Element umlProperty) {
return ((umlProperty instanceof Constraint)
&& (UMLUtil.getAppliedStereotype(umlProperty, DELEGATION_CONST, false) != null));
}
@@ -1954,20 +1954,20 @@ public class EntityUtil {
if (isBlock(umlElement) || isCompType(umlElement) || isComponentImplementation(umlElement)) {
for (Constraint umlConstraint : ((Class) umlElement).getOwnedRules()) {
- if (isDelegationConstraints(umlConstraint)) {
+ if (isDelegationConstraint(umlConstraint)) {
constraints.add((Constraint) umlConstraint);
}
}
}
if (isComponentInstance(umlElement)) {
- constraints.addAll(getDelegationConstraintsAsUMLConstraints(getUMLType((Property) umlElement)));
+ constraints.addAll(getDelegationConstraintsAsUMLConstraints(getUmlType((Property) umlElement)));
}
return constraints;
}
- public EList<FunctionBehavior> getUMLFunctionBehaviors(Element umlElement) {
+ public EList<FunctionBehavior> getUmlFunctionBehaviors(Element umlElement) {
EList<FunctionBehavior> functionBehaviours = null;
@@ -1998,11 +1998,11 @@ public class EntityUtil {
* the function behavior
* @return the requested name
*/
- public String getUMLFunctionBehaviorName(FunctionBehavior uninterpretedFunction) {
+ public String getUmlFunctionBehaviorName(FunctionBehavior uninterpretedFunction) {
return uninterpretedFunction.getName();
}
- public Type getUMLFunctionBehaviorOutputType(FunctionBehavior uninterpretedFunction) {
+ public Type getUmlFunctionBehaviorOutputType(FunctionBehavior uninterpretedFunction) {
for (Parameter parameter : uninterpretedFunction.getOwnedParameters()) {
if (parameter.getDirection() == ParameterDirectionKind.OUT_LITERAL) {
return parameter.getType();
@@ -2011,7 +2011,7 @@ public class EntityUtil {
return null;
}
- public EList<Type> getUMLFunctionBehaviorInputTypes(FunctionBehavior uninterpretedFunction) {
+ public EList<Type> getUmlFunctionBehaviorInputTypes(FunctionBehavior uninterpretedFunction) {
EList<Type> inputTypes = new BasicEList<Type>();
@@ -2030,7 +2030,7 @@ public class EntityUtil {
* the function behavior
* @return the input parameters
*/
- public EList<Parameter> getUMLFunctionBehaviorInputParameters(FunctionBehavior function) {
+ public EList<Parameter> getUmlFunctionBehaviorInputParameters(FunctionBehavior function) {
final EList<Parameter> inputParameters = new BasicEList<Parameter>();
// Loop on all the parameters to find the input ones
@@ -2043,7 +2043,7 @@ public class EntityUtil {
return inputParameters;
}
- public Parameter getUMLFunctionBehaviorOutputParameter(FunctionBehavior function) {
+ public Parameter getUmlFunctionBehaviorOutputParameter(FunctionBehavior function) {
// Loop on all the parameters to find the input ones
final EList<Parameter> parameters = function.getOwnedParameters();
for (Parameter parameter : parameters) {
@@ -2845,7 +2845,7 @@ public class EntityUtil {
}
if (isComponentInstance(umlElement)) {
- constraints.addAll(getParameterAssumptionsAsConstraintsUml(getUMLType((Property) umlElement)));
+ constraints.addAll(getParameterAssumptionsAsConstraintsUml(getUmlType((Property) umlElement)));
}
return constraints;
diff --git a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/actions/ImportOSSFileAction.java b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/actions/ImportOSSFileAction.java
index c958080f9df74b658b2e6e9e2edd71fce7fb9a8d..70e931fbf0648484fa684244b73e6fb593991746 100644
--- a/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/actions/ImportOSSFileAction.java
+++ b/plugins/org.polarsys.chess.OSSImporter/src/org/polarsys/chess/OSSImporter/actions/ImportOSSFileAction.java
@@ -151,7 +151,7 @@ public class ImportOSSFileAction {
if (variableOwnerName != null) {
// Retrieve the component instance containing the behavior
- final Property behaviorOwner = entityUtil.getUMLComponentInstance(owner, variableOwnerName);
+ final Property behaviorOwner = entityUtil.getUmlComponentInstance(owner, variableOwnerName);
// Get the component type
final String typeName = behaviorOwner.getType().getName();
@@ -425,7 +425,7 @@ public class ImportOSSFileAction {
// The component instance containing the refining
// contract
- final Property refiningComponentInstance = entityUtil.getUMLComponentInstance(owner,
+ final Property refiningComponentInstance = entityUtil.getUmlComponentInstance(owner,
ossModelUtil.getNearestComponentName(contractId));
// The component type where the contract property is
@@ -592,7 +592,7 @@ public class ImportOSSFileAction {
Property partWithPort = null;
String portOwnerName = ossModelUtil.getNearestComponentName(portId);
if (portOwnerName != null) {
- partWithPort = entityUtil.getUMLComponentInstance(owner, portOwnerName);
+ partWithPort = entityUtil.getUmlComponentInstance(owner, portOwnerName);
}
return partWithPort;
}
diff --git a/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java b/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java
index 8bb72acbe64d42022052520192806d83661bde73..d6e9ea6dbcaa6534128757beac98d1064ed83351 100644
--- a/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java
+++ b/plugins/org.polarsys.chess.constraints.constraintEditor/src/org/polarsys/chess/constraints/constraintEditor/ConstraintEditorFilter.java
@@ -28,7 +28,7 @@ public class ConstraintEditorFilter implements org.eclipse.jface.viewers.IFilter
Object selectedUmlElement = selectionUtil.getUmlSelectedObject(selected);
if (selectedUmlElement instanceof Constraint) {
- if (entityUtil.isDelegationConstraints((Constraint) selectedUmlElement)) {
+ if (entityUtil.isDelegationConstraint((Constraint) selectedUmlElement)) {
return true;
}
}
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
index 6632416805e00964edf06b03e9e1a283b51521d6..e68a520812bc46f867c30eabb3759d8739d3b7f0 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowBDDElementsAction.java
@@ -152,7 +152,7 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
for (Element child : children) {
if (entityUtil.isPort(child) ||
contractEntityUtil.isContractProperty(child)||
- entityUtil.isDelegationConstraints(child)) {
+ entityUtil.isDelegationConstraint(child)) {
int textLength = 0;
childrenNumber++;
@@ -300,7 +300,7 @@ public class ShowBDDElementsAction extends ShowHideContentsAction {
if((entityUtil.isPort(semanticElement) &&
!(editPartRepresentation.getParentRepresentation() instanceof AffixedChildrenEditPartRepresentation)) ||
contractEntityUtil.isContractProperty(semanticElement)||
- entityUtil.isDelegationConstraints(semanticElement)) {
+ entityUtil.isDelegationConstraint(semanticElement)) {
result.add(editPartRepresentation);
}
}
diff --git a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowIBDElementsAction.java b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowIBDElementsAction.java
index 3e71c6863800d31d60ecd19be69b67b50f4a35c1..baacae4054b3365f7c73dfdc2d23eb2ca4513085 100644
--- a/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowIBDElementsAction.java
+++ b/plugins/org.polarsys.chess.diagramsCreator/src/org/polarsys/chess/diagramsCreator/actions/ShowIBDElementsAction.java
@@ -164,7 +164,7 @@ public class ShowIBDElementsAction extends ShowHideContentsAction {
// If the element is interesting, add it
if(entityUtil.isPort(semanticElement) ||
entityUtil.isComponentInstance(semanticElement) ||
- entityUtil.isDelegationConstraints(semanticElement)) {
+ entityUtil.isDelegationConstraint(semanticElement)) {
result.add(editPartRepresentation);
}
}
diff --git a/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java b/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java
index 90fdc812527a61392e0634e5f8466e4fc111157e..b161c8231ebdac4c44a4510c041530b1556dd521 100644
--- a/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java
+++ b/plugins/org.polarsys.chess.properties.propertyEditor/src/org/polarsys/chess/properties/propertyEditor/PropertyEditorFilter.java
@@ -25,7 +25,7 @@ public class PropertyEditorFilter implements org.eclipse.jface.viewers.IFilter {
Object selectedUmlElement = selectionUtil.getUmlSelectedObject(selection);
if (selectedUmlElement instanceof Constraint) {
- if (!entityUtil.isDelegationConstraints((Constraint) selectedUmlElement)) {
+ if (!entityUtil.isDelegationConstraint((Constraint) selectedUmlElement)) {
return true;
}
}
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
index 8fd5d685795b655c28836f26077430df6deebc63..526edd4cb4215d4c9d37a069d337e9bfa3e4df58 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/core/model/ChessSystemModel.java
@@ -203,12 +203,12 @@ public class ChessSystemModel implements AbstractSystemModel {
*/
@Override
public EList<Port> getNonStaticInputPorts(Object component) {
- return new BasicEList<Port>(entityUtil.getUMLPorts((Element) component, FlowDirection.IN_VALUE, false));
+ return new BasicEList<Port>(entityUtil.getUmlPorts((Element) component, FlowDirection.IN_VALUE, false));
}
@Override
public EList<?> getNonStaticPorts(Object component) {
- return entityUtil.getUMLPorts((Element) component, false);
+ return entityUtil.getUmlPorts((Element) component, false);
}
@@ -217,7 +217,7 @@ public class ChessSystemModel implements AbstractSystemModel {
@Override
public String getUninterpretedFunctionName(Object function) {
if (function instanceof FunctionBehavior) {
- return entityUtil.getUMLFunctionBehaviorName((FunctionBehavior) function);
+ return entityUtil.getUmlFunctionBehaviorName((FunctionBehavior) function);
}
return null;
}
@@ -256,7 +256,7 @@ public class ChessSystemModel implements AbstractSystemModel {
@Override
public EList<Port> getNonStaticOutputPorts(Object component) {
int direction = FlowDirection.OUT_VALUE;
- return new BasicEList<Port>(entityUtil.getUMLPorts((Element) component, direction, false));
+ return new BasicEList<Port>(entityUtil.getUmlPorts((Element) component, direction, false));
}
/*
@@ -268,7 +268,7 @@ public class ChessSystemModel implements AbstractSystemModel {
@Override
public EList<Port> getNonStaticGenericPorts(Object component) {
int direction = FlowDirection.INOUT_VALUE;
- return new BasicEList<Port>(entityUtil.getUMLPorts((Element) component, direction, false));
+ return new BasicEList<Port>(entityUtil.getUmlPorts((Element) component, direction, false));
}
/*
@@ -625,7 +625,7 @@ public class ChessSystemModel implements AbstractSystemModel {
@Override
public EList<?> getStaticPorts(Object component) {
- return entityUtil.getUMLPorts((Element) component, true);
+ return entityUtil.getUmlPorts((Element) component, true);
}
@@ -719,7 +719,7 @@ public class ChessSystemModel implements AbstractSystemModel {
@Override
public EList<?> getUninterpretedFunctions(Object component) {
- return entityUtil.getUMLFunctionBehaviors((Element)component);
+ return entityUtil.getUmlFunctionBehaviors((Element)component);
}
@Override
@@ -776,12 +776,12 @@ public class ChessSystemModel implements AbstractSystemModel {
@Override
public Object getUninterpretedFunctionOutputType(Object uninterpretedFunction) {
- return entityUtil.getUMLFunctionBehaviorOutputType((FunctionBehavior)uninterpretedFunction);
+ return entityUtil.getUmlFunctionBehaviorOutputType((FunctionBehavior)uninterpretedFunction);
}
@Override
public EList<?> getUninterpretedFunctionInputTypes(Object uninterpretedFunction) {
- return entityUtil.getUMLFunctionBehaviorInputTypes((FunctionBehavior)uninterpretedFunction);
+ return entityUtil.getUmlFunctionBehaviorInputTypes((FunctionBehavior)uninterpretedFunction);
}
/*@Override
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/SelectionUtil.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/SelectionUtil.java
index 3bc2f111281e4354b37fe51de32717b4efdcd78e..b3cb1b21d86792cc3e7d6961a85e1c1f11d35492 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/SelectionUtil.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/SelectionUtil.java
@@ -117,7 +117,7 @@ public class SelectionUtil {
if (selectedUmlElement instanceof Property) {
if (entityUtil.isComponentInstance((Property) selectedUmlElement)) {
- selectedUmlElement = entityUtil.getUMLType((Property) selectedUmlElement);
+ selectedUmlElement = entityUtil.getUmlType((Property) selectedUmlElement);
}
}
diff --git a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/core/model/UMLStateMachineModel.java b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/core/model/UMLStateMachineModel.java
index d4bbcd1c4e65420d286d62864cb352b2fd52e6a2..ac0ff120e8ae19db74d023faa530a7bc68de29d0 100644
--- a/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/core/model/UMLStateMachineModel.java
+++ b/plugins/org.polarsys.chess.smvExporter/src/org/polarsys/chess/smvExporter/core/model/UMLStateMachineModel.java
@@ -43,13 +43,13 @@ public class UMLStateMachineModel implements AbstractStateMachineModel {
@Override
public EList<Port> getOwnerInputPortsExceptEvents(Object stateMachine) {
Element owner = ((StateMachine) stateMachine).getOwner();
- return new BasicEList<Port>(entityUtil.getUMLPortsExceptEvents(owner, FlowDirection.IN_VALUE));
+ return new BasicEList<Port>(entityUtil.getUmlPortsExceptEvents(owner, FlowDirection.IN_VALUE));
}
@Override
public EList<Port> getOwnerOutputPortsExceptEvents(Object stateMachine) {
Element owner = ((StateMachine) stateMachine).getOwner();
- return new BasicEList<Port>(entityUtil.getUMLPortsExceptEvents(owner, FlowDirection.OUT_VALUE));
+ return new BasicEList<Port>(entityUtil.getUmlPortsExceptEvents(owner, FlowDirection.OUT_VALUE));
}
/*@Override
@@ -158,7 +158,7 @@ public class UMLStateMachineModel implements AbstractStateMachineModel {
@Override
public Object getAttributeType(Object property) {
- return entityUtil.getUMLType((Property) property);
+ return entityUtil.getUmlType((Property) property);
}
@Override