Cleaned up warnings

diff --git a/src/com/billkuker/rocketry/motorsim/MotorPart.java b/src/com/billkuker/rocketry/motorsim/MotorPart.java
index 1bd054edcc4a6dd753294e5a436f3e09bd5443b9..861145a2338bc3da3af4e3a5afdb80be484852dd 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/MotorPart.java
+++ b/src/com/billkuker/rocketry/motorsim/MotorPart.java
@@ -13,7 +13,6 @@ import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;\r
 import java.lang.reflect.Type;\r
 \r
-import javax.measure.quantity.Quantity;\r
 import javax.measure.unit.Unit;\r
 \r
 import org.jscience.physics.amount.Amount;\r
@@ -38,54 +37,40 @@ public class MotorPart {
                vcs = new VetoableChangeSupport(this);\r
                \r
                vcs.addVetoableChangeListener(new VetoableChangeListener(){\r
+                       @SuppressWarnings("unchecked")\r
                        @Override\r
                        public void vetoableChange(PropertyChangeEvent evt) throws PropertyVetoException {\r
                                if ( evt.getNewValue() instanceof Amount ){\r
-                               try {\r
-                                       BeanInfo b = Introspector.getBeanInfo(evt.getSource().getClass());\r
-                                       PropertyDescriptor ps[] = b.getPropertyDescriptors();\r
-                                       for ( int i = 0; i < ps.length; i++ ){\r
-                                               if (ps[i].getName().equals(evt.getPropertyName())){\r
-                                                       Type t = ps[i].getReadMethod().getGenericReturnType();\r
-                                                       ParameterizedType p = (ParameterizedType) t;\r
-                                                       Class expected = (Class)p.getActualTypeArguments()[0];\r
-                                                       Field f = expected.getDeclaredField("UNIT");\r
-                                                       Unit u = (Unit) f.get(null);\r
-                                                       \r
-                                                       Amount a = (Amount)evt.getNewValue();\r
-                                                       if (!a.getUnit().isCompatible(u))\r
-                                                               throw new PropertyVetoException(ps[i].getShortDescription()\r
-                                                                               + " must be in units of "\r
-                                                                               + expected.getSimpleName(), evt);\r
-\r
-                                                       System.out.println("Expected " + expected + " got " + u);\r
+                                       try {\r
+                                               BeanInfo b = Introspector.getBeanInfo(evt.getSource().getClass());\r
+                                               PropertyDescriptor ps[] = b.getPropertyDescriptors();\r
+                                               for ( int i = 0; i < ps.length; i++ ){\r
+                                                       if (ps[i].getName().equals(evt.getPropertyName())){\r
+                                                               Type t = ps[i].getReadMethod().getGenericReturnType();\r
+                                                               ParameterizedType p = (ParameterizedType) t;\r
+                                                               Class expected = (Class)p.getActualTypeArguments()[0];\r
+                                                               Field f = expected.getDeclaredField("UNIT");\r
+                                                               Unit u = (Unit) f.get(null);\r
+                                                               \r
+                                                               Amount a = (Amount)evt.getNewValue();\r
+                                                               if (!a.getUnit().isCompatible(u))\r
+                                                                       throw new PropertyVetoException(ps[i].getShortDescription()\r
+                                                                                       + " must be in units of "\r
+                                                                                       + expected.getSimpleName(), evt);\r
+       \r
+                                                               System.out.println("Expected " + expected + " got " + u);\r
+                                                       }\r
                                                }\r
+                                       } catch ( PropertyVetoException e ){\r
+                                               throw e;\r
+                                       } catch (Exception e) {\r
+                                               e.printStackTrace();\r
                                        }\r
-                               } catch ( PropertyVetoException e ){\r
-                                       throw e;\r
-                               } catch (Exception e) {\r
-                                       e.printStackTrace();\r
-                               }\r
                                }\r
                        }\r
                });\r
        }\r
 \r
-       public <T extends Quantity> void checkAmount(Amount<T> a, Class<T> q)\r
-                       throws IllegalArgumentException {\r
-               try {\r
-                       Field f = q.getDeclaredField("UNIT");\r
-                       Unit<T> u = (Unit<T>)f.get(null);\r
-\r
-                       if (!a.getUnit().isCompatible(u)) {\r
-                               throw new IllegalArgumentException("Value "\r
-                                               + " must be in units of " + q.getSimpleName());\r
-                       }\r
-               } catch (Exception e) {\r
-                       throw new Error(e);\r
-               }\r
-       }\r
-\r
        public void addPropertyChangeListener(PropertyChangeListener listener) {\r
                pcs.addPropertyChangeListener(listener);\r
        }\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Chart.java b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
index 0b36d9661f4a1eee978600659b4bf5228fc4ff50..09637baef9610c17571ee857af7016ffb7f54dc1 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/Chart.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Chart.java
@@ -122,6 +122,7 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel  {
                }\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public void setDomain(Iterable<Amount<X>> d) {\r
 \r
                //double low = d.low.doubleValue(xUnit);\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
index 2c195e000185ebf3368d647dded4ccca7527781e..85b8fd67d1d1cfd83f75e344ce5ec8e1a8bc12d3 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -11,19 +11,14 @@ import java.beans.PropertyEditorSupport;
 import java.lang.reflect.InvocationTargetException;\r
 import java.util.Vector;\r
 \r
-import javax.measure.unit.NonSI;\r
 import javax.measure.unit.Unit;\r
 import javax.swing.JFrame;\r
-import javax.swing.JPanel;\r
 import javax.swing.JTextField;\r
 import javax.swing.WindowConstants;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.jscience.physics.amount.Amount;\r
 \r
-import com.billkuker.rocketry.motorsim.Grain;\r
-import com.billkuker.rocketry.motorsim.grain.CoredCylindricalGrain;\r
-import com.billkuker.rocketry.motorsim.grain.RodAndTubeGrain;\r
 import com.l2fprod.common.propertysheet.PropertySheetPanel;\r
 \r
 public class Editor extends PropertySheetPanel {\r
@@ -98,6 +93,7 @@ public class Editor extends PropertySheetPanel {
                        return editor.getText();\r
                }\r
 \r
+               @SuppressWarnings("unchecked")\r
                @Override\r
                public Object getValue() {\r
                        String text = editor.getText().trim();\r
@@ -124,6 +120,7 @@ public class Editor extends PropertySheetPanel {
 \r
                }\r
 \r
+               @SuppressWarnings("unchecked")\r
                @Override\r
                public void setValue(Object o) {\r
                        Amount a = (Amount) o;\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
index cbb48f50641500a25815b3c1e439ff39045fb951..7089ab2f1c415d10452901a3f74fd7b22e15d613 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/GrainPanel.java
@@ -36,7 +36,6 @@ public class GrainPanel extends JPanel {
        private Chart<Length,Area> area;\r
        Chart<Length, Volume> volume;\r
        private XC xc;\r
-       private SL sl;\r
        private Grain grain;\r
        \r
        public GrainPanel(Grain g){\r
@@ -95,7 +94,7 @@ public class GrainPanel extends JPanel {
                left.add(xc);\r
 \r
                left.add(l, BorderLayout.NORTH);\r
-               left.add( sl = new SL(), BorderLayout.SOUTH);\r
+               left.add( new SL(), BorderLayout.SOUTH);\r
        \r
                add(new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, left, charts));\r
 \r