Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refact: remove deprecated constructors and replace calls to deprecate… #1120

Merged
merged 3 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,6 @@
<artifactId>mtj</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.ojalgo</groupId>
<artifactId>ojalgo</artifactId>
<version>53.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down
6 changes: 0 additions & 6 deletions pomJava21.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,6 @@
<artifactId>mtj</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.ojalgo</groupId>
<artifactId>ojalgo</artifactId>
<version>53.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down
6 changes: 0 additions & 6 deletions pomJava8.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,6 @@
<artifactId>mtj</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.ojalgo</groupId>
<artifactId>ojalgo</artifactId>
<version>48.4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ public class BaseTuningClass implements TuningInterface {
public double saturationTemperature = 273.15;
public double saturationPressure = 273.15;

/**
* <p>
* Constructor for BaseTuningClass.
* </p>
*/
public BaseTuningClass() {}

/**
* <p>
* Constructor for BaseTuningClass.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,6 @@ public class FlowSetter extends TwoPortEquipment {

ProcessSystem referenceProcess = null;

@Deprecated
/**
* <p>
* Constructor for FlowSetter.
* </p>
*/
public FlowSetter() {
super("Flow Setter");
}

/**
* <p>
* Constructor for FlowSetter.
* </p>
*
* @param stream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object
*/
@Deprecated
public FlowSetter(StreamInterface stream) {
this("Flow Setter", stream);
}

/**
* <p>
* Constructor for FlowSetter.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,6 @@ public class GORfitter extends TwoPortEquipment {
String unitT = "C";
String unitP = "bara";

@Deprecated
/**
* <p>
* Constructor for GORfitter.
* </p>
*/
public GORfitter() {
super("GOR fitter");
}

/**
* <p>
* Constructor for GORfitter.
* </p>
*
* @param stream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object
*/
@Deprecated
public GORfitter(StreamInterface stream) {
this("GORfitter", stream);
}

/**
* <p>
* Constructor for GORfitter.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ public class Recycle extends ProcessEquipmentBaseClass implements MixerInterface
double temperatureAccuracy = 1.0;
double flowAccuracy = 1.0;

/**
* <p>
* Constructor for Recycle.
* </p>
*
* @param name a {@link java.lang.String} object
*/
public Recycle(String name) {
super(name);
}

/**
* <p>
* Setter for the field <code>compositionAccuracy</code>.
Expand Down Expand Up @@ -73,16 +84,6 @@ public void setFlowAccuracy(double flowAccuracy) {
this.flowAccuracy = flowAccuracy;
}

/**
* <p>
* Constructor for Recycle.
* </p>
*/
@Deprecated
public Recycle() {
this("Recycle");
}

/**
* <p>
* resetIterations.
Expand All @@ -92,17 +93,6 @@ public void resetIterations() {
iterations = 0;
}

/**
* <p>
* Constructor for Recycle.
* </p>
*
* @param name a {@link java.lang.String} object
*/
public Recycle(String name) {
super(name);
}

/** {@inheritDoc} */
@Override
public SystemInterface getThermoSystem() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ public class ProcessModule extends SimulationBaseClass {

private boolean solved = false;

/**
* Default constructor that sets the name to "Default Module Name".
*/
public ProcessModule() {
this("Default Module Name");
}

/**
* Constructor that takes a name as a parameter.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,11 @@
* @version $Id: $Id
*/
public class FluidComponentResponse {
private static final long serialVersionUID = 1L;
static Logger logger = LogManager.getLogger(FluidComponentResponse.class);
public String name;
public HashMap<String, HashMap<String, Value>> properties =
new HashMap<String, HashMap<String, Value>>();

/**
* <p>
* Constructor for FluidComponentResponse.
* </p>
*/
@Deprecated
public FluidComponentResponse() {
this("Fluid");
}

/**
* <p>
* Constructor for FluidComponentResponse. Sets name of inputFluid as name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,6 @@ public class FluidResponse {
public HashMap<String, HashMap<String, Value>> conditions =
new HashMap<String, HashMap<String, Value>>();

/**
* <p>
* Constructor for Fluid.
* </p>
*/
@Deprecated
public FluidResponse() {
this("Fluid");
}

/**
* <p>
* Constructor for Fluid. Sets name of inputFluid as name.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/neqsim/thermo/phase/Phase.java
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ public void init(double totalNumberOfMoles, int numberOfComponents, int initType
double beta) {
if (totalNumberOfMoles <= 0) {
throw new RuntimeException(new neqsim.util.exception.InvalidInputException(this, "init",
"totalNumberOfMoles", "must be larger than zero."));
"totalNumberOfMoles", "must be larger than or equal to zero."));
}

this.beta = beta;
Expand Down
Loading