Skip to content
Snippets Groups Projects
Commit b0ec2406 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge branch '3376-genmodel_java_level' into 'master'

GenModels: Use Java Level 8.0

See merge request !1
parents fe9ea64a 9ff6c34a
Branches 3341-refactor_DataBindingUtils
No related tags found
1 merge request!1GenModels: Use Java Level 8.0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
modelDirectory="/org.fortiss.tooling.base/generated-src" editDirectory="/org.fortiss.tooling.base.edit/generated-src" modelDirectory="/org.fortiss.tooling.base/generated-src" editDirectory="/org.fortiss.tooling.base.edit/generated-src"
editorDirectory="/org.fortiss.tooling.base.editor/generated-src" modelPluginID="org.fortiss.tooling.base" editorDirectory="/org.fortiss.tooling.base.editor/generated-src" modelPluginID="org.fortiss.tooling.base"
modelName="Base" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" modelName="Base" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model"> complianceLevel="8.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
<foreignModel>base.ecore</foreignModel> <foreignModel>base.ecore</foreignModel>
<genPackages prefix="Base" basePackage="org.fortiss.tooling.base" disposableProviderFactory="true" <genPackages prefix="Base" basePackage="org.fortiss.tooling.base" disposableProviderFactory="true"
ecorePackage="base.ecore#/"> ecorePackage="base.ecore#/">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="(c) 2017 fortiss GmbH. GENERATED CODE: Do not edit, see Ecore metamodel instead!" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="(c) 2017 fortiss GmbH. GENERATED CODE: Do not edit, see Ecore metamodel instead!"
modelDirectory="/org.fortiss.tooling.graphicsGL/generated-src" editorDirectory="/org.fortiss.tooling.graphicsGL.editor/src" modelDirectory="/org.fortiss.tooling.graphicsGL/generated-src" editorDirectory="/org.fortiss.tooling.graphicsGL.editor/src"
modelPluginID="org.fortiss.tooling.graphicsGL" modelName="Model" modelPluginClass="" modelPluginID="org.fortiss.tooling.graphicsGL" modelName="Model" modelPluginClass=""
importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" complianceLevel="6.0" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" complianceLevel="8.0"
copyrightFields="false" editorPluginID="org.fortiss.tooling.graphicsGL.editor" copyrightFields="false" editorPluginID="org.fortiss.tooling.graphicsGL.editor"
usedGenPackages="platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model"> usedGenPackages="platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
<foreignModel>graphics3D.ecore</foreignModel> <foreignModel>graphics3D.ecore</foreignModel>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
modelName="Model" modelPluginClass="" editPluginClass="org.fortiss.tooling.kernel.model.provider.ModelEditPlugin" modelName="Model" modelPluginClass="" editPluginClass="org.fortiss.tooling.kernel.model.provider.ModelEditPlugin"
editorPluginClass="org.fortiss.tooling.kernel.model.presentation.ModelEditorPlugin" editorPluginClass="org.fortiss.tooling.kernel.model.presentation.ModelEditorPlugin"
testsDirectory="/org.fortiss.tooling.kernel.tests/test-src" importerID="org.eclipse.emf.importer.ecore" testsDirectory="/org.fortiss.tooling.kernel.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
containmentProxies="true" complianceLevel="6.0" copyrightFields="false"> containmentProxies="true" complianceLevel="8.0" copyrightFields="false">
<foreignModel>kernel.ecore</foreignModel> <foreignModel>kernel.ecore</foreignModel>
<genPackages prefix="FortissToolingKernel" basePackage="org.fortiss.tooling.kernel" <genPackages prefix="FortissToolingKernel" basePackage="org.fortiss.tooling.kernel"
disposableProviderFactory="true" ecorePackage="kernel.ecore#/"> disposableProviderFactory="true" ecorePackage="kernel.ecore#/">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment