Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2009-11-05 18:25:32 -0500
committerashatalin2009-11-05 18:25:32 -0500
commit0830c7b0cc3f5cd2c7e3e8e580886756ec22732c (patch)
tree88f45ea04fae9a5d99304c494311c23942f3ecea
parent84f5279263a39c4b03631a333333172086608676 (diff)
downloadorg.eclipse.gmf-tooling-0830c7b0cc3f5cd2c7e3e8e580886756ec22732c.tar.gz
org.eclipse.gmf-tooling-0830c7b0cc3f5cd2c7e3e8e580886756ec22732c.tar.xz
org.eclipse.gmf-tooling-0830c7b0cc3f5cd2c7e3e8e580886756ec22732c.zip
adopting xpand to the OCL version.
-rw-r--r--plugins/org.eclipse.gmf.xpand.editor/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.gmf.xpand.editor/src/org/eclipse/gmf/internal/xpand/expression/codeassist/ExpressionProposalComputer.java5
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<Integer> operands = new HashSet<Integer>();

Back to the top