Index: applications/editors/josm/plugins/cadastre-fr/build.xml =================================================================== --- applications/editors/josm/plugins/cadastre-fr/build.xml (revision 18594) +++ applications/editors/josm/plugins/cadastre-fr/build.xml (revision 18595) @@ -26,5 +26,5 @@ - + Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java =================================================================== --- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (revision 18594) +++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (revision 18595) @@ -26,7 +26,8 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.data.projection.LambertCC9Zones; -import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; @@ -34,5 +35,4 @@ import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.io.OsmTransferException; -import org.openstreetmap.josm.data.coor.EastNorth; /** @@ -65,7 +65,7 @@ private boolean isRaster = false; - + private boolean isAlreadyGeoreferenced = false; - + public double X0, Y0, angle, fX, fY; @@ -73,5 +73,5 @@ private EastNorth rasterMax; private double rasterRatio; - + private JMenuItem saveAsPng; @@ -103,5 +103,5 @@ if (isRaster) { b = new Bounds(Main.proj.eastNorth2latlon(rasterMin), Main.proj.eastNorth2latlon(rasterMax)); - divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider", + divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider", CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER))); } else @@ -203,8 +203,8 @@ @Override - public void paint(Graphics g, final MapView mv) { + public void paint(Graphics2D g, final MapView mv, Bounds bounds) { synchronized(this){ for (GeorefImage img : images) - img.paint((Graphics2D) g, mv, CadastrePlugin.backgroundTransparent, + img.paint(g, mv, CadastrePlugin.backgroundTransparent, CadastrePlugin.transparency, CadastrePlugin.drawBoundaries); } @@ -236,5 +236,5 @@ saveAsPng, new JMenuItem(new LayerListPopup.InfoAction(this)), - + }; return component; @@ -336,9 +336,9 @@ /** - * Set raster positions used for grabbing and georeferencing. + * Set raster positions used for grabbing and georeferencing. * rasterMin is the Eaast North of bottom left corner raster image on the screen when image is grabbed. * The bounds width and height are the raster width and height. The image width matches the current view * and the image height is adapted. - * Required: the communeBBox must be set (normally it is catched by CadastreInterface and saved by DownloadWMSPlanImage) + * Required: the communeBBox must be set (normally it is catched by CadastreInterface and saved by DownloadWMSPlanImage) * @param bounds the current main map view boundaries */ @@ -347,5 +347,5 @@ EastNorth eaMin = Main.proj.latlon2eastNorth(bounds.getMin()); EastNorth eaMax = Main.proj.latlon2eastNorth(bounds.getMax()); - double rasterSizeX = communeBBox.max.getX() - communeBBox.min.getX(); + double rasterSizeX = communeBBox.max.getX() - communeBBox.min.getX(); double rasterSizeY = communeBBox.max.getY() - communeBBox.min.getY(); double ratio = rasterSizeY/rasterSizeX; @@ -443,5 +443,5 @@ return true; } - + /** * Join the grabbed images into one single. @@ -454,5 +454,5 @@ EastNorth max = images.get(images.size()-1).max; int oldImgWidth = images.get(0).image.getWidth(); - int oldImgHeight = images.get(0).image.getHeight(); + int oldImgHeight = images.get(0).image.getHeight(); int newWidth = oldImgWidth*(int)Math.sqrt(images.size()); int newHeight = oldImgHeight*(int)Math.sqrt(images.size()); @@ -475,15 +475,15 @@ } } - + /** * Image cropping based on two EN coordinates pointing to two corners in diagonal * Because it's coming from user mouse clics, we have to sort de positions first. * Works only for raster image layer (only one image in collection). - * Updates layer georeferences. + * Updates layer georeferences. * @param en1 * @param en2 */ public void cropImage(EastNorth en1, EastNorth en2){ - // adj1 is corner bottom, left + // adj1 is corner bottom, left EastNorth adj1 = new EastNorth(en1.east() <= en2.east() ? en1.east() : en2.east(), en1.north() <= en2.north() ? en1.north() : en2.north()); @@ -501,5 +501,5 @@ Graphics g = new_img.getGraphics(); g.drawImage(images.get(0).image, 0, 0, newWidth-1, newHeight-1, - (int)sx1, (int)sy1, (int)sx2, (int)sy2, + sx1, sy1, sx2, sy2, this); images.set(0, new GeorefImage(new_img, adj1, adj2)); @@ -522,5 +522,5 @@ /** - * Method required by ImageObserver when drawing an image + * Method required by ImageObserver when drawing an image */ public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) { @@ -540,5 +540,5 @@ if (Main.map.mapView.getAllLayers().size() == 1) { /* Enable this code below when JOSM will have a proper support of dynamic projection change - * + * System.out.println("close all layers and change current Lambert zone from "+LambertCC9Zones.layoutZone+" to "+lambertZone); Bounds b = null; @@ -562,5 +562,5 @@ (images.get(0).max.north()+images.get(0).min.north())/2); } - + public void displace(double dx, double dy) { this.rasterMin = new EastNorth(rasterMin.east() + dx, rasterMin.north() + dy); @@ -582,5 +582,5 @@ if (!crosspieces.equals("0")) { int modulo = 50; - if (crosspieces.equals("2")) modulo = 100; + if (crosspieces.equals("2")) modulo = 100; EastNorthBound currentView = new EastNorthBound(mv.getEastNorth(0, mv.getHeight()), mv.getEastNorth(mv.getWidth(), 0)); @@ -603,4 +603,4 @@ } } - + } Index: applications/editors/josm/plugins/editgpx/build.xml =================================================================== --- applications/editors/josm/plugins/editgpx/build.xml (revision 18594) +++ applications/editors/josm/plugins/editgpx/build.xml (revision 18595) @@ -26,5 +26,5 @@ - + Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java =================================================================== --- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java (revision 18594) +++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java (revision 18595) @@ -8,5 +8,5 @@ import java.awt.Color; import java.awt.Component; -import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Point; import java.awt.Toolkit; @@ -23,4 +23,5 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.gpx.GpxData; import org.openstreetmap.josm.data.gpx.GpxTrack; @@ -106,5 +107,5 @@ @Override - public void paint(Graphics g, MapView mv) { + public void paint(Graphics2D g, MapView mv, Bounds bounds) { g.setColor(Color.yellow); Index: applications/editors/josm/plugins/imagewaypoint/.classpath =================================================================== --- applications/editors/josm/plugins/imagewaypoint/.classpath (revision 18595) +++ applications/editors/josm/plugins/imagewaypoint/.classpath (revision 18595) @@ -0,0 +1,7 @@ + + + + + + + Index: applications/editors/josm/plugins/imagewaypoint/.project =================================================================== --- applications/editors/josm/plugins/imagewaypoint/.project (revision 18595) +++ applications/editors/josm/plugins/imagewaypoint/.project (revision 18595) @@ -0,0 +1,17 @@ + + + JOSM-imagewaypoint + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + Index: applications/editors/josm/plugins/imagewaypoint/build.xml =================================================================== --- applications/editors/josm/plugins/imagewaypoint/build.xml (revision 18594) +++ applications/editors/josm/plugins/imagewaypoint/build.xml (revision 18595) @@ -26,5 +26,5 @@ - + Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java =================================================================== --- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java (revision 18594) +++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java (revision 18595) @@ -4,5 +4,5 @@ import java.awt.Component; -import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.event.MouseAdapter; @@ -13,4 +13,5 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.gui.MapView; @@ -116,5 +117,5 @@ @Override - public final void paint(final Graphics graphics, final MapView mapView) { + public final void paint(final Graphics2D graphics, final MapView mapView, Bounds box) { final ImageEntry[] images = ImageEntries.getInstance().getImages(); Index: applications/editors/josm/plugins/measurement/.classpath =================================================================== --- applications/editors/josm/plugins/measurement/.classpath (revision 18594) +++ applications/editors/josm/plugins/measurement/.classpath (revision 18595) @@ -2,5 +2,5 @@ - + Index: applications/editors/josm/plugins/measurement/build.xml =================================================================== --- applications/editors/josm/plugins/measurement/build.xml (revision 18594) +++ applications/editors/josm/plugins/measurement/build.xml (revision 18595) @@ -25,5 +25,5 @@ - + Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java =================================================================== --- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (revision 18594) +++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java (revision 18595) @@ -5,5 +5,5 @@ import java.awt.Color; import java.awt.Component; -import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Point; import java.awt.Toolkit; @@ -29,4 +29,5 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.GpxTrack; @@ -71,5 +72,5 @@ } - @Override public void paint(Graphics g, final MapView mv) { + @Override public void paint(Graphics2D g, final MapView mv, Bounds bounds) { g.setColor(Color.green); Point l = null; Index: applications/editors/josm/plugins/openstreetbugs/build.xml =================================================================== --- applications/editors/josm/plugins/openstreetbugs/build.xml (revision 18594) +++ applications/editors/josm/plugins/openstreetbugs/build.xml (revision 18595) @@ -26,5 +26,5 @@ - + Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java (revision 18594) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java (revision 18595) @@ -32,5 +32,5 @@ 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,4 +48,5 @@ 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,5 +119,5 @@ @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,5 +179,5 @@ 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,5 +190,5 @@ 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,5 +232,5 @@ 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,5 +251,5 @@ 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)) {