EvlTask: add 'fix' field

Author: agarciadom

examples/org.eclipse.epsilon.examples.eol.dap/build.xml

@@ -42,9 +42,9 @@
 		<epsilon.emf.loadModel name="M"
 			metamodelfile="epsilon/models/person.ecore"
 			modelfile="epsilon/models/invalidPerson.model"
-			read="true" store="false" />
+			read="true" store="true" />
 
-		<epsilon.evl src="epsilon/09-validate.evl" debug="true" debugPort="4040" failOnErrors="false">
+		<epsilon.evl src="epsilon/09-validate.evl" debug="true" debugPort="4040" failOnErrors="false" fix="true">
 			<model ref="M"/>
 		</epsilon.evl>
 

plugins/org.eclipse.epsilon.evl.engine/src/org/eclipse/epsilon/evl/debug/EvlDebugger.java

@@ -27,6 +27,11 @@ protected boolean isStructuralBlock(ModuleElement ast) {
 	@Override
 	public boolean isDoneAfterModuleElement(ModuleElement ast) {
 		if (super.isDoneAfterModuleElement(ast)) {
+			if (getModule().getUnsatisfiedConstraintFixer() == null) {
+				// There is no fixer to apply the fixes
+				return true;
+			}
+
 			for (UnsatisfiedConstraint unsatisfied : getModule().getContext().getUnsatisfiedConstraints()) {
 				if (!unsatisfied.isFixed() && !unsatisfied.getFixes().isEmpty()) {
 					// There is at least one unfixed unsatisfied constraint with fixes: leave it running

plugins/org.eclipse.epsilon.evl.engine/src/org/eclipse/epsilon/evl/execute/CommandLineFixer.java

@@ -17,16 +17,14 @@
 
 public class CommandLineFixer implements IEvlFixer {
 
-	protected boolean fix = false;
-	
 	@Override
 	public void fix(IEvlModule module) throws EolRuntimeException {
 		IEvlContext context = module.getContext();
 		IUserInput userInput = context.getUserInput();
 
 		for (UnsatisfiedConstraint unsatisfiedConstraint : context.getUnsatisfiedConstraints()) {
 			context.getOutputStream().println(unsatisfiedConstraint.getMessage());
-			boolean fixIt = fix && (unsatisfiedConstraint.getFixes().size() > 0) && userInput.confirm("Fix error?", true);
+			boolean fixIt = unsatisfiedConstraint.getFixes().size() > 0 && userInput.confirm("Fix error?", true);
 
 			if (fixIt) {
 				FixInstance fixInstance = (FixInstance) userInput.choose(unsatisfiedConstraint.getMessage(), unsatisfiedConstraint.getFixes(), null);
@@ -37,12 +35,4 @@ public void fix(IEvlModule module) throws EolRuntimeException {
 		}
 	}
 
-	public boolean isFix() {
-		return fix;
-	}
-
-	public void setFix(boolean fix) {
-		this.fix = fix;
-	}
-	
 }

plugins/org.eclipse.epsilon.workflow/ant/org/eclipse/epsilon/workflow/tasks/EvlTask.java

@@ -21,6 +21,7 @@
 public class EvlTask extends ExportableModuleTask {
 
 	protected String exportConstraintTrace;
+	protected boolean fix = false;
 
 	public String getExportConstraintTrace() {
 		return exportConstraintTrace;
@@ -31,7 +32,15 @@ public void setExportConstraintTrace(String exportConstraintTrace) {
 			((IEvlModule) module).getContext().setOptimizeConstraintTrace(false);
 		}
 	}
-
+
+	public boolean isFix() {
+		return fix;
+	}
+
+	public void setFix(boolean fix) {
+		this.fix = fix;
+	}
+
 	@Override
 	protected IEvlModule createDefaultModule() {
 		return new EvlModuleParallelAnnotation();
@@ -40,9 +49,10 @@ protected IEvlModule createDefaultModule() {
 	@Override
 	protected void initialize() throws Exception {
 		IEvlModule evlModule = (IEvlModule) module;
-		CommandLineFixer clf = new CommandLineFixer();
-		clf.setFix(false);
-		evlModule.setUnsatisfiedConstraintFixer(clf);
+		if (isFix()) {
+			CommandLineFixer clf = new CommandLineFixer();
+			evlModule.setUnsatisfiedConstraintFixer(clf);
+		}
 	}
 
 	@Override