refact: Eclipse cleanup (#959)

* refact: Eclipse cleanup * style: whitespace
equinor · Mar 18, 2024 · 995d633 · 995d633
1 parent 2f3e165
commit 995d633
Show file tree

Hide file tree

Showing 87 changed files with 178 additions and 293 deletions.
diff --git a/src/main/java/neqsim/MathLib/generalMath/TDMAsolve.java b/src/main/java/neqsim/MathLib/generalMath/TDMAsolve.java
@@ -15,7 +15,6 @@
  * @version $Id: $Id
  */
 public final class TDMAsolve {
-
   /**
    * Dummy constructor, not for use. Class is to be considered static.
    */

diff --git a/src/main/java/neqsim/PVTsimulation/simulation/SlimTubeSim.java b/src/main/java/neqsim/PVTsimulation/simulation/SlimTubeSim.java
@@ -170,7 +170,7 @@ public void run() {
       /*
        * double totalAccumulatedVolumeAtStadardConditions =
        * slimTubeNodeSystem[numberOfSlimTubeNodes].getPhase(0).getVolume();
-       * 
+       *
        * if (slimTubeNodeSystem[numberOfSlimTubeNodes].getNumberOfPhases() > 1) {
        * totalAccumulatedVolumeAtStadardConditions =
        * slimTubeNodeSystem[numberOfSlimTubeNodes].getPhase(1).getVolume(); }
@@ -192,11 +192,11 @@ public void run() {
     /*
      * double totalAccumulatedVolumeAtStadardConditions =
      * slimTubeNodeSystem[numberOfSlimTubeNodes].getPhase(0).getVolume();
-     * 
+     *
      * if (slimTubeNodeSystem[numberOfSlimTubeNodes].getNumberOfPhases() > 1) {
      * totalAccumulatedVolumeAtStadardConditions =
      * slimTubeNodeSystem[numberOfSlimTubeNodes].getPhase(1).getVolume(); }
-     * 
+     *
      * System.out.println("accumulated VOlume " + totalAccumulatedVolumeAtStadardConditions +
      * " total reference volume " + totalReferenceNodeVolumeAtStadardConditions);
      * System.out.println("oil recovery ratio" + totalAccumulatedVolumeAtStadardConditions /

diff --git a/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java b/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java
@@ -413,7 +413,7 @@ public boolean solveChemEq(int phase, int type) {
     // System.out.println("pressure1");
     calcChemRefPot(phase);
     // System.out.println("pressure2");
-    if (firsttime == true || type == 0) {
+    if (firsttime || type == 0) {
       try {
         // System.out.println("Calculating initial estimates");
         nVector = calcNVector();

diff --git a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReaction.java b/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReaction.java
@@ -376,12 +376,12 @@ public boolean reactantsContains(String[] names) {
           test = false;
         }
       }
-      if (test == false) {
+      if (!test) {
         break;
       }
     }
 
-    if (test == false) {
+    if (!test) {
       for (int j = 0; j < productNames.length; j++) {
         for (int i = 0; i < names.length; i++) {
           if (names[i].equals(productNames[j])) {
@@ -391,7 +391,7 @@ public boolean reactantsContains(String[] names) {
             test = false;
           }
         }
-        if (test == false) {
+        if (!test) {
           break;
         }
       }

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java b/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java
@@ -444,7 +444,7 @@ public void setBulkSystem(SystemInterface bulkSystem) {
   /** {@inheritDoc} */
   @Override
   public FlowNodeInterface getNextNode() {
-    return (FlowNodeInterface) this.clone();
+    return this.clone();
   }
 
   /** {@inheritDoc} */

diff --git a/...physicalProperties/physicalPropertyMethods/gasPhysicalProperties/viscosity/Viscosity.java b/...physicalProperties/physicalPropertyMethods/gasPhysicalProperties/viscosity/Viscosity.java
@@ -5,7 +5,7 @@
 
 /**
  * * Abstract class for Viscosity property.
- * 
+ *
  * @author Even Solbraa
  */
 abstract class Viscosity extends

diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java b/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java
@@ -339,6 +339,7 @@ public double getKinematicViscosity() {
   }
 
   /** {@inheritDoc} */
+  @Override
   public double getDiffusionCoefficient(int i, int j) {
     return diffusivityCalc.getMaxwellStefanBinaryDiffusionCoefficient(i, j);
   }

diff --git a/src/main/java/neqsim/processSimulation/SimulationBaseClass.java b/src/main/java/neqsim/processSimulation/SimulationBaseClass.java
@@ -32,11 +32,13 @@ public SimulationBaseClass(String name) {
   }
 
   /** {@inheritDoc} */
+  @Override
   public UUID getCalculationIdentifier() {
     return calcIdentifier;
   }
 
   /** {@inheritDoc} */
+  @Override
   public void setCalculationIdentifier(UUID value) {
     if (this.calcIdentifier == null || this.calcIdentifier != value) {
       this.calcIdentifier = value;
@@ -58,16 +60,19 @@ public void setCalculateSteadyState(boolean steady) {
   }
 
   /** {@inheritDoc} */
+  @Override
   public double getTime() {
     return this.time;
   }
 
   /** {@inheritDoc} */
+  @Override
   public void setTime(double value) {
     this.time = value;
   }
 
   /** {@inheritDoc} */
+  @Override
   public void increaseTime(double dt) {
     if (dt < 0) {
       throw new RuntimeException(new InvalidInputException(this, "increaseTime", "dt",

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/CombustionEmissionsCalculator.java b/src/main/java/neqsim/processSimulation/measurementDevice/CombustionEmissionsCalculator.java
@@ -5,6 +5,7 @@
 import neqsim.processSimulation.processEquipment.stream.StreamInterface;
 
 public class CombustionEmissionsCalculator extends StreamMeasurementDeviceBaseClass {
+  private static final long serialVersionUID = 1L;
 
   // Composition of natural gas (in mole percent)
   private static final Map<String, Double> NATURAL_GAS_COMPOSITION = new HashMap<>();

diff --git a/...n/java/neqsim/processSimulation/mechanicalDesign/separator/SeparatorMechanicalDesign.java b/...n/java/neqsim/processSimulation/mechanicalDesign/separator/SeparatorMechanicalDesign.java
@@ -78,7 +78,6 @@ public void readDesignSpecifications() {
                              // design")).getLiquidRetentionTime("API12J", this);
     } else {
       System.out.println("no separator process design specified......");
-      return;
     }
   }
 

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java
@@ -248,6 +248,7 @@ public String getConditionAnalysisMessage() {
    *
    * @return an array of {@link java.lang.String} objects
    */
+  @Override
   public String[][] getResultTable() {
     return null;
   }

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleTEGAbsorber.java b/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleTEGAbsorber.java
@@ -68,7 +68,7 @@ public SimpleTEGAbsorber(String name) {
   public void addStream(StreamInterface newStream) {
     streams.add(newStream);
     if (numberOfInputStreams == 0) {
-      mixedStream = (Stream) streams.get(0).clone();
+      mixedStream = streams.get(0).clone();
       mixedStream.getThermoSystem().setNumberOfPhases(2);
       mixedStream.getThermoSystem().init(0);
       mixedStream.getThermoSystem().init(3);
@@ -87,8 +87,8 @@ public void addStream(StreamInterface newStream) {
    */
   public void addGasInStream(StreamInterface newStream) {
     // TODO: fail if gasInStream is not null?
-    gasInStream = (Stream) newStream;
-    gasOutStream = (Stream) newStream.clone();
+    gasInStream = newStream;
+    gasOutStream = newStream.clone();
     addStream(newStream);
   }
 
@@ -102,8 +102,8 @@ public void addGasInStream(StreamInterface newStream) {
    */
   public void addSolventInStream(StreamInterface newStream) {
     // TODO: fail if solventInStream is not null?
-    solventInStream = (Stream) newStream;
-    solventOutStream = (Stream) newStream.clone();
+    solventInStream = newStream;
+    solventOutStream = newStream.clone();
     addStream(newStream);
     solventStreamNumber = streams.size() - 1;
   }
@@ -118,7 +118,7 @@ public void addSolventInStream(StreamInterface newStream) {
    */
   public void replaceSolventInStream(StreamInterface newStream) {
     // TODO: fails if solventStreamNumber is 0, i.e. no solventinstream set?
-    solventInStream = (Stream) newStream;
+    solventInStream = newStream;
     streams.set(solventStreamNumber, solventInStream);
   }
 
@@ -430,6 +430,7 @@ public void run(UUID id) {
    *
    * @return a double
    */
+  @Override
   public double getGasLoadFactor() {
     double intArea = 3.14 * getInternalDiameter() * getInternalDiameter() / 4.0;
     double vs = getGasOutStream().getThermoSystem().getFlowRate("m3/sec") / intArea;

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java b/src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java
@@ -70,7 +70,7 @@ public WaterStripperColumn(String name) {
   public void addStream(StreamInterface newStream) {
     streams.add(newStream);
     if (numberOfInputStreams == 0) {
-      mixedStream = (Stream) streams.get(0).clone();
+      mixedStream = streams.get(0).clone();
       mixedStream.getThermoSystem().setNumberOfPhases(2);
       mixedStream.getThermoSystem().init(0);
       mixedStream.getThermoSystem().init(3);
@@ -88,8 +88,8 @@ public void addStream(StreamInterface newStream) {
    *        object
    */
   public void addGasInStream(StreamInterface newStream) {
-    gasInStream = (Stream) newStream;
-    gasOutStream = (Stream) newStream.clone();
+    gasInStream = newStream;
+    gasOutStream = newStream.clone();
     addStream(newStream);
   }
 
@@ -102,8 +102,8 @@ public void addGasInStream(StreamInterface newStream) {
    *        object
    */
   public void addSolventInStream(StreamInterface newStream) {
-    solventInStream = (Stream) newStream;
-    solventOutStream = (Stream) newStream.clone();
+    solventInStream = newStream;
+    solventOutStream = newStream.clone();
     addStream(newStream);
     solventStreamNumber = streams.size() - 1;
   }
@@ -117,7 +117,7 @@ public void addSolventInStream(StreamInterface newStream) {
    *        object
    */
   public void replaceSolventInStream(StreamInterface newStream) {
-    solventInStream = (Stream) newStream;
+    solventInStream = newStream;
     streams.set(solventStreamNumber, solventInStream);
   }
 

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java b/src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java
@@ -57,8 +57,8 @@ public SimpleAdsorber(StreamInterface inStream1) {
     this("SimpleAdsorber");
     this.inStream[0] = inStream1;
     this.inStream[1] = inStream1;
-    outStream[0] = (Stream) inStream1.clone();
-    outStream[1] = (Stream) inStream1.clone();
+    outStream[0] = inStream1.clone();
+    outStream[1] = inStream1.clone();
 
     SystemInterface systemOut1 = inStream1.getThermoSystem().clone();
     outStream[0].setThermoSystem(systemOut1);
@@ -98,8 +98,8 @@ public SimpleAdsorber(String name, StreamInterface inStream1) {
     this(name);
     this.inStream[0] = inStream1;
     this.inStream[1] = inStream1;
-    outStream[0] = (Stream) inStream1.clone();
-    outStream[1] = (Stream) inStream1.clone();
+    outStream[0] = inStream1.clone();
+    outStream[1] = inStream1.clone();
     setName(name);
 
     SystemInterface systemOut1 = inStream1.getThermoSystem().clone();

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java b/src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java
@@ -152,6 +152,7 @@ public CompressorMechanicalDesign getMechanicalDesign() {
    *
    * @return a {@link neqsim.processSimulation.processSystem.ProcessSystem} object
    */
+  @Override
   public Compressor copy() {
     return (Compressor) super.copy();
   }
@@ -204,6 +205,7 @@ public void setOutletPressure(double pressure, String unit) {
    *
    * @return a double
    */
+  @Override
   public double getOutletPressure() {
     return pressure;
   }
@@ -1006,6 +1008,7 @@ public boolean isSurge(double flow, double head) {
     return getAntiSurge().isSurge();
   }
 
+  @Override
   public double getDistanceToSurge() {
     return (getInletStream().getFlowRate("m3/hr")
         - getCompressorChart().getSurgeCurve().getSurgeFlow(getPolytropicFluidHead()))
@@ -1391,18 +1394,22 @@ public boolean equals(Object obj) {
         && useRigorousPolytropicMethod == other.useRigorousPolytropicMethod;
   }
 
+  @Override
   public void setMaximumSpeed(double maxSpeed) {
     this.maxspeed = maxSpeed;
   }
 
+  @Override
   public void setMinimumSpeed(double minspeed) {
     this.minspeed = minspeed;
   }
 
+  @Override
   public double getMaximumSpeed() {
     return maxspeed;
   }
 
+  @Override
   public double getMinimumSpeed() {
     return minspeed;
   }

diff --git a/...n/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartGenerator.java b/...n/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartGenerator.java
@@ -4,7 +4,6 @@
  * Compressor chart generator.
  */
 public class CompressorChartGenerator {
-
   Compressor compressor = null;
 
   public CompressorChartGenerator(Compressor inpcompressor) {
@@ -16,7 +15,6 @@ public CompressorChartGenerator(Compressor inpcompressor) {
    * @return a {@link neqsim.processSimulation.processEquipment.compressor.CompressorChart} object
    */
   public CompressorChart generateCompressorChart(String generationOption) {
-
     // Generation compressor chart
     double[] chartConditions = new double[3];
     chartConditions[0] = compressor.getOutletStream().getFluid().getMolarMass("kg/mol");

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/distillation/Condenser.java b/src/main/java/neqsim/processSimulation/processEquipment/distillation/Condenser.java
@@ -79,6 +79,7 @@ public double getDuty() {
    *
    * @return a {@link neqsim.processSimulation.processEquipment.stream.Stream} object
    */
+  @Override
   public StreamInterface getGasOutStream() {
     if (totalCondenser) {
       return new Stream("", mixedStreamSplitter.getSplitStream(1));
@@ -105,6 +106,7 @@ public StreamInterface getProductOutStream() {
    *
    * @return a {@link neqsim.processSimulation.processEquipment.stream.Stream} object
    */
+  @Override
   public StreamInterface getLiquidOutStream() {
     if (totalCondenser) {
       return new Stream("", mixedStreamSplitter.getSplitStream(0));
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
      * @version $Id: $Id
      */
     public final class TDMAsolve {
       /**
        * Dummy constructor, not for use. Class is to be considered static.
        */
@@ Expand Down @@