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.

Sign up for GitHub

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

Jump to bottom

style: removed redundant subclass definitions of setName and getName #314

Merged
merged 2 commits into from
Feb 15, 2022
Merged

style: removed redundant subclass definitions of setName and getName #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b2fb6
style: removed redundant subclass definitions of setName and getName
asmfstatoil Feb 10, 2022
3123002
Merge branch 'master' into redundant_name
asmfstatoil Feb 11, 2022
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
4 changes: 0 additions & 4 deletions src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,10 @@ public SystemInterface getFluid() {
return getThermoSystem();
}

;

/** {@inheritDoc} */
@Override
public void displayResult() {}

;

/** {@inheritDoc} */
@Override
public String getName() {
Expand Down
15 changes: 6 additions & 9 deletions src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
* @version $Id: $Id
*/
public interface ProcessEquipmentInterface extends Runnable, java.io.Serializable {
/** {@inheritDoc}
* /
/**
* <p>
* run
* </p>
* In this method all thermodynamic and unit the operation
* will be calculated in a steady state calculation.
* In this method all thermodynamic and unit the operation will be calculated in a steady state
* calculation.
*
* @return void
*/
Expand All @@ -35,14 +34,12 @@ public interface ProcessEquipmentInterface extends Runnable, java.io.Serializabl
*/
public String[][] reportResults();

/** {@inheritDoc}
* /
/**
* <p>
* runTransient
* </p>
* In this method all thermodynamic and unit the operation
* will be calculated in a dynamic calculation.
* dt is the delta time step (seconds)
* In this method all thermodynamic and unit the operation will be calculated in a dynamic
* calculation. dt is the delta time step (seconds)
*
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleAbsorber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ public SimpleAbsorber(Stream inStream1) {
/** {@inheritDoc} */
@Override
public void setName(String name) {
super.setName(name);
// outStream[0].setName(name + "_Sout1");
// outStream[1].setName(name + "_Sout2");
super.setName(name);
}

/**
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,6 @@ public WaterStripperColumn(String name) {
mechanicalDesign = new AbsorberMechanicalDesign(this);
}

/** {@inheritDoc} */
@Override
public void setName(String name) {
this.name = name;
}

/** {@inheritDoc} */
@Override
public void addStream(StreamInterface newStream) {
Expand Down Expand Up @@ -497,12 +491,6 @@ public void displayResult() {
dialog.setVisible(true);
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* Getter for the field <code>waterDewPointTemperature</code>.
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ public SimpleAdsorber(StreamInterface inStream1) {
/** {@inheritDoc} */
@Override
public void setName(String name) {
super.setName(name);
outStream[0].setName(name + "_Sout1");
outStream[1].setName(name + "_Sout2");
this.name = name;
}

/**
Expand Down Expand Up @@ -189,12 +189,6 @@ public void displayResult() {
outStream[1].displayResult();
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* runTransient.
Expand Down
9 changes: 0 additions & 9 deletions src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@
import java.awt.FlowLayout;
import java.text.DecimalFormat;
import java.text.FieldPosition;

import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JScrollPane;
import javax.swing.JTable;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import neqsim.processSimulation.mechanicalDesign.compressor.CompressorMechanicalDesign;
import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass;
import neqsim.processSimulation.processEquipment.stream.StreamInterface;
Expand Down Expand Up @@ -795,12 +792,6 @@ public String[][] getResultTable() {
return thermoSystem.getResultTable();
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* getTotalWork.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchanger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ public void setFeedStream(int number, StreamInterface inStream) {
/** {@inheritDoc} */
@Override
public void setName(String name) {
super.setName(name);
outStream[0].setName(name + "_Sout1");
outStream[1].setName(name + "_Sout2");
this.name = name;
}

/** {@inheritDoc} */
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Heater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,6 @@ public void displayResult() {
getOutStream().displayResult();
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* runTransient.
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/neqsim/processSimulation/processEquipment/mixer/Mixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,6 @@ public void displayResult() {
dialog.setVisible(true);
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/** {@inheritDoc} */
@Override
public void setPressure(double pres) {
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticNeqMixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,4 @@ public void run() {
// System.out.println("temperature: " +
// mixedStream.getThermoSystem().getTemperature());
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}
}
6 changes: 0 additions & 6 deletions src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticPhaseMixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,4 @@ public void run() {

mixedStream.getThermoSystem().init(3);
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}
}
12 changes: 0 additions & 12 deletions src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ public AdiabaticPipe(StreamInterface inStream) {
outStream = (Stream) inStream.clone();
}

/** {@inheritDoc} */
@Override
public void setName(String name) {
this.name = name;
}

/** {@inheritDoc} */
@Override
public StreamInterface getOutStream() {
Expand Down Expand Up @@ -231,12 +225,6 @@ public void displayResult() {
system.display();
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/** {@inheritDoc} */
@Override
public void runTransient() {
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticTwoPhasePipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ public SystemInterface getThermoSystem() {
return outStream.getThermoSystem();
}

/** {@inheritDoc} */
@Override
public void setName(String name) {
this.name = name;
}

/** {@inheritDoc} */
@Override
public StreamInterface getOutStream() {
Expand Down Expand Up @@ -300,12 +294,6 @@ public void displayResult() {
system.display();
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/** {@inheritDoc} */
@Override
public void runTransient() {
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/neqsim/processSimulation/processEquipment/pipeline/Pipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,18 +291,6 @@ public void setInitialFlowPattern(String flowPattern) {
this.flowPattern = flowPattern;
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/** {@inheritDoc} */
@Override
public void setName(String name) {
this.name = name;
}

/**
* Getter for property times.
*
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/neqsim/processSimulation/processEquipment/pipeline/SimpleTPoutPipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ public SimpleTPoutPipeline(StreamInterface inStream) {
outStream = (Stream) inStream.clone();
}

/** {@inheritDoc} */
@Override
public void setName(String name) {
this.name = name;
}

/** {@inheritDoc} */
@Override
public StreamInterface getOutStream() {
Expand Down Expand Up @@ -97,12 +91,6 @@ public void displayResult() {
System.out.println("Superficial velocity out MEG/water : " + getSuperficialVelocity(2, 1));
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/** {@inheritDoc} */
@Override
public void runTransient() {}
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ public GasScrubber(String name, Stream inletStream) {
this.setInletStream(inletStream);
}

/** {@inheritDoc} */
@Override
public void setName(String name) {
this.name = name;
}

/**
* <p>
* Setter for the field <code>inletStream</code>.
Expand Down Expand Up @@ -144,12 +138,6 @@ public void run() {
@Override
public void displayResult() {}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* runTransient.
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubberSimple.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ public GasScrubberSimple(String name, Stream inletStream) {
this.setInletStream(inletStream);
}

/** {@inheritDoc} */
@Override
public void setName(String name) {
this.name = name;
}

/**
* <p>
* Setter for the field <code>inletStream</code>.
Expand Down Expand Up @@ -136,12 +130,6 @@ public void run() {
liquidOutStream.setThermoSystem(liquidSystem);
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* calcLiquidCarryoverFraction.
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/neqsim/processSimulation/processEquipment/separator/Hydrocyclone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,6 @@ public void displayResult() {
thermoSystem.display("from here " + getName());
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* runTransient.
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/neqsim/processSimulation/processEquipment/separator/NeqGasScrubber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ public NeqGasScrubber(String name, Stream inletStream) {
this.setInletStream(inletStream);
}

/** {@inheritDoc} */
@Override
public void setName(String name) {
this.name = name;
}

/**
* <p>
* Setter for the field <code>inletStream</code>.
Expand Down Expand Up @@ -139,12 +133,6 @@ public void run() {
@Override
public void displayResult() {}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* runTransient.
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/neqsim/processSimulation/processEquipment/separator/ThreePhaseSeparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,6 @@ public void displayResult() {
// }
}

/** {@inheritDoc} */
@Override
public String getName() {
return name;
}

/**
* <p>
* runTransient.
Expand Down
Loading