Changeset 6142 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2013-08-11T21:23:19+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8902 - fix compilation warnings

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• Cascade.java (modified) (1 diff)
• mapcss/ExpressionFactory.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

@@ -147 +147 @@
             return (float[]) o;
         if (o instanceof List) {
-            List l = (List) o;
+            List<?> l = (List<?>) o;
             float[] a = new float[l.size()];
             for (int i=0; i<l.size(); ++i) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -131 +131 @@
         }
 
-        public static Object get(List objects, float index) {
+        public static Object get(List<? extends Object> objects, float index) {
             int idx = Math.round(index);
             if (idx >= 0 && idx < objects.size()) {
@@ -139 +139 @@
         }
 
-        public static List split(String sep, String toSplit) {
+        public static List<String> split(String sep, String toSplit) {
             return Arrays.asList(toSplit.split(Pattern.quote(sep), -1));
         }
@@ -265 +265 @@
         }
 
-        @SuppressWarnings(value = "unchecked")
         public static boolean equal(Object a, Object b) {
             // make sure the casts are done in a meaningful way, so
             // the 2 objects really can be considered equal
-            for (Class klass : new Class[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
+            for (Class<?> klass : new Class[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
                 Object a2 = Cascade.convertTo(a, klass);
                 Object b2 = Cascade.convertTo(b, klass);
@@ -317 +316 @@
         }
 
-        public static List regexp_match(String pattern, String target, String flags) {
+        public static List<String> regexp_match(String pattern, String target, String flags) {
             int f = 0;
             if (flags.contains("i")) {
@@ -340 +339 @@
         }
 
-        public static List regexp_match(String pattern, String target) {
+        public static List<String> regexp_match(String pattern, String target) {
             Matcher m = Pattern.compile(pattern).matcher(target);
             if (m.matches()) {
@@ -480 +479 @@
         @Override
         public Object evaluate(Environment env) {
-            List l = Cascade.convertTo(arg.evaluate(env), List.class);
+            List<?> l = Cascade.convertTo(arg.evaluate(env), List.class);
             if (l != null)
                 return l.size();