Changeset 18595 in osm for applications/editors/josm/plugins/openstreetbugs

Timestamp:

2009-11-14T19:38:46+01:00 (15 years ago)

Author:

jttt

Message:

Updated to new MapViewPaintable.paint arguments

Location:

applications/editors/josm/plugins/openstreetbugs

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osb/OsbLayer.java (modified) (7 diffs)

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="2401"/>
+                <attribute name="Plugin-Mainversion" value="2450"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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

@@ -32 +32 @@
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Point;
@@ -48 +48 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -118 +119 @@
 
     @Override
-    public void paint(Graphics g, MapView mv) {
+    public void paint(Graphics2D g, MapView mv, Bounds bounds) {
         Object[] nodes = data.getNodes().toArray();
         // This loop renders all the bug icons
@@ -178 +179 @@
 
             int tx = p.x + (width / 2) + 5;
-            int ty = (int)(p.y - height / 2) -1;
+            int ty = (p.y - height / 2) -1;
             g.translate(tx, ty);
 
@@ -189 +190 @@
             for(int x = 0; x < 2; x++) {
                 Dimension d = tooltip.getUI().getPreferredSize(tooltip);
-                d.width = Math.min(d.width, (int)(mv.getWidth()*2/3));
+                d.width = Math.min(d.width, (mv.getWidth()*2/3));
                 tooltip.setSize(d);
                 tooltip.paint(g);
@@ -231 +232 @@
         if(e.getButton() == MouseEvent.BUTTON1) {
             if(Main.map.mapView.getActiveLayer() == this) {
-                Node n = (Node) getNearestNode(e.getPoint());
+                Node n = getNearestNode(e.getPoint());
                 if(data.getNodes().contains(n)) {
                     data.setSelected(n);
@@ -250 +251 @@
         if(e.isPopupTrigger()) {
             if(Main.map.mapView.getActiveLayer() == this) {
-                Node n = (Node) getNearestNode(e.getPoint());
+                Node n = getNearestNode(e.getPoint());
                 OsbAction.setSelectedNode(n);
                 if(data.getNodes().contains(n)) {