403808: Validation ignores AppliedStereotypes

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

8 files changed, 0 insertions, 20 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/Activator.java
index 3f9b03fe759..96fa49a3545 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/Activator.java
@@ -62,5 +62,4 @@ public class Activator extends AbstractUIPlugin {
 	public static Activator getDefault() {

 		return plugin;

 	}

-

 }

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/UMLDiagnostician.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/UMLDiagnostician.java
index 9eecc0de361..82df0661332 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/UMLDiagnostician.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/UMLDiagnostician.java
@@ -33,16 +33,12 @@ public class UMLDiagnostician extends EcoreDiagnostician {
 

 	protected boolean doValidateStereotypeApplications(EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context) {

 		List<EObject> stereotypeApplications = eObject instanceof Element ? ((Element)eObject).getStereotypeApplications() : Collections.<EObject> emptyList();

-

 		if(!stereotypeApplications.isEmpty()) {

 			Iterator<EObject> i = stereotypeApplications.iterator();

 			boolean result = validate(i.next(), diagnostics, context);

-

 			while(i.hasNext() && (result || diagnostics != null)) {

-

 				result &= validate(i.next(), diagnostics, context);

 			}

-

 			return result;

 		} else {

 			return true;

@@ -52,11 +48,9 @@ public class UMLDiagnostician extends EcoreDiagnostician {
 	@Override

 	protected boolean doValidateContents(EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context) {

 		boolean result = doValidateStereotypeApplications(eObject, diagnostics, context);

-

 		if(result || diagnostics != null) {

 			result &= super.doValidateContents(eObject, diagnostics, context);

 		}

-

 		return result;

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java
index 94dbdefd517..f6b94d7cc18 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateModelHandler.java
@@ -11,7 +11,6 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
-
 package org.eclipse.papyrus.uml.service.validation.handler;
 
 import org.eclipse.emf.common.command.Command;
@@ -19,7 +18,6 @@ import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateModelCommand;
 import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
 import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-import org.eclipse.uml2.uml.Element;
 
 /**
  * Action used for pasting either a model element or a shape (i.e. the model element represented
@@ -33,5 +31,4 @@ public class SelectAndValidateModelHandler extends AbstractCommandHandler {
 		// not useful to cache command, since selected element may change
 		return new GMFtoEMFCommandWrapper(new SelectAndValidateModelCommand(getSelectedElement(), new UMLDiagnostician()));
 	}
-	
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java
index 68d628d59fe..765a2241cd4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/SelectAndValidateSubtreeHandler.java
@@ -11,7 +11,6 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
-
 package org.eclipse.papyrus.uml.service.validation.handler;
 
 import org.eclipse.emf.common.command.Command;
@@ -19,7 +18,6 @@ import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.SelectAndValidateSubtreeCommand;
 import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
 import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-import org.eclipse.uml2.uml.Element;
 
 /**
  * Action used for pasting either a model element or a shape (i.e. the model element represented
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromModelHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromModelHandler.java
index 25f1adb1f05..a5ebe4a2aa5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromModelHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromModelHandler.java
@@ -11,7 +11,6 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
-
 package org.eclipse.papyrus.uml.service.validation.handler;
 
 import org.eclipse.emf.common.command.Command;
@@ -19,7 +18,6 @@ import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateDelMarkersFromModelCommand;
 import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
 import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-import org.eclipse.uml2.uml.Element;
 
 /**
  * Action used for pasting either a model element or a shape (i.e. the model element represented
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromSubtreeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
index 318372e9f0a..3183d4b30b6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateDelMarkersFromSubtreeHandler.java
@@ -11,7 +11,6 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
-
 package org.eclipse.papyrus.uml.service.validation.handler;
 
 import org.eclipse.emf.common.command.Command;
@@ -19,7 +18,6 @@ import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateDelMarkersFromSubtreeCommand;
 import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
 import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-import org.eclipse.uml2.uml.Element;
 
 /**
  * Action used for pasting either a model element or a shape (i.e. the model element represented
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java
index 0501b1a0f5a..1d11dc60c86 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateModelHandler.java
@@ -11,7 +11,6 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
-
 package org.eclipse.papyrus.uml.service.validation.handler;
 
 import org.eclipse.emf.common.command.Command;
@@ -19,7 +18,6 @@ import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateModelCommand;
 import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
 import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-import org.eclipse.uml2.uml.Element;
 
 /**
  * Action used for pasting either a model element or a shape (i.e. the model element represented
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java
index fb98fae9591..e53ee277849 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.validation/src/org/eclipse/papyrus/uml/service/validation/handler/ValidateSubtreeHandler.java
@@ -11,7 +11,6 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
  *
  *****************************************************************************/
-
 package org.eclipse.papyrus.uml.service.validation.handler;
 
 import org.eclipse.emf.common.command.Command;
@@ -19,7 +18,6 @@ import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.services.validation.commands.ValidateSubtreeCommand;
 import org.eclipse.papyrus.infra.services.validation.handler.AbstractCommandHandler;
 import org.eclipse.papyrus.uml.service.validation.UMLDiagnostician;
-import org.eclipse.uml2.uml.Element;
 
 /**
  * Action used for pasting either a model element or a shape (i.e. the model element represented