Changeset 6113 in josm

Timestamp:

2013-08-06T22:02:27+02:00 (11 years ago)

Author:

Don-vip

Message:

fix some compilation warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/PurgeCommand.java (modified) (1 diff)
• data/osm/QuadBuckets.java (modified) (1 diff)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• data/validation/tests/RelationChecker.java (modified) (1 diff)
• gui/dialogs/properties/TagEditHelper.java (modified) (2 diffs)
• tools/Geometry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -192 +192 @@
 
         /**
-            * Rest are relations. Do topological sorting on a DAG where each
-            * arrow points from child to parent. (Because it is faster to
-            * loop over getReferrers() than getMembers().)
-            */
+          * Rest are relations. Do topological sorting on a DAG where each
+          * arrow points from child to parent. (Because it is faster to
+          * loop over getReferrers() than getMembers().)
+          */
+        @SuppressWarnings({ "unchecked", "rawtypes" })
         Set<Relation> inR = (Set) in;
         Set<Relation> childlessR = new HashSet<Relation>();

trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

@@ -102 +102 @@
             // testing.  Child access is one of the single
             // hottest code paths in this entire class.
+            @SuppressWarnings("unchecked")
             QBLevel[] result = (QBLevel[]) Array.newInstance(this.getClass(), QuadTiling.TILES_PER_LEVEL);
             result[NW_INDEX] = nw;

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

@@ -154 +154 @@
      * @param bounds display boundaries
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void render(DataSet data, boolean virtual, Bounds bounds) {

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -88 +88 @@
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void visit(Relation n) {

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

@@ -158 +158 @@
         objKey=key;
         
+        @SuppressWarnings("unchecked")
         final EditTagDialog editDialog = new EditTagDialog(key, row, 
                 (Map<String, Integer>) propertyData.getValueAt(row, 1), focusOnKey);
@@ -164 +165 @@
         editDialog.performTagEdit();
     }
+    
     /**
      * If during last editProperty call user changed the key name, this key will be returned

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -49 +49 @@
     public static Set<Node> addIntersections(List<Way> ways, boolean test, List<Command> cmds) {
 
-        //stupid java, cannot instantiate array of generic classes..
+        int n = ways.size();
         @SuppressWarnings("unchecked")
-        int n = ways.size();
         ArrayList<Node>[] newNodes = new ArrayList[n];
         BBox[] wayBounds = new BBox[n];
@@ -67 +66 @@
         //iterate over all way pairs and introduce the intersections
         Comparator<Node> coordsComparator = new NodePositionComparator();
-        WayLoop: for (int seg1Way = 0; seg1Way < n; seg1Way ++) {
+        for (int seg1Way = 0; seg1Way < n; seg1Way ++) {
             for (int seg2Way = seg1Way; seg2Way < n; seg2Way ++) {