Changeset 5590 in josm for trunk

Timestamp:

2012-11-18T16:40:44+01:00 (12 years ago)

Author:

bastiK

Message:

suppress some warnings (unchecked cast mostly)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/CustomConfigurator.java (modified) (2 diffs)
• data/Preferences.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (3 diffs)
• gui/preferences/advanced/AdvancedPreference.java (modified) (2 diffs)
• gui/preferences/advanced/MapListEditor.java (modified) (1 diff)
• io/GpxReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -1028 +1028 @@
         engine.eval(finish);
 
+        @SuppressWarnings("unchecked")
         Map<String, String> stringMap =  (Map<String, String>) engine.get("stringMap");
+        @SuppressWarnings("unchecked")
         Map<String, List<String>> listMap = (SortedMap<String, List<String>> ) engine.get("listMap");
+        @SuppressWarnings("unchecked")
         Map<String, List<Collection<String>>> listlistMap = (SortedMap<String, List<Collection<String>>>) engine.get("listlistMap");
+        @SuppressWarnings("unchecked")
         Map<String, List<Map<String, String>>> listmapMap = (SortedMap<String, List<Map<String,String>>>) engine.get("listmapMap");
 
@@ -1050 +1054 @@
         for (Entry<String, List<Collection<String>>> e : listlistMap.entrySet()) {
             if (Preferences.equalArray(e.getValue(), tmpPref.arrayDefaults.get(e.getKey()))) continue;
-            tmpPref.arrayProperties.put(e.getKey(), (List<List<String>>)(List)e.getValue());
+            @SuppressWarnings("unchecked") List<List<String>> value = (List)e.getValue();
+            tmpPref.arrayProperties.put(e.getKey(), value);
         }
 

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1799 +1799 @@
         if (a instanceof StringSetting) 
             return (a.getValue().equals(b.getValue()));
