Ticket #3407: osb_npe_and_warnings.2.patch

src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java

@@ -84 +84 @@
             double lat = Double.parseDouble(m.group(3));
             double lon = Double.parseDouble(m.group(2));
             LatLon latlon = new LatLon(lat, lon);
-            Node osmNode = new Node(latlon);
-            osmNode.id = Long.parseLong(m.group(1));
+            Node osmNode = new Node(Long.parseLong(m.group(1)));
+            osmNode.setCoor(latlon);
+            osmNode.incomplete = false;
             osmNode.put("id", m.group(1));
             osmNode.put("note", m.group(4));
             osmNode.put("openstreetbug", "FIXME");

src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java

@@ -78 +78 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
 public class OsbDialog extends ToggleDialog implements OsbObserver, ListSelectionListener, LayerChangeListener,
-        DataChangeListener, MouseListener, OsbActionObserver {
+DataChangeListener, MouseListener, OsbActionObserver {
 
     private static final long serialVersionUID = 1L;
     private DefaultListModel model;
@@ -187 +187 @@
         Collections.sort(sortedList, new BugComparator());
 
         for (Node node : sortedList) {
-            if (!node.deleted) {
+            if (!node.isDeleted()) {
                 model.addElement(new OsbListItem(node));
             }
         }
@@ -217 +217 @@
             }
 
             OsbAction.setSelectedNode(node);
-
             scrollToSelected(node);
+        }
 
-            if (fireSelectionChanged) {
-                Main.main.getCurrentDataSet().setSelected(selected);
-            }
+        // CurrentDataSet may be null if there is no normal, edible map
+        // If so, a temporary DataSet is created because it's the simplest way
+        // to fire all necessary events so OSB updates its popups.
+        DataSet ds = Main.main.getCurrentDataSet();
+        if (fireSelectionChanged) {
+            if(ds == null)
+                ds = new DataSet();
+            ds.setSelected(selected);
         }
     }
 
     private void scrollToSelected(Node node) {
         for (int i = 0; i < model.getSize(); i++) {
             Node current = ((OsbListItem) model.get(i)).getNode();
-            if (current.id == node.id) {
+            if (current.getId()== node.getId()) {
                 list.scrollRectToVisible(list.getCellBounds(i, i));
                 list.setSelectedIndex(i);
                 return;
@@ -319 +324 @@
             }
         });
     }
-    
-        @Override
-        public void showDialog() {
-                if (!downloaded) {
-                        initialDownload();
-                        downloaded = true;
-                }
-                super.showDialog();
-        }
+
+    @Override
+    public void showDialog() {
+        if (!downloaded) {
+            initialDownload();
+            downloaded = true;
+        }
+        super.showDialog();
+    }
 }

src/org/openstreetmap/josm/plugins/osb/gui/OsbListItem.java

@@ -62 +62 @@
         if(obj instanceof OsbListItem) {
             OsbListItem other = (OsbListItem)obj;
             if(getNode() != null && other.getNode() != null) {
-                return getNode().id == other.getNode().id;
+                return getNode().getId() == other.getNode().getId();
             }
         }
 

src/org/openstreetmap/josm/plugins/osb/OsbLayer.java

@@ -124 +124 @@
             Node node = (Node) nodes[i];
 
             // don't paint deleted nodes
-            if(node.deleted)
+            if(node.isDeleted())
                 continue;
 
             Point p = mv.getPoint(node);
@@ -148 +148 @@
         for (int i = 0; i < nodes.length; i++) {
             Node node = (Node) nodes[i];
             
-            if(node.deleted || !selection.contains(node))
+            if(node.isDeleted() || !selection.contains(node))
                 continue;
             
             // draw selection border
@@ -159 +159 @@
             int height = icon.getIconHeight();
             
             g.setColor(ColorHelper.html2color(Main.pref.get("color.selected")));
-            g.drawRect(p.x - (width / 2), p.y - (height / 2), 16, 16);
+            g.drawRect(p.x-(width/2), p.y-(height/2), width-1, height-1);
             
             // draw description
             String desc = node.get("note");
@@ -209 +209 @@
         double minDistanceSq = Double.MAX_VALUE;
         Node minPrimitive = null;
         for (Node n : data.nodes) {
-            if (n.deleted || n.incomplete)
+            if (!n.isUsable())
                 continue;
             Point sp = Main.map.mapView.getPoint(n);
             double dist = p.distanceSq(sp);