Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Zarnekow2014-07-08 12:08:52 +0000
committerEd Merks2014-07-10 04:44:40 +0000
commit1567648f0b61fe2c6b706a5daa0bfc6b9981726c (patch)
tree17b5b642993d20c5ee50bdb8700e8b5cfbeb71ee
parent90546786ba96dc395790e2ca35ed67c2f253e955 (diff)
downloadorg.eclipse.emf-1567648f0b61fe2c6b706a5daa0bfc6b9981726c.tar.gz
org.eclipse.emf-1567648f0b61fe2c6b706a5daa0bfc6b9981726c.tar.xz
org.eclipse.emf-1567648f0b61fe2c6b706a5daa0bfc6b9981726c.zip
[439126] Int constants should be inferred as JvmField
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
-rw-r--r--plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreJvmInferrer.java26
1 files changed, 8 insertions, 18 deletions
diff --git a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreJvmInferrer.java b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreJvmInferrer.java
index 5d743085a..9292370b5 100644
--- a/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreJvmInferrer.java
+++ b/plugins/org.eclipse.emf.ecore.xcore/src/org/eclipse/emf/ecore/xcore/util/XcoreJvmInferrer.java
@@ -1648,18 +1648,13 @@ public class XcoreJvmInferrer
associate(genEnumLiteral, enumLiteralInferrer);
members.add(enumLiteralInferrer.getInferredElement());
- JvmElementInferrer<JvmEnumerationLiteral> enumLiteralValueInferrer =
- new JvmElementInferrer<JvmEnumerationLiteral>(X_VERY_HIGH)
+ JvmElementInferrer<JvmField> enumLiteralValueInferrer =
+ new JvmElementInferrer<JvmField>(X_VERY_HIGH)
{
@Override
- protected JvmEnumerationLiteral inferStructure()
+ protected JvmField inferStructure()
{
- JvmEnumerationLiteral enumLiteralValue = TypesFactory.eINSTANCE.createJvmEnumerationLiteral();
- enumLiteralValue.setStatic(true);
- enumLiteralValue.setFinal(true);
- enumLiteralValue.setVisibility(JvmVisibility.PUBLIC);
- enumLiteralValue.setType(getJvmTypeReference("int", genEnumLiteral));
- return enumLiteralValue;
+ return createJvmField(genEnumLiteral, JvmVisibility.PUBLIC, true, true, getJvmTypeReference("int", genEnumLiteral));
}
@Override
@@ -1700,11 +1695,11 @@ public class XcoreJvmInferrer
for (final GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals())
{
- JvmElementInferrer<JvmEnumerationLiteral> enumLiteralValueInferrer =
- new JvmElementInferrer<JvmEnumerationLiteral>(X_VERY_HIGH)
+ JvmElementInferrer<JvmField> enumLiteralValueInferrer =
+ new JvmElementInferrer<JvmField>(X_VERY_HIGH)
{
@Override
- protected JvmEnumerationLiteral inferStructure()
+ protected JvmField inferStructure()
{
JvmElementInferrer<JvmField> enumLiteralInferrer =
new JvmElementInferrer<JvmField>(X_VERY_HIGH)
@@ -1726,12 +1721,7 @@ public class XcoreJvmInferrer
associate(genEnumLiteral, enumLiteralInferrer);
members.add(enumLiteralInferrer.getInferredElement());
- JvmEnumerationLiteral enumLiteralValue = TypesFactory.eINSTANCE.createJvmEnumerationLiteral();
- enumLiteralValue.setStatic(true);
- enumLiteralValue.setFinal(true);
- enumLiteralValue.setVisibility(JvmVisibility.PUBLIC);
- enumLiteralValue.setType(getJvmTypeReference("int", genEnumLiteral));
- return enumLiteralValue;
+ return createJvmField(genEnumLiteral, JvmVisibility.PUBLIC, true, true, getJvmTypeReference("int", genEnumLiteral));
}
@Override

Back to the top