Changeset 4724 in josm

Timestamp:

27.12.2011 16:31:36 (5 months ago)

Author:

jttt

Message:

Fix some of errors found by FindBugs

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• data/osm/DataSet.java (modified) (4 diffs)
• data/osm/NodeData.java (modified) (1 diff)
• data/osm/PrimitiveData.java (modified) (3 diffs)
• data/osm/history/History.java (modified) (8 diffs)
• data/osm/visitor/paint/MapPainter.java (modified) (5 diffs)
• io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (4 diffs)
• tools/template_engine/ContextSwitchTemplate.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -39 +39 @@
 import javax.swing.JTextArea;
 import javax.swing.KeyStroke;
-import javax.swing.RepaintManager;
 import javax.swing.UIManager;
 
@@ -887 +886 @@
                 while(it.hasNext()){
                     WeakReference<ProjectionChangeListener> wr = it.next();
-                    if (wr.get() == null) {
+                    ProjectionChangeListener listener = wr.get();
+                    if (listener == null) {
                         it.remove();
                         continue;
                     }
-                    wr.get().projectionChanged(oldValue, newValue);
+                    listener.projectionChanged(oldValue, newValue);
                 }
             }

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

@@ -208 +208 @@
 
     /*
-    * Holding bin for changeset tag information, to be applied when or if this is ever uploaded.
-    */
+     * Holding bin for changeset tag information, to be applied when or if this is ever uploaded.
+     */
     private Map<String, String> changeSetTags = new HashMap<String, String>();
 
@@ -586 +586 @@
             selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
             changed = addSelected(selection, false)
-            || (!wasEmpty && selectedPrimitives.isEmpty());
+                    || (!wasEmpty && selectedPrimitives.isEmpty());
             if (changed) {
                 selectionSnapshot = null;
@@ -783 +783 @@
     }
 
