Merge branch 'master' into 'master'

Fix Bugged rules avoidDollarSigns

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

src/main/atl/analysis.atl

@@ -44,6 +44,7 @@ helper def: allMeasures(project : java!Model): Set(smm!Measure) =
 		
 		-- Code Style rules
 		--
+		thisModule.avoidDollarSigns(),
 		thisModule.avoidPrefixingMethodParameters(),
 		thisModule.extendsObject(),
 		thisModule.fieldDeclarationsShouldBeAtStartOfClass(),
@@ -132,7 +133,6 @@ helper def: allMeasures(project : java!Model): Set(smm!Measure) =
 		-- thisModule.emptyfinalizeMethod(),
 		-- thisModule.doNotThrowExceptionInFinally(),
 		-- thisModule.finalizeShouldBeProtected(),
-		-- thisModule.avoidDollarSigns(),
 		-- thisModule.returnEmptyArrayRatherThanNull(),
 		-- thisModule.replaceVectorToList()
 		-- thisModule.unusedPrivateMethod ()

src/main/atl/codestyle.atl

@@ -5,7 +5,7 @@ library codestyle;
 -- Rule for metrics AvoidDollarSigns : return the set of class Measures that violates the rule.
 helper def: avoidDollarSigns() : Set(smm!Measure) =
 	-- Browse through all variable/method/class/interface. 
-	java!TypeDeclaration.allInstances()->union(java!MethodDeclaration.allInstances())->union(java!VariableDeclaration.allInstances())->select(i | i.name.indexOf('$') <> -1)
+	java!TypeDeclaration.allInstances()->union(java!MethodDeclaration.allInstances())->union(java!VariableDeclaration.allInstances())-> reject(each | each.isProxy())->select(i | i.name.indexOf('$') <> -1)
 	->collect(i | thisModule.MesureAvoidDollarSigns(i));
 
 -- Rule for metrics shortMethodName : return the set of method Measures that violates the rule.
@@ -166,4 +166,4 @@ helper context java!ClassDeclaration def: isNotAllFieldsDeclaredAtStartOfClass()
 				endif
 			endif
 		)
-	endif;
+	endif;
\ No newline at end of file