Commit 850c505f authored by De Viry Guilhem's avatar De Viry Guilhem

Résolution de conflits, merging final pour la soutenance

parent 253e17f9
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
......
......@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.sirius,
org.eclipse.sirius.common.acceleo.aql
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-9
Bundle-RequiredExecutionEnvironment: JavaSE-10
Bundle-Vendor: %providerName
Automatic-Module-Name: fr.supelec.plong9.fsm.design
Export-Package: fr.supelec.plong9.fsm.design;uses:="org.osgi.framework,org.eclipse.emf.ecore,org.eclipse.ui.plugin"
......@@ -66,7 +66,7 @@
<firstModelOperations xsi:type="tool_1:CreateInstance" typeName="fsm::Guard" referenceName="ownedGuards"/>
</initialOperation>
</ownedTools>
<ownedTools xsi:type="tool_1:ToolDescription" name="NewMessage" label="New Message" forceRefresh="true">
<ownedTools xsi:type="tool_1:ToolDescription" name="NewMessage" label="New Message" forceRefresh="true" iconPath="/fr.supelec.plong9.fsm.edit/icons/full/obj16/Message.gif">
<element name="element"/>
<elementView name="elementView"/>
<initialOperation>
......@@ -75,7 +75,7 @@
</ownedTools>
</toolSections>
<toolSections name="Set" label="Set">
<ownedTools xsi:type="tool_1:ToolDescription" name="SetInitialState" label="Set Initial State">
<ownedTools xsi:type="tool_1:ToolDescription" name="SetInitialState" label="Set Initial State" iconPath="/fr.supelec.plong9.fsm.edit/icons/full/obj16/InitialState.gif">
<element name="element"/>
<elementView name="elementView"/>
<initialOperation>
......@@ -86,7 +86,7 @@
</firstModelOperations>
</initialOperation>
</ownedTools>
<ownedTools xsi:type="tool_1:ToolDescription" name="SetFinalState" label="Set Final State">
<ownedTools xsi:type="tool_1:ToolDescription" name="SetFinalState" label="Set Final State" iconPath="/fr.supelec.plong9.fsm.edit/icons/full/obj16/FinalState.gif">
<element name="element"/>
<elementView name="elementView"/>
<initialOperation>
......
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=10
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=10
......@@ -8,7 +8,7 @@ Bundle-ClassPath: .
Bundle-Activator: fr.supelec.plong9.fsm.provider.FsmEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-9
Bundle-RequiredExecutionEnvironment: JavaSE-10
Export-Package: fr.supelec.plong9.fsm.provider
Require-Bundle: org.eclipse.core.runtime,
fr.supelec.plong9.fsm;visibility:=reexport,
......
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=10
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=10
......@@ -8,7 +8,7 @@ Bundle-ClassPath: .
Bundle-Activator: fr.supelec.plong9.fsm.presentation.FsmEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-9
Bundle-RequiredExecutionEnvironment: JavaSE-10
Export-Package: fr.supelec.plong9.fsm.presentation
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=10
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
......@@ -9,5 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=10
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=9
......@@ -7,7 +7,7 @@ Bundle-Version: 0.0.1
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-9
Bundle-RequiredExecutionEnvironment: JavaSE-10
Export-Package: fr.supelec.plong9.fsm;
uses:="org.eclipse.emf.ecore,
org.eclipse.emf.common.util",
......
......@@ -9,3 +9,5 @@ jars.compile.order = .
source.. = src-gen/,\
src/
output.. = bin/
javacSource = 9
javacTarget = 9
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