ASSIGNED - bug 318920: [Element Edit Service] SysML specific types

https://bugs.eclipse.org/bugs/show_bug.cgi?id=318920

3 files changed, 7 insertions, 16 deletions

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
index 57767fab6eb..81039dc351e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/PartPropertyEditHelperAdvice.java
@@ -20,6 +20,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

@@ -31,11 +32,7 @@ import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Property;

 

 /** SysML Property Part edit helper advice */

-public class PartPropertyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public PartPropertyEditHelperAdvice() {

-	}

+public class PartPropertyEditHelperAdvice extends AbstractEditHelperAdvice {

 

 	/**

 	 * Check if the creation context is a {@link Block}.

@@ -79,7 +76,7 @@ public class PartPropertyEditHelperAdvice extends AbstractStereotypedElementEdit
 				if(element != null) {

 

 					// Set default name

-					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), "reference"); //$NON-NLS-1$

+					String initializedName = NamedElementHelper.EINSTANCE.getNewUMLElementName(element.getOwner(), "part"); //$NON-NLS-1$

 					element.setName(initializedName);

 					// Initialize the aggregation to composite.

 					element.setAggregation(AggregationKind.COMPOSITE_LITERAL);

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
index d53476f5c06..8880bd0774c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ReferencePropertyEditHelperAdvice.java
@@ -20,6 +20,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

@@ -30,11 +31,7 @@ import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Property;

 

 /** SysML Property Reference edit helper advice */

-public class ReferencePropertyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public ReferencePropertyEditHelperAdvice() {

-	}

+public class ReferencePropertyEditHelperAdvice extends AbstractEditHelperAdvice {

 

 	/**

 	 * Check if the creation context is a {@link Block}.

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java
index 84c13a88c7f..2d9b456b450 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValuePropertyEditHelperAdvice.java
@@ -20,6 +20,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

 import org.eclipse.gmf.runtime.emf.type.core.commands.ConfigureElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

@@ -31,11 +32,7 @@ import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Property;

 

 /** SysML Property Value edit helper advice */

-public class ValuePropertyEditHelperAdvice extends AbstractStereotypedElementEditHelperAdvice {

-

-	/** Default constructor */

-	public ValuePropertyEditHelperAdvice() {

-	}

+public class ValuePropertyEditHelperAdvice extends AbstractEditHelperAdvice {

 

 	/**

 	 * Check if the creation context is a {@link Block}.