Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-04-29 21:41:23 +0000
committermgolubev2012-04-29 21:41:23 +0000
commitfc8ab6e0ffa32d14953aa8fdf4fb527b7d95d2c2 (patch)
tree1b79fc656d4fe41564a6bd6b76abff15cf3a341e
parentd7b7f04411596143992e353eb62c2bd0c3682c85 (diff)
downloadorg.eclipse.gmf-tooling-fc8ab6e0ffa32d14953aa8fdf4fb527b7d95d2c2.tar.gz
org.eclipse.gmf-tooling-fc8ab6e0ffa32d14953aa8fdf4fb527b7d95d2c2.tar.xz
org.eclipse.gmf-tooling-fc8ab6e0ffa32d14953aa8fdf4fb527b7d95d2c2.zip
[368398] - merging typo fixed: (use 'or' not '||' in ocl/templates)
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
index 71c5c7b3b..d8e1674f8 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
@@ -23,7 +23,7 @@
«EXPAND xpt::Common::generatedMemberComment»
private org.eclipse.gmf.runtime.common.ui.services.parser.IParser parser;
- «IF isOclChoiceLabel() || isViewExpressionDefiedAndOcl()-»
+ «IF isOclChoiceLabel() or isViewExpressionDefiedAndOcl()-»
«EXPAND xpt::Common::generatedMemberComment»
private org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTracker.Registrator myOclRegistrator;
«ELSE-»
@@ -105,7 +105,7 @@
«EXPAND getFontStyleOwnerView(viewmap)-»
-«IF isOclChoiceLabelWithShowExpr() OR isViewExpressionDefiedAndOcl()-»
+«IF isOclChoiceLabelWithShowExpr() or isViewExpressionDefiedAndOcl()-»
«EXPAND getOclTracker-»
«ENDIF-»
@@ -537,7 +537,7 @@
«DEFINE removeSemanticListeners FOR gmfgen::GenCommonBase-»
«EXPAND xpt::Common::generatedMemberComment»
protected void removeSemanticListeners() {
-«IF isOclChoiceLabel() || isViewExpressionDefiedAndOcl()-»
+«IF isOclChoiceLabel() or isViewExpressionDefiedAndOcl()-»
((org.eclipse.gmf.tooling.runtime.parsers.OclChoiceParser) getParser()).uninstallListeners();
«IF isOclChoiceLabelWithShowExpr()-»
getTracker().uninstallListeners();

Back to the top