From f1bde2cbf218784c0ee00e73b21216e81e25893c Mon Sep 17 00:00:00 2001
From: Michael Leuschel <leuschel@cs.uni-duesseldorf.de>
Date: Fri, 9 Nov 2018 15:47:37 +0100
Subject: [PATCH] push changes to ui/build/ast
---
.../src/org/eventb/texteditor/ui/build/ast/AstBuilder.java | 3 +--
.../org/eventb/texteditor/ui/build/ast/FormulaTranslator.java | 4 ++--
.../org/eventb/texteditor/ui/build/ast/FormulasResolver.java | 1 -
.../texteditor/ui/build/ast/MachineTranslateSwitch.java | 4 ++--
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/AstBuilder.java b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/AstBuilder.java
index 69d1a85..93cc7b1 100644
--- a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/AstBuilder.java
+++ b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/AstBuilder.java
@@ -44,7 +44,7 @@ public class AstBuilder implements IBuildPhase {
return successful;
}
-public void run(final EventBTextEditor editor, final Resource resource,
+ public void run(final EventBTextEditor editor, final Resource resource,
final IDocument document, final IProgressMonitor monitor) {
successful = false;
@@ -95,7 +95,6 @@ public void run(final EventBTextEditor editor, final Resource resource,
FormulasResolver.resolveFormulas(resource, astRoot, document,
markFormulaErrors);
monitor.worked(1);
-
/*
* Add text representation as annotation to resource's model
*/
diff --git a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulaTranslator.java b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulaTranslator.java
index 7a10bca..c23dd05 100644
--- a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulaTranslator.java
+++ b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulaTranslator.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
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.EventBNamedCommentedComponentElement;
import org.eventb.emf.core.EventBNamedCommentedPredicateElement;
@@ -73,7 +73,7 @@ public class FormulaTranslator {
}
}
- public void replace(final EventBCommentedExpressionElement expression) {
+ public void replace(final EventBNamedCommentedExpressionElement expression) {
final String input = expression.getExpression();
if (input != null) {
diff --git a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulasResolver.java b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulasResolver.java
index 74fe88f..679be65 100644
--- a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulasResolver.java
+++ b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/FormulasResolver.java
@@ -36,7 +36,6 @@ public class FormulasResolver {
String projectName = resource.getURI().segment(1);
final List<FormulaParseException> exceptions = FormulaResolver
.resolveAllFormulas(projectName, astRoot);
-
if (markErrors && exceptions.size() > 0) {
markerHelper.deleteMarkers(resource,
RodinMarkerUtil.RODIN_PROBLEM_MARKER, true,
diff --git a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/MachineTranslateSwitch.java b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/MachineTranslateSwitch.java
index b8d860b..bd51d9d 100644
--- a/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/MachineTranslateSwitch.java
+++ b/org.eventb.texteditor.ui/src/org/eventb/texteditor/ui/build/ast/MachineTranslateSwitch.java
@@ -6,7 +6,7 @@
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.machine.Action;
import org.eventb.emf.core.machine.util.MachineSwitch;
@@ -26,7 +26,7 @@ public class MachineTranslateSwitch extends MachineSwitch<Boolean> {
}
@Override
- public Boolean caseEventBCommentedExpressionElement(final EventBCommentedExpressionElement object) {
+ public Boolean caseEventBNamedCommentedExpressionElement(final EventBNamedCommentedExpressionElement object) {
translator.replace(object);
return true;
}
--
GitLab