Changeset 17520 in osm

Timestamp:

2009-09-08T17:08:26+02:00 (15 years ago)

Author:

stoecker

Message:

close josm 3407 - patch by xeen

Location:

applications/editors/josm/plugins/openstreetbugs

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osb/OsbLayer.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/osb/gui/OsbListItem.java (modified) (1 diff)

applications/editors/josm/plugins/openstreetbugs/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/OpenStreetBugs"/>
-                <attribute name="Plugin-Mainversion" value="2010"/>
+                <attribute name="Plugin-Mainversion" value="2067"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java

@@ -68 +68 @@
 
     private JToolTip tooltip = new JToolTip();
-    
+
     private static ImageIcon iconError = OsbPlugin.loadIcon("icon_error16.png");
     private static ImageIcon iconValid = OsbPlugin.loadIcon("icon_valid16.png");
@@ -83 +83 @@
         // if the map layer has been closed, while we are requesting the osb db,
         // the mapframe is null, so we check that, before installing the mouse listener
-        if(Main.map != null && Main.map.mapView != null) { 
+        if(Main.map != null && Main.map.mapView != null) {
             Main.map.mapView.addMouseListener(this);
         }
@@ -125 +125 @@
 
             // don't paint deleted nodes
-            if(node.deleted)
+            if(!node.isUsable())
                 continue;
 
@@ -140 +140 @@
             });
         }
-        
+
         if(selection == null)
             return;
-        
+
         // This loop renders the selection border and tooltips so they get drawn
         // on top of the bug icons
         for (int i = 0; i < nodes.length; i++) {
             Node node = (Node) nodes[i];
-            
-            if(node.deleted || !selection.contains(node))
-                continue;
-            
+
+            if(!node.isUsable() || !selection.contains(node))
+                continue;
+
             // draw selection border
             Point p = mv.getPoint(node);
-            
+
             ImageIcon icon = ("1".equals(node.get("state"))) ? iconValid : iconError;
             int width = icon.getIconWidth();
             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");
@@ -175 +175 @@
             // draw description as a tooltip
             tooltip.setTipText(desc);
-            
+
             int tx = p.x + (width / 2) + 5;
             int ty = (int)(p.y - height / 2) -1;
             g.translate(tx, ty);
-            
+
             // This limits the width of the tooltip to 2/3 of the drawing
             // area, which makes longer tooltips actually readable (they
             // would disappear if scrolled too much to the right)
-            
+
             // Need to do this twice as otherwise getPreferredSize doesn't take
             // the reduced width into account
             for(int x = 0; x < 2; x++) {
-                Dimension d = tooltip.getUI().getPreferredSize(tooltip);                
+                Dimension d = tooltip.getUI().getPreferredSize(tooltip);
                 d.width = Math.min(d.width, (int)(mv.getWidth()*2/3));
                 tooltip.setSize(d);
                 tooltip.paint(g);
             }
-            
+
             g.translate(-tx, -ty);
         }
@@ -210 +210 @@
         Node minPrimitive = null;
         for (Node n : data.nodes) {
-            if (n.deleted || n.incomplete)
+            if (!n.isUsable())
                 continue;
             Point sp = Main.map.mapView.getPoint(n);

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java

@@ -85 +85 @@
             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));

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java

@@ -79 +79 @@
 
 public class OsbDialog extends ToggleDialog implements OsbObserver, ListSelectionListener, LayerChangeListener,
-        DataChangeListener, MouseListener, OsbActionObserver {
+DataChangeListener, MouseListener, OsbActionObserver {
 
     private static final long serialVersionUID = 1L;
@@ -188 +188 @@
 
         for (Node node : sortedList) {
-            if (!node.deleted) {
+            if (node.isUsable()) {
                 model.addElement(new OsbListItem(node));
             }
@@ -218 +218 @@
 
             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);
         }
     }
@@ -230 +235 @@
         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);
@@ -320 +325 @@
         });
     }
-    
-        @Override
-        public void showDialog() {
-                if (!downloaded) {
-                        initialDownload();
-                        downloaded = true;
-                }
-                super.showDialog();
-        }
+
+    @Override
+    public void showDialog() {
+        if (!downloaded) {
+            initialDownload();
+            downloaded = true;
+        }
+        super.showDialog();
+    }
 }

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbListItem.java

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