[abstractexec] bug fix: need activator

(was lost during conflict resolution)

2 files changed, 9 insertions, 4 deletions

diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
index 591b57026..dc5107b5a 100644
--- a/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.abstractexec.behavior/META-INF/MANIFEST.MF
@@ -12,3 +12,5 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0",
  org.eclipse.emf.ecore;bundle-version="2.7.0",

  org.eclipse.xtext;bundle-version="2.1.1",

  org.eclipse.xtext.ui;bundle-version="2.1.1"

+Bundle-Activator: org.eclipse.etrice.abstractexec.behavior.Activator

+Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidatorExtensionManager.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidatorExtensionManager.java
index 52a0ab67f..85da62161 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidatorExtensionManager.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidatorExtensionManager.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EClassifier;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.etrice.core.room.RoomPackage;

 import org.eclipse.xtext.validation.AbstractDeclarativeValidator;

 import org.eclipse.xtext.validation.Check;

@@ -102,8 +103,8 @@ public class ValidatorExtensionManager extends AbstractDeclarativeValidator {
 			}

 			

 			// now we add each extension to our maps

-			try {

-				for (IConfigurationElement e : config) {

+			for (IConfigurationElement e : config) {

+				try {

 					final Object ext = e.createExecutableExtension("class");

 					if (ext instanceof IRoomValidator) {

 						IRoomValidator validator = (IRoomValidator) ext;

@@ -132,8 +133,9 @@ public class ValidatorExtensionManager extends AbstractDeclarativeValidator {
 						System.out.println("ValidatorExtensionManager: unexpected extension");

 					}

 				}

-			} catch (CoreException ex) {

-				System.out.println(ex.getMessage());

+				catch (CoreException ex) {

+					System.out.println(ex.getMessage());

+				}

 			}

 		}

 		

@@ -228,6 +230,7 @@ public class ValidatorExtensionManager extends AbstractDeclarativeValidator {
 	

 	@Check

 	public void checkObject(EObject object) {

+		//EcoreUtil.resolveAll(object.eResource().getResourceSet());

 		Registry.getInstance().validate(object, getCheckMode(), getMessageAcceptor());

 	}