Merge remote-tracking branch 'origin/master' into neon
Conflicts:
plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml_gen
plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/FlaDslUiModule.java
plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/contentassist/FlaDslProposalProvider.xtend
plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml_gen
plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslRuntimeModule.java
plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslStandaloneSetup.java
plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend
Change-Id: I53087b42678e799d1486c9ffc95f7d067c904987
diff --git a/org.polarsys.chess.parent/bundles/pom.xml b/org.polarsys.chess.parent/bundles/pom.xml
index 1d79bec..0582b1c 100644
--- a/org.polarsys.chess.parent/bundles/pom.xml
+++ b/org.polarsys.chess.parent/bundles/pom.xml
@@ -9,84 +9,65 @@
<artifactId>org.polarsys.chess.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <modules>
- <module>../../plugins/org.polarsys.chess.chessmlprofile</module>
- <module>../../plugins/org.polarsys.chess.core</module>
- <module>../../plugins/org.polarsys.chess.wizards</module>
+ <modules>
<module>../../plugins/contracts/org.polarsys.chess.contracts.profile</module>
- <module>../../plugins/org.polarsys.chess.service</module>
- <module>../../plugins/org.polarsys.chess.cleanCExporter</module>
- <module>../../plugins/org.polarsys.chess.OSSImporter</module>
- <module>../../plugins/org.polarsys.chess.cdo</module>
- <module>../../plugins/org.polarsys.chess.codegen.ada</module>
- <module>../../plugins/org.polarsys.chess.commands</module>
- <module>
- ../../plugins/org.polarsys.chess.constraints.constraintEditor
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.chessextension
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.contractEditor
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.integration
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.refinementView
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.transformations
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.validation
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.verificationService
- </module>
- <module>
- ../../plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime
- </module>
- <module>../../plugins/org.polarsys.chess.diagram.ui</module>
- <module>../../plugins/org.polarsys.chess.diagramsCreator</module>
- <module>../../plugins/org.polarsys.chess.discovery</module>
- <module>../../plugins/fla/org.polarsys.chess.fla</module>
- <module>
- ../../plugins/fla/org.polarsys.chess.fla.faultTreeGenerator
- </module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.chessextension</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.contractEditor</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.contractPropertyManager</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.integration</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.refinementView</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.safetyAnalysis</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.transformations</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.validation</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.verificationService</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime</module>
+ <module>../../plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView</module>
+
+ <module>../../plugins/fla/org.polarsys.chess.fla</module>
+ <module>../../plugins/fla/org.polarsys.chess.fla.faultTreeGenerator</module>
<module>../../plugins/fla/org.polarsys.chess.fla.flamm</module>
<module>../../plugins/fla/org.polarsys.chess.fla.flaxml</module>
- <module>
- ../../plugins/fla/org.polarsys.chess.fla.transformations
- </module>
+ <module>../../plugins/fla/org.polarsys.chess.fla.transformations</module>
+ <!-- module>../../plugins/fla/org.polarsys.chess.fla.FPTC2FLABehavior</module-->
+ <module>../../plugins/fla/org.polarsys.chess.xtext.fladsl</module>
+ <module>../../plugins/fla/org.polarsys.chess.xtext.fladsl.ide</module>
+ <module>../../plugins/fla/org.polarsys.chess.xtext.fladsl.ui</module>
+
+ <module>../../plugins/org.polarsys.chess.cdo</module>
+ <module>../../plugins/org.polarsys.chess.checkers</module>
+ <module>../../plugins/org.polarsys.chess.chessmlprofile</module>
+ <module>../../plugins/org.polarsys.chess.cleanCExporter</module>
+ <module>../../plugins/org.polarsys.chess.codegen.ada</module>
+ <module>../../plugins/org.polarsys.chess.commands</module>
+ <module>../../plugins/org.polarsys.chess.constraints.constraintEditor</module>
+ <module>../../plugins/org.polarsys.chess.core</module>
+ <module>../../plugins/org.polarsys.chess.diagram.ui</module>
+ <module>../../plugins/org.polarsys.chess.diagramsCreator</module>
+ <module>../../plugins/org.polarsys.chess.discovery</module>
<module>../../plugins/org.polarsys.chess.functionBehaviors.functionBehaviorEditor</module>
+ <!-- module>../../plugins/org.polarsys.chess.instance.view</module-->
<module>../../plugins/org.polarsys.chess.m2m</module>
<module>../../plugins/org.polarsys.chess.monitoring</module>
<module>../../plugins/org.polarsys.chess.monitoring.edit</module>
<module>../../plugins/org.polarsys.chess.monitoring.editor</module>
<module>../../plugins/org.polarsys.chess.monitoring.tests</module>
<module>../../plugins/org.polarsys.chess.multicore</module>
+ <module>../../plugins/org.polarsys.chess.OSSImporter</module>
<module>../../plugins/org.polarsys.chess.paramArchConfigurator</module>
<module>../../plugins/org.polarsys.chess.patterns</module>
<module>../../plugins/org.polarsys.chess.patterns.library</module>
<module>../../plugins/org.polarsys.chess.patterns.profile</module>
<module>../../plugins/org.polarsys.chess.properties.propertyEditor</module>
- <module>../../plugins/org.polarsys.chess.validator</module>
- <module>../../plugins/contracts/org.polarsys.chess.contracts.hierarchicalContractView</module>
+ <module>../../plugins/org.polarsys.chess.service</module>
<module>../../plugins/org.polarsys.chess.smvExporter</module>
- <module>../../plugins/sba/org.polarsys.chess.statebased</module>
- <module>../../plugins/org.polarsys.chess.xtext.global</module>
+ <module>../../plugins/org.polarsys.chess.tabbedproperties</module>
+ <module>../../plugins/org.polarsys.chess.test.runtime</module>
<module>../../plugins/org.polarsys.chess.tradeoffAnalysis</module>
- <module>../../plugins/org.polarsys.chess.checkers</module>
+ <module>../../plugins/org.polarsys.chess.validator</module>
+ <module>../../plugins/org.polarsys.chess.wizards</module>
+ <module>../../plugins/org.polarsys.chess.xtext.global</module>
+
+ <module>../../plugins/sba/org.polarsys.chess.statebased</module>
- <!-- module>../../plugins/org.polarsys.chess.tabbedproperties</module>
- <module>../../plugins/fla/org.polarsys.chess.xtext.fladsl</module>
- <module>../../plugins/fla/org.polarsys.chess.xtext.fladsl.ui</module-->
</modules>
</project>
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/.project b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/.project
new file mode 100644
index 0000000..ecbd97a
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>eu.fbk.tools.aida.chess.target.neon</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/eu.fbk.tools.aida.chess.target.neon.target b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/eu.fbk.tools.aida.chess.target.neon.target
new file mode 100644
index 0000000..706669c
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/eu.fbk.tools.aida.chess.target.neon.target
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="eu.fbk.tools.aida.chess.target.neon.target" sequenceNumber="59">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/nebula/releases/2.2.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201605261103"/>
+<unit id="org.eclipse.emf.mwe.sdk.feature.group" version="1.3.20.v201605261103"/>
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.elk.gmf.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.algorithms.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.graphiti.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.4.0"/>
+<unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.4.0"/>
+<repository location="http://build.eclipse.org/modeling/elk/updates/0.4.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="1.2.0.201703081153"/>
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="2.0.3.201703080851"/>
+<unit id="org.eclipse.papyrus.extra.cdo.feature.feature.group" version="1.2.0.201703081153"/>
+<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="2.0.0.201703081153"/>
+<unit id="org.eclipse.papyrus.extra.marte.feature.feature.group" version="1.2.0.201703081153"/>
+<repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.epsilon.emf.feature.feature.group" version="1.5.1.201809302027"/>
+<unit id="org.eclipse.epsilon.core.feature.feature.group" version="1.5.1.201809302027"/>
+<repository location="http://download.eclipse.org/epsilon/updates/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/>
+<unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.2.0.v20160523-1914"/>
+<repository location="http://download.eclipse.org/releases/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.sirius.specifier.ide.ui.aql.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.eef.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.properties.feature.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.doc.feature.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.properties.feature.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.acceleo.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.tests.support.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.interpreter.feature.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.aql.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.properties.feature.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ocl.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.samples.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.tests.support.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.doc.feature.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.aql.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.samples.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.runtime.ide.xtext.source.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="4.1.9.201802221507"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="4.1.9.201802221507"/>
+<repository location="http://download.eclipse.org/sirius/updates/releases/4.1.9/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2m.atl.feature.group" version="4.1.0.v201909021645"/>
+<repository location="https://download.eclipse.org/mmt/atl/updates/releases/4.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
+<repository location="https://download.eclipse.org/mmt/qvto/updates/releases/3.8.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.viatra.query.sdk.feature.source.feature.group" version="1.7.2.201803211255"/>
+<unit id="org.eclipse.viatra.addon.viewers.runtime.feature.source.feature.group" version="0.17.2.201803211255"/>
+<repository location="https://download.eclipse.org/viatra/updates/release/1.7.2"/>
+</location>
+</locations>
+</target>
diff --git a/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/pom.xml b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/pom.xml
new file mode 100644
index 0000000..35a22d0
--- /dev/null
+++ b/org.polarsys.chess.parent/releng/eu.fbk.tools.aida.chess.target.neon/pom.xml
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.polarsys.chess</groupId>
+ <artifactId>org.polarsys.chess.releng</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>eu.fbk.tools.aida.chess.target</groupId>
+ <artifactId>eu.fbk.tools.aida.chess.target.neon</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+ <dependencies>
+ </dependencies>
+</project>
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml
index ef02ae1..2ce6617 100644
--- a/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.configuration/pom.xml
@@ -296,6 +296,74 @@
<configuration>
<target>
<artifact>
+ <groupId>eu.fbk.tools.aida.chess.target</groupId>
+ <artifactId>eu.fbk.tools.aida.chess.target.neon</artifactId>
+ <version>${project.version}</version>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.equinox.common</artifactId>
+ <version>[3.8.0,4.0.0)</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.13.102</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+ <version>1.3.110</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+ <version>1.2.101</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>org.eclipse.emf.codegen</artifactId>
+ <version>2.11.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>Eclipse-Neon-Java8</id>
+ <properties>
+ <!-- Tycho settings -->
+ <tycho.version>1.0.0</tycho.version>
+ <tycho.extras.version>1.0.0</tycho.extras.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <xtextVersion>2.12.0</xtextVersion>
+ <ecore-xcore-version>1.3.1</ecore-xcore-version>
+ <ecore-xcore-codegen-version>1.2.0</ecore-xcore-codegen-version>
+ <ecore-xcore-lib-version>1.1.100</ecore-xcore-lib-version>
+ <mwe2Version>[2.9.0,2.9.1)</mwe2Version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <emfRuntimeVersion>2.12</emfRuntimeVersion>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <target>
+ <artifact>
<groupId>org.polarsys.chess.target</groupId>
<artifactId>org.polarsys.chess.target.neon</artifactId>
<version>${project.version}</version>
diff --git a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target
index 0d734b2..c752fc8 100644
--- a/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target
+++ b/org.polarsys.chess.parent/releng/org.polarsys.chess.target.neon/org.polarsys.chess.target.neon.target
@@ -1,20 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="org.polarsys.chess.target.neon.target" sequenceNumber="59">
+<?pde version="3.8"?><target name="org.polarsys.chess.target.neon.target" sequenceNumber="65">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/nebula/releases/2.2.0/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201605261103"/>
-<unit id="org.eclipse.emf.mwe.sdk.feature.group" version="1.3.20.v201605261103"/>
-<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.elk.gmf.feature.feature.group" version="0.4.0"/>
<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.4.0"/>
<unit id="org.eclipse.elk.algorithms.feature.feature.group" version="0.4.0"/>
@@ -25,22 +12,14 @@
<repository location="http://build.eclipse.org/modeling/elk/updates/0.4.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="1.2.0.201703081153"/>
-<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="2.0.3.201703080851"/>
-<unit id="org.eclipse.papyrus.extra.cdo.feature.feature.group" version="1.2.0.201703081153"/>
-<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="2.0.0.201703081153"/>
-<unit id="org.eclipse.papyrus.extra.marte.feature.feature.group" version="1.2.0.201703081153"/>
-<repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/"/>
+<unit id="org.eclipse.viatra.query.sdk.feature.source.feature.group" version="1.7.2.201803211255"/>
+<unit id="org.eclipse.viatra.addon.viewers.runtime.feature.source.feature.group" version="0.17.2.201803211255"/>
+<repository location="https://download.eclipse.org/viatra/updates/release/1.7.2"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.epsilon.emf.feature.feature.group" version="1.5.1.201809302027"/>
-<unit id="org.eclipse.epsilon.core.feature.feature.group" version="1.5.1.201809302027"/>
-<repository location="http://download.eclipse.org/epsilon/updates/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/>
-<unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.2.0.v20160523-1914"/>
-<repository location="http://download.eclipse.org/releases/neon/"/>
+<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201605261103"/>
+<unit id="org.eclipse.emf.mwe.sdk.feature.group" version="1.3.20.v201605261103"/>
+<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sirius.specifier.ide.ui.aql.source.feature.group" version="4.1.9.201802221507"/>
@@ -81,17 +60,46 @@
<repository location="http://download.eclipse.org/sirius/updates/releases/4.1.9/neon/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/nebula/releases/2.2.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.3.v20170227-0935"/>
+<unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.2.0.v20160523-1914"/>
+<repository location="http://download.eclipse.org/releases/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.m2m.atl.feature.group" version="4.1.0.v201909021645"/>
<repository location="https://download.eclipse.org/mmt/atl/updates/releases/4.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.epsilon.emf.feature.feature.group" version="1.5.1.201809302027"/>
+<unit id="org.eclipse.epsilon.core.feature.feature.group" version="1.5.1.201809302027"/>
+<repository location="http://download.eclipse.org/epsilon/updates/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="1.2.0.201703081153"/>
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="2.0.3.201703080851"/>
+<unit id="org.eclipse.papyrus.extra.cdo.feature.feature.group" version="1.2.0.201703081153"/>
+<unit id="org.eclipse.papyrus.sysml.diagram.feature.feature.group" version="2.0.0.201703081153"/>
+<unit id="org.eclipse.papyrus.extra.marte.feature.feature.group" version="1.2.0.201703081153"/>
+<repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.12.0.v20170519-1412"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="eu.fbk.tools.aida.sde.feature.feature.group" version="0.0.0"/>
+<repository location="http://es-static.fbk.eu/tools/eclipse_sde_devel"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.8.0.v20180612-0940"/>
<repository location="https://download.eclipse.org/mmt/qvto/updates/releases/3.8.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.viatra.query.sdk.feature.source.feature.group" version="1.7.2.201803211255"/>
-<unit id="org.eclipse.viatra.addon.viewers.runtime.feature.source.feature.group" version="0.17.2.201803211255"/>
-<repository location="https://download.eclipse.org/viatra/updates/release/1.7.2"/>
+<unit id="eu.fbk.eclipse.standardtools.feature.feature.group" version="0.0.0"/>
+<repository location="http://es-static.fbk.eu/tools/eclipse_est_devel"/>
</location>
</locations>
</target>
diff --git a/org.polarsys.chess.parent/releng/pom.xml b/org.polarsys.chess.parent/releng/pom.xml
index dccc0e5..118b6b9 100644
--- a/org.polarsys.chess.parent/releng/pom.xml
+++ b/org.polarsys.chess.parent/releng/pom.xml
@@ -9,10 +9,11 @@
<artifactId>org.polarsys.chess.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
- <modules>
+
+ <modules>
<module>org.polarsys.chess.configuration</module>
- <module>org.polarsys.chess.target.neon</module>
- <module>eu.fbk.tools.aida.chess.repository</module>
- </modules>
+ <module>eu.fbk.tools.aida.chess.target.neon</module>
+ <module>org.polarsys.chess.target.neon</module>
+ <module>eu.fbk.tools.aida.chess.repository</module>
+ </modules>
</project>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.classpath b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.classpath
new file mode 100644
index 0000000..8d26fa5
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.gitignore b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.gitignore
new file mode 100644
index 0000000..e6f918a
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.gitignore
@@ -0,0 +1,5 @@
+/bin/
+/src-gen/
+/xtend-gen/
+/target/
+/model/
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.project b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.project
new file mode 100644
index 0000000..33da0c3
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.polarsys.chess.xtext.fladsl.ide</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a46621f
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.polarsys.chess.xtext.fladsl.ide
+Bundle-Vendor: Intecs
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: org.polarsys.chess.xtext.fladsl.ide; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.polarsys.chess.xtext.fladsl,
+ org.eclipse.xtext.ide,
+ org.eclipse.xtext.xbase.ide,
+ org.antlr.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.polarsys.chess.xtext.ide.contentassist.antlr.internal,
+ org.polarsys.chess.xtext.ide.contentassist.antlr
+
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/build.properties b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/build.properties
new file mode 100644
index 0000000..5c6bbf9
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/build.properties
@@ -0,0 +1,6 @@
+source.. = src/,\
+ src-gen/,\
+ xtend-gen/
+bin.includes = .,\
+ META-INF/
+bin.excludes = **/*.xtend
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/pom.xml b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/pom.xml
new file mode 100644
index 0000000..c0f5c05
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/pom.xml
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+<parent>
+ <groupId>org.polarsys.chess</groupId>
+ <artifactId>org.polarsys.chess.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../org.polarsys.chess.parent</relativePath>
+ </parent>
+ <artifactId>org.polarsys.chess.xtext.fladsl.ide</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.xtend</groupId>
+ <artifactId>xtend-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/src/org/polarsys/chess/xtext/ide/FlaDslIdeModule.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/src/org/polarsys/chess/xtext/ide/FlaDslIdeModule.xtend
new file mode 100644
index 0000000..6b8381a
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/src/org/polarsys/chess/xtext/ide/FlaDslIdeModule.xtend
@@ -0,0 +1,11 @@
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.ide
+
+
+/**
+ * Use this class to register ide components.
+ */
+class FlaDslIdeModule extends AbstractFlaDslIdeModule {
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/src/org/polarsys/chess/xtext/ide/FlaDslIdeSetup.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/src/org/polarsys/chess/xtext/ide/FlaDslIdeSetup.xtend
new file mode 100644
index 0000000..7f1e5c7
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ide/src/org/polarsys/chess/xtext/ide/FlaDslIdeSetup.xtend
@@ -0,0 +1,20 @@
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.ide
+
+import com.google.inject.Guice
+import org.eclipse.xtext.util.Modules2
+import org.polarsys.chess.xtext.FlaDslRuntimeModule
+import org.polarsys.chess.xtext.FlaDslStandaloneSetup
+
+/**
+ * Initialization support for running Xtext languages as language servers.
+ */
+class FlaDslIdeSetup extends FlaDslStandaloneSetup {
+
+ override createInjector() {
+ Guice.createInjector(Modules2.mixin(new FlaDslRuntimeModule, new FlaDslIdeModule))
+ }
+
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
index 29ba398..8d26fa5 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
@@ -1,9 +1,9 @@
-<?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-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.project b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.project
index 13bf8bc..e0bba5d 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.project
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.polarsys.chess.xtext.fladsl.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.polarsys.chess.xtext.fladsl.ui</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.core.resources.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.core.resources.prefs
index 4824b80..99f26c0 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.jdt.core.prefs
index 295926d..0c68a61 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
index 4a71ac4..e05dc0e 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
@@ -1,30 +1,29 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.polarsys.chess.xtext.fladsl.ui
-Bundle-Vendor: Intecs
-Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: org.polarsys.chess.xtext.fladsl.ui;singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext.ui,
- org.eclipse.ui.editors;bundle-version="3.8.200",
- org.eclipse.ui.ide;bundle-version="3.10.0",
- org.eclipse.xtext.ui.shared,
- org.eclipse.ui,
- org.eclipse.xtext.builder,
- org.eclipse.xtext.common.types.ui,
- org.eclipse.xtext.ui.codetemplates.ui,
- org.eclipse.compare,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.uml2.uml.editor;bundle-version="5.0.1",
- org.polarsys.chess.xtext.fladsl,
- org.antlr.runtime
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.polarsys.chess.xtext.ui,
- org.polarsys.chess.xtext.ui.contentassist,
- org.polarsys.chess.xtext.ui.quickfix,
- org.polarsys.chess.xtext.ui.internal,
- org.polarsys.chess.xtext.ui.contentassist.antlr,
- org.polarsys.chess.xtext.ui.contentassist.antlr.internal
-Bundle-Activator: org.polarsys.chess.xtext.ui.internal.FlaDslActivator
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.polarsys.chess.xtext.fladsl.ui
+Bundle-Vendor: Intecs
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: org.polarsys.chess.xtext.fladsl.ui; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.polarsys.chess.xtext.fladsl,
+ org.polarsys.chess.xtext.fladsl.ide,
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.xtext.ui.codetemplates.ui,
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.ui,
+ org.eclipse.compare,
+ org.eclipse.xtext.builder,
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtext.xbase.lib
+Import-Package: org.apache.log4j
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.polarsys.chess.xtext.fladsl.ui.internal,
+ org.polarsys.chess.xtext.ui,
+ org.polarsys.chess.xtext.ui.contentassist,
+ org.polarsys.chess.xtext.ui.quickfix
+ org.polarsys.chess.xtext.ui.internal,
+ org.polarsys.chess.xtext.ui.contentassist.antlr,
+ org.polarsys.chess.xtext.ui.contentassist.antlr.internal
+Bundle-Activator: org.polarsys.chess.xtext.fladsl.ui.internal.FladslActivator
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/build.properties b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/build.properties
index f2ae661..323f56c 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/build.properties
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/build.properties
@@ -1,6 +1,7 @@
-source.. = src/,\
- src-gen/,\
- xtend-gen/
-bin.includes = META-INF/,\
- .,\
- plugin.xml
+source.. = src/,\
+ src-gen/,\
+ xtend-gen/
+bin.includes = .,\
+ META-INF/,\
+ plugin.xml
+bin.excludes = **/*.xtend
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml
index 125b903..fe6177a 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml
@@ -1,425 +1,410 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension
- point="org.eclipse.ui.editors">
- <editor
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
- contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
- default="true"
- extensions="fladsl"
- id="org.polarsys.chess.xtext.FlaDsl"
- name="FlaDsl Editor">
- </editor>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
- commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
- <activeWhen>
- <reference
- definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- </reference>
- </activeWhen>
- </handler>
- <handler
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
- commandId="org.polarsys.chess.xtext.FlaDsl.validate">
- <activeWhen>
- <reference
- definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- </reference>
- </activeWhen>
- </handler>
- <!-- copy qualified name -->
- <handler
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
- commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
- <activeWhen>
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
- </activeWhen>
- </handler>
- <handler
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
- commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
- <activeWhen>
- <and>
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened" />
- <iterate>
- <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
- </iterate>
- </and>
- </activeWhen>
- </handler>
- </extension>
- <extension point="org.eclipse.core.expressions.definitions">
- <definition id="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- <and>
- <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
- <with variable="activeEditor">
- <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
- value="org.polarsys.chess.xtext.FlaDsl"
- forcePluginActivation="true"/>
- </with>
- </and>
- </definition>
- <definition id="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened">
- <and>
- <reference definitionId="isXtextEditorActive"/>
- <with variable="activeEditor">
- <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
- value="org.polarsys.chess.xtext.FlaDsl"
- forcePluginActivation="true"/>
- </with>
- </and>
- </definition>
- </extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
- id="org.polarsys.chess.xtext.FlaDsl"
- name="FlaDsl">
- <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
- </page>
- <page
- category="org.polarsys.chess.xtext.FlaDsl"
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
- id="org.polarsys.chess.xtext.FlaDsl.coloring"
- name="Syntax Coloring">
- <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
- </page>
- <page
- category="org.polarsys.chess.xtext.FlaDsl"
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
- id="org.polarsys.chess.xtext.FlaDsl.templates"
- name="Templates">
- <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
- </page>
- </extension>
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
- id="org.polarsys.chess.xtext.FlaDsl"
- name="FlaDsl">
- <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject"/>
- </enabledWhen>
- <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
- </page>
- </extension>
- <extension
- point="org.eclipse.ui.keywords">
- <keyword
- id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"
- label="FlaDsl"/>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- description="Trigger expensive validation"
- id="org.polarsys.chess.xtext.FlaDsl.validate"
- name="Validate">
- </command>
- <!-- copy qualified name -->
- <command
- id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
- categoryId="org.eclipse.ui.category.edit"
- description="Copy the qualified name for the selected element"
- name="Copy Qualified Name">
- </command>
- <command
- id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
- categoryId="org.eclipse.ui.category.edit"
- description="Copy the qualified name for the selected element"
- name="Copy Qualified Name">
- </command>
- </extension>
- <extension point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="popup:#TextEditorContext?after=group.edit">
- <command
- commandId="org.polarsys.chess.xtext.FlaDsl.validate"
- style="push"
- tooltip="Trigger expensive validation">
- <visibleWhen checkEnabled="false">
- <reference
- definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- </reference>
- </visibleWhen>
- </command>
- </menuContribution>
- <!-- copy qualified name -->
- <menuContribution locationURI="popup:#TextEditorContext?after=copy">
- <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
- style="push" tooltip="Copy Qualified Name">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
- </visibleWhen>
- </command>
- </menuContribution>
- <menuContribution locationURI="menu:edit?after=copy">
- <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
- style="push" tooltip="Copy Qualified Name">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
- </visibleWhen>
- </command>
- </menuContribution>
- <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
- <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
- style="push" tooltip="Copy Qualified Name">
- <visibleWhen checkEnabled="false">
- <and>
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened" />
- <iterate>
- <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
- </iterate>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension point="org.eclipse.ui.menus">
- <menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
- <command commandId="org.eclipse.xtext.ui.editor.FindReferences">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- </reference>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension point="org.eclipse.ui.handlers">
- <handler
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
- commandId="org.eclipse.xtext.ui.editor.FindReferences">
- <activeWhen>
- <reference
- definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- </reference>
- </activeWhen>
- </handler>
- </extension>
-
-<!-- adding resource factories -->
-
- <extension
- point="org.eclipse.emf.ecore.extension_parser">
- <parser
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
- type="fladsl">
- </parser>
- </extension>
- <extension point="org.eclipse.xtext.extension_resourceServiceProvider">
- <resourceServiceProvider
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
- uriExtension="fladsl">
- </resourceServiceProvider>
- </extension>
-
-
- <!-- marker definitions for org.polarsys.chess.xtext.FlaDsl -->
- <extension
- id="fladsl.check.fast"
- name="FlaDsl Problem"
- point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.xtext.ui.check.fast"/>
- <persistent value="true"/>
- </extension>
- <extension
- id="fladsl.check.normal"
- name="FlaDsl Problem"
- point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.xtext.ui.check.normal"/>
- <persistent value="true"/>
- </extension>
- <extension
- id="fladsl.check.expensive"
- name="FlaDsl Problem"
- point="org.eclipse.core.resources.markers">
- <super type="org.eclipse.xtext.ui.check.expensive"/>
- <persistent value="true"/>
- </extension>
-
- <extension
- point="org.eclipse.xtext.builder.participant">
- <participant
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
- fileExtensions="fladsl"
- >
- </participant>
- </extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="org.polarsys.chess.xtext.FlaDsl"
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
- id="org.polarsys.chess.xtext.FlaDsl.compiler.preferencePage"
- name="Compiler">
- <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
- </page>
- </extension>
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- category="org.polarsys.chess.xtext.FlaDsl"
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
- id="org.polarsys.chess.xtext.FlaDsl.compiler.propertyPage"
- name="Compiler">
- <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject"/>
- </enabledWhen>
- <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
- </page>
- </extension>
- <extension point="org.eclipse.ui.menus">
- <menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
- <command
- commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
- id="org.polarsys.chess.xtext.FlaDsl.OpenGeneratedCode"
- style="push">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension point="org.eclipse.ui.handlers">
- <handler
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
- commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
- <activeWhen>
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
- </activeWhen>
- </handler>
- </extension>
-
- <!-- Quick Outline -->
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
- commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
- <activeWhen>
- <reference
- definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- </reference>
- </activeWhen>
- </handler>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- description="Open the quick outline."
- id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
- name="Quick Outline">
- </command>
- </extension>
- <extension point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="popup:#TextEditorContext?after=group.open">
- <command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
- style="push"
- tooltip="Open Quick Outline">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened"/>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <!-- quickfix marker resolution generator for org.polarsys.chess.xtext.FlaDsl -->
- <extension
- point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
- markerType="org.polarsys.chess.xtext.ui.fladsl.check.fast">
- <attribute
- name="FIXABLE_KEY"
- value="true">
- </attribute>
- </markerResolutionGenerator>
- <markerResolutionGenerator
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
- markerType="org.polarsys.chess.xtext.ui.fladsl.check.normal">
- <attribute
- name="FIXABLE_KEY"
- value="true">
- </attribute>
- </markerResolutionGenerator>
- <markerResolutionGenerator
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
- markerType="org.polarsys.chess.xtext.ui.fladsl.check.expensive">
- <attribute
- name="FIXABLE_KEY"
- value="true">
- </attribute>
- </markerResolutionGenerator>
- </extension>
- <!-- Rename Refactoring -->
- <extension point="org.eclipse.ui.handlers">
- <handler
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
- commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
- <activeWhen>
- <reference
- definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- </reference>
- </activeWhen>
- </handler>
- </extension>
- <extension point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="popup:#TextEditorContext?after=group.edit">
- <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
- style="push">
- <visibleWhen checkEnabled="false">
- <reference
- definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
- </reference>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension point="org.eclipse.ui.preferencePages">
- <page
- category="org.polarsys.chess.xtext.FlaDsl"
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
- id="org.polarsys.chess.xtext.FlaDsl.refactoring"
- name="Refactoring">
- <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
- </page>
- </extension>
-
- <extension point="org.eclipse.compare.contentViewers">
- <viewer id="org.polarsys.chess.xtext.FlaDsl.compare.contentViewers"
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
- extensions="fladsl">
- </viewer>
- </extension>
- <extension point="org.eclipse.compare.contentMergeViewers">
- <viewer id="org.polarsys.chess.xtext.FlaDsl.compare.contentMergeViewers"
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
- extensions="fladsl" label="FlaDsl Compare">
- </viewer>
- </extension>
- <extension point="org.eclipse.ui.editors.documentProviders">
- <provider id="org.polarsys.chess.xtext.FlaDsl.editors.documentProviders"
- class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
- extensions="fladsl">
- </provider>
- </extension>
- <extension point="org.eclipse.team.core.fileTypes">
- <fileTypes
- extension="fladsl"
- type="text">
- </fileTypes>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+ contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+ default="true"
+ extensions="fladsl"
+ id="org.polarsys.chess.xtext.FlaDsl"
+ name="FlaDsl Editor">
+ </editor>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+ commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+ <activeWhen>
+ <reference
+ definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+ commandId="org.polarsys.chess.xtext.FlaDsl.validate">
+ <activeWhen>
+ <reference
+ definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ <!-- copy qualified name -->
+ <handler
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+ <activeWhen>
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+ commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+ <activeWhen>
+ <and>
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension point="org.eclipse.core.expressions.definitions">
+ <definition id="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ <and>
+ <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.polarsys.chess.xtext.FlaDsl"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
+ <definition id="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened">
+ <and>
+ <reference definitionId="isXtextEditorActive"/>
+ <with variable="activeEditor">
+ <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+ value="org.polarsys.chess.xtext.FlaDsl"
+ forcePluginActivation="true"/>
+ </with>
+ </and>
+ </definition>
+ </extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+ id="org.polarsys.chess.xtext.FlaDsl"
+ name="FlaDsl">
+ <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+ </page>
+ <page
+ category="org.polarsys.chess.xtext.FlaDsl"
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+ id="org.polarsys.chess.xtext.FlaDsl.coloring"
+ name="Syntax Coloring">
+ <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+ </page>
+ <page
+ category="org.polarsys.chess.xtext.FlaDsl"
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+ id="org.polarsys.chess.xtext.FlaDsl.templates"
+ name="Templates">
+ <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+ id="org.polarsys.chess.xtext.FlaDsl"
+ name="FlaDsl">
+ <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+ <enabledWhen>
+ <adapt type="org.eclipse.core.resources.IProject"/>
+ </enabledWhen>
+ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+ </page>
+ </extension>
+ <extension
+ point="org.eclipse.ui.keywords">
+ <keyword
+ id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"
+ label="FlaDsl"/>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="Trigger expensive validation"
+ id="org.polarsys.chess.xtext.FlaDsl.validate"
+ name="Validate">
+ </command>
+ <!-- copy qualified name -->
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ <command
+ id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ categoryId="org.eclipse.ui.category.edit"
+ description="Copy the qualified name for the selected element"
+ name="Copy Qualified Name">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:#TextEditorContext?after=group.edit">
+ <command
+ commandId="org.polarsys.chess.xtext.FlaDsl.validate"
+ style="push"
+ tooltip="Trigger expensive validation">
+ <visibleWhen checkEnabled="false">
+ <reference
+ definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <!-- copy qualified name -->
+ <menuContribution locationURI="popup:#TextEditorContext?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="menu:edit?after=copy">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+ <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+ style="push" tooltip="Copy Qualified Name">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.XtextEditor.opened" />
+ <iterate>
+ <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+ <command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+ commandId="org.eclipse.xtext.ui.editor.FindReferences">
+ <activeWhen>
+ <reference
+ definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ </extension>
+ <!-- adding resource factories -->
+ <extension
+ point="org.eclipse.emf.ecore.extension_parser">
+ <parser
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
+ type="fladsl">
+ </parser>
+ </extension>
+ <extension point="org.eclipse.xtext.extension_resourceServiceProvider">
+ <resourceServiceProvider
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
+ uriExtension="fladsl">
+ </resourceServiceProvider>
+ </extension>
+ <!-- marker definitions for org.polarsys.chess.xtext.FlaDsl -->
+ <extension
+ id="fladsl.check.fast"
+ name="FlaDsl Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.fast"/>
+ <persistent value="true"/>
+ </extension>
+ <extension
+ id="fladsl.check.normal"
+ name="FlaDsl Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.normal"/>
+ <persistent value="true"/>
+ </extension>
+ <extension
+ id="fladsl.check.expensive"
+ name="FlaDsl Problem"
+ point="org.eclipse.core.resources.markers">
+ <super type="org.eclipse.xtext.ui.check.expensive"/>
+ <persistent value="true"/>
+ </extension>
+ <extension point="org.eclipse.xtext.builder.participant">
+ <participant
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+ fileExtensions="fladsl"/>
+ </extension>
+ <extension point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.polarsys.chess.xtext.FlaDsl"
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+ id="org.polarsys.chess.xtext.FlaDsl.compiler.preferencePage"
+ name="Compiler">
+ <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+ </page>
+ </extension>
+ <extension point="org.eclipse.ui.propertyPages">
+ <page
+ category="org.polarsys.chess.xtext.FlaDsl"
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+ id="org.polarsys.chess.xtext.FlaDsl.compiler.propertyPage"
+ name="Compiler">
+ <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+ <enabledWhen>
+ <adapt type="org.eclipse.core.resources.IProject"/>
+ </enabledWhen>
+ <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+ </page>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+ <command
+ commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+ id="org.polarsys.chess.xtext.FlaDsl.OpenGeneratedCode"
+ style="push">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+ commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+ <activeWhen>
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened" />
+ </activeWhen>
+ </handler>
+ </extension>
+ <!-- Quick Outline -->
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+ commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+ <activeWhen>
+ <reference
+ definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="Open the quick outline."
+ id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+ name="Quick Outline">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:#TextEditorContext?after=group.open">
+ <command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+ style="push"
+ tooltip="Open Quick Outline">
+ <visibleWhen checkEnabled="false">
+ <reference definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened"/>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <!-- quickfix marker resolution generator for org.polarsys.chess.xtext.FlaDsl -->
+ <extension
+ point="org.eclipse.ui.ide.markerResolution">
+ <markerResolutionGenerator
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.polarsys.chess.xtext.fladsl.ui.fladsl.check.fast">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ <markerResolutionGenerator
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.polarsys.chess.xtext.fladsl.ui.fladsl.check.normal">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ <markerResolutionGenerator
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+ markerType="org.polarsys.chess.xtext.fladsl.ui.fladsl.check.expensive">
+ <attribute
+ name="FIXABLE_KEY"
+ value="true">
+ </attribute>
+ </markerResolutionGenerator>
+ </extension>
+ <!-- Rename Refactoring -->
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
+ commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
+ <activeWhen>
+ <reference
+ definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ </reference>
+ </activeWhen>
+ </handler>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="popup:#TextEditorContext?after=group.edit">
+ <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
+ style="push">
+ <visibleWhen checkEnabled="false">
+ <reference
+ definitionId="org.polarsys.chess.xtext.FlaDsl.Editor.opened">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.preferencePages">
+ <page
+ category="org.polarsys.chess.xtext.FlaDsl"
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
+ id="org.polarsys.chess.xtext.FlaDsl.refactoring"
+ name="Refactoring">
+ <keywordReference id="org.polarsys.chess.xtext.ui.keyword_FlaDsl"/>
+ </page>
+ </extension>
+ <extension point="org.eclipse.compare.contentViewers">
+ <viewer id="org.polarsys.chess.xtext.FlaDsl.compare.contentViewers"
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+ extensions="fladsl">
+ </viewer>
+ </extension>
+ <extension point="org.eclipse.compare.contentMergeViewers">
+ <viewer id="org.polarsys.chess.xtext.FlaDsl.compare.contentMergeViewers"
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+ extensions="fladsl" label="FlaDsl Compare">
+ </viewer>
+ </extension>
+ <extension point="org.eclipse.ui.editors.documentProviders">
+ <provider id="org.polarsys.chess.xtext.FlaDsl.editors.documentProviders"
+ class="org.polarsys.chess.xtext.ui.FlaDslExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
+ extensions="fladsl">
+ </provider>
+ </extension>
+ <extension point="org.eclipse.team.core.fileTypes">
+ <fileTypes
+ extension="fladsl"
+ type="text">
+ </fileTypes>
+ </extension>
+</plugin>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/pom.xml b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/pom.xml
index 028b70c..7652c13 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/pom.xml
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/pom.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+<parent>
<groupId>org.polarsys.chess</groupId>
<artifactId>org.polarsys.chess.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../../org.polarsys.chess.parent</relativePath>
</parent>
- <artifactId>org.polarsys.chess.xtext.fladsl.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <build>
+ <artifactId>org.polarsys.chess.xtext.fladsl.ui</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+ <build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
@@ -19,4 +18,5 @@
</plugin>
</plugins>
</build>
+
</project>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/FlaDslUiModule.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/FlaDslUiModule.xtend
new file mode 100644
index 0000000..9950f8f
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/FlaDslUiModule.xtend
@@ -0,0 +1,13 @@
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.ui
+
+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+
+/**
+ * Use this class to register components to be used within the Eclipse IDE.
+ */
+@FinalFieldsConstructor
+class FlaDslUiModule extends AbstractFlaDslUiModule {
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/contentassist/FlaDslProposalProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/contentassist/FlaDslProposalProvider.xtend
index a930674..a09389c 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/contentassist/FlaDslProposalProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/contentassist/FlaDslProposalProvider.xtend
@@ -1,13 +1,13 @@
-/*
- * generated by Xtext
- */
-package org.polarsys.chess.xtext.ui.contentassist
-
-import org.polarsys.chess.xtext.ui.contentassist.AbstractFlaDslProposalProvider
-
-/**
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#content-assist
- * on how to customize the content assistant.
- */
-class FlaDslProposalProvider extends AbstractFlaDslProposalProvider {
-}
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.ui.contentassist
+
+
+/**
+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#content-assist
+ * on how to customize the content assistant.
+ */
+class FlaDslProposalProvider extends AbstractFlaDslProposalProvider {
+}
+
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
index 8d2911b..cfbcac5 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend
@@ -1,39 +1,24 @@
-/*
- * generated by Xtext
- */
- /*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.xtext.ui.labeling
-
-//import org.eclipse.xtext.resource.IEObjectDescription
-
-/**
- * Provides labels for IEObjectDescriptions and IResourceDescriptions.
- *
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
- */
-class FlaDslDescriptionLabelProvider extends org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider {
-
- // Labels and icons can be computed like this:
-
-// override text(IEObjectDescription ele) {
-// ele.name.toString
-// }
-//
-// override image(IEObjectDescription ele) {
-// ele.EClass.name + '.gif'
-// }
-}
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.ui.labeling
+
+import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider
+
+/**
+ * Provides labels for IEObjectDescriptions and IResourceDescriptions.
+ *
+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
+ */
+class FlaDslDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
+
+ // Labels and icons can be computed like this:
+
+// override text(IEObjectDescription ele) {
+// ele.name.toString
+// }
+//
+// override image(IEObjectDescription ele) {
+// ele.EClass.name + '.gif'
+// }
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
index af9fa97..cd9421a 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend
@@ -1,44 +1,31 @@
-/*
- * generated by Xtext
- */
- /*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.xtext.ui.labeling
-
-import com.google.inject.Inject
-
-/**
- * Provides labels for EObjects.
- *
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
- */
-class FlaDslLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {
-
- @Inject
- new(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {
- super(delegate);
- }
-
- // Labels and icons can be computed like this:
-
-// def text(Greeting ele) {
-// 'A greeting to ' + ele.name
-// }
-//
-// def image(Greeting ele) {
-// 'Greeting.gif'
-// }
-}
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.ui.labeling
+
+import com.google.inject.Inject
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
+import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider
+
+/**
+ * Provides labels for EObjects.
+ *
+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
+ */
+class FlaDslLabelProvider extends DefaultEObjectLabelProvider {
+
+ @Inject
+ new(AdapterFactoryLabelProvider delegate) {
+ super(delegate);
+ }
+
+ // Labels and icons can be computed like this:
+
+// def text(Greeting ele) {
+// 'A greeting to ' + ele.name
+// }
+//
+// def image(Greeting ele) {
+// 'Greeting.gif'
+// }
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
index 2d39ecd..081bcfa 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend
@@ -1,28 +1,15 @@
-/*
- * generated by Xtext
- */
- /*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.xtext.ui.outline
-
-/**
- * Customization of the default outline structure.
- *
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#outline
- */
-class FlaDslOutlineTreeProvider extends org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider {
-
-}
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.ui.outline
+
+import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider
+
+/**
+ * Customization of the default outline structure.
+ *
+ * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#outline
+ */
+class FlaDslOutlineTreeProvider extends DefaultOutlineTreeProvider {
+
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
index d61b72f..db235c9 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend
@@ -1,41 +1,24 @@
-/*
- * generated by Xtext
- */
- /*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.xtext.ui.quickfix
-
-//import org.eclipse.xtext.ui.editor.quickfix.Fix
-//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor
-//import org.eclipse.xtext.validation.Issue
-
-/**
- * Custom quickfixes.
- *
- * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#quick-fixes
- */
-class FlaDslQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {
-
-// @Fix(MyDslValidator::INVALID_NAME)
-// def capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {
-// acceptor.accept(issue, 'Capitalize name', 'Capitalize the name.', 'upcase.png') [
-// context |
-// val xtextDocument = context.xtextDocument
-// val firstLetter = xtextDocument.get(issue.offset, 1)
-// xtextDocument.replace(issue.offset, 1, firstLetter.toUpperCase)
-// ]
-// }
-}
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.ui.quickfix
+
+import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider
+
+/**
+ * Custom quickfixes.
+ *
+ * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#quick-fixes
+ */
+class FlaDslQuickfixProvider extends DefaultQuickfixProvider {
+
+// @Fix(FlaDslValidator.INVALID_NAME)
+// def capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {
+// acceptor.accept(issue, 'Capitalize name', 'Capitalize the name.', 'upcase.png') [
+// context |
+// val xtextDocument = context.xtextDocument
+// val firstLetter = xtextDocument.get(issue.offset, 1)
+// xtextDocument.replace(issue.offset, 1, firstLetter.toUpperCase)
+// ]
+// }
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath b/plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
index 29ba398..8d26fa5 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
@@ -1,9 +1,9 @@
-<?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-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen"/>
+ <classpathentry kind="src" path="xtend-gen"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git "a/plugins/fla/org.polarsys.chess.xtext.fladsl/.launch/Generate Language Infrastructure \050org.intecs.chess.xtext.fladsl\051.launch" "b/plugins/fla/org.polarsys.chess.xtext.fladsl/.launch/Generate Language Infrastructure \050org.intecs.chess.xtext.fladsl\051.launch"
deleted file mode 100644
index 2f295b6..0000000
--- "a/plugins/fla/org.polarsys.chess.xtext.fladsl/.launch/Generate Language Infrastructure \050org.intecs.chess.xtext.fladsl\051.launch"
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <launchConfigurationWorkingSet factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1299248699643_13" label="working set" name="working set"> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.polarsys.chess.xtext.fladsl" type="4"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.polarsys.chess.xtext.fladsl.generator" type="4"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.polarsys.chess.xtext.fladsl.tests" type="4"/> <item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.polarsys.chess.xtext.fladsl.ui" type="4"/> </launchConfigurationWorkingSet>}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.polarsys.chess.xtext.fladsl"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.polarsys.chess.xtext.fladsl"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
-</launchConfiguration>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.project b/plugins/fla/org.polarsys.chess.xtext.fladsl/.project
index 86f5c3b..6e299c9 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.project
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.polarsys.chess.xtext.fladsl</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.polarsys.chess.xtext.fladsl</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.core.resources.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.core.resources.prefs
index 4824b80..99f26c0 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.jdt.core.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.jdt.core.prefs
index 295926d..0c68a61 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.m2e.core.prefs b/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF b/plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
index 73e2b6a..57fe697 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
@@ -1,41 +1,38 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.polarsys.chess.xtext.fladsl
-Bundle-Vendor: Intecs
-Bundle-Version: 1.0.0.qualifier
-Bundle-SymbolicName: org.polarsys.chess.xtext.fladsl; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
- org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.1.1";resolution:=optional,
- org.eclipse.emf.codegen.ecore;resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.uml2.codegen.ecore;bundle-version="2.0.1",
- org.eclipse.xtext.util,
- org.eclipse.emf.ecore,
- org.eclipse.emf.common,
- org.antlr.runtime,
- org.eclipse.xtext.common.types,
- org.objectweb.asm;bundle-version="5.0.1";resolution:=optional,
- org.eclipse.equinox.common;bundle-version="3.6.200",
- org.eclipse.xtext.xbase.lib,
- org.polarsys.chess.xtext.global;bundle-version="1.0.0",
- org.polarsys.chess.chessmlprofile;bundle-version="0.9.0"
-Import-Package: org.apache.log4j,
- org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.polarsys.chess.xtext,
- org.polarsys.chess.xtext.formatting,
- org.polarsys.chess.xtext.generator,
- org.polarsys.chess.xtext.scoping,
- org.polarsys.chess.xtext.validation,
- org.polarsys.chess.xtext.services,
- org.polarsys.chess.xtext.flaDsl,
- org.polarsys.chess.xtext.flaDsl.impl,
- org.polarsys.chess.xtext.flaDsl.util,
- org.polarsys.chess.xtext.serializer,
- org.polarsys.chess.xtext.parser.antlr,
- org.polarsys.chess.xtext.parser.antlr.internal
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.polarsys.chess.xtext.fladsl
+Bundle-Vendor: Intecs
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: org.polarsys.chess.xtext.fladsl; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.xbase,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.uml2.uml;bundle-version="5.0.0",
+ org.eclipse.uml2.codegen.ecore;bundle-version="2.0.1",
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.antlr.runtime,
+ org.eclipse.xtext.common.types,
+ org.eclipse.xtext.xbase.lib,
+ org.polarsys.chess.xtext.global;bundle-version="1.0.0",
+ org.polarsys.chess.chessmlprofile;bundle-version="0.9.0",
+ org.eclipse.equinox.common;bundle-version="3.5.0",
+ org.eclipse.xtext.util,
+ org.eclipse.xtend.lib
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.polarsys.chess.xtext.validation,
+ org.polarsys.chess.xtext,
+ org.polarsys.chess.xtext.formatting2,
+ org.polarsys.chess.xtext.serializer,
+ org.polarsys.chess.xtext.parser.antlr,
+ org.polarsys.chess.xtext.flaDsl,
+ org.polarsys.chess.xtext.scoping,
+ org.polarsys.chess.xtext.flaDsl.impl,
+ org.polarsys.chess.xtext.flaDsl.util,
+ org.polarsys.chess.xtext.parser.antlr.internal,
+ org.polarsys.chess.xtext.generator,
+ org.polarsys.chess.xtext.services
+Import-Package: org.apache.log4j
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/build.properties b/plugins/fla/org.polarsys.chess.xtext.fladsl/build.properties
index 7da718d..18d540b 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/build.properties
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/build.properties
@@ -1,8 +1,20 @@
-source.. = src/,\
- src-gen/,\
- xtend-gen/
-bin.includes = model/,\
- META-INF/,\
- .,\
- plugin.xml
-
+source.. = src/,\
+ src-gen/,\
+ xtend-gen/
+bin.includes = model/generated/,\
+ .,\
+ META-INF/,\
+ plugin.xml
+bin.excludes = **/*.mwe2,\
+ **/*.xtend
+additional.bundles = org.eclipse.xtext.xbase,\
+ org.eclipse.xtext.common.types,\
+ org.eclipse.xtext.xtext.generator,\
+ org.eclipse.emf.codegen.ecore,\
+ org.eclipse.emf.mwe.utils,\
+ org.eclipse.emf.mwe2.launch,\
+ org.eclipse.emf.mwe2.lib,\
+ org.objectweb.asm,\
+ org.apache.commons.logging,\
+ org.apache.log4j,\
+ com.ibm.icu
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml b/plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml
index ca15dd9..626e354 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml
@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri = "http://www.intecs.org/chess/xtext/FlaDsl"
- class = "org.polarsys.chess.xtext.flaDsl.FlaDslPackage"
- genModel = "model/generated/FlaDsl.genmodel" />
-
- </extension>
-
-
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <package
+ uri = "http://www.intecs.org/chess/xtext/FlaDsl"
+ class = "org.polarsys.chess.xtext.flaDsl.FlaDslPackage"
+ genModel = "model/generated/FlaDsl.genmodel" />
+ </extension>
+</plugin>
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDsl.xtext b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDsl.xtext
index 40f25d2..8c42783 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDsl.xtext
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDsl.xtext
@@ -1,77 +1,77 @@
-/*
- * TODO: License and author (Petter Isberg - MDH)
- */
-
-grammar org.polarsys.chess.xtext.FlaDsl with org.eclipse.xtext.common.Terminals
-
-import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
-import "http://www.eclipse.org/emf/2002/Ecore" as ecore
-
-generate flaDsl "http://www.intecs.org/chess/xtext/FlaDsl"
-
-/*
- * FLA Grammar
- */
-
-Behaviour:
- rules+=Expression+;
-
-Expression:
- 'FLA:' lhs=Lhs '->' rhs=Rhs ';';
-
-Lhs: failures+=InputExpression (',' failures+=InputExpression)*;
-Rhs: failures+=OutputExpression (',' failures+=OutputExpression)*;
-
-InputExpression: (ref=[uml::Port]| "undefined") '.' failureExpr=InFailureExpr;
-OutputExpression: (ref=[uml::Port]| "undefined") '.' failureExpr=OutFailureExpr;
-
-InFailureExpr:
- failures+=WildcardDefinition |
- failures+=NoFailureDefinition |
- failures+=FailureDefinition |
- '{' failures+=FailureDefinition (',' failures+=FailureDefinition)+ '}' |
- failures+=VariableDefinition
-;
-
-OutFailureExpr:
- failures+=NoFailureDefinition |
- failures+=ComplexNofailureDefinition |
- failures+=FailureDefinition |
- '{' failures+=FailureDefinition (',' failures+=FailureDefinition)+ '}' |
- failures+=VariableDefinition
-;
-
-Definitions: FailureDefinition | NoFailureDefinition | ComplexNofailureDefinition | WildcardDefinition | VariableDefinition;
-
-FailureDefinition: {FailureDefinition} type = ActualFailureType ('.' acidAvoidable = ACIDavoidable)?;
-NoFailureDefinition: {NoFailureDefinition} 'noFailure';
-ComplexNofailureDefinition: {NoFailureDefinition} 'noFailure' '.' acidMitigation = ACIDMitigation;
-WildcardDefinition: {WildcardDefinition} 'wildcard';
-VariableDefinition: {VariableDefinition} variableName=ID;
-
-enum FailureType: NO_FAILURE='noFailure' | EARLY='early'| LATE='late' | COMMISSION='commission' | OMISSION='omission' | VALUE_SUBTLE='valueSubtle' | VALUE_COARSE='valueCoarse' | WILDCARD="wildcard" | VARIABLE='variable';
-enum ActualFailureType returns FailureType: EARLY | LATE | COMMISSION | OMISSION | VALUE_SUBTLE | VALUE_COARSE;
-enum NoFailureType returns FailureType: NO_FAILURE;
-enum Wildcard returns FailureType: WILDCARD;
-
-ACIDavoidable: a = Aavoidable '.' c = Cavoidable '.' i = Iavoidable '.' d = Davoidable;
-
-enum Aavoidable: INCOMPLETION='incompletion' | NONE='none' | UNSPECIFIED='unspecified';
-enum Cavoidable: INCONSISTENCY='inconsistency' | NONE='none' | UNSPECIFIED='unspecified';
-enum Iavoidable: INTERFERENCE='interference' | NONE='none' | UNSPECIFIED='unspecified';
-enum Davoidable: IMPERMANENCE='impermanence' | NONE='none' | UNSPECIFIED='unspecified';
-
-ACIDMitigation: a = Amitigation '.' c = Cmitigation '.' i = Imitigation '.' d = Dmitigation;
-
-enum Amitigation: ALL_OR_NOTHING='all_or_nothing' | ALL_OR_COMPENSATION='all_or_compensation' | NONE='none' | UNSPECIFIED='unspecified';
-enum Cmitigation: FULL_CONSISTENCY='full_consistency' | RANGE_VIOLATION_ALLOWED='range_violation_allowed' | NONE='none' | UNSPECIFIED='unspecified';
-enum Imitigation: SERIALIZABLE='serializable' | PORTABLE_LEVEL='portable_level' | NONE='none' | UNSPECIFIED='unspecified';
-enum Dmitigation: NO_LOSS='no_loss' | PARTIAL_LOSS_ALLOWED='partial_loss_allowed' | NONE='none' | UNSPECIFIED='unspecified';
-
-/*
- * Additional rule to refer UML elements in a Model
- */
-
-FQN returns ecore::EString :
- ID('::'ID)*
-;
+/*
+ * TODO: License and author (Petter Isberg - MDH)
+ */
+
+grammar org.polarsys.chess.xtext.FlaDsl with org.eclipse.xtext.common.Terminals
+
+import "http://www.eclipse.org/uml2/5.0.0/UML" as uml
+import "http://www.eclipse.org/emf/2002/Ecore" as ecore
+
+generate flaDsl "http://www.intecs.org/chess/xtext/FlaDsl"
+
+/*
+ * FLA Grammar
+ */
+
+Behaviour:
+ rules+=Expression+;
+
+Expression:
+ 'FLA:' lhs=Lhs '->' rhs=Rhs ';';
+
+Lhs: failures+=InputExpression (',' failures+=InputExpression)*;
+Rhs: failures+=OutputExpression (',' failures+=OutputExpression)*;
+
+InputExpression: (ref=[uml::Port]| "undefined") '.' failureExpr=InFailureExpr;
+OutputExpression: (ref=[uml::Port]| "undefined") '.' failureExpr=OutFailureExpr;
+
+InFailureExpr:
+ failures+=WildcardDefinition |
+ failures+=NoFailureDefinition |
+ failures+=FailureDefinition |
+ '{' failures+=FailureDefinition (',' failures+=FailureDefinition)+ '}' |
+ failures+=VariableDefinition
+;
+
+OutFailureExpr:
+ failures+=NoFailureDefinition |
+ failures+=ComplexNofailureDefinition |
+ failures+=FailureDefinition |
+ '{' failures+=FailureDefinition (',' failures+=FailureDefinition)+ '}' |
+ failures+=VariableDefinition
+;
+
+Definitions: FailureDefinition | NoFailureDefinition | ComplexNofailureDefinition | WildcardDefinition | VariableDefinition;
+
+FailureDefinition: {FailureDefinition} type = ActualFailureType ('.' acidAvoidable = ACIDavoidable)?;
+NoFailureDefinition: {NoFailureDefinition} 'noFailure';
+ComplexNofailureDefinition: {NoFailureDefinition} 'noFailure' '.' acidMitigation = ACIDMitigation;
+WildcardDefinition: {WildcardDefinition} 'wildcard';
+VariableDefinition: {VariableDefinition} variableName=ID;
+
+enum FailureType: NO_FAILURE='noFailure' | EARLY='early'| LATE='late' | COMMISSION='commission' | OMISSION='omission' | VALUE_SUBTLE='valueSubtle' | VALUE_COARSE='valueCoarse' | WILDCARD="wildcard" | VARIABLE='variable';
+enum ActualFailureType returns FailureType: EARLY | LATE | COMMISSION | OMISSION | VALUE_SUBTLE | VALUE_COARSE;
+enum NoFailureType returns FailureType: NO_FAILURE;
+enum Wildcard returns FailureType: WILDCARD;
+
+ACIDavoidable: a = Aavoidable '.' c = Cavoidable '.' i = Iavoidable '.' d = Davoidable;
+
+enum Aavoidable: INCOMPLETION='incompletion' | NONE='none' | UNSPECIFIED='unspecified';
+enum Cavoidable: INCONSISTENCY='inconsistency' | NONE='none' | UNSPECIFIED='unspecified';
+enum Iavoidable: INTERFERENCE='interference' | NONE='none' | UNSPECIFIED='unspecified';
+enum Davoidable: IMPERMANENCE='impermanence' | NONE='none' | UNSPECIFIED='unspecified';
+
+ACIDMitigation: a = Amitigation '.' c = Cmitigation '.' i = Imitigation '.' d = Dmitigation;
+
+enum Amitigation: ALL_OR_NOTHING='all_or_nothing' | ALL_OR_COMPENSATION='all_or_compensation' | NONE='none' | UNSPECIFIED='unspecified';
+enum Cmitigation: FULL_CONSISTENCY='full_consistency' | RANGE_VIOLATION_ALLOWED='range_violation_allowed' | NONE='none' | UNSPECIFIED='unspecified';
+enum Imitigation: SERIALIZABLE='serializable' | PORTABLE_LEVEL='portable_level' | NONE='none' | UNSPECIFIED='unspecified';
+enum Dmitigation: NO_LOSS='no_loss' | PARTIAL_LOSS_ALLOWED='partial_loss_allowed' | NONE='none' | UNSPECIFIED='unspecified';
+
+/*
+ * Additional rule to refer UML elements in a Model
+ */
+
+FQN returns ecore::EString :
+ ID('::'ID)*
+;
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslRuntimeModule.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslRuntimeModule.xtend
new file mode 100644
index 0000000..364f3b6
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslRuntimeModule.xtend
@@ -0,0 +1,11 @@
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext
+
+
+/**
+ * Use this class to register components to be used at runtime / without the Equinox extension registry.
+ */
+class FlaDslRuntimeModule extends AbstractFlaDslRuntimeModule {
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslStandaloneSetup.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslStandaloneSetup.xtend
new file mode 100644
index 0000000..dd2e7d7
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslStandaloneSetup.xtend
@@ -0,0 +1,15 @@
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext
+
+
+/**
+ * Initialization support for running Xtext languages without Equinox extension registry.
+ */
+class FlaDslStandaloneSetup extends FlaDslStandaloneSetupGenerated {
+
+ def static void doSetup() {
+ new FlaDslStandaloneSetup().createInjectorAndDoEMFRegistration()
+ }
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2 b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
index 8db7ad1..9b95fe3 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2
@@ -1,201 +1,101 @@
-/*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-module org.polarsys.chess.xtext.GenerateFlaDsl
-
-import org.eclipse.emf.mwe.utils.*
-import org.eclipse.xtext.generator.*
-import org.eclipse.xtext.ui.generator.*
-
-var grammarURI = "classpath:/org/polarsys/chess/xtext/FlaDsl.xtext"
-var fileExtensions = "fladsl"
-var projectName = "org.polarsys.chess.xtext.fladsl"
-var runtimeProject = "../${projectName}"
-var generateXtendStub = true
-var encoding = "UTF-8"
-
-Workflow {
- bean = StandaloneSetup {
- scanClassPath = true
- platformUri = "${runtimeProject}/.."
-
- //load EMF ECORE
- uriMap = {
- from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore"
- to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore"
- }
-
- uriMap = { from = "platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
- to = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
- }
- uriMap = {
- from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel"
- to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"
- }
- registerGeneratedEPackage = "org.eclipse.emf.ecore.EcorePackage"
- registerGeneratedEPackage = "org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage"
- registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"
- registerGenModelFile = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
-
- //load UML
-
- uriMap = {
- from = "platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel"
- to = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
- }
- uriMap = {
- from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel"
- to = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
- }
-
- uriMap = {
- from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
- to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
- }
-
- uriMap = {
- from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"
- to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"
- }
- uriMap = {
- from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore"
- to = "platform:/resource/org.eclipse.uml2.uml/model/UML.ecore"
- }
-
- uriMap = {
- from = "platform:/plugin/org.eclipse.uml2.types/model/Types.ecore"
- to = "platform:/resource/org.eclipse.uml2.types/model/Types.ecore"
- }
- registerGeneratedEPackage = "org.eclipse.uml2.types.TypesPackage"
- registerGeneratedEPackage = "org.eclipse.uml2.uml.UMLPackage"
- registerGeneratedEPackage = "org.eclipse.uml2.codegen.ecore.genmodel.GenModelPackage"
-
- registerGenModelFile = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
- registerGenModelFile = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
- registerGenModelFile = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
-
- }
-
- component = DirectoryCleaner {
- directory = "${runtimeProject}/src-gen"
- }
-
- component = DirectoryCleaner {
- directory = "${runtimeProject}/model/generated"
- }
-
- component = DirectoryCleaner {
- directory = "${runtimeProject}.ui/src-gen"
- }
-
- component = DirectoryCleaner {
- directory = "${runtimeProject}.tests/src-gen"
- }
-
- component = Generator {
- pathRtProject = runtimeProject
- pathUiProject = "${runtimeProject}.ui"
- projectNameRt = projectName
- projectNameUi = "${projectName}.ui"
- encoding = encoding
- language = auto-inject {
-
- uri = grammarURI
-
- // Java API to access grammar elements (required by several other fragments)
- fragment = grammarAccess.GrammarAccessFragment auto-inject {}
-
- // generates Java API for the generated EPackages
- fragment = ecore.EMFGeneratorFragment auto-inject {}
-
- // the old serialization component
- // fragment = parseTreeConstructor.ParseTreeConstructorFragment auto-inject {}
-
- // serializer 2.0
- fragment = serializer.SerializerFragment auto-inject {
- generateStub = false
- }
-
- // a custom ResourceFactory for use with EMF
- fragment = resourceFactory.ResourceFactoryFragment auto-inject {}
-
- // The antlr parser generator fragment.
- fragment = parser.antlr.XtextAntlrGeneratorFragment auto-inject {
- // options = {
- // backtrack = true
- // }
- }
-
- // Xtend-based API for validation
- fragment = validation.ValidatorFragment auto-inject {
- composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
- // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
- }
-
- // old scoping and exporting API
- // fragment = scoping.ImportURIScopingFragment auto-inject {}
- // fragment = exporting.SimpleNamesFragment auto-inject {}
-
- // scoping and exporting API
- fragment = scoping.ImportNamespacesScopingFragment auto-inject {}
- fragment = exporting.QualifiedNamesFragment auto-inject {}
- fragment = builder.BuilderIntegrationFragment auto-inject {}
-
- // generator API
- fragment = generator.GeneratorFragment auto-inject {}
-
- // formatter API
- fragment = formatting.FormatterFragment auto-inject {}
-
- // labeling API
- fragment = labeling.LabelProviderFragment auto-inject {}
-
- // outline API
- fragment = outline.OutlineTreeProviderFragment auto-inject {}
- fragment = outline.QuickOutlineFragment auto-inject {}
-
- // quickfix API
- fragment = quickfix.QuickfixProviderFragment auto-inject {}
-
- // content assist API
- fragment = contentAssist.ContentAssistFragment auto-inject {}
-
- // generates a more lightweight Antlr parser and lexer tailored for content assist
- fragment = parser.antlr.XtextAntlrUiGeneratorFragment auto-inject {}
-
- // generates junit test support classes into Generator#pathTestProject
- fragment = junit.Junit4Fragment auto-inject {}
-
- // rename refactoring
- fragment = refactoring.RefactorElementNameFragment auto-inject {}
-
- // provides the necessary bindings for java types integration
- fragment = types.TypesGeneratorFragment auto-inject {}
-
- // generates the required bindings only if the grammar inherits from Xbase
- fragment = xbase.XbaseGeneratorFragment auto-inject {}
-
- // generates the required bindings only if the grammar inherits from Xtype
- fragment = xbase.XtypeGeneratorFragment auto-inject {}
-
- // provides a preference page for template proposals
- fragment = templates.CodetemplatesGeneratorFragment auto-inject {}
-
- // provides a compare view
- fragment = compare.CompareFragment auto-inject {}
- }
- }
-}
-
+module org.polarsys.chess.xtext.GenerateFlaDsl
+
+import org.eclipse.emf.mwe.utils.*
+import org.eclipse.xtext.xtext.generator.*
+import org.eclipse.xtext.xtext.generator.model.project.*
+
+var rootPath = ".."
+
+Workflow {
+ bean = StandaloneSetup {
+ scanClassPath = true
+ //load EMF ECORE
+ uriMap = {
+ from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore"
+ to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore"
+ }
+
+ uriMap = { from = "platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
+ to = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
+ }
+ uriMap = {
+ from = "platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel"
+ to = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"
+ }
+ registerGeneratedEPackage = "org.eclipse.emf.ecore.EcorePackage"
+ registerGeneratedEPackage = "org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage"
+ registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"
+ registerGenModelFile = "platform:/resource/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel"
+
+ //load UML
+
+ uriMap = {
+ from = "platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel"
+ to = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
+ }
+ uriMap = {
+ from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel"
+ to = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
+ }
+
+ uriMap = {
+ from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
+ to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
+ }
+
+ uriMap = {
+ from = "platform:/plugin/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"
+ to = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.ecore"
+ }
+ uriMap = {
+ from = "platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore"
+ to = "platform:/resource/org.eclipse.uml2.uml/model/UML.ecore"
+ }
+
+ uriMap = {
+ from = "platform:/plugin/org.eclipse.uml2.types/model/Types.ecore"
+ to = "platform:/resource/org.eclipse.uml2.types/model/Types.ecore"
+ }
+ registerGeneratedEPackage = "org.eclipse.uml2.types.TypesPackage"
+ registerGeneratedEPackage = "org.eclipse.uml2.uml.UMLPackage"
+ registerGeneratedEPackage = "org.eclipse.uml2.codegen.ecore.genmodel.GenModelPackage"
+
+ registerGenModelFile = "platform:/resource/org.eclipse.uml2.types/model/Types.genmodel"
+ registerGenModelFile = "platform:/resource/org.eclipse.uml2.uml/model/UML.genmodel"
+ registerGenModelFile = "platform:/resource/org.eclipse.uml2.codegen.ecore/model/GenModel.genmodel"
+ }
+
+ component = XtextGenerator {
+ configuration = {
+ project = StandardProjectConfig {
+ baseName = "org.polarsys.chess.xtext.fladsl"
+ rootPath = rootPath
+ eclipsePlugin = {
+ enabled = true
+ }
+ createEclipseMetaData = true
+ }
+ code = {
+ encoding = "UTF-8"
+ lineDelimiter = "\n"
+ fileHeader = "/*\n * generated by Xtext \${version}\n */"
+ }
+ }
+ language = StandardLanguage {
+ name = "org.polarsys.chess.xtext.FlaDsl"
+ fileExtensions = "fladsl"
+
+ serializer = {
+ generateStub = true
+ }
+
+ formatter = {
+ generateStub=true
+ }
+
+ validator = {
+ // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
+ }
+ }
+ }
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend
deleted file mode 100644
index b4b6ce7..0000000
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * generated by Xtext
- */
- /*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.xtext.formatting
-
-import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter
-import org.eclipse.xtext.formatting.impl.FormattingConfig
-// import com.google.inject.Inject;
-// import org.polarsys.chess.xtext.services.FlaDslGrammarAccess
-
-/**
- * This class contains custom formatting declarations.
- *
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#formatting
- * on how and when to use it.
- *
- * Also see {@link org.eclipse.xtext.xtext.XtextFormattingTokenSerializer} as an example
- */
-class FlaDslFormatter extends AbstractDeclarativeFormatter {
-
-// @Inject extension FlaDslGrammarAccess
-
- override protected void configureFormatting(FormattingConfig c) {
-// It's usually a good idea to activate the following three statements.
-// They will add and preserve newlines around comments
-// c.setLinewrap(0, 1, 2).before(SL_COMMENTRule)
-// c.setLinewrap(0, 1, 2).before(ML_COMMENTRule)
-// c.setLinewrap(0, 1, 1).after(ML_COMMENTRule)
- }
-}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting2/FlaDslFormatter.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting2/FlaDslFormatter.xtend
new file mode 100644
index 0000000..01e9934
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting2/FlaDslFormatter.xtend
@@ -0,0 +1,31 @@
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.formatting2
+
+import com.google.inject.Inject
+import org.eclipse.xtext.formatting2.AbstractFormatter2
+import org.eclipse.xtext.formatting2.IFormattableDocument
+import org.polarsys.chess.xtext.flaDsl.Behaviour
+import org.polarsys.chess.xtext.flaDsl.Expression
+import org.polarsys.chess.xtext.services.FlaDslGrammarAccess
+
+class FlaDslFormatter extends AbstractFormatter2 {
+
+ @Inject extension FlaDslGrammarAccess
+
+ def dispatch void format(Behaviour behaviour, extension IFormattableDocument document) {
+ // TODO: format HiddenRegions around keywords, attributes, cross references, etc.
+ for (Expression expression : behaviour.getRules()) {
+ expression.format;
+ }
+ }
+
+ def dispatch void format(Expression expression, extension IFormattableDocument document) {
+ // TODO: format HiddenRegions around keywords, attributes, cross references, etc.
+ expression.getLhs.format;
+ expression.getRhs.format;
+ }
+
+ // TODO: implement for Lhs, Rhs, InputExpression, OutputExpression, InFailureExpr, OutFailureExpr, FailureDefinition, NoFailureDefinition
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
index abd1789..19c89e8 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend
@@ -1,39 +1,25 @@
-/*
- * generated by Xtext
- */
- /*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.xtext.generator
-
-import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.xtext.generator.IGenerator
-import org.eclipse.xtext.generator.IFileSystemAccess
-
-/**
- * Generates code from your model files on save.
- *
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
- */
-class FlaDslGenerator implements IGenerator {
-
- override void doGenerate(Resource resource, IFileSystemAccess fsa) {
-// fsa.generateFile('greetings.txt', 'People to greet: ' +
-// resource.allContents
-// .filter(typeof(Greeting))
-// .map[name]
-// .join(', '))
- }
-}
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.generator
+
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.xtext.generator.AbstractGenerator
+import org.eclipse.xtext.generator.IFileSystemAccess2
+import org.eclipse.xtext.generator.IGeneratorContext
+
+/**
+ * Generates code from your model files on save.
+ *
+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
+ */
+class FlaDslGenerator extends AbstractGenerator {
+
+ override void doGenerate(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext context) {
+// fsa.generateFile('greetings.txt', 'People to greet: ' +
+// resource.allContents
+// .filter(Greeting)
+// .map[name]
+// .join(', '))
+ }
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
index 7f1f884..51e374f 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend
@@ -1,80 +1,15 @@
-/*
- * generated by Xtext
- */
- /*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.xtext.scoping
-
-import org.eclipse.emf.ecore.EReference
-import org.eclipse.xtext.scoping.IScope
-import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider
-import org.polarsys.chess.xtext.global.utils.XtextUtils
-import org.eclipse.uml2.uml.Port
-import org.eclipse.xtext.scoping.Scopes
-import org.eclipse.emf.ecore.EObject
-import org.eclipse.emf.common.util.EList
-import org.polarsys.chess.chessmlprofile.Dependability.FailurePropagation.FLABehavior;
-import org.polarsys.chess.chessmlprofile.Dependability.FailurePropagation.FPTC;
-import org.eclipse.uml2.uml.EncapsulatedClassifier
-
-/**
- * This class contains custom scoping description.
- *
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping
- * on how and when to use it.
- *
- */
-class FlaDslScopeProvider extends AbstractDeclarativeScopeProvider {
-
- EncapsulatedClassifier contextComponent ;
-
- new(){
- val contextElement = XtextUtils.getContextElement;
- if(contextElement instanceof FPTC){
- contextComponent = (contextElement as FPTC).getBase_Component();
- }else if(contextElement instanceof FLABehavior){
- if ((contextElement as FLABehavior).getBase_Class() != null) {
- contextComponent = (contextElement as FLABehavior).getBase_Class() as EncapsulatedClassifier;
- }
- else if ((contextElement as FLABehavior).getBase_InstanceSpecification != null) {
- contextComponent = (contextElement as FLABehavior).getBase_InstanceSpecification.classifiers.get(0) as EncapsulatedClassifier;
- }
- }
- }
-
-/*
- def IScope scope_InputExpression_ref(InputExpression inExpr, EReference ref){
-
- val ports = contextComponent.ownedPorts
-
- //ports.forEach[println((it as Port).qualifiedName)]
-
-// val scope = delegateGetScope(inExpr, ref)
-//
-// val filter = [IEObjectDescription descr | ports.contains(descr.EObjectOrProxy as Port)]
-//
-// new FilteringScope(scope, filter);
-
- return Scopes.scopeFor(ports)
- }*/
-
- override IScope getScope(EObject context, EReference reference){
- val EList<Port> ports = this.contextComponent.getOwnedPorts();
- return Scopes.scopeFor(ports);
- }
-
-
-}
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.scoping
+
+
+/**
+ * This class contains custom scoping description.
+ *
+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping
+ * on how and when to use it.
+ */
+class FlaDslScopeProvider extends AbstractFlaDslScopeProvider {
+
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.xtend
new file mode 100644
index 0000000..36213de
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.xtend
@@ -0,0 +1,8 @@
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.serializer
+
+
+class FlaDslSemanticSequencer extends AbstractFlaDslSemanticSequencer {
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.xtend
new file mode 100644
index 0000000..9b2d269
--- /dev/null
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.xtend
@@ -0,0 +1,8 @@
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.serializer
+
+
+class FlaDslSyntacticSequencer extends AbstractFlaDslSyntacticSequencer {
+}
diff --git a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend
index f5e9df4..962bc47 100644
--- a/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend
+++ b/plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend
@@ -1,40 +1,25 @@
-/*
- * generated by Xtext
- */
- /*------------------------------------------------------------------------------
- -
- - Copyright (c) 2013, 2015 Intecs SpA
- - All rights reserved. This program and the accompanying materials
- - are made available under the terms of the Eclipse Public License v1.0
- - which accompanies this distribution, and is available at
- - http://www.eclipse.org/legal/epl-v10.html
- -
- - Contributors:
- -
- - Stefano Puri stefano.puri@intecs.it
- -
- - Initial API and implementation and/or initial documentation
- ------------------------------------------------------------------------------*/
-
-package org.polarsys.chess.xtext.validation
-
-//import org.eclipse.xtext.validation.Check
-
-/**
- * This class contains custom validation rules.
- *
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
- */
-class FlaDslValidator {
-
-// public static val INVALID_NAME = 'invalidName'
-//
-// @Check
-// def checkGreetingStartsWithCapital(Greeting greeting) {
-// if (!Character.isUpperCase(greeting.name.charAt(0))) {
-// warning('Name should start with a capital',
-// MyDslPackage.Literals.GREETING__NAME,
-// INVALID_NAME)
-// }
-// }
-}
+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.validation
+
+
+/**
+ * This class contains custom validation rules.
+ *
+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation
+ */
+class FlaDslValidator extends AbstractFlaDslValidator {
+
+// public static val INVALID_NAME = 'invalidName'
+//
+// @Check
+// def checkGreetingStartsWithCapital(Greeting greeting) {
+// if (!Character.isUpperCase(greeting.name.charAt(0))) {
+// warning('Name should start with a capital',
+// FlaDslPackage.Literals.GREETING__NAME,
+// INVALID_NAME)
+// }
+// }
+
+}
diff --git a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/Activator.java b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/Activator.java
index 8c9e7b5..6cdb5b5 100644
--- a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/Activator.java
+++ b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/Activator.java
@@ -19,6 +19,7 @@
import org.osgi.framework.BundleContext;
import org.polarsys.chess.checkers.core.checkerManager.CheckerManager;
import org.polarsys.chess.checkers.core.checkerManager.CheckersContainer;
+import org.polarsys.chess.checkers.core.impl.IdentifiersChecker;
import org.polarsys.chess.checkers.core.impl.NameDistance;
import org.polarsys.chess.checkers.core.impl.StateStatus;
import org.polarsys.chess.checkers.core.impl.TestChecker1;
@@ -82,6 +83,7 @@
new NameDistance(1, 1);
new StateStatus();
+ new IdentifiersChecker();
started = true;
}
diff --git a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/Checker.java b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/Checker.java
index 30094df..6b0973d 100644
--- a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/Checker.java
+++ b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/Checker.java
@@ -9,19 +9,15 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
import org.polarsys.chess.contracts.profile.chesscontract.util.EntityUtil;
public abstract class Checker {
private static final Logger logger = Logger.getLogger(Checker.class);
- private static String pluginID = "org.polarsys.chess.checkers";
+// private static String pluginID = "org.polarsys.chess.checkers";
public final String unifiedName;
protected final Set<String> checkerTags;
@@ -49,10 +45,6 @@
public void asyncCheck(boolean isFirstChecker) throws Exception {
- Display defaultDisplay = Display.getDefault();
- Shell activeShell = defaultDisplay.getActiveShell();
-
-
CheckerManager checkerManager = org.polarsys.chess.checkers.Activator.getCheckerManager();
org.eclipse.uml2.uml.Package pack = EntityUtil.getInstance().getCurrentSystemView();
@@ -73,8 +65,8 @@
errors = new ArrayList<Exception>();
List<CheckerMessage> messages = check(monitor);
if (messages != null) {
-
- checkerManager.deleteMarkers(iFile, unifiedName);
+// checkerManager.deleteMarkers(iFile, unifiedName);
+ checkerManager.deleteProjectMarkers(iFile.getProject(), unifiedName);
checkerManager.addMessages(unifiedName, messages);
}
} catch (Exception e) {
@@ -93,9 +85,29 @@
job.setUser(isFirstChecker);
job.schedule();
-
-
}
+
+// /**
+// * Recursively returns all the files in the given container
+// * @param container the IContainer
+// * @return
+// */
+// private List<IFile> getProjectFiles(IContainer container) {
+// final List<IFile> files = new ArrayList<IFile>();
+// try {
+// for (IResource member : container.members()) {
+// if (member instanceof IContainer) {
+// files.addAll(getProjectFiles((IContainer) member));
+// } else if (member instanceof IFile) {
+// files.add((IFile) member);
+// }
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// return files;
+// }
+
/*
* private void syncWithUI(Shell shell) { Display.getDefault().asyncExec(new
* Runnable() { public void run() { MessageDialog.openInformation(shell,
diff --git a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckerManager.java b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckerManager.java
index 5e66638..c7184e3 100644
--- a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckerManager.java
+++ b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckerManager.java
@@ -9,6 +9,7 @@
import org.apache.log4j.Logger;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.ecore.EObject;
@@ -118,14 +119,14 @@
} else if (msn.object != null && msn.object instanceof INode) {
try {
final INode node = (INode) msn.object;
- if (msn.severity == 0) {
- ReportProblemsUtil.reportInfo(msn.file, msn.message, node.getStartLine(),
+ if (msn.severity == IMarker.SEVERITY_INFO) {
+ ReportProblemsUtil.reportInfo(msn.file, CHECKER_NAME, msn.checkerName, msn.message, node.getStartLine(),
node.getOffset(), node.getEndOffset());
- } else if (msn.severity == 1) {
- ReportProblemsUtil.reportWarning(msn.file, msn.message, node.getStartLine(),
+ } else if (msn.severity == IMarker.SEVERITY_WARNING) {
+ ReportProblemsUtil.reportWarning(msn.file, CHECKER_NAME, msn.checkerName, msn.message, node.getStartLine(),
node.getOffset(), node.getEndOffset());
- } else if (msn.severity == 2) {
- ReportProblemsUtil.reportError(msn.file, msn.message, node.getStartLine(),
+ } else if (msn.severity == IMarker.SEVERITY_ERROR) {
+ ReportProblemsUtil.reportError(msn.file, CHECKER_NAME, msn.checkerName, msn.message, node.getStartLine(),
node.getOffset(), node.getEndOffset());
}
} catch (NullPointerException | CoreException e) {
@@ -155,7 +156,21 @@
marker.delete();
}
}
+ }
+ /**
+ * Deletes all the matching markers inside the given project.
+ * @param project the active project
+ * @param checkerName the name of the creating checker
+ * @throws CoreException
+ */
+ void deleteProjectMarkers(IProject project, String checkerName) throws CoreException {
+ IMarker[] markers = project.findMarkers(null, false, IResource.DEPTH_INFINITE);
+ for (IMarker marker : markers) {
+ if (marker != null && marker.exists() && marker.getAttribute(CHECKER_NAME, "").equals(checkerName)) {
+ marker.delete();
+ }
+ }
}
private ModelExplorerPageBookView getModelExplorerPageBookView() {
diff --git a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/IdentifiersChecker.java b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/IdentifiersChecker.java
new file mode 100644
index 0000000..62be6d4
--- /dev/null
+++ b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/IdentifiersChecker.java
@@ -0,0 +1,154 @@
+package org.polarsys.chess.checkers.core.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Property;
+import org.polarsys.chess.checkers.core.checkerManager.Checker;
+import org.polarsys.chess.checkers.core.checkerManager.CheckerMessage;
+import org.polarsys.chess.contracts.profile.chesscontract.util.EntityUtil;
+
+public class IdentifiersChecker extends Checker {
+ protected Package systemViewPackage;
+ private static final Logger logger = Logger.getLogger(IdentifiersChecker.class);
+ private static final String checkerName = "IdentifierChecker";
+
+ /**
+ * Default constructor
+ */
+ public IdentifiersChecker() {
+ super(checkerName, getTags());
+ }
+
+ /**
+ * Creates the checker with the given priority.
+ * @param priority the priority
+ */
+ public IdentifiersChecker(int priority) {
+ super(checkerName, getTags(), priority);
+ }
+
+ /**
+ * Constructor with explicit tags.
+ * @param tags the tags identifying this checker
+ */
+ public IdentifiersChecker(Set<String> tags) {
+ super(checkerName, tags);
+ }
+
+ /**
+ * Constructor with explicit tags and priority.
+ * @param tags the tags identifying this checker
+ * @param priority the priority
+ */
+ public IdentifiersChecker(Set<String> tags, int priority) {
+ super(checkerName, tags, priority);
+ }
+
+ @Override
+ public List<CheckerMessage> check(IProgressMonitor monitor) throws Exception {
+ List<CheckerMessage> messages = new ArrayList<CheckerMessage>();
+ Collection<Class> blocks = null;
+ try {
+ blocks = (Collection<Class>) EntityUtil.getInstance().getAllClasses(systemViewPackage);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ monitor.beginTask(checkerName, blocks.size());
+ for (Class block : blocks) {
+ messages.addAll(processBlock(block));
+ if (monitor.isCanceled())
+ throw new Exception("Checker interrupted");
+ monitor.worked(1);
+ }
+ return messages;
+ }
+
+ /**
+ * Processes the given block.
+ *
+ * @param block
+ * the block to process
+ * @return a list of messages
+ */
+ protected List<CheckerMessage> processBlock(Class block) {
+ final EList<NamedElement> elements = filterElements(block);
+ return processElements(elements);
+ }
+
+ /**
+ * Processes the given list of elements.
+ *
+ * @param block
+ * the list to process
+ * @return a list of warnings
+ */
+ protected List<CheckerMessage> processElements(EList<NamedElement> elements) {
+ List<CheckerMessage> messages = new ArrayList<CheckerMessage>();
+
+ for (NamedElement element : elements) {
+ final String name = element.getName();
+ logger.debug("Processing " + name);
+ if (!isValidId(name)) {
+ logger.debug("The element name is not a valid identifier: " + name);
+ final String msg = "The element name is not a valid identifier: " + name;
+ messages.add(new CheckerMessage(msg, IMarker.SEVERITY_WARNING, element, checkerName));
+ }
+ }
+ return messages;
+ }
+
+ protected boolean isValidId(String id) {
+ return javax.lang.model.SourceVersion.isIdentifier(id) && (!javax.lang.model.SourceVersion.isKeyword(id));
+ }
+
+ /**
+ * Creates the list of elements to be analized (incuding the block itself). Can be overridden if necessary.
+ * @param elements
+ * @return the filtered elements
+ */
+ protected EList<NamedElement> filterElements(Class block) {
+ final EList<Property> attributes = block.getOwnedAttributes();
+ final EList<Operation> operations = block.getOwnedOperations();
+ final EList<Behavior> behaviors = block.getOwnedBehaviors();
+ final EList<Port> ports = block.getOwnedPorts();
+
+ final EList<NamedElement> elements = new BasicEList<NamedElement>(attributes.size() +
+ operations.size() + behaviors.size() + ports.size() + 1);
+ elements.addAll(attributes);
+ elements.addAll(operations);
+ elements.addAll(behaviors);
+ elements.addAll(ports);
+ elements.add(block);
+ return elements;
+ }
+
+ private static Set<String> getTags() {
+ Set<String> tags = new HashSet<String>();
+ tags.add("fast");
+ tags.add("warnings");
+ tags.add("sysml");
+ return tags;
+ }
+
+ @Override
+ public void init() throws Exception {
+ systemViewPackage = EntityUtil.getInstance().getCurrentSystemView();
+ }
+}
diff --git a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/NameDistance.java b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/NameDistance.java
index 94da2ab..46727be 100644
--- a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/NameDistance.java
+++ b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/NameDistance.java
@@ -6,6 +6,7 @@
import java.util.List;
import java.util.Set;
import org.apache.log4j.Logger;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
@@ -154,7 +155,7 @@
if (distance == 0) {
final String msg = equalsMsg(first, second);
- messages.add(createMessage(msg, 2, first, unifiedName));
+ messages.add(createMessage(msg, IMarker.SEVERITY_ERROR, first, unifiedName));
}
if (distance <= threshold) {
similarNames.add(second.getName());
@@ -164,7 +165,7 @@
// If some similarities are found, store the entry in the warnings
if (similarNames.size() > 0) {
final String msg = similarMsg(first, similarNames);
- messages.add(createMessage(msg, 1, first, unifiedName));
+ messages.add(createMessage(msg, IMarker.SEVERITY_WARNING, first, unifiedName));
}
}
return messages;
diff --git a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/StateStatus.java b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/StateStatus.java
index 5cfb952..ae751ed 100644
--- a/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/StateStatus.java
+++ b/plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/impl/StateStatus.java
@@ -7,6 +7,7 @@
import java.util.Set;
import org.apache.log4j.Logger;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
@@ -128,7 +129,7 @@
}
if (dead) {
final String msg = deadMsg(state, block);
- errors.add(createMessage(msg, 2, state, unifiedName));
+ errors.add(createMessage(msg, IMarker.SEVERITY_ERROR, state, unifiedName));
deadStates.add(state.getName());
}
@@ -179,7 +180,7 @@
}
if (unreachable) {
final String msg = unreachableMsg(state, block);
- errors.add(createMessage(msg, 2, state, unifiedName));
+ errors.add(createMessage(msg, IMarker.SEVERITY_ERROR, state, unifiedName));
unreachableStates.add(state.getName());
}
}
@@ -254,13 +255,13 @@
if ((dead && stateCounter > 2)) {
final String msg = deadMsg(state, block);
- errors.add(createMessage(msg, 2, state, unifiedName));
+ errors.add(createMessage(msg, IMarker.SEVERITY_ERROR, state, unifiedName));
deadStates.add(state.getName());
}
if ((unreachable)) {
final String msg = unreachableMsg(state, block);
- errors.add(createMessage(msg, 2, state, unifiedName));
+ errors.add(createMessage(msg, IMarker.SEVERITY_ERROR, state, unifiedName));
unreachableStates.add(state.getName());
}
}
diff --git a/plugins/org.polarsys.chess.instance.view/.gitignore b/plugins/org.polarsys.chess.instance.view/.gitignore
index 0e37a66..ba077a4 100644
--- a/plugins/org.polarsys.chess.instance.view/.gitignore
+++ b/plugins/org.polarsys.chess.instance.view/.gitignore
@@ -1,2 +1 @@
bin
-/src-gen/
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
index e0766df..7695b14 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/DialogUtils.java
@@ -40,11 +40,15 @@
}
public String getDirectoryNameFromDialog(String title) throws Exception {
+ return getDirectoryNameFromDialog(title, directoryUtils.getCurrentProjectDir());
+ }
+
+ public String getDirectoryNameFromDialog(String title, String path) throws Exception {
final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
final DirectoryDialog directoryDialog = new DirectoryDialog(shell);
directoryDialog.setText(title);
- directoryDialog.setFilterPath(directoryUtils.getCurrentProjectDir());
+ directoryDialog.setFilterPath(path);
String directoryName = directoryDialog.open();
return directoryName;
diff --git a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java
index c28272c..8f1db20 100644
--- a/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java
+++ b/plugins/org.polarsys.chess.service/src/org/polarsys/chess/service/gui/utils/ReportProblemsUtil.java
@@ -36,6 +36,8 @@
/**
* Reports a warning in the Problems tab.
* @param resource the resource
+ * @param ownerField the name of the field to store the owner
+ * @param ownerName the name of the creator of this report
* @param msg the message to display
* @param lineNumber the line to select (or 0)
* @param charStart the start of selection (or 0)
@@ -44,15 +46,17 @@
* @throws CoreException
* @throws NullPointerException
*/
- public static IMarker reportWarning(IResource resource, String msg, int lineNumber,
+ public static IMarker reportWarning(IResource resource, String ownerField, String ownerName, String msg, int lineNumber,
int charStart, int charEnd) throws CoreException, NullPointerException {
- return reportMessage(resource, msg, lineNumber, charStart, charEnd,
+ return reportMessage(resource, ownerField, ownerName, msg, lineNumber, charStart, charEnd,
IMarker.PROBLEM, IMarker.SEVERITY_WARNING);
}
/**
* Reports an error in the Problems tab.
* @param resource the resource
+ * @param ownerField the name of the field to store the owner
+ * @param ownerName the name of the creator of this report
* @param msg the message to display
* @param lineNumber the line to select (or 0)
* @param charStart the start of selection (or 0)
@@ -61,15 +65,17 @@
* @throws CoreException
* @throws NullPointerException
*/
- public static IMarker reportError(IResource resource, String msg, int lineNumber,
+ public static IMarker reportError(IResource resource, String ownerField, String ownerName, String msg, int lineNumber,
int charStart, int charEnd) throws CoreException, NullPointerException {
- return reportMessage(resource, msg, lineNumber, charStart, charEnd,
+ return reportMessage(resource, ownerField, ownerName, msg, lineNumber, charStart, charEnd,
IMarker.PROBLEM, IMarker.SEVERITY_ERROR);
}
/**
* Reports an info in the Problems tab.
* @param resource the resource
+ * @param ownerField the name of the field to store the owner
+ * @param ownerName the name of the creator of this report
* @param msg the message to display
* @param lineNumber the line to select (or 0)
* @param charStart the start of selection (or 0)
@@ -78,14 +84,14 @@
* @throws CoreException
* @throws NullPointerException
*/
- public static IMarker reportInfo(IResource resource, String msg, int lineNumber,
+ public static IMarker reportInfo(IResource resource, String ownerField, String ownerName, String msg, int lineNumber,
int charStart, int charEnd) throws CoreException, NullPointerException {
- return reportMessage(resource, msg, lineNumber, charStart, charEnd,
+ return reportMessage(resource, ownerField, ownerName, msg, lineNumber, charStart, charEnd,
IMarker.PROBLEM, IMarker.SEVERITY_INFO);
}
- private static IMarker reportMessage(IResource resource, String msg, int lineNumber, int charStart,
- int charEnd, String type, int severity) throws CoreException, NullPointerException {
+ private static IMarker reportMessage(IResource resource, String ownerField, String ownerName, String msg, int lineNumber,
+ int charStart, int charEnd, String type, int severity) throws CoreException, NullPointerException {
if (resource == null) {
throw new NullPointerException("Resource is null");
}
@@ -100,7 +106,7 @@
if (charStart > 0) attributes.put(IMarker.CHAR_START, new Integer(charStart)); // Note: this value is from the beginning of the document
if (charEnd > 0) attributes.put(IMarker.CHAR_END, new Integer(charEnd)); // Note: this value is from the beginning of the document
// m.setAttribute(IMarker.LOCATION, "whole file"); // This is a generic info about location
-
+ attributes.put(ownerField, ownerName);
m.setAttributes(attributes);
return m;
}
diff --git a/plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF
index af62535..b79bd87 100644
--- a/plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF
@@ -31,7 +31,6 @@
org.eclipse.core.databinding;bundle-version="1.4.1",
org.eclipse.papyrus.infra.widgets,
org.eclipse.papyrus.views.properties,
- org.polarsys.chess.xtext.fladsl.ui,
org.eclipse.xtext.ui;bundle-version="2.7.3",
org.eclipse.gmf.runtime.diagram.ui.properties,
com.google.inject,
@@ -44,4 +43,6 @@
org.eclipse.papyrus.marte.static.profile,
org.eclipse.papyrus.infra.properties.ui,
org.polarsys.chess.xtext.global;bundle-version="1.0.0",
- org.eclipse.emf.ecore
+ org.eclipse.emf.ecore,
+ org.polarsys.chess.xtext.fladsl.ui
+Import-Package: org.polarsys.chess.xtext.fladsl.ui.internal
diff --git a/plugins/org.polarsys.chess.tabbedproperties/build.properties b/plugins/org.polarsys.chess.tabbedproperties/build.properties
index fffc2ea..bfcbbe5 100644
--- a/plugins/org.polarsys.chess.tabbedproperties/build.properties
+++ b/plugins/org.polarsys.chess.tabbedproperties/build.properties
@@ -3,7 +3,6 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- bin/,\
build.properties,\
readme.txt,\
CHESS.ctx,\
diff --git a/plugins/org.polarsys.chess.tabbedproperties/src/org/polarsys/chess/tabbedproperties/xtext/XtextInputDialog.java b/plugins/org.polarsys.chess.tabbedproperties/src/org/polarsys/chess/tabbedproperties/xtext/XtextInputDialog.java
index f5711a6..b086847 100644
--- a/plugins/org.polarsys.chess.tabbedproperties/src/org/polarsys/chess/tabbedproperties/xtext/XtextInputDialog.java
+++ b/plugins/org.polarsys.chess.tabbedproperties/src/org/polarsys/chess/tabbedproperties/xtext/XtextInputDialog.java
@@ -31,7 +31,7 @@
import org.eclipse.xtext.ui.editor.embedded.EmbeddedEditor;
import org.eclipse.xtext.ui.editor.embedded.EmbeddedEditorFactory;
import org.eclipse.xtext.ui.editor.embedded.EmbeddedEditorModelAccess;
-import org.polarsys.chess.xtext.ui.internal.FlaDslActivator;
+import org.polarsys.chess.xtext.fladsl.ui.internal.FladslActivator;
import com.google.inject.Injector;
@@ -227,7 +227,7 @@
if( this.xtextEnabled ) {
- Injector injector = FlaDslActivator.getInstance().getInjector(FlaDslActivator.ORG_POLARSYS_CHESS_XTEXT_FLADSL);
+ Injector injector = FladslActivator.getInstance().getInjector(FladslActivator.ORG_POLARSYS_CHESS_XTEXT_FLADSL);
FLAExpressionsProvider provider = injector.getInstance(FLAExpressionsProvider.class);
diff --git a/plugins/org.polarsys.chess.test.runtime/.classpath b/plugins/org.polarsys.chess.test.runtime/.classpath
index 098194c..eca7bdb 100644
--- a/plugins/org.polarsys.chess.test.runtime/.classpath
+++ b/plugins/org.polarsys.chess.test.runtime/.classpath
@@ -1,6 +1,6 @@
<?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-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.polarsys.chess.test.runtime/.gitignore b/plugins/org.polarsys.chess.test.runtime/.gitignore
index ae3c172..09e3bc9 100644
--- a/plugins/org.polarsys.chess.test.runtime/.gitignore
+++ b/plugins/org.polarsys.chess.test.runtime/.gitignore
@@ -1 +1,2 @@
/bin/
+/target/
diff --git a/plugins/org.polarsys.chess.test.runtime/.project b/plugins/org.polarsys.chess.test.runtime/.project
index 065b86f..1fda9d1 100644
--- a/plugins/org.polarsys.chess.test.runtime/.project
+++ b/plugins/org.polarsys.chess.test.runtime/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -20,8 +25,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/plugins/org.polarsys.chess.test.runtime/META-INF/MANIFEST.MF b/plugins/org.polarsys.chess.test.runtime/META-INF/MANIFEST.MF
index 8cad701..9a16678 100644
--- a/plugins/org.polarsys.chess.test.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.polarsys.chess.test.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.polarsys.chess.test.runtime;singleton:=true
-Bundle-Version: 0.9.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.polarsys.chess.test.runtime.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -15,6 +15,6 @@
org.eclipse.jdt.junit.core,
org.eclipse.swt,
org.polarsys.chess.chessmlprofile
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/plugins/org.polarsys.chess.test.runtime/pom.xml b/plugins/org.polarsys.chess.test.runtime/pom.xml
index 5a7b821..6ee6dab 100644
--- a/plugins/org.polarsys.chess.test.runtime/pom.xml
+++ b/plugins/org.polarsys.chess.test.runtime/pom.xml
@@ -2,14 +2,12 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <parent>
+ <parent>
<groupId>org.polarsys.chess</groupId>
- <artifactId>CHESS</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <artifactId>org.polarsys.chess.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../org.polarsys.chess.parent</relativePath>
</parent>
- <groupId>org.polarsys.chess</groupId>
<artifactId>org.polarsys.chess.test.runtime</artifactId>
- <version>0.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.polarsys.chess.test.runtime/target/MANIFEST.MF b/plugins/org.polarsys.chess.test.runtime/target/MANIFEST.MF
new file mode 100644
index 0000000..0bc15f4
--- /dev/null
+++ b/plugins/org.polarsys.chess.test.runtime/target/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: org.polarsys.chess.test.runtime;singleton:=true
+Bundle-Name: %pluginName
+Bundle-Version: 1.0.0.202004191103
+Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.um
+ l2.uml;bundle-version="5.0.2",org.eclipse.core.resources;bundle-versi
+ on="3.9.1",org.polarsys.chess.core,org.eclipse.ui.workbench,org.eclip
+ se.ui.ide;bundle-version="3.10.2",org.junit,org.eclipse.jdt.junit.cor
+ e,org.eclipse.swt,org.polarsys.chess.chessmlprofile
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.polarsys.chess.test.runtime.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+
