cleared some warnings
authorBill Kuker <bkuker@billkuker.com>
Sun, 24 Oct 2010 18:52:08 +0000 (18:52 +0000)
committerBill Kuker <bkuker@billkuker.com>
Sun, 24 Oct 2010 18:52:08 +0000 (18:52 +0000)
src/com/billkuker/rocketry/motorsim/RocketScience.java

index e208305175da27c1b6769e0be7728026bf9230c9..a76d0abb8cb805218ec80ca6a1047fe061f60747 100644 (file)
@@ -51,26 +51,24 @@ public class RocketScience {
                \r
                protected Set<Unit<?>> units = new HashSet<Unit<?>>();\r
                \r
-               @SuppressWarnings("unchecked")\r
-               UnitPreference( Unit u[] ){\r
-                       for ( Unit uu : u )\r
+               UnitPreference( Unit<?> u[] ){\r
+                       for ( Unit<?> uu : u )\r
                                units.add(uu);\r
                }\r
                \r
                @SuppressWarnings("unchecked")\r
-               public Unit getPreferredUnit(Unit u){\r
+               public <T extends Quantity> Unit<T> getPreferredUnit(Unit<T> u){\r
                        if ( units.contains(u) )\r
                                return u;\r
-                       for( Unit ret : units ){\r
+                       for( Unit<?> ret : units ){\r
                                if ( ret.isCompatible(u) ){\r
-                                       return ret;\r
+                                       return (Unit<T>) ret;\r
                                }\r
                        }\r
                        return u;\r
                }\r
        }\r
 \r
-       @SuppressWarnings("unchecked")\r
        public static <T extends Quantity> String approx(Amount<T> a) {\r
                if (a == null)\r
                        return "NULL";\r