Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2015-07-09 13:38:11 +0000
committerPierre-Charles David2015-08-13 14:32:28 +0000
commitc36fc817168371a74c342ab04532b43b196720a6 (patch)
tree038338216501a2d2444e09f77912a1e9cced9888
parent7752e0a5119fdb8bd8364d747fdf211caf78b13e (diff)
downloadorg.eclipse.sirius-c36fc817168371a74c342ab04532b43b196720a6.tar.gz
org.eclipse.sirius-c36fc817168371a74c342ab04532b43b196720a6.tar.xz
org.eclipse.sirius-c36fc817168371a74c342ab04532b43b196720a6.zip
[470822] Enable NON-NLS markers generation in samples genmodels
Bug: 470822 Change-Id: I0a05082e5558e8f47888c6b4e34670f3959171da Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.sample.interactions/model/interactions.genmodel2
-rw-r--r--plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/model/basicfamily.genmodel6
-rw-r--r--plugins/org.eclipse.sirius.tests.sample.benchmark/model/benchmark.genmodel2
-rw-r--r--plugins/org.eclipse.sirius.tests.sample.component/model/component.genmodel8
-rw-r--r--plugins/org.eclipse.sirius.tests.sample.docbook/model/docbook.genmodel4
-rw-r--r--plugins/org.eclipse.sirius.tests.sample.migration/model/migrationModeler.genmodel4
-rw-r--r--plugins/org.eclipse.sirius.tests.sample.scxml/model/scxml.genmodel2
7 files changed, 14 insertions, 14 deletions
diff --git a/plugins/org.eclipse.sirius.sample.interactions/model/interactions.genmodel b/plugins/org.eclipse.sirius.sample.interactions/model/interactions.genmodel
index bfce5181c3..88ee43f690 100644
--- a/plugins/org.eclipse.sirius.sample.interactions/model/interactions.genmodel
+++ b/plugins/org.eclipse.sirius.sample.interactions/model/interactions.genmodel
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2007, 2014 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.sample.interactions/src" creationIcons="false" modelPluginID="org.eclipse.sirius.sample.interactions" modelName="Interactions" modelPluginClass="" editPluginClass="org.eclipse.sirius.sample.interactions.provider.InteractionsEditPlugin" editorPluginClass="org.eclipse.sirius.sample.interactions.presentation.InteractionsEditorPlugin" codeFormatting="true" testSuiteClass="org.eclipse.sirius.sample.interactions.tests.InteractionsAllTests" booleanFlagsField="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.3" classNamePattern="">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2007, 2014 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.sample.interactions/src" creationIcons="false" modelPluginID="org.eclipse.sirius.sample.interactions" modelName="Interactions" modelPluginClass="" editPluginClass="org.eclipse.sirius.sample.interactions.provider.InteractionsEditPlugin" editorPluginClass="org.eclipse.sirius.sample.interactions.presentation.InteractionsEditorPlugin" nonNLSMarkers="true" codeFormatting="true" testSuiteClass="org.eclipse.sirius.sample.interactions.tests.InteractionsAllTests" booleanFlagsField="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.3" classNamePattern="">
<foreignModel>interactions.ecore</foreignModel>
<genPackages prefix="Interactions" basePackage="org.eclipse.sirius.sample" disposableProviderFactory="true">
<ecorePackage href="interactions.ecore#/"/>
diff --git a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/model/basicfamily.genmodel b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/model/basicfamily.genmodel
index d333d4caa4..783d09f2cc 100644
--- a/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/model/basicfamily.genmodel
+++ b/plugins/org.eclipse.sirius.samples.family/samples/org.eclipse.sirius.sample.basicfamily/model/basicfamily.genmodel
@@ -3,9 +3,9 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 Obeo&#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.sample.basicfamily/src" modelPluginID="org.eclipse.sirius.sample.basicfamily"
modelName="Basicfamily" editPluginClass="org.eclipse.sirius.sample.basicfamily.provider.BasicfamilyEditPlugin"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.3" language=""
- operationReflection="false" importOrganizing="true">
+ nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
+ runtimeVersion="2.3" language="" importOrganizing="true">
<foreignModel>basicfamily.ecore</foreignModel>
<genPackages prefix="Basicfamily" basePackage="org.eclipse.sirius.sample" disposableProviderFactory="true"
ecorePackage="basicfamily.ecore#/">
diff --git a/plugins/org.eclipse.sirius.tests.sample.benchmark/model/benchmark.genmodel b/plugins/org.eclipse.sirius.tests.sample.benchmark/model/benchmark.genmodel
index 443166f7e3..b59301b15a 100644
--- a/plugins/org.eclipse.sirius.tests.sample.benchmark/model/benchmark.genmodel
+++ b/plugins/org.eclipse.sirius.tests.sample.benchmark/model/benchmark.genmodel
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2007, 2014 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.tests.sample.benchmark/src" modelPluginID="org.eclipse.sirius.tests.sample.benchmark" modelName="Benchmark" editPluginClass="org.eclipse.sirius.tests.sample.benchmark.provider.BenchmarkEditPlugin" editorPluginClass="org.eclipse.sirius.tests.sample.benchmark.presentation.BenchmarkEditorPlugin" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2007, 2014 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.tests.sample.benchmark/src" modelPluginID="org.eclipse.sirius.tests.sample.benchmark" modelName="Benchmark" editPluginClass="org.eclipse.sirius.tests.sample.benchmark.provider.BenchmarkEditPlugin" editorPluginClass="org.eclipse.sirius.tests.sample.benchmark.presentation.BenchmarkEditorPlugin" importerID="org.eclipse.emf.importer.ecore" nonNLSMarkers="true" complianceLevel="5.0" copyrightFields="false">
<foreignModel>benchmark.ecore</foreignModel>
<genPackages prefix="Benchmark" basePackage="org.eclipse.sirius.tests.sample" disposableProviderFactory="true">
<ecorePackage href="benchmark.ecore#/"/>
diff --git a/plugins/org.eclipse.sirius.tests.sample.component/model/component.genmodel b/plugins/org.eclipse.sirius.tests.sample.component/model/component.genmodel
index 307c2317ee..0a66ed07a8 100644
--- a/plugins/org.eclipse.sirius.tests.sample.component/model/component.genmodel
+++ b/plugins/org.eclipse.sirius.tests.sample.component/model/component.genmodel
@@ -3,10 +3,10 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 Obeo&#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"
modelDirectory="/org.eclipse.sirius.tests.sample.component/src" editorDirectory="/org.eclipse.sirius.tests.sample.component.design/src-gen"
modelPluginID="org.eclipse.sirius.tests.sample.component" modelName="Component"
- rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" rootImplementsInterface=""
- importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" complianceLevel="6.0"
- copyrightFields="false" runtimeVersion="2.8" language="" classNamePattern="" operationReflection="true"
- importOrganizing="true">
+ nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ rootImplementsInterface="" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
+ complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.8" language=""
+ classNamePattern="" operationReflection="true" importOrganizing="true">
<foreignModel>component.ecore</foreignModel>
<genPackages prefix="Component" basePackage="org.eclipse.sirius.tests.sample" disposableProviderFactory="true"
ecorePackage="component.ecore#/">
diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook/model/docbook.genmodel b/plugins/org.eclipse.sirius.tests.sample.docbook/model/docbook.genmodel
index 1c21f99667..89ba8585a1 100644
--- a/plugins/org.eclipse.sirius.tests.sample.docbook/model/docbook.genmodel
+++ b/plugins/org.eclipse.sirius.tests.sample.docbook/model/docbook.genmodel
@@ -3,8 +3,8 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013, 2014 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.tests.sample.docbook/src" editDirectory="/org.eclipse.sirius.tests.sample.docbook.edit/src-gen"
editorDirectory="/org.eclipse.sirius.tests.sample.docbook.editor/src-gen" modelPluginID="org.eclipse.sirius.tests.sample.docbook"
- modelName="Docbook" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
- copyrightFields="false" runtimeVersion="2.8">
+ modelName="Docbook" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
+ complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.8">
<foreignModel>docbook.ecore</foreignModel>
<genPackages prefix="Docbook" basePackage="org.eclipse.sirius.tests.sample" resource="XML"
disposableProviderFactory="true" ecorePackage="docbook.ecore#/">
diff --git a/plugins/org.eclipse.sirius.tests.sample.migration/model/migrationModeler.genmodel b/plugins/org.eclipse.sirius.tests.sample.migration/model/migrationModeler.genmodel
index c909788134..25c1302bdc 100644
--- a/plugins/org.eclipse.sirius.tests.sample.migration/model/migrationModeler.genmodel
+++ b/plugins/org.eclipse.sirius.tests.sample.migration/model/migrationModeler.genmodel
@@ -6,8 +6,8 @@
modelPluginID="org.eclipse.sirius.tests.sample.migration" modelName="MigrationModeler"
editPluginClass="org.eclipse.sirius.tests.sample.migration.migrationmodeler.provider.MigrationModelerEditPlugin"
editorPluginClass="org.eclipse.sirius.tests.sample.migration.migrationmodeler.presentation.MigrationModelerEditorPlugin"
- testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
- copyrightFields="false" editPluginID="org.eclipse.sirius.tests.sample.migration.edit"
+ nonNLSMarkers="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+ complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.sirius.tests.sample.migration.edit"
editorPluginID="org.eclipse.sirius.tests.sample.migration.editor" runtimeVersion="2.3"
usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
<foreignModel>migrationModeler.ecore</foreignModel>
diff --git a/plugins/org.eclipse.sirius.tests.sample.scxml/model/scxml.genmodel b/plugins/org.eclipse.sirius.tests.sample.scxml/model/scxml.genmodel
index 00fe94a861..b45c0a857c 100644
--- a/plugins/org.eclipse.sirius.tests.sample.scxml/model/scxml.genmodel
+++ b/plugins/org.eclipse.sirius.tests.sample.scxml/model/scxml.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 Obeo.&#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"
modelDirectory="/org.eclipse.sirius.tests.sample.scxml/src-gen" editDirectory="/org.eclipse.sirius.tests.sample.scxml.edit/src-gen"
editorDirectory="/org.eclipse.sirius.tests.sample.scxml.editor/src-gen" modelPluginID="org.eclipse.sirius.tests.sample.scxml"
- modelName="Scxml" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ modelName="Scxml" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.xsd.ecore.importer" complianceLevel="5.0" copyrightFields="false"
editPluginID="org.eclipse.sirius.tests.sample.scxml.edit" usedGenPackages="../../org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace"
interfaceNamePattern="" operationReflection="true" importOrganizing="true">

Back to the top