Clear warnings for Indigo

diff --git a/.externalToolBuilders/net.sourceforge.metrics.builder.launch b/.externalToolBuilders/net.sourceforge.metrics.builder.launch
new file mode 100644 (file)
index 0000000..8ea1ae6
--- /dev/null
+++ b/.externalToolBuilders/net.sourceforge.metrics.builder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">\r
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>\r
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="net.sourceforge.metrics.builder"/>\r
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>\r
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>\r
+</launchConfiguration>\r

diff --git a/.project b/.project
index 9e6c56f40c8fb97963f373c72bf9c54481bab97c..9226a9ead006bb06e4338afb92a589f1157180ec 100644 (file)
--- a/.project
+++ b/.project
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>MotorSim</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.ajdt.core.ajbuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>net.sourceforge.metrics.builder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.ajdt.ui.ajnature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>net.sourceforge.metrics.nature</nature>
-       </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>MotorSim</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.ajdt.core.ajbuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>\r
+                       <triggers>full,incremental,</triggers>\r
+                       <arguments>\r
+                               <dictionary>\r
+                                       <key>LaunchConfigHandle</key>\r
+                                       <value>&lt;project&gt;/.externalToolBuilders/net.sourceforge.metrics.builder.launch</value>\r
+                               </dictionary>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.ajdt.ui.ajnature</nature>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+               <nature>net.sourceforge.metrics.nature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
index c22398c74d6e454724d2dd46c50d322b687a4c60..824e9e5fd0738ab99400b0db96f8a19943f3d182 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -39,7 +39,7 @@ public class Editor extends PropertySheetPanel {
 \r
        private Object obj;\r
 \r
-       @SuppressWarnings("deprecation")\r
+       @SuppressWarnings({ "deprecation", "rawtypes", "unchecked" })\r
        public Editor(Object o) {\r
                obj = o;\r
 \r
@@ -209,7 +209,7 @@ public class Editor extends PropertySheetPanel {
 \r
                }\r
 \r
-               @SuppressWarnings("unchecked")\r
+               @SuppressWarnings({"rawtypes","unchecked"})\r
                @Override\r
                public void setValue(Object o) {\r
                        Amount a = (Amount) o;\r

diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java
index 0416d1ec0892a087710627ceb61555854534f99c..cea51d5d5834a970b018487c3122cfe6d4947f18 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Burn.java
+++ b/src/com/billkuker/rocketry/motorsim/Burn.java
@@ -311,7 +311,7 @@ public class Burn {
                }\r
        }\r
        \r
-       @SuppressWarnings("unchecked")\r
+       @SuppressWarnings({ "unchecked", "rawtypes" })\r
        /*\r
         * This converts the units of this constant to something JScience is able\r
         * to work from. This conversion is unchecked at compile time, but\r

diff --git a/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java b/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java
index 4430d998ccb84d0d1212195a7eb6c0a6df0a1226..07837a3d59598f6fdebe170232fea2836c08203f 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java
+++ b/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java
@@ -26,10 +26,12 @@ public class GraphSimplifier<X extends Quantity, Y extends Quantity> {
                Amount<Y> y;
        }
 
+       @SuppressWarnings("rawtypes")
        private class DDEntry implements Comparable<DDEntry> {
                Amount<X> x;
                Amount dd;
 
+               @SuppressWarnings("unchecked")
                @Override
                public int compareTo(DDEntry o) {
                        return o.dd.compareTo(dd);
@@ -56,6 +58,7 @@ public class GraphSimplifier<X extends Quantity, Y extends Quantity> {
                Entry max = null;
                while (domain.hasNext()) {
                        Amount<X> x = domain.next();
+                       @SuppressWarnings("unchecked")
                        Amount<Y> y = (Amount<Y>) f.invoke(source, x);
                        Entry e = new Entry();
                        e.x = x;
@@ -79,6 +82,7 @@ public class GraphSimplifier<X extends Quantity, Y extends Quantity> {
                                out.put(middle.x, middle.y);
                        }
 
+                       @SuppressWarnings("rawtypes")
                        Amount d1, d2, dd;
 
                        d1 = middle.y.minus(low.y).divide(middle.x.minus(low.x));

diff --git a/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj b/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
index 95a8c5ad0edbf010d755a3edffd85372c818787f..4b4e30bff8dba5ed12bc73a13556915d9af154d6 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
+++ b/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
@@ -20,7 +20,7 @@ public aspect QuantityChecking {
 
        declare parents: Motor || Grain || Chamber || Nozzle || Fuel extends Checked;
 
-       @SuppressWarnings("unchecked")
+       @SuppressWarnings({"rawtypes","unchecked"})
        void around(Checked c, Amount amt):
                execution(void Checked+.set*(Amount)) && target(c) && args(amt) {
                try {

diff --git a/src/com/billkuker/rocketry/motorsim/grain/EndBurner.java b/src/com/billkuker/rocketry/motorsim/grain/EndBurner.java
index 1d6e475cf16064803d19755b8024de380d04211e..6439e85e8d11883ea3c2efad7320ffca30abd6ff 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/grain/EndBurner.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/EndBurner.java
@@ -10,7 +10,6 @@ import javax.measure.unit.SI;
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.Validating;
-import com.billkuker.rocketry.motorsim.Validating.ValidationException;
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;
 import com.billkuker.rocketry.motorsim.grain.util.RotatedShapeGrain;
 

diff --git a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
index a3b3a6f910678bc6a88b9c2b6b53d266425faf87..19d8aef13f1935a2e10c12adcf44acf4b20bebc8 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
+++ b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
@@ -29,7 +29,7 @@ public class MotorIO {
        static class FuelConverter implements Converter{\r
 \r
                @Override\r
-               public boolean canConvert(Class c) {\r
+               public boolean canConvert(@SuppressWarnings("rawtypes") Class c) {\r
                        return Fuel.class.isAssignableFrom(c);\r
                }\r
 \r
@@ -76,7 +76,7 @@ public class MotorIO {
        \r
        static class AmountConverter implements Converter{\r
                \r
-               @SuppressWarnings("unchecked")\r
+               @SuppressWarnings({"rawtypes","unchecked"})\r
                public void marshal(Object o, HierarchicalStreamWriter w, MarshallingContext c) {\r
                        Amount a = (Amount)o;\r
                        String text;\r
@@ -101,7 +101,7 @@ public class MotorIO {
                        return s.replace("^3", "\u00B3");\r
                }\r
 \r
-               public boolean canConvert(Class c) {\r
+               public boolean canConvert(@SuppressWarnings("rawtypes") Class c) {\r
                        return c.equals(Amount.class);\r
                }\r
                \r

diff --git a/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java b/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java
index 986ccbaab5986489ddc351e7eae8732f7f0e0466..0d2b346007b34f8d0a4104522ce74feaf06b2531 100644 (file)
--- a/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java
+++ b/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java
@@ -13,12 +13,12 @@ public abstract class AbstractRocketTest {
        \r
        protected static final Unit<javax.measure.quantity.Volume> cubeMM = SI.MILLIMETER.pow(3).asType(javax.measure.quantity.Volume.class);\r
 \r
-       @SuppressWarnings("unchecked")\r
+       @SuppressWarnings({ "unchecked", "rawtypes" })\r
        protected void assertApproximate(Amount a, Amount b){\r
                Assert.assertTrue("" + a.to(b.getUnit()) + " !~ " + b , a.approximates(b));\r
        }\r
        \r
-       @SuppressWarnings("unchecked")\r
+       @SuppressWarnings({ "unchecked", "rawtypes" })\r
        protected void assertApproximate(Amount a, Amount b, Amount diff){\r
                Assert.assertTrue("" + a.to(b.getUnit()) + " !~~ " + b ,  a.minus(b).abs().isLessThan(diff));\r
        }\r