refact: eclipse cleanup (#1127)

equinor · Oct 5, 2024 · af48a7d · af48a7d
1 parent df1584a
commit af48a7d
Show file tree

Hide file tree

Showing 74 changed files with 37 additions and 122 deletions.
diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/pipeLeg/PipeLeg.java b/src/main/java/neqsim/fluidMechanics/flowLeg/pipeLeg/PipeLeg.java
@@ -28,7 +28,6 @@ public class PipeLeg extends FlowLeg {
    * </p>
    */
   public PipeLeg() {
-    super();
   }
 
   /** {@inheritDoc} */

diff --git a/...dBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorAlg.java b/...dBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorAlg.java
@@ -11,14 +11,6 @@
  * @version $Id: $Id
  */
 public class EnhancementFactorAlg extends EnhancementFactor {
-  /**
-   * <p>
-   * Constructor for EnhancementFactorAlg.
-   * </p>
-   */
-  public EnhancementFactorAlg() {
-    super();
-  }
 
   /**
    * <p>

diff --git a/...ndary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java b/...ndary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java
@@ -13,14 +13,6 @@
  * @version $Id: $Id
  */
 public class EnhancementFactorNumeric extends EnhancementFactor {
-  /**
-   * <p>
-   * Constructor for EnhancementFactorNumeric.
-   * </p>
-   */
-  public EnhancementFactorNumeric() {
-    super();
-  }
 
   /**
    * <p>

diff --git a/...s/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java b/...s/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java
@@ -14,15 +14,6 @@ public class CommonPhysicalPropertyMethod
 
   protected neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase;
 
-  /**
-   * <p>
-   * Constructor for CommonPhysicalPropertyMethod.
-   * </p>
-   */
-  public CommonPhysicalPropertyMethod() {
-    super();
-  }
-
   /**
    * <p>
    * Constructor for CommonPhysicalPropertyMethod.
@@ -34,7 +25,6 @@ public CommonPhysicalPropertyMethod() {
    */
   public CommonPhysicalPropertyMethod(
       neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) {
-    super();
     this.phase = phase;
   }
 

diff --git a/...alProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java b/...alProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java
@@ -23,7 +23,6 @@ public class GasPhysicalPropertyMethod
    * </p>
    */
   public GasPhysicalPropertyMethod() {
-    super();
   }
 
   /**
@@ -37,7 +36,6 @@ public GasPhysicalPropertyMethod() {
    */
   public GasPhysicalPropertyMethod(
       neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) {
-    super();
     this.gasPhase = gasPhase;
     binaryMolecularDiameter = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase
         .getPhase().getNumberOfComponents()];

diff --git a/...erties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java b/...erties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java
@@ -20,7 +20,6 @@ public class LiquidPhysicalPropertyMethod
    * </p>
    */
   public LiquidPhysicalPropertyMethod() {
-    super();
   }
 
   /**
@@ -34,7 +33,6 @@ public LiquidPhysicalPropertyMethod() {
    */
   public LiquidPhysicalPropertyMethod(
       neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) {
-    super();
     this.liquidPhase = liquidPhase;
   }
 

diff --git a/...operties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java b/...operties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java
@@ -20,7 +20,6 @@ public class SolidPhysicalPropertyMethod
    * </p>
    */
   public SolidPhysicalPropertyMethod() {
-    super();
   }
 
   /**
@@ -34,7 +33,6 @@ public SolidPhysicalPropertyMethod() {
    */
   public SolidPhysicalPropertyMethod(
       neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase) {
-    super();
     this.solidPhase = solidPhase;
   }
 

diff --git a/src/main/java/neqsim/processSimulation/SimulationInterface.java b/src/main/java/neqsim/processSimulation/SimulationInterface.java
@@ -92,6 +92,7 @@ public interface SimulationInterface extends NamedInterface, Runnable, Serializa
    * run.
    * </p>
    */
+  @Override
   public default void run() {
     if (isRunInSteps()) {
       run_step(UUID.randomUUID());

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/MultiPhaseMeter.java b/src/main/java/neqsim/processSimulation/measurementDevice/MultiPhaseMeter.java
@@ -223,7 +223,6 @@ public double getMeasuredValue(String measurement, String unit) {
       }
       if (measurement.equals("waterDensity")) {
         if (!tempFluid.hasPhaseType("aqueous")) {
-          return 0.0;
         } else {
           return tempFluid.getPhase("aqueous").getDensity("kg/m3");
         }

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java b/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java
@@ -158,7 +158,6 @@ public void setAngle(double angle) {
    */
   public double getAngle(String unit) {
     if (unit.equals("Degree")) {
-      return this.angle;
     } else if (unit.equals("Radian")) {
       return this.angle * pi / 180;
     }

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java
@@ -294,6 +294,7 @@ public String toJson() {
    *
    * @return a String
    */
+  @Override
   public String getReport_json() {
     return new Report(this).generateJsonReport();
   }

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java
@@ -231,5 +231,6 @@ public default SystemInterface getFluid() {
    *
    * @return a String
    */
+  @Override
   public String getReport_json();
 }
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java b/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java
@@ -7,8 +7,6 @@
 import org.apache.logging.log4j.Logger;
 import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass;
 import neqsim.processSimulation.processEquipment.heatExchanger.Heater;
-import neqsim.processSimulation.processEquipment.mixer.Mixer;
-import neqsim.processSimulation.processEquipment.mixer.MixerInterface;
 import neqsim.processSimulation.processEquipment.separator.Separator;
 import neqsim.processSimulation.processEquipment.stream.Stream;
 import neqsim.processSimulation.processEquipment.stream.StreamInterface;
@@ -113,7 +111,7 @@ public void init() {
       return;
     }
     setDoInitializion(false);
-    ((Runnable) trays.get(feedTrayNumber)).run();
+    trays.get(feedTrayNumber).run();
     if (getTray(feedTrayNumber).getFluid().getNumberOfPhases() == 1) {
       for (int i = 0; i < numberOfTrays; i++) {
         if (getTray(i).getNumberOfInputStreams() > 0 && i != feedTrayNumber) {
@@ -126,7 +124,7 @@ public void init() {
           }
         } else if (i == feedTrayNumber && getTray(i).getNumberOfInputStreams() > 1) {
           getTray(feedTrayNumber).addStream(trays.get(i).getStream(1));
-          ((Runnable) trays.get(feedTrayNumber)).run();
+          trays.get(feedTrayNumber).run();
           getTray(feedTrayNumber)
               .removeInputStream(getTray(feedTrayNumber).getNumberOfInputStreams() - 1);
           if (getTray(feedTrayNumber).getThermoSystem().getNumberOfPhases() > 1) {
@@ -145,7 +143,7 @@ public void init() {
     // .setTotalNumberOfMoles(((Mixer) trays.get(numberOfTrays -
     // 1)).getStream(0).getThermoSystem()
     // .getTotalNumberOfMoles() * (1.0));
-    ((MixerInterface) trays.get(0))
+    trays.get(0)
         .addStream(trays.get(feedTrayNumber).getLiquidOutStream().clone());
     // ((Mixer)
     // trays.get(0)).getStream(streamNumbReboil).getThermoSystem().setTotalNumberOfMoles(
@@ -154,18 +152,18 @@ public void init() {
     // * (1.0));
 
     // ((Runnable) trays.get(numberOfTrays - 1)).run();
-    ((Runnable) trays.get(0)).run();
+    trays.get(0).run();
 
     double feedTrayTemperature = getTray(getFeedTrayNumber()).getTemperature();
 
     if (trays.get(numberOfTrays - 1).getNumberOfInputStreams() > 0) {
       condenserTemperature =
-          ((MixerInterface) trays.get(numberOfTrays - 1)).getThermoSystem().getTemperature();
+          trays.get(numberOfTrays - 1).getThermoSystem().getTemperature();
     } else {
       condenserTemperature = feedTrayTemperature - 1.0;
     }
 
-    reboilerTemperature = ((MixerInterface) trays.get(0)).getThermoSystem().getTemperature();
+    reboilerTemperature = trays.get(0).getThermoSystem().getTemperature();
 
     double deltaTempCondenser =
         (feedTrayTemperature - condenserTemperature) / (numberOfTrays * 1.0 - feedTrayNumber - 1);
@@ -174,31 +172,31 @@ public void init() {
     double delta = 0;
     for (int i = feedTrayNumber + 1; i < numberOfTrays; i++) {
       delta += deltaTempCondenser;
-      ((Mixer) trays.get(i))
+      trays.get(i)
           .setTemperature(getTray(getFeedTrayNumber()).getThermoSystem().getTemperature() - delta);
     }
     delta = 0;
     for (int i = feedTrayNumber - 1; i >= 0; i--) {
       delta += deltaTempReboiler;
-      ((Mixer) trays.get(i))
+      trays.get(i)
           .setTemperature(getTray(getFeedTrayNumber()).getThermoSystem().getTemperature() + delta);
     }
 
     for (int i = 1; i < numberOfTrays; i++) {
-      ((MixerInterface) trays.get(i)).addStream(trays.get(i - 1).getGasOutStream());
+      trays.get(i).addStream(trays.get(i - 1).getGasOutStream());
       trays.get(i).init();
-      ((Runnable) trays.get(i)).run();
+      trays.get(i).run();
     }
 
     for (int i = numberOfTrays - 2; i >= 1; i--) {
-      ((MixerInterface) trays.get(i)).addStream(trays.get(i + 1).getLiquidOutStream());
+      trays.get(i).addStream(trays.get(i + 1).getLiquidOutStream());
       trays.get(i).init();
-      ((Runnable) trays.get(i)).run();
+      trays.get(i).run();
     }
     int streamNumb = (trays.get(0)).getNumberOfInputStreams() - 1;
-    ((MixerInterface) trays.get(0)).replaceStream(streamNumb, trays.get(1).getLiquidOutStream());
+    trays.get(0).replaceStream(streamNumb, trays.get(1).getLiquidOutStream());
     trays.get(0).init();
-    ((Runnable) trays.get(0)).run();
+    trays.get(0).run();
 
     // massBalanceCheck();
   }
@@ -340,39 +338,39 @@ public void run(UUID id) {
         errOld = err;
         err = 0.0;
         for (int i = 0; i < numberOfTrays; i++) {
-          oldtemps[i] = ((MixerInterface) trays.get(i)).getThermoSystem().getTemperature();
+          oldtemps[i] = trays.get(i).getThermoSystem().getTemperature();
         }
 
         for (int i = feedTrayNumber; i > 1; i--) {
           int replaceStream1 = trays.get(i - 1).getNumberOfInputStreams() - 1;
-          ((Mixer) trays.get(i - 1)).replaceStream(replaceStream1,
+          trays.get(i - 1).replaceStream(replaceStream1,
               trays.get(i).getLiquidOutStream());
           trays.get(i - 1).setPressure(bottomTrayPressure - (i - 1) * dp);
           trays.get(i - 1).run(id);
         }
         int streamNumb = trays.get(0).getNumberOfInputStreams() - 1;
         trays.get(0).setPressure(bottomTrayPressure);
-        ((Mixer) trays.get(0)).replaceStream(streamNumb, trays.get(1).getLiquidOutStream());
+        trays.get(0).replaceStream(streamNumb, trays.get(1).getLiquidOutStream());
         trays.get(0).run(id);
 
         for (int i = 1; i <= numberOfTrays - 1; i++) {
           int replaceStream = trays.get(i).getNumberOfInputStreams() - 2;
           if (i == (numberOfTrays - 1)) {
             replaceStream = trays.get(i).getNumberOfInputStreams() - 1;
           }
-          ((Mixer) trays.get(i)).replaceStream(replaceStream, trays.get(i - 1).getGasOutStream());
+          trays.get(i).replaceStream(replaceStream, trays.get(i - 1).getGasOutStream());
           trays.get(i).run(id);
         }
 
         for (int i = numberOfTrays - 2; i >= feedTrayNumber; i--) {
           int replaceStream = trays.get(i).getNumberOfInputStreams() - 1;
-          ((Mixer) trays.get(i)).replaceStream(replaceStream,
+          trays.get(i).replaceStream(replaceStream,
               trays.get(i + 1).getLiquidOutStream());
           trays.get(i).run(id);
         }
         for (int i = 0; i < numberOfTrays; i++) {
           err += Math.abs(
-              oldtemps[i] - ((MixerInterface) trays.get(i)).getThermoSystem().getTemperature());
+              oldtemps[i] - trays.get(i).getThermoSystem().getTemperature());
         }
         logger.info("error iter " + err + " iteration " + iter);
         // System.out.println("error iter " + err + " iteration " + iter);

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java b/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java
@@ -92,7 +92,6 @@ public double getPower() {
    */
   public double getPower(String unit) {
     if (unit.equals("W")) {
-      return dH;
     } else if (unit.equals("kW")) {
       return dH / 1000.0;
     } else if (unit.equals("MW")) {

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java b/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java
@@ -58,7 +58,7 @@ public ReservoirTPsim(String name, SystemInterface reservoirFluid) {
   /** {@inheritDoc} */
   @Override
   public void run(UUID id) {
-    SystemInterface fluid1 = ((SystemInterface) reservoirFluid).clone();
+    SystemInterface fluid1 = reservoirFluid.clone();
     fluid1.setTemperature(temperature, tUnit);
     fluid1.setPressure(pressure, pUnit);
     fluid1.setTotalFlowRate(flowRate, flowUnit);

diff --git a/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java b/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java
@@ -254,6 +254,7 @@ public ArrayList<String[]> getReport() {
    *
    * @return a String
    */
+  @Override
   public String getReport_json() {
     return new Report(this).generateJsonReport();
   }

diff --git a/src/main/java/neqsim/processSimulation/processSystem/ProcessModuleBaseClass.java b/src/main/java/neqsim/processSimulation/processSystem/ProcessModuleBaseClass.java
@@ -250,6 +250,7 @@ public String toJson() {
    *
    * @return a String
    */
+  @Override
   public String getReport_json() {
     return new Report(this).generateJsonReport();
   }

diff --git a/src/main/java/neqsim/processSimulation/processSystem/ProcessSystem.java b/src/main/java/neqsim/processSimulation/processSystem/ProcessSystem.java
@@ -559,7 +559,6 @@ public double getTime() {
    */
   public double getTime(String unit) {
     if (unit.equals("sec")) {
-      return time;
     } else if (unit.equals("hr")) {
       return time / 3600.0;
     } else if (unit.equals("day")) {
@@ -944,6 +943,7 @@ public boolean equals(Object obj) {
    *
    * @return a String
    */
+  @Override
   public String getReport_json() {
     return new Report(this).generateJsonReport();
   }

diff --git a/...eqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtAbsDev.java b/...eqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtAbsDev.java
@@ -21,7 +21,6 @@ public class LevenbergMarquardtAbsDev extends LevenbergMarquardt {
    * </p>
    */
   public LevenbergMarquardtAbsDev() {
-    super();
   }
 
   /** {@inheritDoc} */

diff --git a/...qsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtBiasDev.java b/...qsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtBiasDev.java
@@ -21,7 +21,6 @@ public class LevenbergMarquardtBiasDev extends LevenbergMarquardt {
    * </p>
    */
   public LevenbergMarquardtBiasDev() {
-    super();
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java b/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java
@@ -305,6 +305,7 @@ public PedersenHeavyOilPlusModel() {
 
   class WhitsonGammaModel extends PedersenPlusModel {
 
+    private static final long serialVersionUID = 1L;
     public double[] zValues;
     public double[] molarMasses;
     public double[] densities;

diff --git a/src/main/java/neqsim/thermo/characterization/TBPfractionModel.java b/src/main/java/neqsim/thermo/characterization/TBPfractionModel.java
@@ -337,6 +337,7 @@ public double calcPC(double molarMass, double density) {
       return PC;
     }
 
+    @Override
     public double calcAcentricFactor(double molarMass, double density) {
       return super.calcAcentricFactorKeslerLee(molarMass, density);
     }

diff --git a/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java b/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java
@@ -260,7 +260,6 @@ public void removeWax() {
   public WaxModelInterface getModel(String name) {
     this.name = name;
     if (name.equals("PedersenWax")) {
-      return new PedersenWaxModel();
     }
     return new PedersenWaxModel();
   }

diff --git a/src/main/java/neqsim/thermo/component/ComponentInterface.java b/src/main/java/neqsim/thermo/component/ComponentInterface.java
@@ -929,9 +929,9 @@ public void Finit(PhaseInterface phase, double temperature, double pressure,
    * <p>
    * Getter for property NormalBoilingPoint.
    * </p>
-   * 
+   *
    * @param unit Unit of return pressure
-   * 
+   *
    * @return The normal boiling point of the component
    */
   public double getNormalBoilingPoint(String unit);