From 6846d7c1c2748aaab1eaa2f385262f3cbb69627a Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Sun, 24 Oct 2010 17:40:29 +0000 Subject: [PATCH] organized Imports --- .../rocketry/motorsim/CylindricalChamber.java | 2 -- .../billkuker/rocketry/motorsim/io/ENGExporter.java | 2 -- .../rocketry/motorsim/visual/BurnPanel.java | 2 +- .../rocketry/motorsim/visual/HardwarePanel.java | 1 - .../motorsim/visual/workbench/MotorEditor.java | 10 ---------- .../motorsim/visual/workbench/MotorWorkbench.java | 5 ----- .../motorsim/visual/workbench/SRFuelEditor.java | 13 +------------ .../visual/workbench/WorkbenchTreeModel.java | 1 - 8 files changed, 2 insertions(+), 34 deletions(-) diff --git a/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java b/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java index d810008..8642c25 100644 --- a/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java +++ b/src/com/billkuker/rocketry/motorsim/CylindricalChamber.java @@ -3,8 +3,6 @@ package com.billkuker.rocketry.motorsim; import java.awt.Shape; import java.awt.geom.Area; import java.awt.geom.Rectangle2D; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import javax.measure.quantity.Length; import javax.measure.quantity.Pressure; diff --git a/src/com/billkuker/rocketry/motorsim/io/ENGExporter.java b/src/com/billkuker/rocketry/motorsim/io/ENGExporter.java index 5233205..17ff7fc 100644 --- a/src/com/billkuker/rocketry/motorsim/io/ENGExporter.java +++ b/src/com/billkuker/rocketry/motorsim/io/ENGExporter.java @@ -6,8 +6,6 @@ import java.io.IOException; import java.io.OutputStream; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.Collection; -import java.util.Set; import javax.measure.quantity.Duration; import javax.measure.quantity.Force; diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java index ebaf532..8158dd9 100644 --- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java +++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java @@ -23,8 +23,8 @@ import javax.swing.event.ChangeListener; import org.jscience.physics.amount.Amount; import com.billkuker.rocketry.motorsim.Burn; -import com.billkuker.rocketry.motorsim.RocketScience; import com.billkuker.rocketry.motorsim.Burn.Interval; +import com.billkuker.rocketry.motorsim.RocketScience; public class BurnPanel extends JPanel { private static final long serialVersionUID = 1L; diff --git a/src/com/billkuker/rocketry/motorsim/visual/HardwarePanel.java b/src/com/billkuker/rocketry/motorsim/visual/HardwarePanel.java index 0c35222..0917010 100644 --- a/src/com/billkuker/rocketry/motorsim/visual/HardwarePanel.java +++ b/src/com/billkuker/rocketry/motorsim/visual/HardwarePanel.java @@ -6,7 +6,6 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.Shape; -import java.awt.geom.Area; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java index ab60e82..42769bc 100644 --- a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java +++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java @@ -10,13 +10,9 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyVetoException; import java.io.IOException; import java.util.HashMap; -import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Vector; -import javax.measure.quantity.Pressure; -import javax.measure.quantity.Velocity; import javax.measure.unit.SI; import javax.swing.BoxLayout; import javax.swing.ComboBoxModel; @@ -33,7 +29,6 @@ import javax.swing.JTextField; import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.WindowConstants; -import javax.swing.event.ListDataListener; import org.apache.log4j.Logger; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; @@ -49,10 +44,6 @@ import com.billkuker.rocketry.motorsim.Fuel; import com.billkuker.rocketry.motorsim.Grain; import com.billkuker.rocketry.motorsim.Motor; import com.billkuker.rocketry.motorsim.Nozzle; -import com.billkuker.rocketry.motorsim.fuel.EditableFuel; -import com.billkuker.rocketry.motorsim.fuel.KNDX; -import com.billkuker.rocketry.motorsim.fuel.KNER; -import com.billkuker.rocketry.motorsim.fuel.KNSB; import com.billkuker.rocketry.motorsim.fuel.KNSU; import com.billkuker.rocketry.motorsim.grain.CSlot; import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain; @@ -63,7 +54,6 @@ import com.billkuker.rocketry.motorsim.grain.MultiGrain; import com.billkuker.rocketry.motorsim.grain.RodAndTubeGrain; import com.billkuker.rocketry.motorsim.io.MotorIO; import com.billkuker.rocketry.motorsim.visual.BurnPanel; -import com.billkuker.rocketry.motorsim.visual.Chart; import com.billkuker.rocketry.motorsim.visual.Editor; import com.billkuker.rocketry.motorsim.visual.GrainPanel; import com.billkuker.rocketry.motorsim.visual.HardwarePanel; diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java index 4528b8a..be0d8e1 100644 --- a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java +++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java @@ -1,7 +1,6 @@ package com.billkuker.rocketry.motorsim.visual.workbench; import java.awt.BorderLayout; -import java.awt.Component; import java.awt.Dimension; import java.awt.FileDialog; import java.awt.event.ActionEvent; @@ -10,13 +9,10 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.util.HashMap; -import java.util.HashSet; -import java.util.List; import java.util.Vector; import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; -import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JMenu; import javax.swing.JMenuBar; @@ -40,7 +36,6 @@ import com.billkuker.rocketry.motorsim.Burn; import com.billkuker.rocketry.motorsim.Fuel; import com.billkuker.rocketry.motorsim.Motor; import com.billkuker.rocketry.motorsim.RocketScience.UnitPreference; -import com.billkuker.rocketry.motorsim.fuel.EditableFuel; import com.billkuker.rocketry.motorsim.fuel.KNDX; import com.billkuker.rocketry.motorsim.fuel.KNER; import com.billkuker.rocketry.motorsim.fuel.KNSB; diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/SRFuelEditor.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/SRFuelEditor.java index a3d31e5..ec743de 100644 --- a/src/com/billkuker/rocketry/motorsim/visual/workbench/SRFuelEditor.java +++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/SRFuelEditor.java @@ -1,13 +1,9 @@ package com.billkuker.rocketry.motorsim.visual.workbench; -import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.TextListener; import java.beans.PropertyChangeEvent; import java.text.DecimalFormat; import java.text.NumberFormat; @@ -21,33 +17,26 @@ import javax.measure.unit.SI; import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; -import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import javax.swing.table.AbstractTableModel; -import javax.swing.table.TableModel; import org.jscience.physics.amount.Amount; import com.billkuker.rocketry.motorsim.Fuel; import com.billkuker.rocketry.motorsim.RocketScience; -import com.billkuker.rocketry.motorsim.RocketScience.UnitPreference; +import com.billkuker.rocketry.motorsim.fuel.EditableFuel.EditableCombustionProduct; import com.billkuker.rocketry.motorsim.fuel.PiecewiseSaintRobertFuel; import com.billkuker.rocketry.motorsim.fuel.SaintRobertFuel; -import com.billkuker.rocketry.motorsim.fuel.EditableFuel.EditableCombustionProduct; import com.billkuker.rocketry.motorsim.fuel.SaintRobertFuel.Type; import com.billkuker.rocketry.motorsim.visual.Chart; import com.billkuker.rocketry.motorsim.visual.Editor; -import com.billkuker.rocketry.motorsim.visual.Chart.IntervalDomain; public class SRFuelEditor extends JSplitPane { private static final NumberFormat nf = new DecimalFormat("##########.###"); diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java index 8e6aaeb..1745d6e 100644 --- a/src/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java +++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java @@ -7,7 +7,6 @@ import java.util.Enumeration; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.MutableTreeNode; import javax.swing.tree.TreeNode; import com.billkuker.rocketry.motorsim.ChangeListening; -- 2.47.2