Merge branch 'master' into 'master'

Fixed a bug where the rule avoidThreadGroup would throw an error.

See merge request naomod/mde/projet-2019!52

src/main/atl/analysis.atl

@@ -463,7 +463,7 @@ rule measureAvoidThreadGroup(variable : java!VariableDeclarationFragment) {
 			measure <- noc,
 			measurements <- measurement
 		),
-		noc: smm!DimnsionalMeasure (
+		noc: smm!DimensionalMeasure (
 			name <- 'Avoid Thread Group',
 			shortDescription <- 'Avoid using java.lang.ThreadGroup; although it is intended to be used in a threaded environment it contains methods that are not thread-safe.'		
 		),

src/main/atl/multithreading.atl

@@ -43,23 +43,9 @@ helper def:isDontCallThreadRun(s:java!MethodInvocation): Boolean =
 --Goes through all the variables to check if the following rule is followed:
 --Avoid using java.lang.ThreadGroup;
 helper def: avoidThreadGroup() : Set(smm!Measure) =
-	java!VariableDeclarationFragment.allInstances() -> iterate(i; res : Set(smm!Measure) = Set{}  | 
-	
-		if (thisModule.isThreadGroup(i))
-			then res->union(Set{thisModule.measureAvoidThreadGroup(i)})
-			else res
-		endif
-		
-	);
-
---Detect a wrong usage of the variable type java.lang.ThreadGroup
---return true if the variable of type java.lang.ThreadGroup
-helper def:isThreadGroup(s:java!VariableDeclarationFragment): Boolean =
-	if s.variablesContainer.type.type.name.toString() = 'ThreadGroup' then
-		true
-	else
-		false
-	endif;
+    java!VariableDeclarationFragment.allInstances() -> 
+		select(i | i.variablesContainer.type.toString() <> 'OclUndefined')-> 
+			select(s|s.variablesContainer.type.type.name.toString() = 'ThreadGroup')->collect(i | thisModule.measureAvoidThreadGroup(i) );
 	
 --------------------------------------------- UseNotifyAllInsteadOfNotify ---------------------------------------------