mavenize fla dsl plugins

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslStandaloneSetup.xtend

+/*
+ * 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()
+	}
+}

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2

-/*------------------------------------------------------------------------------
- -
- - 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"
+			}
+		}
+	}
+}

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend

-/*
- * 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)
-	}
-}

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting2/FlaDslFormatter.xtend

+/*
+ * 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
+}

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend

-/*
- * 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(', '))
+	}
+}

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend

-/*
- * 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 {
+
+}

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/serializer/FlaDslSemanticSequencer.xtend

+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.serializer
+
+
+class FlaDslSemanticSequencer extends AbstractFlaDslSemanticSequencer {
+}

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/serializer/FlaDslSyntacticSequencer.xtend

+/*
+ * generated by Xtext 2.12.0
+ */
+package org.polarsys.chess.xtext.serializer
+
+
+class FlaDslSyntacticSequencer extends AbstractFlaDslSyntacticSequencer {
+}

plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend

-/*
- * 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 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', 
-//					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)
+//		}
+//	}
+	
+}

plugins/org.polarsys.chess.tabbedproperties/META-INF/MANIFEST.MF

@@ -31,7 +31,6 @@ Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",
  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 @@ Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",
  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

plugins/org.polarsys.chess.tabbedproperties/src/org/polarsys/chess/tabbedproperties/xtext/XtextInputDialog.java

@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Text;
 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 @@ public class XtextInputDialog extends Dialog {
       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);
   		

plugins/org.polarsys.chess.test.runtime/.classpath

 <?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"/>

plugins/org.polarsys.chess.test.runtime/.gitignore

 /bin/
+/target/

plugins/org.polarsys.chess.test.runtime/.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<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>

plugins/org.polarsys.chess.test.runtime/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 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 @@ Require-Bundle: org.eclipse.ui,
  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

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>

plugins/org.polarsys.chess.test.runtime/target/MANIFEST.MF

+Manifest-Version: 1.0
+Bundle-SymbolicName: org.polarsys.chess.test.runtime;singleton:=true
+Bundle-Name: %pluginName
+Bundle-Version: 1.0.0.202004191009
+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
+