projects
/
sw
/
motorsim
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some warnings
[sw/motorsim]
/
gui
/
com
/
billkuker
/
rocketry
/
motorsim
/
visual
/
workbench
/
SRFuelEditor.java
diff --git
a/gui/com/billkuker/rocketry/motorsim/visual/workbench/SRFuelEditor.java
b/gui/com/billkuker/rocketry/motorsim/visual/workbench/SRFuelEditor.java
index 013216f90b536c9aa25f4ff3e68dab8e799ddcbb..05b18ea23cb1bb4f1485d80e2cccdcf427fcd764 100644
(file)
--- a/
gui/com/billkuker/rocketry/motorsim/visual/workbench/SRFuelEditor.java
+++ b/
gui/com/billkuker/rocketry/motorsim/visual/workbench/SRFuelEditor.java
@@
-39,6
+39,8
@@
import com.billkuker.rocketry.motorsim.visual.Chart;
import com.billkuker.rocketry.motorsim.visual.Editor;
public class SRFuelEditor extends JSplitPane {
import com.billkuker.rocketry.motorsim.visual.Editor;
public class SRFuelEditor extends JSplitPane {
+ private static final long serialVersionUID = 1L;
+
private static final NumberFormat nf = new DecimalFormat("##########.###");
Chart<Pressure, Velocity> burnRate;
private static final NumberFormat nf = new DecimalFormat("##########.###");
Chart<Pressure, Velocity> burnRate;
@@
-56,8
+58,10
@@
public class SRFuelEditor extends JSplitPane {
public static class EditablePSRFuel extends PiecewiseSaintRobertFuel {
public static class EditablePSRFuel extends PiecewiseSaintRobertFuel {
+ @SuppressWarnings("unchecked")
private Amount<VolumetricDensity> idealDensity = (Amount<VolumetricDensity>) Amount
.valueOf("1 g/mm^3");
private Amount<VolumetricDensity> idealDensity = (Amount<VolumetricDensity>) Amount
.valueOf("1 g/mm^3");
+
private double combustionEfficiency = 1;
private double densityRatio = 1;
private EditableCombustionProduct cp;
private double combustionEfficiency = 1;
private double densityRatio = 1;
private EditableCombustionProduct cp;
@@
-123,6
+127,7
@@
public class SRFuelEditor extends JSplitPane {
final EditablePSRFuel f = new EditablePSRFuel(SaintRobertFuel.Type.SI);
private class TM extends AbstractTableModel {
final EditablePSRFuel f = new EditablePSRFuel(SaintRobertFuel.Type.SI);
private class TM extends AbstractTableModel {
+ private static final long serialVersionUID = 1L;
@Override
public int getColumnCount() {
@Override
public int getColumnCount() {
@@
-166,6
+171,7
@@
public class SRFuelEditor extends JSplitPane {
return true;
}
return true;
}
+ @SuppressWarnings("unchecked")
public void setValueAt(Object value, int row, int col) {
Entry e = entries.get(row);
try {
public void setValueAt(Object value, int row, int col) {
Entry e = entries.get(row);
try {
@@
-319,10
+325,9
@@
public class SRFuelEditor extends JSplitPane {
}
public static void main(String args[]) {
}
public static void main(String args[]) {
- SRFuelEditor ed;
JFrame f = new JFrame();
f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
JFrame f = new JFrame();
f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- f.setContentPane(
ed =
new SRFuelEditor());
+ f.setContentPane(new SRFuelEditor());
f.setSize(800, 600);
f.setVisible(true);
f.setSize(800, 600);
f.setVisible(true);