-    /**
-     *
-     * @param primitiveId
-     * @param createNew
-     * @return
-     * @deprecated This method can created inconsistent dataset when called for node with id < 0 and createNew=true. That will add
-     * complete node without coordinates to dataset which is not allowed.
-     */
-    @Deprecated
-    public OsmPrimitive getPrimitiveById(PrimitiveId primitiveId, boolean createNew) {
-        OsmPrimitive result = primitivesMap.get(primitiveId);
-
-        if (result == null && createNew) {
-            switch (primitiveId.getType()) {
-            case NODE: result = new Node(primitiveId.getUniqueId(), true); break;
-            case WAY: result = new Way(primitiveId.getUniqueId(), true); break;
-            case RELATION: result = new Relation(primitiveId.getUniqueId(), true); break;
-            }
-            addPrimitive(result);
-        }
-
-        return result;
-    }
 
     /**
@@ -1175 +1152 @@
         return ret;
     }
-    
+
     /**
      * Moves all primitives and datasources from DataSet "from" to this DataSet

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

@@ -23 +23 @@
 
     private boolean isLatLonKnown() {
-        return lat != Double.NaN && lon != Double.NaN;
+        return !Double.isNaN(lat) && !Double.isNaN(lon);
     }
 

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -27 +28 @@
         this.id = id;
     }
-    
+
     public void setVersion(int version) {
         this.version = version;
     }
-    
+
     /**
      * override to make it public
@@ -45 +46 @@
     public String toString() {
         StringBuilder builder = new StringBuilder();
-        builder.append(id).append(keys).append(getFlagsAsString());
+        builder.append(id).append(Arrays.toString(keys)).append(getFlagsAsString());
         return builder.toString();
     }

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -71 +71 @@
                     }
                 }
-        );
+                );
         return new History(id, type, copy);
     }
@@ -84 +84 @@
                     }
                 }
-        );
+                );
         return new History(id, type,copy);
     }
@@ -96 +96 @@
                     }
                 }
-        );
+                );
     }
 
@@ -107 +107 @@
                     }
                 }
-        );
+                );
     }
 
@@ -122 +122 @@
                     }
                 }
-        );
+                );
     }
 
@@ -133 +133 @@
                     }
                 }
-        );
+                );
     }
 
@@ -140 +140 @@
     }
 
-    public History forUser(final String user) {
-        return filter(
-                this,
-                new FilterPredicate() {
-                    public boolean matches(HistoryOsmPrimitive primitive) {
-                        return primitive.getUser().equals(user);
-                    }
-                }
-        );
-    }
-
     public History forUserId(final long uid) {
         return filter(
@@ -159 +148 @@
                     }
                 }
-        );
+                );
     }
 

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

@@ -252 +252 @@
      * represent a line that is shifted by a certain offset perpendicular
      * to the way direction.
-     * 
+     *
      * There is no intention, to handle consecutive duplicate Nodes in a
      * perfect way, but it is should not throw an exception.
@@ -328 +328 @@
                 int m = dx_next*(y_current0 - y_prev0) - dy_next*(x_current0 - x_prev0);
 
-                int cx_ = x_prev0 + Math.round(m * dx_prev / det);
-                int cy_ = y_prev0 + Math.round(m * dy_prev / det);
+                int cx_ = x_prev0 + Math.round((float)m * dx_prev / det);
+                int cy_ = y_prev0 + Math.round((float)m * dy_prev / det);
                 ++idx;
                 prev = current;
@@ -809 +809 @@
 
         Shape area = path.createTransformedShape(nc.getAffineTransform());
-        
+
         if (!isOutlineOnly) {
             if (fillImage == null) {
@@ -816 +816 @@
             } else {
                 TexturePaint texture = new TexturePaint(fillImage,
-//                        new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
-                      new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
+                        //                        new Rectangle(polygon.xpoints[0], polygon.ypoints[0], fillImage.getWidth(), fillImage.getHeight()));
+                        new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
                 g.setPaint(texture);
                 if (fillImageAlpha != 1f) {
@@ -858 +858 @@
 
             if ((pb.width >= nb.getWidth() && pb.height >= nb.getHeight()) && // quick check
-                  area.contains(centeredNBounds) // slow but nice
-            ) {
+                    area.contains(centeredNBounds) // slow but nice
+                    ) {
                 g.setColor(text.color);
                 Font defaultFont = g.getFont();

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -45 +45 @@
     {
         return tr("Remote Control has been asked to load data from the API.") +
-        "<br>" + tr("Request details: {0}", request);
+                "<br>" + tr("Request details: {0}", request);
     }
 
@@ -81 +81 @@
                     Area toDownload = null;
                     DataSet ds = Main.main.getCurrentDataSet();
-                    if (ds != null)
+                    if (ds != null) {
                         present = ds.getDataSourceArea();
+                    }
                     if (present != null && !present.isEmpty()) {
                         toDownload = new Area(new Rectangle2D.Double(minlon,minlat,maxlon-minlon,maxlat-minlat));
@@ -168 +169 @@
                     }
                     ds.setSelected(newSel);
-                    if (Main.pref.getBoolean(changeViewportPermissionKey, changeViewportPermissionDefault))
+                    if (Main.pref.getBoolean(changeViewportPermissionKey, changeViewportPermissionDefault)) {
                         new AutoScaleAction("selection").actionPerformed(null);
+                    }
                 }
             });
@@ -189 +191 @@
                         tags = URLDecoder.decode(args.get("addtags"), "UTF-8").split("\\|");
                     } catch (UnsupportedEncodingException e) {
-                        new RuntimeException();
+                        throw new RuntimeException();
                     }
                     String[][] keyValue = new String[tags.length][2];

trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java

@@ -171 +171 @@
             List<OsmPrimitive> lhsList = lhs.getPrimitives(root);
             for (OsmPrimitive o: rhs.getPrimitives(root)) {
-                if (lhsList.contains(o) && condition == null && condition.match(o)) {
+                if (lhsList.contains(o) && (condition == null || condition.match(o))) {
                     result.add(o);
                 }