IConfigurationElement arrays changed for ArrayLists in GEMOC tools (#177)

* IConfigurationElement arrays changed for ArrayLists in GEMOC tools
* DslValidator check for metaprogramming approach now in its own function

Signed-off-by: Ronan Guéguen <[email protected]>

Author: Kairides

commons/plugins/org.eclipse.gemoc.dsl.ui/src/org/eclipse/gemoc/ui/contentassist/DslProposalProvider.xtend

@@ -42,7 +42,7 @@ class DslProposalProvider extends AbstractDslProposalProvider {
 		super.complete_SPACE(model, ruleCall, context, acceptor)
 
 		var String metaprog
-		var IConfigurationElement[] keys
+		var ArrayList<IConfigurationElement> keys = new ArrayList<IConfigurationElement>()
 		var ArrayList<String> dslKeys = new ArrayList<String>()
 
 		if (model instanceof Dsl){

commons/plugins/org.eclipse.gemoc.dsl.ui/src/org/eclipse/gemoc/ui/highlighting/DslHighlightingCalculator.xtend

@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IConfigurationElement
 import org.eclipse.gemoc.dsl.Dsl
 import org.eclipse.gemoc.dsl.Entry
 import org.eclipse.gemoc.xdsmlframework.api.extensions.metaprog.LanguageComponentHelper
+import java.util.ArrayList
 
 public class DslHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
 
@@ -24,16 +25,15 @@ public class DslHighlightingCalculator extends DefaultSemanticHighlightingCalcul
 		val LanguageComponentHelper languageHelper = new LanguageComponentHelper()
 		var Dsl dsl = root.getSemanticElement as Dsl
 		var String metaprog
-		var IConfigurationElement[] keys
+		var ArrayList<IConfigurationElement> keys = new ArrayList<IConfigurationElement>();
 
 		for(Entry entry : dsl.getEntries){
 			if("metaprog".equals(entry.key)){
 				metaprog = entry.value
+				keys = languageHelper.getFullApproachKeys(metaprog)
 			}
 		}
 
-		keys = languageHelper.getFullApproachKeys(metaprog)
-		
 		for (INode node : root.getAsTreeIterable()) {
 			val EObject grammarElement = node.getGrammarElement();
 
@@ -54,13 +54,20 @@ public class DslHighlightingCalculator extends DefaultSemanticHighlightingCalcul
 
 							if(sem instanceof Entry){
 
-								if(!keys.filter[e | (e.getAttribute('name') == sem.key) && (e.getAttribute('optional').matches("false"))].isEmpty){
-									acceptor.addPosition(node.getOffset(), node.getLength(),
+								if(!keys.empty){
+									if(!keys.filter[e | (e.getAttribute('name') == sem.key) && (e.getAttribute('optional').matches("false"))].isEmpty){
+										acceptor.addPosition(node.getOffset(), node.getLength(),
 										DslHighlightingConfiguration.KEY_PLUGIN_ID);
-								}else if (!keys.filter[e | (e.getAttribute('name') == sem.key) && (e.getAttribute('optional').matches("true"))].isEmpty){
-									acceptor.addPosition(node.getOffset(), node.getLength(),
-									DslHighlightingConfiguration.OPTIONAL_KEY_PLUGIN_ID);
-								}else{
+									}else if(!keys.filter[e | (e.getAttribute('name') == sem.key) && (e.getAttribute('optional').matches("true"))].isEmpty){
+										acceptor.addPosition(node.getOffset(), node.getLength(),
+										DslHighlightingConfiguration.OPTIONAL_KEY_PLUGIN_ID);
+									}else{
+										acceptor.addPosition(node.getOffset(), node.getLength(),
+										DslHighlightingConfiguration.KEY_ID);
+									
+									}
+								}
+								else{
 									acceptor.addPosition(node.getOffset(), node.getLength(),
 									DslHighlightingConfiguration.KEY_ID);
 								}

commons/plugins/org.eclipse.gemoc.dsl/src/org/eclipse/gemoc/validation/DslValidator.xtend

@@ -28,7 +28,8 @@ class DslValidator extends AbstractDslValidator {
 
 	public val IConfigurationElement[] exts = org.eclipse.core.runtime.Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.gemoc.gemoc_language_workbench.metaprog")
 	public val LanguageComponentHelper languageHelper = new LanguageComponentHelper();
-	public var IConfigurationElement[] keys
+	public var ArrayList<IConfigurationElement> keys = new ArrayList<IConfigurationElement>()
+	public var String metaprog
 
 	//public var IRuleProvider providedValidator
 
@@ -86,23 +87,26 @@ class DslValidator extends AbstractDslValidator {
 	}
 
 	@Check
-	def checkMissingKeys(Dsl dsl){
-		var String metaprog
+	def checkApproach(Entry entry) {
+		
 		var ArrayList<String> approachesList = new ArrayList<String>()
 
-		for (Entry entry: dsl.getEntries){
-			if("metaprog".matches(entry.key)){
+		if("metaprog".matches(entry.key)){
 				metaprog = entry.value
 
 				for(IConfigurationElement elem : exts){
 					approachesList.add(elem.getAttribute("name"))
 				}
 
-				if(!approachesList.contains(entry.value)){
+				if(!approachesList.contains(metaprog)){
 				error("Unknown metaprogramming approach", DslPackage.Literals.ENTRY__VALUE)
 				}
 			}
-		}
+	}
+	
+	
+	@Check
+	def checkMissingKeys(Dsl dsl){
 
 		var ArrayList<String> dslKeys = new ArrayList<String>()
 		for(Entry entry : dsl.getEntries){
@@ -118,7 +122,5 @@ class DslValidator extends AbstractDslValidator {
 
 		}
 	}
-	
-	
 
 }