From d56d91dfda2b7cac9e33370fc0baa3dd51362bfa Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Mon, 5 Sep 2011 21:10:36 +0000 Subject: [PATCH] Clear warnings for Indigo --- .../net.sourceforge.metrics.builder.launch | 7 +++ .project | 53 ++++++++++--------- .../rocketry/motorsim/visual/Editor.java | 4 +- src/com/billkuker/rocketry/motorsim/Burn.java | 2 +- .../rocketry/motorsim/GraphSimplifier.java | 4 ++ .../rocketry/motorsim/QuantityChecking.aj | 2 +- .../rocketry/motorsim/grain/EndBurner.java | 1 - .../rocketry/motorsim/io/MotorIO.java | 6 +-- .../motorsim/test/AbstractRocketTest.java | 4 +- 9 files changed, 49 insertions(+), 34 deletions(-) create mode 100644 .externalToolBuilders/net.sourceforge.metrics.builder.launch diff --git a/.externalToolBuilders/net.sourceforge.metrics.builder.launch b/.externalToolBuilders/net.sourceforge.metrics.builder.launch new file mode 100644 index 0000000..8ea1ae6 --- /dev/null +++ b/.externalToolBuilders/net.sourceforge.metrics.builder.launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.project b/.project index 9e6c56f..9226a9e 100644 --- a/.project +++ b/.project @@ -1,24 +1,29 @@ - - - MotorSim - - - - - - org.eclipse.ajdt.core.ajbuilder - - - - - net.sourceforge.metrics.builder - - - - - - org.eclipse.ajdt.ui.ajnature - org.eclipse.jdt.core.javanature - net.sourceforge.metrics.nature - - + + + MotorSim + + + + + + org.eclipse.ajdt.core.ajbuilder + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/net.sourceforge.metrics.builder.launch + + + + + + org.eclipse.ajdt.ui.ajnature + org.eclipse.jdt.core.javanature + net.sourceforge.metrics.nature + + diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java index c22398c..824e9e5 100644 --- 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 { private Object obj; - @SuppressWarnings("deprecation") + @SuppressWarnings({ "deprecation", "rawtypes", "unchecked" }) public Editor(Object o) { obj = o; @@ -209,7 +209,7 @@ public class Editor extends PropertySheetPanel { } - @SuppressWarnings("unchecked") + @SuppressWarnings({"rawtypes","unchecked"}) @Override public void setValue(Object o) { Amount a = (Amount) o; diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java index 0416d1e..cea51d5 100644 --- a/src/com/billkuker/rocketry/motorsim/Burn.java +++ b/src/com/billkuker/rocketry/motorsim/Burn.java @@ -311,7 +311,7 @@ public class Burn { } } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) /* * This converts the units of this constant to something JScience is able * to work from. This conversion is unchecked at compile time, but diff --git a/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java b/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java index 4430d99..07837a3 100644 --- a/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java +++ b/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java @@ -26,10 +26,12 @@ public class GraphSimplifier { Amount y; } + @SuppressWarnings("rawtypes") private class DDEntry implements Comparable { Amount x; Amount dd; + @SuppressWarnings("unchecked") @Override public int compareTo(DDEntry o) { return o.dd.compareTo(dd); @@ -56,6 +58,7 @@ public class GraphSimplifier { Entry max = null; while (domain.hasNext()) { Amount x = domain.next(); + @SuppressWarnings("unchecked") Amount y = (Amount) f.invoke(source, x); Entry e = new Entry(); e.x = x; @@ -79,6 +82,7 @@ public class GraphSimplifier { 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 95a8c5a..4b4e30b 100644 --- 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 1d6e475..6439e85 100644 --- 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 a3b3a6f..19d8aef 100644 --- 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{ @Override - public boolean canConvert(Class c) { + public boolean canConvert(@SuppressWarnings("rawtypes") Class c) { return Fuel.class.isAssignableFrom(c); } @@ -76,7 +76,7 @@ public class MotorIO { static class AmountConverter implements Converter{ - @SuppressWarnings("unchecked") + @SuppressWarnings({"rawtypes","unchecked"}) public void marshal(Object o, HierarchicalStreamWriter w, MarshallingContext c) { Amount a = (Amount)o; String text; @@ -101,7 +101,7 @@ public class MotorIO { return s.replace("^3", "\u00B3"); } - public boolean canConvert(Class c) { + public boolean canConvert(@SuppressWarnings("rawtypes") Class c) { return c.equals(Amount.class); } diff --git a/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java b/test/com/billkuker/rocketry/motorsim/test/AbstractRocketTest.java index 986ccba..0d2b346 100644 --- 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 { protected static final Unit cubeMM = SI.MILLIMETER.pow(3).asType(javax.measure.quantity.Volume.class); - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) protected void assertApproximate(Amount a, Amount b){ Assert.assertTrue("" + a.to(b.getUnit()) + " !~ " + b , a.approximates(b)); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) protected void assertApproximate(Amount a, Amount b, Amount diff){ Assert.assertTrue("" + a.to(b.getUnit()) + " !~~ " + b , a.minus(b).abs().isLessThan(diff)); } -- 2.47.2