Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2018-09-05 13:32:55 -0400
committerEd Merks2018-09-05 13:32:55 -0400
commitc6d5b3bf2ad1176192d6b8084299d5c9d1345046 (patch)
tree14223573696702f891489fa4ed18304f15dc8a1c
parent91a9bae4bf3962548d2030ff7b1f8803e7057ec8 (diff)
downloadorg.eclipse.emf-c6d5b3bf2ad1176192d6b8084299d5c9d1345046.tar.gz
org.eclipse.emf-c6d5b3bf2ad1176192d6b8084299d5c9d1345046.tar.xz
org.eclipse.emf-c6d5b3bf2ad1176192d6b8084299d5c9d1345046.zip
[538664] GenModel properties, such as GenOperation.body, should supportR2_15_0
multi-line text
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java4
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel8
4 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java
index 0d48c8c0c..57cd28555 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenDataTypeItemProvider.java
@@ -137,7 +137,7 @@ public class GenDataTypeItemProvider extends GenBaseItemProvider
getString("_UI_GenDataType_create_description"),
GenModelPackage.Literals.GEN_DATA_TYPE__CREATE,
true,
- false,
+ true,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
getString("_UI_ModelPropertyCategory"),
@@ -161,7 +161,7 @@ public class GenDataTypeItemProvider extends GenBaseItemProvider
getString("_UI_GenDataType_convert_description"),
GenModelPackage.Literals.GEN_DATA_TYPE__CONVERT,
true,
- false,
+ true,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
getString("_UI_ModelPropertyCategory"),
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java
index 780467913..5f087f3fb 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenFeatureItemProvider.java
@@ -451,7 +451,7 @@ public class GenFeatureItemProvider
getString("_UI_GenFeature_get_description"),
GenModelPackage.Literals.GEN_FEATURE__GET,
true,
- false,
+ true,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
getString("_UI_ModelPropertyCategory"),
diff --git a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java
index ae241f2ef..5df3715e6 100644
--- a/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java
+++ b/plugins/org.eclipse.emf.codegen.ecore.ui/src/org/eclipse/emf/codegen/ecore/genmodel/provider/GenOperationItemProvider.java
@@ -156,7 +156,7 @@ public class GenOperationItemProvider
getString("_UI_GenOperation_body_description"),
GenModelPackage.Literals.GEN_OPERATION__BODY,
true,
- false,
+ true,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
getString("_UI_ModelPropertyCategory"),
diff --git a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
index a056ae184..7a372eb40 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
+++ b/plugins/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel
@@ -372,7 +372,7 @@
<genFeatures createChild="false" propertyCategory="Model" propertyDescription="Whether to suppress the generated unset accessor from the interface"
ecoreFeature="ecore:EAttribute GenModel.ecore#//GenFeature/suppressedUnsetVisibility"/>
<genFeatures createChild="false" propertyCategory="Model" propertyDescription="The body to be generated for the get-accessor method of the feature in the implementation class"
- ecoreFeature="ecore:EAttribute GenModel.ecore#//GenFeature/get"/>
+ propertyMultiLine="true" ecoreFeature="ecore:EAttribute GenModel.ecore#//GenFeature/get"/>
<genFeatures createChild="false" propertyCategory="Edit" propertyDescription="A URI that specifies a registered property editor factory that will be used to create property editors"
ecoreFeature="ecore:EAttribute GenModel.ecore#//GenFeature/propertyEditorFactory"/>
</genClasses>
@@ -407,9 +407,9 @@
<genFeatures property="Readonly" createChild="false" propertyCategory="Ecore"
propertyDescription="The Ecore model element for this data type" ecoreFeature="ecore:EReference GenModel.ecore#//GenDataType/ecoreDataType"/>
<genFeatures createChild="false" propertyCategory="Model" propertyDescription="The body to be generated for the create-from-string method of the data type in the factory implementation class"
- ecoreFeature="ecore:EAttribute GenModel.ecore#//GenDataType/create"/>
+ propertyMultiLine="true" ecoreFeature="ecore:EAttribute GenModel.ecore#//GenDataType/create"/>
<genFeatures createChild="false" propertyCategory="Model" propertyDescription="The body to be generated for the convert-to-string method of the data type in the factory implementation class"
- ecoreFeature="ecore:EAttribute GenModel.ecore#//GenDataType/convert"/>
+ propertyMultiLine="true" ecoreFeature="ecore:EAttribute GenModel.ecore#//GenDataType/convert"/>
<genFeatures createChild="false" propertyCategory="Edit" propertyDescription="A URI that specifies a registered property editor factory that will be used to create property editors for attributes of this type"
ecoreFeature="ecore:EAttribute GenModel.ecore#//GenDataType/propertyEditorFactory"/>
</genClasses>
@@ -422,7 +422,7 @@
<genFeatures createChild="false" propertyCategory="Model" propertyDescription="Whether to suppress the generated method from the interface"
ecoreFeature="ecore:EAttribute GenModel.ecore#//GenOperation/suppressedVisibility"/>
<genFeatures createChild="false" propertyCategory="Model" propertyDescription="The body to be generated for the method of the operation in the implementation class"
- ecoreFeature="ecore:EAttribute GenModel.ecore#//GenOperation/body"/>
+ propertyMultiLine="true" ecoreFeature="ecore:EAttribute GenModel.ecore#//GenOperation/body"/>
</genClasses>
<genClasses image="false" ecoreClass="GenModel.ecore#//GenParameter">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference GenModel.ecore#//GenParameter/genOperation"/>

Back to the top