Commit 4273bb93 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch...

Merge branch '21-in-unitmultiplierenum-literal-of-none-should-should-be-the-empty-string' into 'master'

Resolve "In UnitMultiplierEnum, literal of None should should be the empty string"

Closes #21

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!19
parents 24743d60 a8cf177f
...@@ -2105,7 +2105,7 @@ ...@@ -2105,7 +2105,7 @@
<eLiterals name="E" value="17"/> <eLiterals name="E" value="17"/>
<eLiterals name="Z" value="18"/> <eLiterals name="Z" value="18"/>
<eLiterals name="Y" value="19"/> <eLiterals name="Y" value="19"/>
<eLiterals name="None" value="20"/> <eLiterals name="None" value="20" literal=""/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="ValKindEnum"> <eClassifiers xsi:type="ecore:EEnum" name="ValKindEnum">
<eLiterals name="Spec"/> <eLiterals name="Spec"/>
......
...@@ -242,7 +242,7 @@ public enum UnitMultiplierEnum implements Enumerator { ...@@ -242,7 +242,7 @@ public enum UnitMultiplierEnum implements Enumerator {
* @generated * @generated
* @ordered * @ordered
*/ */
NONE( 20, "None", "None" ); NONE( 20, "None", "" );
/** /**
* The '<em><b>Milli</b></em>' literal value. * The '<em><b>Milli</b></em>' literal value.
...@@ -553,7 +553,7 @@ public enum UnitMultiplierEnum implements Enumerator { ...@@ -553,7 +553,7 @@ public enum UnitMultiplierEnum implements Enumerator {
* </p> * </p>
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see #NONE * @see #NONE
* @model name="None" * @model name="None" literal=""
* @generated * @generated
* @ordered * @ordered
*/ */
......
...@@ -2105,7 +2105,7 @@ ...@@ -2105,7 +2105,7 @@
<eLiterals name="E" value="17"/> <eLiterals name="E" value="17"/>
<eLiterals name="Z" value="18"/> <eLiterals name="Z" value="18"/>
<eLiterals name="Y" value="19"/> <eLiterals name="Y" value="19"/>
<eLiterals name="None" value="20"/> <eLiterals name="None" value="20" literal=""/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="ValKindEnum"> <eClassifiers xsi:type="ecore:EEnum" name="ValKindEnum">
<eLiterals name="Spec"/> <eLiterals name="Spec"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment