summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2014-04-15 11:28:01 (EDT)
committerBenoit Maggi2014-04-15 11:28:01 (EDT)
commitd856a7fcbe9150b382c25c8cdff3a3cd2f50a150 (patch)
tree2c42e2452393006894814c2d54b65c50da3deae8
parent397bd4458da8f9bd49965615617721163a116670 (diff)
downloadorg.eclipse.papyrus-d856a7fcbe9150b382c25c8cdff3a3cd2f50a150.zip
org.eclipse.papyrus-d856a7fcbe9150b382c25c8cdff3a3cd2f50a150.tar.gz
org.eclipse.papyrus-d856a7fcbe9150b382c25c8cdff3a3cd2f50a150.tar.bz2
Clean - Replace some call to deprecated NamedElementHelper byrefs/changes/65/25065/1
NamedElementUtil Change-Id: I187d9e7f9605d1771f1bff05ebbe43b9bf4eca83 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ApplyStereotypeCommand.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintParser.java28
2 files changed, 15 insertions, 17 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ApplyStereotypeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ApplyStereotypeCommand.java
index 1fd19cc..b82c948 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ApplyStereotypeCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/ApplyStereotypeCommand.java
@@ -53,7 +53,7 @@ public class ApplyStereotypeCommand extends AbstractTransactionalCommand {
if(stereotype == null) {
// stereotype has no been found. should ask for
// profile application ?
- Activator.log.warn("impossible to retrieve the stereotype " + stereotypeQName);
+ Activator.log.warn("impossible to retrieve the stereotype " + stereotypeQName); //$NON-NLS-1$
} else {
result.add(element.applyStereotype(stereotype));
}
@@ -62,7 +62,7 @@ public class ApplyStereotypeCommand extends AbstractTransactionalCommand {
if (req.renameWithFirstStereotype() && element instanceof NamedElement && !stereotypeQNames.isEmpty()) {
String stereotypeName = NamedElementUtil.getNameFromQualifiedName(stereotypeQNames.get(0));
// find a new name for the element
- String name = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), stereotypeName);
+ String name = NamedElementUtil.getDefaultNameWithIncrementFromBase(stereotypeName, element.getOwner().eContents());
((NamedElement)element).setName(name);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintParser.java
index 7fd47ee..6db86d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/parser/ConstraintParser.java
@@ -32,7 +32,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
import org.eclipse.uml2.uml.Constraint;
import org.eclipse.uml2.uml.Duration;
import org.eclipse.uml2.uml.DurationInterval;
@@ -52,8 +52,8 @@ import org.eclipse.uml2.uml.ValueSpecification;
*/
public class ConstraintParser implements IParser, ISemanticParser {
- protected static final String OPAQUE_EXPRESSION_BEGIN_LANGUAGE = "{";
- protected static final String OPAQUE_EXPRESSION_END_LANGUAGE = "} ";
+ protected static final String OPAQUE_EXPRESSION_BEGIN_LANGUAGE = "{"; //$NON-NLS-1$
+ protected static final String OPAQUE_EXPRESSION_END_LANGUAGE = "} "; //$NON-NLS-1$
/**
* @see org.eclipse.gmf.runtime.common.ui.services.parser.IParser#getEditString(org.eclipse.core.runtime.IAdaptable, int)
@@ -155,16 +155,15 @@ public class ConstraintParser implements IParser, ISemanticParser {
Interval specif = (Interval)constraint.getSpecification();
command = new CompositeTransactionalCommand(editingDomain, "Set Value Constraint"); //$NON-NLS-1$
Duration durationMin= UMLFactory.eINSTANCE.createDuration();
- durationMin.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(constraint, durationMin.eClass()));
+ durationMin.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(durationMin.eClass().getName(), constraint.eContents()));
Duration durationMax= UMLFactory.eINSTANCE.createDuration();
- durationMax.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(constraint, durationMax.eClass()));
-
+ durationMax.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(durationMax.eClass().getName(), constraint.eContents()));
LiteralString exp1 =UMLFactory.eINSTANCE.createLiteralString();
LiteralString exp2 =UMLFactory.eINSTANCE.createLiteralString();
- exp1.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(durationMin, exp1.eClass()));
+ exp1.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(exp1.eClass().getName(), durationMin.eContents()));
exp1.setValue(newString.substring(0, newString.indexOf("..")));
exp2.setValue( newString.substring(newString.indexOf("..")+2,newString.length()));
- exp2.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(durationMax, exp2.eClass()));
+ exp2.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(exp2.eClass().getName(), durationMax.eContents()));
durationMin.setExpr(exp1);
durationMax.setExpr(exp2);
SetRequest request = new SetRequest(specif, UMLPackage.eINSTANCE.getInterval_Min(),durationMin);
@@ -178,16 +177,15 @@ public class ConstraintParser implements IParser, ISemanticParser {
TimeInterval specif = (TimeInterval)constraint.getSpecification();
command = new CompositeTransactionalCommand(editingDomain, "Set Value Constraint"); //$NON-NLS-1$
TimeExpression timeMin= UMLFactory.eINSTANCE.createTimeExpression();
- timeMin.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(constraint, timeMin.eClass()));
+ timeMin.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(timeMin.eClass().getName(), constraint.eContents()));
TimeExpression timeMax= UMLFactory.eINSTANCE.createTimeExpression();
- timeMax.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(constraint, timeMax.eClass()));
-
+ timeMax.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(timeMax.eClass().getName(), constraint.eContents()));
LiteralString exp1 =UMLFactory.eINSTANCE.createLiteralString();
LiteralString exp2 =UMLFactory.eINSTANCE.createLiteralString();
- exp1.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(timeMin, exp1.eClass()));
+ exp1.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(exp1.eClass().getName(), timeMin.eContents()));
exp1.setValue(newString.substring(0, newString.indexOf("..")));
exp2.setValue( newString.substring(newString.indexOf("..")+2,newString.length()));
- exp2.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(timeMax, exp2.eClass()));
+ exp2.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(exp2.eClass().getName(), timeMax.eContents()));
timeMin.setExpr(exp1);
timeMax.setExpr(exp2);
SetRequest request = new SetRequest(specif, UMLPackage.eINSTANCE.getInterval_Min(),timeMin);
@@ -203,8 +201,8 @@ public class ConstraintParser implements IParser, ISemanticParser {
command = new CompositeTransactionalCommand(editingDomain, "Set Value Constraint"); //$NON-NLS-1$
LiteralInteger min = UMLFactory.eINSTANCE.createLiteralInteger();
LiteralInteger max = UMLFactory.eINSTANCE.createLiteralInteger();
- min.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(min, min.eClass()));
- max.setName(NamedElementHelper.EINSTANCE.getNewUMLElementName(max, max.eClass()));
+ min.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(min.eClass().getName(), min.eContents()));
+ max.setName(NamedElementUtil.getDefaultNameWithIncrementFromBase(max.eClass().getName(), max.eContents()));
Integer minInt= new Integer(newString.substring(0, newString.indexOf("..")));
Integer maxInt= new Integer( newString.substring(newString.indexOf("..")+2,newString.length()));
min.setValue(minInt.intValue());