Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2015-07-09 13:38:34 +0000
committerPierre-Charles David2015-08-13 14:32:48 +0000
commit636f99cec456ad931602c67772be77b9a4f1e82b (patch)
tree938e3ffe6879eb7af25eb10a5b33af36c5e3afbb
parent386ce9954658168af19272c62801fd95fb0e972b (diff)
downloadorg.eclipse.sirius-636f99cec456ad931602c67772be77b9a4f1e82b.tar.gz
org.eclipse.sirius-636f99cec456ad931602c67772be77b9a4f1e82b.tar.xz
org.eclipse.sirius-636f99cec456ad931602c67772be77b9a4f1e82b.zip
[470822] Enable NON-NLS markers generation in core genmodels
Bug: 470822 Change-Id: Iab142a1bf4aef61de3746cb917b1c1ae75892c3b Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.layoutdata/model/layoutdata.genmodel3
-rw-r--r--plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel4
-rw-r--r--plugins/org.eclipse.sirius.diagram/model/diagram.genmodel6
-rw-r--r--plugins/org.eclipse.sirius.table/model/table.genmodel8
-rw-r--r--plugins/org.eclipse.sirius.tree/model/tree.genmodel9
-rw-r--r--plugins/org.eclipse.sirius/model/contribution.genmodel4
-rw-r--r--plugins/org.eclipse.sirius/model/viewpoint.genmodel6
7 files changed, 21 insertions, 19 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/model/layoutdata.genmodel b/plugins/org.eclipse.sirius.diagram.layoutdata/model/layoutdata.genmodel
index 152ec43b7d..34fb3e367f 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/model/layoutdata.genmodel
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/model/layoutdata.genmodel
@@ -4,7 +4,8 @@
modelDirectory="/org.eclipse.sirius.diagram.layoutdata/src-gen" editDirectory="/org.eclipse.sirius.diagram.layoutdata.edit/src-gen"
modelPluginID="org.eclipse.sirius.diagram.layoutdata" modelName="Layoutdata" editPluginClass="org.eclipse.sirius.diagram.layoutdata.provider.LayoutdataEditPlugin"
editorPluginClass="org.eclipse.sirius.diagram.layoutdata.presentation.LayoutdataEditorPlugin"
- testsDirectory="/org.eclipse.sirius.diagram.layoutdata.tests/src-gen" testSuiteClass="org.eclipse.sirius.diagram.layoutdata.tests.LayoutdataAllTests"
+ nonNLSMarkers="true" testsDirectory="/org.eclipse.sirius.diagram.layoutdata.tests/src-gen"
+ testSuiteClass="org.eclipse.sirius.diagram.layoutdata.tests.LayoutdataAllTests"
importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" complianceLevel="5.0"
copyrightFields="false" runtimeVersion="2.6" language="">
<foreignModel>layoutdata.ecore</foreignModel>
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel b/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel
index 0572978762..c8a7672f0a 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel
+++ b/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel
@@ -6,8 +6,8 @@
modelPluginID="org.eclipse.sirius.diagram.sequence" redirection="" modelName="Sequence"
editPluginClass="org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin"
editorPluginClass="org.eclipse.sirius.diagram.sequence.description.presentation.SequenceEditorPlugin"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
- testsDirectory="" testSuiteClass="org.eclipse.sirius.diagram.sequence.description.tests.SequenceAllTests"
+ nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.sirius.diagram.sequence.description.tests.SequenceAllTests"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint ../../org.eclipse.sirius.diagram/model/diagram.genmodel#//diagram"
importOrganizing="true" cleanup="true">
diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel b/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
index b0e85263f7..6effa898af 100644
--- a/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
+++ b/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
@@ -4,9 +4,9 @@
modelDirectory="/org.eclipse.sirius.diagram/src-gen" creationIcons="false" editDirectory="/org.eclipse.sirius.diagram.ui/src-gen"
editorDirectory="" modelPluginID="org.eclipse.sirius.diagram" templateDirectory=""
redirection="" modelName="Diagram" editPluginClass="org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
- testsDirectory="" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
- complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.diagram.ui"
+ nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+ containmentProxies="true" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.diagram.ui"
runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
importOrganizing="true" cleanup="true">
<foreignModel>diagram.ecore</foreignModel>
diff --git a/plugins/org.eclipse.sirius.table/model/table.genmodel b/plugins/org.eclipse.sirius.table/model/table.genmodel
index 4f5cd816ee..40d9eca00a 100644
--- a/plugins/org.eclipse.sirius.table/model/table.genmodel
+++ b/plugins/org.eclipse.sirius.table/model/table.genmodel
@@ -4,10 +4,10 @@
modelDirectory="/org.eclipse.sirius.table/src-gen" creationIcons="false" editDirectory="/org.eclipse.sirius.table.ui/src-gen"
editorDirectory="" modelPluginID="org.eclipse.sirius.table" modelName="Table"
editPluginClass="org.eclipse.sirius.table.metamodel.table.provider.TableUIPlugin"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
- testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
- copyrightFields="false" editPluginID="org.eclipse.sirius.table.ui" testsPluginID="org.eclipse.sirius.table.editor"
- runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
+ nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+ complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.table.ui"
+ testsPluginID="org.eclipse.sirius.table.editor" runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
importOrganizing="true" cleanup="true">
<foreignModel>table.ecore</foreignModel>
<genPackages prefix="Table" basePackage="org.eclipse.sirius.table.metamodel" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.sirius.tree/model/tree.genmodel b/plugins/org.eclipse.sirius.tree/model/tree.genmodel
index 6cb26bf4d6..612385dca2 100644
--- a/plugins/org.eclipse.sirius.tree/model/tree.genmodel
+++ b/plugins/org.eclipse.sirius.tree/model/tree.genmodel
@@ -3,10 +3,11 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA; Obeo - initial API and implementation&#xA;"
modelDirectory="/org.eclipse.sirius.tree/src-gen" creationIcons="false" editDirectory="/org.eclipse.sirius.tree.ui/src-gen"
editorDirectory="" modelPluginID="org.eclipse.sirius.tree" redirection="" modelName="Tree"
- editPluginClass="org.eclipse.sirius.tree.ui.provider.TreeUIPlugin" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.tree.ui"
- editorPluginID="org.eclipse.sirius.editor" runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
+ editPluginClass="org.eclipse.sirius.tree.ui.provider.TreeUIPlugin" nonNLSMarkers="true"
+ rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
+ testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+ copyrightFields="false" editPluginID="org.eclipse.sirius.tree.ui" editorPluginID="org.eclipse.sirius.editor"
+ runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
importOrganizing="true" cleanup="true">
<foreignModel>tree.ecore</foreignModel>
<genPackages prefix="Tree" basePackage="org.eclipse.sirius" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.sirius/model/contribution.genmodel b/plugins/org.eclipse.sirius/model/contribution.genmodel
index 3128b9e3ce..0095a54c64 100644
--- a/plugins/org.eclipse.sirius/model/contribution.genmodel
+++ b/plugins/org.eclipse.sirius/model/contribution.genmodel
@@ -4,8 +4,8 @@
modelDirectory="/org.eclipse.sirius/src-gen" creationIcons="false" editDirectory="/org.eclipse.sirius.ui/src-gen"
editorDirectory="" modelPluginID="org.eclipse.sirius" modelName="Contribution"
editPluginClass="org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin" editorPluginClass="org.eclipse.sirius.presentation.SiriusEditorPlugin"
- testsDirectory="" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
- complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.ui"
+ nonNLSMarkers="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+ containmentProxies="true" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.ui"
editorPluginID="org.eclipse.sirius.editor" runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
<foreignModel>contribution.ecore</foreignModel>
<genPackages prefix="Contribution" basePackage="org.eclipse.sirius.description"
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.genmodel b/plugins/org.eclipse.sirius/model/viewpoint.genmodel
index 08c4474ca7..96bae535e6 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.genmodel
+++ b/plugins/org.eclipse.sirius/model/viewpoint.genmodel
@@ -4,9 +4,9 @@
modelDirectory="/org.eclipse.sirius/src-gen" creationIcons="false" editDirectory="/org.eclipse.sirius.ui/src-gen"
editorDirectory="" modelPluginID="org.eclipse.sirius" templateDirectory="" redirection=""
modelName="Viewpoint" editPluginClass="org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
- testsDirectory="" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
- complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.ui"
+ nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+ containmentProxies="true" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.ui"
testsPluginID="org.eclipse.sirius.editor" runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
importOrganizing="true" cleanup="true">
<foreignModel>viewpoint.ecore</foreignModel>

Back to the top