Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorradvorak2006-06-06 16:22:07 +0000
committerradvorak2006-06-06 16:22:07 +0000
commit1ac29a23be457b15de4b7a181c374f204cfea565 (patch)
tree167cd4af422ac18480cd518b1fed38f6836c1c5e /plugins/org.eclipse.gmf.codegen.edit
parentb6d7c8ccbda31381ea688bb3cc421d27b8a8c5da (diff)
downloadorg.eclipse.gmf-tooling-1ac29a23be457b15de4b7a181c374f204cfea565.tar.gz
org.eclipse.gmf-tooling-1ac29a23be457b15de4b7a181c374f204cfea565.tar.xz
org.eclipse.gmf-tooling-1ac29a23be457b15de4b7a181c374f204cfea565.zip
#145042 Introduce expression Language enumeration into gmfmap, gfmgen models instead of plain text attribute
Diffstat (limited to 'plugins/org.eclipse.gmf.codegen.edit')
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/plugin.properties8
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenConstraintItemProvider.java2
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenExpressionInterpreterItemProvider.java4
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenFeatureValueSpecItemProvider.java2
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/ValueExpressionItemProvider.java5
5 files changed, 15 insertions, 6 deletions
diff --git a/plugins/org.eclipse.gmf.codegen.edit/plugin.properties b/plugins/org.eclipse.gmf.codegen.edit/plugin.properties
index 4583ac9b4..34e209744 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/plugin.properties
+++ b/plugins/org.eclipse.gmf.codegen.edit/plugin.properties
@@ -439,3 +439,11 @@ _UI_GenDomainAttributeTarget_attribute_feature = Attribute
_UI_ParentAssignedViewmap_getterName_feature = Accesor to parent figure's child
_UI_ParentAssignedViewmap_setterName_feature = Typed child.setFigure override
_UI_ParentAssignedViewmap_figureQualifiedClassName_feature = Figure Qualified Class Name
+# ====================================================================
+ _UI_ValueExpression_langName_feature = Lang Name
+_UI_GenLanguage_ocl_literal = ocl
+_UI_GenLanguage_java_literal = java
+_UI_GenLanguage_regexp_literal = regexp
+_UI_GenLanguage_nregexp_literal = nregexp
+
+
diff --git a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenConstraintItemProvider.java b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenConstraintItemProvider.java
index 08506ed37..b669056c3 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenConstraintItemProvider.java
+++ b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenConstraintItemProvider.java
@@ -80,7 +80,7 @@ public class GenConstraintItemProvider
* @generated
*/
public String getText(Object object) {
- String label = ((GenConstraint)object).getBody();
+ String label = crop(((GenConstraint)object).getBody());
return label == null || label.length() == 0 ?
getString("_UI_GenConstraint_type") :
getString("_UI_GenConstraint_type") + " " + label;
diff --git a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenExpressionInterpreterItemProvider.java b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenExpressionInterpreterItemProvider.java
index 91775914b..2612b5e15 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenExpressionInterpreterItemProvider.java
+++ b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenExpressionInterpreterItemProvider.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: GenExpressionInterpreterItemProvider.java,v 1.2 2006/05/17 14:22:36 dstadnik Exp $
+ * $Id: GenExpressionInterpreterItemProvider.java,v 1.3 2006/06/06 16:22:08 radvorak Exp $
*/
package org.eclipse.gmf.codegen.gmfgen.provider;
@@ -128,7 +128,7 @@ public class GenExpressionInterpreterItemProvider
getString("_UI_GenExpressionInterpreter_language_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_GenExpressionInterpreter_language_feature", "_UI_GenExpressionInterpreter_type"),
GMFGenPackage.eINSTANCE.getGenExpressionInterpreter_Language(),
- true,
+ false,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
diff --git a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenFeatureValueSpecItemProvider.java b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenFeatureValueSpecItemProvider.java
index 58328c2e0..b9aec415e 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenFeatureValueSpecItemProvider.java
+++ b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenFeatureValueSpecItemProvider.java
@@ -101,7 +101,7 @@ public class GenFeatureValueSpecItemProvider
* @generated
*/
public String getText(Object object) {
- String label = ((GenFeatureValueSpec)object).getBody();
+ String label = crop(((GenFeatureValueSpec)object).getBody());
return label == null || label.length() == 0 ?
getString("_UI_GenFeatureValueSpec_type") :
getString("_UI_GenFeatureValueSpec_type") + " " + label;
diff --git a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/ValueExpressionItemProvider.java b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/ValueExpressionItemProvider.java
index 6f9fb4be5..edb3c44bb 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/ValueExpressionItemProvider.java
+++ b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/ValueExpressionItemProvider.java
@@ -81,7 +81,7 @@ public class ValueExpressionItemProvider
getString("_UI_PropertyDescriptor_description", "_UI_ValueExpression_body_feature", "_UI_ValueExpression_type"),
GMFGenPackage.eINSTANCE.getValueExpression_Body(),
true,
- false,
+ true,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
@@ -127,7 +127,7 @@ public class ValueExpressionItemProvider
* @generated
*/
public String getText(Object object) {
- String label = ((ValueExpression)object).getBody();
+ String label = crop(((ValueExpression)object).getBody());
return label == null || label.length() == 0 ?
getString("_UI_ValueExpression_type") :
getString("_UI_ValueExpression_type") + " " + label;
@@ -146,6 +146,7 @@ public class ValueExpressionItemProvider
switch (notification.getFeatureID(ValueExpression.class)) {
case GMFGenPackage.VALUE_EXPRESSION__BODY:
case GMFGenPackage.VALUE_EXPRESSION__LANGUAGE:
+ case GMFGenPackage.VALUE_EXPRESSION__LANG_NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}

Back to the top