Extract addFormalCtTypeParameterAt into a static method

But this fails architecture enforcer tests

Author: slarse

src/main/java/spoon/support/reflect/declaration/CtConstructorImpl.java

@@ -7,7 +7,6 @@
  */
 package spoon.support.reflect.declaration;
 
-import spoon.reflect.ModelElementContainerDefaultCapacities;
 import spoon.reflect.annotations.MetamodelPropertyField;
 import spoon.reflect.declaration.CtConstructor;
 import spoon.reflect.declaration.CtFormalTypeDeclarer;
@@ -26,6 +25,7 @@
 import spoon.support.UnsettableProperty;
 import spoon.support.reflect.CtExtendedModifier;
 import spoon.support.reflect.CtModifierHandler;
+import spoon.support.reflect.internal.CtFormalTypeDeclarerHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -104,15 +104,8 @@ public <C extends CtFormalTypeDeclarer> C setFormalCtTypeParameters(List<CtTypeP
 
 	@Override
 	public <C extends CtFormalTypeDeclarer> C addFormalCtTypeParameterAt(int position, CtTypeParameter formalTypeParameter) {
-		if (formalTypeParameter == null) {
-			return (C) this;
-		}
-		if (formalCtTypeParameters == CtElementImpl.<CtTypeParameter>emptyList()) {
-			formalCtTypeParameters = new ArrayList<>(ModelElementContainerDefaultCapacities.TYPE_TYPE_PARAMETERS_CONTAINER_DEFAULT_CAPACITY);
-		}
-		formalTypeParameter.setParent(this);
-		getFactory().getEnvironment().getModelChangeListener().onListAdd(this, CtRole.TYPE_PARAMETER, this.formalCtTypeParameters, formalTypeParameter);
-		formalCtTypeParameters.add(position, formalTypeParameter);
+		formalCtTypeParameters = CtFormalTypeDeclarerHelper.addFormalCtTypeParameterAt(
+				this, formalCtTypeParameters, position, formalTypeParameter);
 		return (C) this;
 	}
 

src/main/java/spoon/support/reflect/declaration/CtMethodImpl.java

@@ -23,6 +23,7 @@
 import spoon.reflect.visitor.filter.AllTypeMembersFunction;
 import spoon.support.reflect.CtExtendedModifier;
 import spoon.support.reflect.CtModifierHandler;
+import spoon.support.reflect.internal.CtFormalTypeDeclarerHelper;
 import spoon.support.visitor.ClassTypingContext;
 
 import java.util.ArrayList;
@@ -109,15 +110,8 @@ public <C extends CtFormalTypeDeclarer> C setFormalCtTypeParameters(List<CtTypeP
 
 	@Override
 	public <C extends CtFormalTypeDeclarer> C addFormalCtTypeParameterAt(int position, CtTypeParameter formalTypeParameter) {
-		if (formalTypeParameter == null) {
-			return (C) this;
-		}
-		if (formalCtTypeParameters == CtElementImpl.<CtTypeParameter>emptyList()) {
-			formalCtTypeParameters = new ArrayList<>(ModelElementContainerDefaultCapacities.TYPE_TYPE_PARAMETERS_CONTAINER_DEFAULT_CAPACITY);
-		}
-		formalTypeParameter.setParent(this);
-		getFactory().getEnvironment().getModelChangeListener().onListAdd(this, CtRole.TYPE_PARAMETER, this.formalCtTypeParameters, formalTypeParameter);
-		formalCtTypeParameters.add(position, formalTypeParameter);
+		formalCtTypeParameters = CtFormalTypeDeclarerHelper.addFormalCtTypeParameterAt(
+				this, formalCtTypeParameters, position, formalTypeParameter);
 		return (C) this;
 	}
 

src/main/java/spoon/support/reflect/declaration/CtTypeImpl.java

@@ -46,6 +46,7 @@
 import spoon.support.compiler.SnippetCompilationHelper;
 import spoon.support.reflect.CtExtendedModifier;
 import spoon.support.reflect.CtModifierHandler;
+import spoon.support.reflect.internal.CtFormalTypeDeclarerHelper;
 import spoon.support.util.QualifiedNameBasedSortedSet;
 import spoon.support.util.SignatureBasedSortedSet;
 import spoon.support.visitor.ClassTypingContext;
@@ -655,15 +656,8 @@ public <C extends CtFormalTypeDeclarer> C setFormalCtTypeParameters(List<CtTypeP
 
 	@Override
 	public <C extends CtFormalTypeDeclarer> C addFormalCtTypeParameterAt(int position, CtTypeParameter formalTypeParameter) {
-		if (formalTypeParameter == null) {
-			return (C) this;
-		}
-		if (formalCtTypeParameters == CtElementImpl.<CtTypeParameter>emptyList()) {
-			formalCtTypeParameters = new ArrayList<>(ModelElementContainerDefaultCapacities.TYPE_TYPE_PARAMETERS_CONTAINER_DEFAULT_CAPACITY);
-		}
-		formalTypeParameter.setParent(this);
-		getFactory().getEnvironment().getModelChangeListener().onListAdd(this, CtRole.TYPE_PARAMETER, this.formalCtTypeParameters, formalTypeParameter);
-		formalCtTypeParameters.add(position, formalTypeParameter);
+		formalCtTypeParameters = CtFormalTypeDeclarerHelper.addFormalCtTypeParameterAt(
+				this, formalCtTypeParameters, position, formalTypeParameter);
 		return (C) this;
 	}
 

src/main/java/spoon/support/reflect/internal/CtFormalTypeDeclarerHelper.java

@@ -0,0 +1,29 @@
+package spoon.support.reflect.internal;
+
+import spoon.reflect.ModelElementContainerDefaultCapacities;
+import spoon.reflect.declaration.CtFormalTypeDeclarer;
+import spoon.reflect.declaration.CtTypeParameter;
+import spoon.reflect.path.CtRole;
+import spoon.support.reflect.declaration.CtElementImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CtFormalTypeDeclarerHelper {
+
+	private CtFormalTypeDeclarerHelper() {
+	}
+
+	public static <C extends CtFormalTypeDeclarer> List<CtTypeParameter> addFormalCtTypeParameterAt(C receiver, List<CtTypeParameter> formalCtTypeParameters, int position, CtTypeParameter formalTypeParameter) {
+		if (formalTypeParameter == null) {
+			return formalCtTypeParameters;
+		}
+		if (formalCtTypeParameters == CtElementImpl.<CtTypeParameter>emptyList()) {
+			formalCtTypeParameters = new ArrayList<>(ModelElementContainerDefaultCapacities.TYPE_TYPE_PARAMETERS_CONTAINER_DEFAULT_CAPACITY);
+		}
+		formalTypeParameter.setParent(receiver);
+		receiver.getFactory().getEnvironment().getModelChangeListener().onListAdd(receiver, CtRole.TYPE_PARAMETER, formalCtTypeParameters, formalTypeParameter);
+		formalCtTypeParameters.add(position, formalTypeParameter);
+		return formalCtTypeParameters;
+	}
+}