Skip to content
Snippets Groups Projects
Commit f1bde2cb authored by Michael Leuschel's avatar Michael Leuschel
Browse files

push changes to ui/build/ast

parent 4b96df85
Branches
Tags
No related merge requests found
...@@ -95,7 +95,6 @@ public void run(final EventBTextEditor editor, final Resource resource, ...@@ -95,7 +95,6 @@ public void run(final EventBTextEditor editor, final Resource resource,
FormulasResolver.resolveFormulas(resource, astRoot, document, FormulasResolver.resolveFormulas(resource, astRoot, document,
markFormulaErrors); markFormulaErrors);
monitor.worked(1); monitor.worked(1);
/* /*
* Add text representation as annotation to resource's model * Add text representation as annotation to resource's model
*/ */
......
...@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; ...@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eventb.emf.core.EventBCommentedExpressionElement; import org.eventb.emf.core.EventBNamedCommentedExpressionElement;
import org.eventb.emf.core.EventBElement; import org.eventb.emf.core.EventBElement;
import org.eventb.emf.core.EventBNamedCommentedComponentElement; import org.eventb.emf.core.EventBNamedCommentedComponentElement;
import org.eventb.emf.core.EventBNamedCommentedPredicateElement; import org.eventb.emf.core.EventBNamedCommentedPredicateElement;
...@@ -73,7 +73,7 @@ public class FormulaTranslator { ...@@ -73,7 +73,7 @@ public class FormulaTranslator {
} }
} }
public void replace(final EventBCommentedExpressionElement expression) { public void replace(final EventBNamedCommentedExpressionElement expression) {
final String input = expression.getExpression(); final String input = expression.getExpression();
if (input != null) { if (input != null) {
......
...@@ -36,7 +36,6 @@ public class FormulasResolver { ...@@ -36,7 +36,6 @@ public class FormulasResolver {
String projectName = resource.getURI().segment(1); String projectName = resource.getURI().segment(1);
final List<FormulaParseException> exceptions = FormulaResolver final List<FormulaParseException> exceptions = FormulaResolver
.resolveAllFormulas(projectName, astRoot); .resolveAllFormulas(projectName, astRoot);
if (markErrors && exceptions.size() > 0) { if (markErrors && exceptions.size() > 0) {
markerHelper.deleteMarkers(resource, markerHelper.deleteMarkers(resource,
RodinMarkerUtil.RODIN_PROBLEM_MARKER, true, RodinMarkerUtil.RODIN_PROBLEM_MARKER, true,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
package org.eventb.texteditor.ui.build.ast; package org.eventb.texteditor.ui.build.ast;
import org.eventb.emf.core.EventBCommentedExpressionElement; import org.eventb.emf.core.EventBNamedCommentedExpressionElement;
import org.eventb.emf.core.EventBNamedCommentedPredicateElement; import org.eventb.emf.core.EventBNamedCommentedPredicateElement;
import org.eventb.emf.core.machine.Action; import org.eventb.emf.core.machine.Action;
import org.eventb.emf.core.machine.util.MachineSwitch; import org.eventb.emf.core.machine.util.MachineSwitch;
...@@ -26,7 +26,7 @@ public class MachineTranslateSwitch extends MachineSwitch<Boolean> { ...@@ -26,7 +26,7 @@ public class MachineTranslateSwitch extends MachineSwitch<Boolean> {
} }
@Override @Override
public Boolean caseEventBCommentedExpressionElement(final EventBCommentedExpressionElement object) { public Boolean caseEventBNamedCommentedExpressionElement(final EventBNamedCommentedExpressionElement object) {
translator.replace(object); translator.replace(object);
return true; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment