Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2008-07-01 11:40:21 +0000
committeratikhomirov2008-07-01 11:40:21 +0000
commit273180b5c39800d6cda886a4548d8402b3da4753 (patch)
treec0f5a23504fd3aa3f6cf32341d8a0cbfc69550bb /plugins
parent29525b13732b1ddf0cf04da292d4332d1b05e002 (diff)
downloadorg.eclipse.gmf-tooling-273180b5c39800d6cda886a4548d8402b3da4753.tar.gz
org.eclipse.gmf-tooling-273180b5c39800d6cda886a4548d8402b3da4753.tar.xz
org.eclipse.gmf-tooling-273180b5c39800d6cda886a4548d8402b3da4753.zip
[227127] support literal values for feature initializers. step 1: models updated to specify new possible values
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.gmf.map/models/gmfmap.ecore1
-rw-r--r--plugins/org.eclipse.gmf.map/models/gmfmap.genmodel1
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/Language.java29
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java42
5 files changed, 72 insertions, 3 deletions
diff --git a/plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF
index 3d9ab709c..e19f66a0a 100644
--- a/plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GMF Mapping Model
Bundle-SymbolicName: org.eclipse.gmf.map; singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.2.0.qualifier
Bundle-Vendor: Eclipse.org
Export-Package: org.eclipse.gmf.internal.map.util;x-internal:=true,
org.eclipse.gmf.mappings,
diff --git a/plugins/org.eclipse.gmf.map/models/gmfmap.ecore b/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
index 20ee71577..d540ed2f7 100644
--- a/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
+++ b/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
@@ -685,5 +685,6 @@
<eLiterals name="java" value="1"/>
<eLiterals name="regexp" value="2"/>
<eLiterals name="nregexp" value="3"/>
+ <eLiterals name="literal" value="4"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.gmf.map/models/gmfmap.genmodel b/plugins/org.eclipse.gmf.map/models/gmfmap.genmodel
index 249375f6f..75745b3ac 100644
--- a/plugins/org.eclipse.gmf.map/models/gmfmap.genmodel
+++ b/plugins/org.eclipse.gmf.map/models/gmfmap.genmodel
@@ -25,6 +25,7 @@
<genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/java"/>
<genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/regexp"/>
<genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/nregexp"/>
+ <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/literal"/>
</genEnums>
<genClasses ecoreClass="gmfmap.ecore#//Mapping">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//Mapping/nodes"/>
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/Language.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/Language.java
index e07c22268..2c65308fc 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/Language.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/Language.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Language.java,v 1.2 2007/03/14 13:00:05 atikhomirov Exp $
+ * $Id: Language.java,v 1.3 2008/07/01 11:40:21 atikhomirov Exp $
*/
package org.eclipse.gmf.mappings;
@@ -58,7 +58,15 @@ public enum Language implements Enumerator
* @generated
* @ordered
*/
- NREGEXP_LITERAL(3, "nregexp", "nregexp");
+ NREGEXP_LITERAL(3, "nregexp", "nregexp"), /**
+ * The '<em><b>Literal</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #LITERAL
+ * @generated
+ * @ordered
+ */
+ LITERAL_LITERAL(4, "literal", "literal");
/**
* The '<em><b>Ocl</b></em>' literal value.
* <!-- begin-user-doc -->
@@ -120,6 +128,21 @@ public enum Language implements Enumerator
public static final int NREGEXP = 3;
/**
+ * The '<em><b>Literal</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>Literal</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #LITERAL_LITERAL
+ * @model name="literal"
+ * @generated
+ * @ordered
+ */
+ public static final int LITERAL = 4;
+
+ /**
* An array of all the '<em><b>Language</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -131,6 +154,7 @@ public enum Language implements Enumerator
JAVA_LITERAL,
REGEXP_LITERAL,
NREGEXP_LITERAL,
+ LITERAL_LITERAL,
};
/**
@@ -185,6 +209,7 @@ public enum Language implements Enumerator
case JAVA: return JAVA_LITERAL;
case REGEXP: return REGEXP_LITERAL;
case NREGEXP: return NREGEXP_LITERAL;
+ case LITERAL: return LITERAL_LITERAL;
}
return null;
}
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
index a3fee10c9..c49198f42 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
@@ -15,6 +15,47 @@ import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
+import org.eclipse.gmf.mappings.AppearanceSteward;
+import org.eclipse.gmf.mappings.AuditContainer;
+import org.eclipse.gmf.mappings.AuditRule;
+import org.eclipse.gmf.mappings.Auditable;
+import org.eclipse.gmf.mappings.AuditedMetricTarget;
+import org.eclipse.gmf.mappings.CanvasMapping;
+import org.eclipse.gmf.mappings.ChildReference;
+import org.eclipse.gmf.mappings.CompartmentMapping;
+import org.eclipse.gmf.mappings.Constraint;
+import org.eclipse.gmf.mappings.DesignLabelMapping;
+import org.eclipse.gmf.mappings.DiagramElementTarget;
+import org.eclipse.gmf.mappings.DomainAttributeTarget;
+import org.eclipse.gmf.mappings.DomainElementTarget;
+import org.eclipse.gmf.mappings.ElementInitializer;
+import org.eclipse.gmf.mappings.FeatureInitializer;
+import org.eclipse.gmf.mappings.FeatureLabelMapping;
+import org.eclipse.gmf.mappings.FeatureSeqInitializer;
+import org.eclipse.gmf.mappings.FeatureValueSpec;
+import org.eclipse.gmf.mappings.GMFMapFactory;
+import org.eclipse.gmf.mappings.GMFMapPackage;
+import org.eclipse.gmf.mappings.LabelMapping;
+import org.eclipse.gmf.mappings.LabelTextAccessMethod;
+import org.eclipse.gmf.mappings.Language;
+import org.eclipse.gmf.mappings.LinkConstraints;
+import org.eclipse.gmf.mappings.LinkMapping;
+import org.eclipse.gmf.mappings.Mapping;
+import org.eclipse.gmf.mappings.MappingEntry;
+import org.eclipse.gmf.mappings.Measurable;
+import org.eclipse.gmf.mappings.MenuOwner;
+import org.eclipse.gmf.mappings.MetricContainer;
+import org.eclipse.gmf.mappings.MetricRule;
+import org.eclipse.gmf.mappings.NeedsContainment;
+import org.eclipse.gmf.mappings.NodeMapping;
+import org.eclipse.gmf.mappings.NodeReference;
+import org.eclipse.gmf.mappings.NotationElementTarget;
+import org.eclipse.gmf.mappings.ReferenceNewElementSpec;
+import org.eclipse.gmf.mappings.RuleBase;
+import org.eclipse.gmf.mappings.Severity;
+import org.eclipse.gmf.mappings.ToolOwner;
+import org.eclipse.gmf.mappings.TopNodeReference;
+import org.eclipse.gmf.mappings.ValueExpression;
import org.eclipse.gmf.mappings.*;
import org.eclipse.gmf.tooldef.GMFToolPackage;
import org.eclipse.gmf.validate.GMFValidator;
@@ -1967,6 +2008,7 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
addEEnumLiteral(languageEEnum, Language.JAVA_LITERAL);
addEEnumLiteral(languageEEnum, Language.REGEXP_LITERAL);
addEEnumLiteral(languageEEnum, Language.NREGEXP_LITERAL);
+ addEEnumLiteral(languageEEnum, Language.LITERAL_LITERAL);
// Create resource
createResource(eNS_URI);

Back to the top