Remove marker interface ForceParameter

Signed-off-by: NathanDissoubray <nathan.dissoubray@rte-france.com>

Author: NathanDissoubray

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/AbstractForce.java

@@ -8,24 +8,13 @@
 
 package com.powsybl.diagram.util.forcelayout.forces;
 
-import com.powsybl.diagram.util.forcelayout.forces.forceparameter.ForceParameter;
 import com.powsybl.diagram.util.forcelayout.geometry.ForceGraph;
 import com.powsybl.diagram.util.forcelayout.geometry.Point;
 import com.powsybl.diagram.util.forcelayout.geometry.Vector2D;
 
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public abstract class AbstractForce<V, E, P extends ForceParameter> {
-    P forceParameter;
-
-    AbstractForce(P forceParameter) {
-        this.forceParameter = forceParameter;
-    }
-
-    public void setForceParameter(P forceParameter) {
-        this.forceParameter = forceParameter;
-    }
-
+public abstract class AbstractForce<V, E> {
     public abstract Vector2D calculateForce(V forThisVertex, Point correspondingPoint, ForceGraph<V, E> forceGraph);
 }

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/CoulombForce.java

@@ -16,10 +16,12 @@
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public class CoulombForce<V, E> extends AbstractForce<V, E, IntensityEffectFromFixedNodesParameters> {
+public class CoulombForce<V, E> extends AbstractForce<V, E> {
+
+    private final IntensityEffectFromFixedNodesParameters forceParameter;
 
     public CoulombForce(IntensityEffectFromFixedNodesParameters forceParameter) {
-        super(forceParameter);
+        this.forceParameter = forceParameter;
     }
 
     @Override

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/GravityForceByEdgeNumber.java

@@ -16,10 +16,12 @@
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public class GravityForceByEdgeNumber<V, E> extends AbstractForce<V, E, IntensityParameter> {
+public class GravityForceByEdgeNumber<V, E> extends AbstractForce<V, E> {
+
+    private final IntensityParameter forceParameter;
 
     public GravityForceByEdgeNumber(IntensityParameter forceParameter) {
-        super(forceParameter);
+        this.forceParameter = forceParameter;
     }
 
     @Override

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/GravityForceLinear.java

@@ -16,10 +16,11 @@
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public class GravityForceLinear<V, E> extends AbstractForce<V, E, IntensityParameter> {
+public class GravityForceLinear<V, E> extends AbstractForce<V, E> {
+    private final IntensityParameter forceParameter;
 
     public GravityForceLinear(IntensityParameter forceParameter) {
-        super(forceParameter);
+        this.forceParameter = forceParameter;
     }
 
     @Override

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/GravityForceUnit.java

@@ -15,10 +15,11 @@
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public class GravityForceUnit<V, E> extends AbstractForce<V, E, IntensityParameter> {
+public class GravityForceUnit<V, E> extends AbstractForce<V, E> {
+    private final IntensityParameter forceParameter;
 
     public GravityForceUnit(IntensityParameter forceParameter) {
-        super(forceParameter);
+        this.forceParameter = forceParameter;
     }
 
     @Override

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/SpringForce.java

@@ -19,10 +19,11 @@
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public class SpringForce<V, E> extends AbstractForce<V, E, SpringContainer<DefaultEdge>> {
+public class SpringForce<V, E> extends AbstractForce<V, E> {
+    private final SpringContainer<DefaultEdge> forceParameter;
 
     public SpringForce(SpringContainer<DefaultEdge> forceParameter) {
-        super(forceParameter);
+        this.forceParameter = forceParameter;
     }
 
     /// This is Hooke's Law

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/forceparameter/IntensityParameter.java

@@ -10,7 +10,7 @@
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public class IntensityParameter implements ForceParameter {
+public class IntensityParameter {
     private double forceIntensity;
 
     public IntensityParameter(double forceIntensity) {

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/forceparameter/SpringContainer.java

@@ -14,7 +14,7 @@
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public class SpringContainer<E> implements ForceParameter {
+public class SpringContainer<E> {
     private final Map<E, SpringParameter> springs;
 
     public SpringContainer() {

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/forces/forceparameter/SpringParameter.java

@@ -10,7 +10,7 @@
 /**
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
-public class SpringParameter implements ForceParameter {
+public class SpringParameter {
     private double stiffness;
     private double length;
 

diagram-util/src/main/java/com/powsybl/diagram/util/forcelayout/layouts/AbstractLayoutAlgorithm.java

@@ -19,11 +19,11 @@
  * @author Nathan Dissoubray {@literal <nathan.dissoubray at rte-france.com>}
  */
 public abstract class AbstractLayoutAlgorithm<V, E> {
-    protected List<AbstractForce<V, E, ? extends ForceParameter>> forces;
+    protected List<AbstractForce<V, E>> forces;
 
     public abstract void calculateLayout(ForceGraph<V, E> forceGraph);
 
-    AbstractLayoutAlgorithm(List<AbstractForce<V, E, ? extends ForceParameter>> forces) {
+    AbstractLayoutAlgorithm(List<AbstractForce<V, E>> forces) {
         this.forces = forces;
     }