-        if (a instanceof ListSetting) 
-            return equalCollection((Collection<String>) a.getValue(), (Collection<String>) b.getValue());
-        if (a instanceof ListListSetting) 
-            return equalArray((Collection<Collection<String>>) a.getValue(), (Collection<List<String>>) b.getValue());
-        if (a instanceof MapListSetting) 
-            return equalListOfStructs((Collection<Map<String, String>>) a.getValue(), (Collection<Map<String, String>>) b.getValue());
+        if (a instanceof ListSetting) {
+            @SuppressWarnings("unchecked") Collection<String> aValue = (Collection) a.getValue();
+            @SuppressWarnings("unchecked") Collection<String> bValue = (Collection) b.getValue();
+            return equalCollection(aValue, bValue);
+        }
+        if (a instanceof ListListSetting) {
+            @SuppressWarnings("unchecked") Collection<Collection<String>> aValue = (Collection) a.getValue();
+            @SuppressWarnings("unchecked") Collection<List<String>> bValue = (Collection) b.getValue();
+            return equalArray(aValue, bValue);
+        }
+        if (a instanceof MapListSetting) {
+            @SuppressWarnings("unchecked") Collection<Map<String, String>> aValue = (Collection) a.getValue();
+            @SuppressWarnings("unchecked") Collection<Map<String, String>> bValue = (Collection) b.getValue();
+            return equalListOfStructs(aValue, bValue);
+        }
         return a.equals(b);
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -24 +24 @@
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -61 +60 @@
 import org.openstreetmap.josm.gui.mappaint.TextElement;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -1194 +1192 @@
 
                             while (dist < segmentLength) {
-                                for (Pair<Float, GeneralPath> sizeAndPath : Arrays.asList(new Pair[] {
-                                        new Pair<Float, GeneralPath>(3f, onewayArrowsCasing),
-                                        new Pair<Float, GeneralPath>(2f, onewayArrows)})) {
+                                for (int i=0; i<2; ++i) {
+                                    float onewaySize = i == 0 ? 3f : 2f;
+                                    GeneralPath onewayPath = i == 0 ? onewayArrowsCasing : onewayArrows;
 
                                     // scale such that border is 1 px
-                                    final double fac = - (onewayReversed ? -1 : 1) * sizeAndPath.a * (1 + sinPHI) / (sinPHI * cosPHI);
+                                    final double fac = - (onewayReversed ? -1 : 1) * onewaySize * (1 + sinPHI) / (sinPHI * cosPHI);
                                     final double sx = nx * fac;
                                     final double sy = ny * fac;
@@ -1205 +1203 @@
                                     // Attach the triangle at the incenter and not at the tip.
                                     // Makes the border even at all sides.
-                                    final double x = p1.x + nx * (dist + (onewayReversed ? -1 : 1) * (sizeAndPath.a / sinPHI));
-                                    final double y = p1.y + ny * (dist + (onewayReversed ? -1 : 1) * (sizeAndPath.a / sinPHI));
-
-                                    sizeAndPath.b.moveTo(x, y);
-                                    sizeAndPath.b.lineTo (x + cosPHI * sx - sinPHI * sy, y + sinPHI * sx + cosPHI * sy);
-                                    sizeAndPath.b.lineTo (x + cosPHI * sx + sinPHI * sy, y - sinPHI * sx + cosPHI * sy);
-                                    sizeAndPath.b.lineTo(x, y);
+                                    final double x = p1.x + nx * (dist + (onewayReversed ? -1 : 1) * (onewaySize / sinPHI));
+                                    final double y = p1.y + ny * (dist + (onewayReversed ? -1 : 1) * (onewaySize / sinPHI));
+
+                                    onewayPath.moveTo(x, y);
+                                    onewayPath.lineTo (x + cosPHI * sx - sinPHI * sy, y + sinPHI * sx + cosPHI * sy);
+                                    onewayPath.lineTo (x + cosPHI * sx + sinPHI * sy, y - sinPHI * sx + cosPHI * sy);
+                                    onewayPath.lineTo(x, y);
                                 }
                                 dist += interval;

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -238 +238 @@
      * @param row The row of the table from which the value is edited.
      */
-    @SuppressWarnings("unchecked")
     private void editProperty(int row) {
         Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
@@ -269 +268 @@
         p.add(keys, GBC.eol().fill(GBC.HORIZONTAL));
 
+        @SuppressWarnings("unchecked")
         final Map<String, Integer> m = (Map<String, Integer>) propertyData.getValueAt(row, 1);
 
@@ -1376 +1376 @@
                     row = propertyTable.getSelectedRow();
                     String key = URLEncoder.encode(propertyData.getValueAt(row, 0).toString(), "UTF-8");
-                    String val = URLEncoder.encode(
-                            ((Map<String,Integer>)propertyData.getValueAt(row, 1))
-                            .entrySet().iterator().next().getKey(), "UTF-8"
-                            );
+                    @SuppressWarnings("unchecked")
+                    Map<String, Integer> m = (Map<String, Integer>) propertyData.getValueAt(row, 1);
+                    String val = URLEncoder.encode(m.entrySet().iterator().next().getKey(), "UTF-8");
 
                     uris.add(new URI(String.format("%s%sTag:%s=%s", base, lang, key, val)));

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -585 +585 @@
                 if (llEditor.getValue() == 1) {
                     List<List<String>> data = llEditor.getData();
-                    if (!Preferences.equalArray((Collection) llSetting.getValue(), data)) {
+                    @SuppressWarnings("unchecked")
+                    Collection<Collection<String>> llSettingValue = (Collection) llSetting.getValue();
+                    if (!Preferences.equalArray(llSettingValue, data)) {
                         pe.setValue(new ListListSetting(data));
                         ok = true;
@@ -645 +647 @@
             if (llEditor.getValue() == 1) {
                 List<List<String>> data = llEditor.getData();
-                if (!Preferences.equalArray((Collection) stg.getValue(), data)) {
+                @SuppressWarnings("unchecked")
+                Collection<Collection<String>> stgValue = (Collection) stg.getValue();
+                if (!Preferences.equalArray(stgValue, data)) {
                     e.setValue(new ListListSetting(data));
                     applyFilter();

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java

@@ -203 +203 @@
         private List<List<String>> data() {
             if (entryIdx == null) return Collections.emptyList();
-            return Arrays.asList(dataKeys.get(entryIdx), dataValues.get(entryIdx));
+            @SuppressWarnings("unchecked")
+            List<List<String>> result = Arrays.asList(dataKeys.get(entryIdx), dataValues.get(entryIdx));
+            return result;
         }
 

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -385 +385 @@
                 GpxLink link = new GpxLink(url);
                 link.text = urlname;
-                ((Collection<GpxLink>) attr.get(GpxData.META_LINKS)).add(link);
+                @SuppressWarnings("unchecked")
+                Collection<GpxLink> links = (Collection) attr.get(GpxData.META_LINKS);
+                links.add(link);
             }
         }