Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-03-10 14:16:20 +0000
committerptessier2014-03-10 14:16:20 +0000
commit1118d9b70850d945c3b0d89919c4100db64b9424 (patch)
tree34384ea38c796278ad49226b576db6d7fc8f2c41 /plugins/uml
parentaadd70e59010f365353242f60f7f153d8c19f76d (diff)
parente9eb2ae9d1d16b7119826e6bbce5da2955533d99 (diff)
downloadorg.eclipse.papyrus-1118d9b70850d945c3b0d89919c4100db64b9424.tar.gz
org.eclipse.papyrus-1118d9b70850d945c3b0d89919c4100db64b9424.tar.xz
org.eclipse.papyrus-1118d9b70850d945c3b0d89919c4100db64b9424.zip
Merge branch 'master' into bugs/386118-emf-facet
Conflicts: plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/resource/EMFLogicalModel.java
Diffstat (limited to 'plugins/uml')
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java
index 6e9a377efed..7ffdcef936f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java
@@ -31,7 +31,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.text.IDocument;
import org.eclipse.ocl.examples.domain.evaluation.DomainModelManager;
-import org.eclipse.ocl.examples.domain.evaluation.EvaluationHaltedException;
import org.eclipse.ocl.examples.domain.utilities.DomainUtil;
import org.eclipse.ocl.examples.domain.values.CollectionValue;
import org.eclipse.ocl.examples.domain.values.impl.InvalidValueException;
@@ -44,7 +43,6 @@ import org.eclipse.ocl.examples.pivot.context.ParserContext;
import org.eclipse.ocl.examples.pivot.evaluation.EvaluationEnvironment;
import org.eclipse.ocl.examples.pivot.evaluation.EvaluationVisitor;
import org.eclipse.ocl.examples.pivot.evaluation.EvaluationVisitorImpl;
-import org.eclipse.ocl.examples.pivot.evaluation.PivotEvaluationEnvironment;
import org.eclipse.ocl.examples.pivot.manager.MetaModelManager;
import org.eclipse.ocl.examples.pivot.utilities.BaseResource;
import org.eclipse.ocl.examples.pivot.utilities.PivotEnvironment;
@@ -243,8 +241,6 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery {
value = evaluationVisitor.visitExpressionInOCL(expressionInOCL);
} catch (InvalidValueException e) {
value = e;
- } catch (EvaluationHaltedException e) {
- value = new InvalidValueException(ConsoleMessages.Result_EvaluationTerminated);
} catch (Exception e) {
value = new InvalidValueException(e, ConsoleMessages.Result_EvaluationFailure);
} finally {

Back to the top