From 0830c7b0cc3f5cd2c7e3e8e580886756ec22732c Mon Sep 17 00:00:00 2001 From: ashatalin Date: Thu, 5 Nov 2009 23:25:32 +0000 Subject: adopting xpand to the OCL version. --- plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF | 8 ++++---- .../xpand/expression/codeassist/ExpressionProposalComputer.java | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF index b813e6348..e1818052b 100644 --- a/plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.gmf.xpand.editor;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.eclipse.gmf.internal.xpand.editor.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", @@ -14,9 +14,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", - org.eclipse.gmf.xpand;bundle-version="[2.0.0,3.0.0)", - org.eclipse.ocl.ecore;bundle-version="[1.3.0,2.0.0)", - org.eclipse.m2m.qvt.oml;bundle-version="[2.0.0,3.0.0)" + org.eclipse.gmf.xpand;bundle-version="[2.1.0,3.0.0)", + org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)", + org.eclipse.m2m.qvt.oml;bundle-version="[3.0.0,4.0.0)" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.gmf.internal.xpand.codeassist;x-friends:="org.eclipse.gmf.tests.xpand", org.eclipse.gmf.internal.xpand.editor;x-friends:="org.eclipse.gmf.tests.xpand", diff --git a/plugins/org.eclipse.gmf.xpand.editor/src/org/eclipse/gmf/internal/xpand/expression/codeassist/ExpressionProposalComputer.java b/plugins/org.eclipse.gmf.xpand.editor/src/org/eclipse/gmf/internal/xpand/expression/codeassist/ExpressionProposalComputer.java index 9d0c8402a..4a8a9332c 100644 --- a/plugins/org.eclipse.gmf.xpand.editor/src/org/eclipse/gmf/internal/xpand/expression/codeassist/ExpressionProposalComputer.java +++ b/plugins/org.eclipse.gmf.xpand.editor/src/org/eclipse/gmf/internal/xpand/expression/codeassist/ExpressionProposalComputer.java @@ -289,14 +289,15 @@ public class ExpressionProposalComputer implements ProposalComputer { methodNames.add(XpandParsersym.TK_sortedBy); methodNames.add(XpandParsersym.TK_isUnique); methodNames.add(XpandParsersym.TK_iterate); - methodNames.add(XpandParsersym.TK_oclIsKindOf); +// TODO: commented out due to the latest changed in OCL parser. Corresponding code have to be reviewed. +/* methodNames.add(XpandParsersym.TK_oclIsKindOf); methodNames.add(XpandParsersym.TK_oclIsTypeOf); methodNames.add(XpandParsersym.TK_oclAsType); methodNames.add(XpandParsersym.TK_oclIsNew); methodNames.add(XpandParsersym.TK_oclIsUndefined); methodNames.add(XpandParsersym.TK_oclIsInvalid); methodNames.add(XpandParsersym.TK_oclIsInState); - methodNames.add(XpandParsersym.TK_allInstances); + methodNames.add(XpandParsersym.TK_allInstances);*/ } private final Set operands = new HashSet(); -- cgit v1.2.1