[lang] Make the generation of the agent type members faster.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Apr 10, 2019 · ebe9bb8 · ebe9bb8
1 parent 9d4ea66
commit ebe9bb8
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/SARLJvmModelInferrer.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/jvmmodel/SARLJvmModelInferrer.java
@@ -2196,20 +2196,21 @@ protected void appendAOPMembers(
 				null,
 				this.sarlSignatureProvider);
 
+		final List<XtendMember> delayedMembers = new LinkedList<>();
+
 		for (final XtendMember feature : container.getMembers()) {
-			if (context.isSupportedMember(feature)
-					&& (!(feature instanceof SarlCapacityUses))
-					&& (!(feature instanceof SarlRequiredCapacity))) {
-				transform(feature, featureContainerType, true);
+			if (context.isSupportedMember(feature)) {
+				if ((feature instanceof SarlCapacityUses)
+						|| (feature instanceof SarlRequiredCapacity)) {
+					delayedMembers.add(feature);
+				} else {
+					transform(feature, featureContainerType, true);
+				}
 			}
 		}
 
-		for (final XtendMember feature : container.getMembers()) {
-			if (context.isSupportedMember(feature)
-					&& ((feature instanceof SarlCapacityUses)
-							|| (feature instanceof SarlRequiredCapacity))) {
-				transform(feature, featureContainerType, false);
-			}
+		for (final XtendMember feature : delayedMembers) {
+			transform(feature, featureContainerType, false);
 		}
 
 		// Add event handlers