436296 - [Validation] DSML plugin generation is broken

2 files changed, 6 insertions, 4 deletions

diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
index c45b465bec6..b9f77b3a069 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard/src/org/eclipse/papyrus/dsml/validation/wizard/ValidationPluginGenerator.java
@@ -79,6 +79,8 @@ public class ValidationPluginGenerator {
 

 	private static final String EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT = "org.eclipse.emf.validation.constraintProviders";  //$NON-NLS-1$

 

+	private static final String EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT =  "org.eclipse.emf.validation.constraintBindings"; //$NON-NLS-1$

+	

 	private static final String UML_PLUGIN = "org.eclipse.uml2.uml";  //$NON-NLS-1$

 

 	private static final String EMF_VALIDATION_PLUGIN = "org.eclipse.emf.validation";  //$NON-NLS-1$

@@ -355,7 +357,7 @@ public class ValidationPluginGenerator {
 	@SuppressWarnings("nls")

 	private void generateBindings(String pluginID, PluginEditor editor, IConstraintsManager constraintsManager)

 	{

-		Element extension = createOrCleanExtension(editor, "org.eclipse.emf.validation.constraintBindings");

+		Element extension = createOrCleanExtension(editor, EMF_VALIDATION_CONSTRAINT_BINDINGS_EXTENSIONPOINT);

 		

 		// create a client context per stereotype

 		Set<Stereotype>constrainedStereotype=constraintsManager.getConstraintsOfStereotype().keySet();

@@ -407,7 +409,7 @@ public class ValidationPluginGenerator {
 			return extension;

 		}

 		else {

-			return editor.getPluginEditor().addExtension(EMF_VALIDATION_CONSTRAINT_PROVIDERS_EXTENSIONPOINT);

+			return editor.getPluginEditor().addExtension(extensionName);

 		}

 	}

 	

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java
index a76f6c92aa1..ee49278e18f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java
@@ -264,9 +264,9 @@ public class ProfileDefinitionDialog extends TitleAreaDialog {
 		// Enable button by default, see bug #411256

 		constraintCheck.setSelection(true);

 		// should look 

-		constraintCheck.setText("Save constraints into the definition (OCL only)");	//$NON-NLS-1$

+		constraintCheck.setText("Save OCL constraints, if any, into the profile definition");	//$NON-NLS-1$

 		Button writeToPlugin = new Button(group, SWT.RADIO);

-		writeToPlugin.setText("Ignore. Use this option, if you use (a generated) plugin that embeds the constraints");	//$NON-NLS-1$

+		writeToPlugin.setText("Ignore OCL constraints, if any. (use validation plugin generator instead)");	//$NON-NLS-1$

 		GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, true);

 		gd.heightHint = 60;

 		group.setLayoutData(gd);